Merge branch 'dev' of gitlab.com:stax-river/poker-analytics into dev

app/src/main/java/net/pokeranalytics/android/model/realm/CustomField.kt

@@ -236,10 +236,16 @@ open class CustomField : RealmObject(), NameManageable, StaticRowRepresentableDa
 	}
 
 	/**
-	 * Remove the deleted entries from realm
+	 * Clean the entries if the type is not a list & remove the deleted entries from realm
 	 */
-	fun cleanDeletedEntries(realm: Realm) {
+	fun cleanEntries(realm: Realm) {
 		realm.executeTransaction {
+
+			if (!isListType) {
+				entriesToDelete.addAll(entries)
+				entries.clear()
+			}
+
 			entriesToDelete.forEach {
 				realm.where<CustomFieldEntry>().equalTo("id", it.id).findFirst()?.deleteFromRealm()
 			}

app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt

@@ -29,7 +29,8 @@ open class Filter : RealmObject(), RowRepresentable, Identifiable, Deletable {
 		fun newInstance(realm: Realm, filterableType:Int): Filter {
 			val filter = Filter()
             filter.filterableTypeOrdinal = filterableType
-			return realm.copyToRealm(filter)
+			return filter
+			//return realm.copyToRealm(filter)
 		}
 
 		// Get a queryWith by its id

app/src/main/java/net/pokeranalytics/android/ui/activity/FilterDetailsActivity.kt

@@ -5,6 +5,7 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import net.pokeranalytics.android.R
+import net.pokeranalytics.android.model.realm.Filter
 import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
 import net.pokeranalytics.android.ui.fragment.FilterDetailsFragment
 
@@ -16,6 +17,7 @@ class FilterDetailsActivity : PokerAnalyticsActivity() {
 	}
 
 	companion object {
+
 		/**
 		 * Default constructor
 		 */
@@ -29,7 +31,8 @@ class FilterDetailsActivity : PokerAnalyticsActivity() {
 		/**
 		 * Create a new instance for result
 		 */
-		fun newInstanceForResult(fragment: Fragment, filterId: String, filterCategoryOrdinal: Int, requestCode: Int) {
+		fun newInstanceForResult(fragment: Fragment, filterId: String, filterCategoryOrdinal: Int, requestCode: Int, filter: Filter? = null) {
+
 			val intent = Intent(fragment.requireContext(), FilterDetailsActivity::class.java)
 			intent.putExtra(IntentKey.FILTER_ID.keyName, filterId)
 			intent.putExtra(IntentKey.FILTER_CATEGORY_ORDINAL.keyName, filterCategoryOrdinal)
@@ -63,7 +66,6 @@ class FilterDetailsActivity : PokerAnalyticsActivity() {
 		fragmentTransaction.add(R.id.container, fragment)
 		fragmentTransaction.commit()
 		fragment.setData(filterId, filterCategoryOrdinal)
-
 	}
 
 }

app/src/main/java/net/pokeranalytics/android/ui/activity/FiltersActivity.kt

@@ -5,7 +5,6 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
 import net.pokeranalytics.android.ui.fragment.FiltersFragment
 import net.pokeranalytics.android.ui.interfaces.FilterActivityRequestCode

app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt

@@ -134,7 +134,6 @@ class DataListFragment : DeletableItemFragment(), LiveRowRepresentableDataSource
 				EditableDataActivity.newInstanceForResult(this, this.dataType, identifier, REQUEST_CODE_DETAILS)
 			}
 		}
-
 	}
 
 }

app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt

@@ -1,6 +1,5 @@
 package net.pokeranalytics.android.ui.fragment
 
-import android.app.Activity
 import android.app.Activity.RESULT_OK
 import android.content.Intent
 import android.os.Bundle
@@ -28,11 +27,11 @@ import net.pokeranalytics.android.ui.adapter.FeedTransactionRowRepresentableAdap
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.fragment.components.FilterableFragment
 import net.pokeranalytics.android.ui.interfaces.FilterActivityRequestCode
-import net.pokeranalytics.android.ui.interfaces.FilterHandler
 import net.pokeranalytics.android.ui.interfaces.FilterableType
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.SmoothScrollLinearLayoutManager
 import net.pokeranalytics.android.util.Preferences
+import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.*
 
@@ -85,7 +84,7 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
 			if (data.getBooleanExtra(DataListActivity.IntentKey.ITEM_DELETED.keyName, false)) {
 				deleteSelectedTransaction()
 			}
-		} else if (requestCode == FilterActivityRequestCode.SELECT_FILTER.ordinal && resultCode == Activity.RESULT_OK) {
+		} else if (requestCode == FilterActivityRequestCode.SELECT_FILTER.ordinal && resultCode == RESULT_OK) {
             data?.let {
                 this.saveFilter(this.requireContext(), it.getStringExtra(FiltersActivity.IntentKey.FILTER_ID.keyName))
             }
@@ -99,15 +98,17 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
 		realmTransactions.removeAllChangeListeners()
 	}
 
+	/*
     override fun setUserVisibleHint(isVisibleToUser: Boolean) {
         super.setUserVisibleHint(isVisibleToUser)
-        if (isVisibleToUser) {
+        if (isVisibleToUser && view != null) {
             if (FilterHandler.filterWasUpdated) {
                 this.initData()
                 FilterHandler.filterWasUpdated = false
             }
         }
     }
+    */
 
 	override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) {
 		when (row) {
@@ -174,15 +175,14 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
 
         val sdf = SimpleDateFormat("dd/M/yyyy hh:mm", Locale.getDefault())
 		betaLimitDate = sdf.parse("17/7/2019 10:00")
-        val filter : Filter? = this.currentFilter(this.requireContext(), getRealm())
+
-        this.loadSessions(filter)
-        this.loadTransactions(filter)
         val viewManager = SmoothScrollLinearLayoutManager(requireContext())
         recyclerView.apply {
             setHasFixedSize(true)
             layoutManager = viewManager
-            adapter = feedSessionAdapter
         }
+
+		applyFilter()
     }
 
     private fun loadSessions(filter : Filter? = null) {
@@ -204,6 +204,7 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
         val pendingSessions = sessionFilter?.let {  getRealm().where<Session>().alwaysFalse().findAll() } ?: run { getRealm().where<Session>().isNull("year").isNull("month").findAll().sort("startDate", Sort.DESCENDING) }
         val distinctDateSessions = sessionFilter?.results("year", "month") ?: run { getRealm().where<Session>().distinct("year", "month").findAll() }.sort("startDate", Sort.DESCENDING)
         this.feedSessionAdapter = FeedSessionRowRepresentableAdapter(this, realmSessions, pendingSessions, distinctDateSessions)
+	    recyclerView.adapter = feedSessionAdapter
     }
 
     private fun loadTransactions(filter : Filter? = null) {
@@ -287,6 +288,8 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
     }
 
     override fun applyFilter() {
+	    super.applyFilter()
+	    Timber.d("applyFilter")
         val filter: Filter? = this.currentFilter(this.requireContext(), getRealm())
         this.loadSessions(filter)
         this.loadTransactions(filter)
@@ -300,6 +303,7 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
     }
 
     override fun removeFilter() {
+	    super.removeFilter()
         this.loadSessions()
         this.loadTransactions()
         if (currentFilterable== FilterableType.SESSION) {

app/src/main/java/net/pokeranalytics/android/ui/fragment/FilterDetailsFragment.kt

@@ -5,7 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
-import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -22,15 +21,11 @@ import net.pokeranalytics.android.ui.fragment.components.RealmFragment
 import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
 import net.pokeranalytics.android.ui.helpers.DateTimePickerManager
 import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.ui.view.rowrepresentable.FilterCategoryRow
 import net.pokeranalytics.android.ui.view.rowrepresentable.FilterElementRow
 import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow
 import net.pokeranalytics.android.util.NULL_TEXT
-import net.pokeranalytics.android.util.extensions.shortDate
-import net.pokeranalytics.android.util.extensions.shortTime
-import net.pokeranalytics.android.util.extensions.toMinutes
 import timber.log.Timber
 import java.util.*
 import kotlin.collections.ArrayList
@@ -45,10 +40,7 @@ open class  FilterDetailsFragment : RealmFragment(), StaticRowRepresentableDataS
 	private var rows: ArrayList<RowRepresentable> = ArrayList()
 	private var rowsForFilterSubcategoryRow: HashMap<FilterSectionRow, ArrayList<RowRepresentable>> = HashMap()
 
-	private var filterMenu: Menu? = null
 	private val selectedRows = ArrayList<QueryCondition>()
-	private var isUpdating = false
-	private var shouldOpenKeyboard = true
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		super.onCreateView(inflater, container, savedInstanceState)
@@ -70,15 +62,20 @@ open class  FilterDetailsFragment : RealmFragment(), StaticRowRepresentableDataS
 	override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) {
 		super.onRowSelected(position, row, fromAction)
 
-		Timber.d("Row: $row")
-
 		if (row.viewType == RowViewType.TITLE_CHECK.ordinal) {
 			updateRowsSelection(row)
 			return
 		}
 
 		when (row) {
-            is QueryCondition.DateQuery -> DateTimePickerManager.create(requireContext(), row, this, row.singleValue, onlyDate = !row.showTime, onlyTime = row.showTime)
+			is QueryCondition.DateQuery -> DateTimePickerManager.create(
+				requireContext(),
+				row,
+				this,
+				row.singleValue,
+				onlyDate = !row.showTime,
+				onlyTime = row.showTime
+			)
 			is QueryCondition.Duration -> {
 				var hours: String? = null
 				var minutes: String? = null
@@ -189,8 +186,8 @@ open class  FilterDetailsFragment : RealmFragment(), StaticRowRepresentableDataS
 	 */
 	private fun initData() {
 
-			currentFilter = Filter.getFilterBydId(getRealm(), primaryKey)
+		//currentFilter = Filter.getFilterBydId(getRealm(), primaryKey)
-
+		currentFilter = FiltersFragment.currentFilter
 
 		this.appBar.toolbar.title = filterCategoryRow.localizedTitle(requireContext())
 
@@ -257,7 +254,6 @@ open class  FilterDetailsFragment : RealmFragment(), StaticRowRepresentableDataS
 			Timber.d("Condition: $it")
 		}
 
-
 		finishActivityWithResult(currentFilter?.id)
 	}
 

app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt

@@ -12,7 +12,9 @@ import kotlinx.android.synthetic.main.fragment_editable_data.recyclerView
 import kotlinx.android.synthetic.main.fragment_filters.*
 import kotlinx.android.synthetic.main.fragment_filters.view.toolbar
 import net.pokeranalytics.android.R
+import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.model.realm.Filter
+import net.pokeranalytics.android.ui.activity.DataListActivity
 import net.pokeranalytics.android.ui.activity.FilterDetailsActivity
 import net.pokeranalytics.android.ui.activity.FiltersActivity
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
@@ -20,6 +22,7 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
 import net.pokeranalytics.android.ui.extensions.px
 import net.pokeranalytics.android.ui.fragment.components.RealmFragment
+import net.pokeranalytics.android.ui.interfaces.FilterActivityRequestCode
 import net.pokeranalytics.android.ui.interfaces.FilterableType
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.rowrepresentable.FilterCategoryRow
@@ -32,11 +35,13 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 
 	companion object {
 		const val REQUEST_CODE_FILTER_DETAILS = 100
+
+		var currentFilter: Filter? = null
+
 	}
 
 	private lateinit var rowRepresentableAdapter: RowRepresentableAdapter
 
-	private var currentFilter: Filter? = null
 	private var filterCopy: Filter? = null
 
 	private var rows: ArrayList<RowRepresentable> = ArrayList()
@@ -46,6 +51,7 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 
 	private var selectedRow: RowRepresentable? = null
 	private var isUpdating = false
+	private var isSaved = false
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
 		super.onCreateView(inflater, container, savedInstanceState)
@@ -56,24 +62,38 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 		super.onViewCreated(view, savedInstanceState)
 		initUI()
 		initData()
+		updateMostUsedFilters()
 	}
 
 	override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
 		super.onActivityResult(requestCode, resultCode, data)
 
+		Timber.d("requestCode: $requestCode")
+		Timber.d("resultCode: $resultCode")
+		Timber.d("data: $data")
+
 		if (requestCode == REQUEST_CODE_FILTER_DETAILS && resultCode == RESULT_OK) {
 
+			// Update object
 			/*
-			Timber.d("onActivityResult: $requestCode")
+			currentFilter?.id?.let { currentFilterId ->
-			if (data != null && data.hasExtra(FilterDetailsActivity.IntentKey.FILTER_ID.keyName)) {
+				Filter.getFilterBydId(getRealm(), currentFilterId)?.let { filter ->
-				val filterId = data.getStringExtra(FilterDetailsActivity.IntentKey.FILTER_ID.keyName)
+					currentFilter = filter
-				Timber.d("Updated queryWith: ${filterId}")
+				}
 			}
 			*/
 
 			selectedRow?.let {
 				rowRepresentableAdapter.refreshRow(it)
 			}
+		} else if (requestCode == FilterActivityRequestCode.SELECT_FILTER.ordinal) {
+
+			updateMostUsedFilters()
+
+			if (resultCode == RESULT_OK && data != null && data.hasExtra(FiltersActivity.IntentKey.FILTER_ID.keyName)) {
+				val filterId = data.getStringExtra(FiltersActivity.IntentKey.FILTER_ID.keyName)
+				finishActivityWithResult(filterId)
+			}
 		}
 	}
 
@@ -96,7 +116,6 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 	override fun onOptionsItemSelected(item: MenuItem?): Boolean {
 		when (item!!.itemId) {
 			R.id.save -> validateUpdates()
-			R.id.delete -> deleteFilter()
 		}
 		return true
 	}
@@ -142,48 +161,9 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 			layoutManager = viewManager
 		}
 
-		val filters = getRealm().sorted(Filter::class.java)
+		moreFilters.setOnClickListener {
-		val currentFilterId = Preferences.getActiveFilterId(requireContext())
+			DataListActivity.newSelectInstance(this, LiveData.FILTER.ordinal)
-
-		mostUsedFilters.removeAllViews()
-		filters.forEachIndexed { index, filter ->
-			if (index < 5) {
-				val chip = Chip(requireContext())
-				chip.id = View.generateViewId()
-				chip.tag = filter.id
-				chip.text = filter.getDisplayName(requireContext())
-				chip.chipStartPadding = 8f.px
-				chip.chipEndPadding = 8f.px
-
-				chip.isCloseIconVisible = true
-				chip.isChecked = filter.id == currentFilterId
-				chip.setOnCloseIconClickListener {
-					Preferences.removeActiveFilterId(requireContext())
-					chip.isChecked = false
-				}
-				chip.setOnClickListener {
-					deleteFilter(false)
-					finishActivityWithResult(filter.id)
-				}
-				mostUsedFilters.addView(chip)
-			}
-		}
-
-		/*
-		Limit.values().forEach {
-			val chip = Chip(requireContext())
-			chip.id = it.ordinal
-			chip.text = it.shortName
-			chip.chipStartPadding = 8f.px
-			chip.chipEndPadding = 8f.px
-			chip.isChecked = false
-			mostUsedFilters.addView(chip)
 		}
-
-		mostUsedFilters.setOnCheckedChangeListener { _, i ->
-		}
-		*/
-
 	}
 
 	/**
@@ -198,18 +178,20 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 		Timber.d("Filters: ${filters.size}")
 
 		primaryKey?.let {
-			currentFilter = Filter.getFilterBydId(realm, it)
+			currentFilter = realm.copyFromRealm(Filter.getFilterBydId(realm, it))
 			isUpdating = true
 		} ?: run {
 			realm.beginTransaction()
-			currentFilter = Filter.newInstance(realm, this.filterableType.ordinal)
+			currentFilter = Filter.newInstance(realm, this.filterableType.ordinal) //realm.copyFromRealm(Filter.newInstance(realm, this.filterableType.ordinal))
 			realm.commitTransaction()
 		}
 
 		// Create a copy if the user cancels the updates
 		currentFilter?.let {
+			if (it.isValid && it.isManaged) {
 				filterCopy = getRealm().copyFromRealm(it)
 			}
+		}
 
 		rows.clear()
 		rows.addAll(FilterCategoryRow.values(this.filterableType))
@@ -219,12 +201,55 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 
 	}
 
+	/**
+	 * Update the most used filters chips
+	 */
+	private fun updateMostUsedFilters() {
+
+		if (isUpdating) {
+			mostUsedFiltersLayout.visibility = View.GONE
+			return
+		}
+
+		val filters = getRealm().sorted(Filter::class.java)
+		val currentFilterId = Preferences.getActiveFilterId(requireContext())
+
+		mostUsedFilters.removeAllViews()
+		filters.forEachIndexed { index, filter ->
+			if (index < 3) {
+				val chip = Chip(requireContext())
+				chip.id = View.generateViewId()
+				chip.tag = filter.id
+				chip.text = filter.getDisplayName(requireContext())
+				chip.chipStartPadding = 8f.px
+				chip.chipEndPadding = 8f.px
+
+				chip.isChecked = filter.id == currentFilterId
+				chip.setOnCloseIconClickListener {
+
+					chip.isChecked = false
+				}
+				chip.setOnClickListener {
+					if (chip.isChecked) {
+						deleteFilter(false)
+						finishActivityWithResult(filter.id)
+					} else {
+						Preferences.removeActiveFilterId(requireContext())
+						deleteFilter(true)
+					}
+				}
+				mostUsedFilters.addView(chip)
+			}
+		}
+
+	}
+
 	/**
 	 * Update menu UI
 	 */
 	private fun updateMenuUI() {
-		filterMenu?.findItem(R.id.delete)?.isVisible = isUpdating
 		filterMenu?.findItem(R.id.save)?.isVisible = true
+		filterMenu?.findItem(R.id.delete)?.isVisible = false
 	}
 
 	/**
@@ -232,6 +257,16 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 	 */
 	private fun validateUpdates() {
 		Timber.d("Validate queryWith updates")
+
+		val realm = getRealm()
+		realm.beginTransaction()
+		currentFilter?.let {
+			it.name = it.query.getName(requireContext())
+			Timber.d("name: ${it.name}")
+			realm.copyToRealmOrUpdate(it)
+		}
+		realm.commitTransaction()
+
 		val filterId = currentFilter?.id ?: ""
 		finishActivityWithResult(filterId)
 	}
@@ -258,10 +293,12 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 	 */
 	private fun deleteFilter(closeActivity: Boolean = true) {
 		Timber.d("Delete queryWith")
+		if (currentFilter?.isValid == true && currentFilter?.isManaged == true) {
 			val realm = getRealm()
 			realm.beginTransaction()
 			currentFilter?.deleteFromRealm()
 			realm.commitTransaction()
+		}
 
 		if (closeActivity) {
 			finishActivityWithResult("")

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/DeletableItemFragment.kt

@@ -15,8 +15,10 @@ import kotlinx.coroutines.launch
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.interfaces.Deletable
 import net.pokeranalytics.android.model.interfaces.Identifiable
+import net.pokeranalytics.android.model.realm.Filter
 import net.pokeranalytics.android.ui.activity.DataListActivity
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
+import timber.log.Timber
 
 /**
  * Deletable Item Fragment
@@ -87,6 +89,8 @@ abstract class DeletableItemFragment : RealmFragment() {
 
 			val deletableItem = (itemToDelete as Deletable)
 
+			Timber.d("deletableItem: ${(deletableItem as Filter).getDisplayName(requireContext())}")
+
 			// Check if the object is valid for the deletion
 			if (deletableItem.isValidForDelete(this.getRealm())) {
 				deletedItem = getRealm().copyFromRealm(itemToDelete)

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt

@@ -3,11 +3,16 @@ package net.pokeranalytics.android.ui.fragment.components
 import android.os.Bundle
 import android.view.*
 import androidx.appcompat.widget.Toolbar
-import net.pokeranalytics.android.R
+import kotlinx.android.synthetic.main.view_selected_filter.view.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import net.pokeranalytics.android.ui.interfaces.FilterHandler
 import net.pokeranalytics.android.ui.interfaces.FilterableType
 import timber.log.Timber
 
+
 /**
  * A class which define the fragment as Filterable
  * - Add an filter icon menu
@@ -29,18 +34,18 @@ open class FilterableFragment: RealmFragment(), FilterHandler {
 		super.onCreateOptionsMenu(menu, inflater)
 		Timber.d("onCreateOptionsMenu")
 
-		view?.findViewById<Toolbar>(R.id.toolbar)?.let { toolbar ->
+		view?.findViewById<Toolbar>(net.pokeranalytics.android.R.id.toolbar)?.let { toolbar ->
 			Timber.d("toolbar menu ${toolbar.menu}")
-			toolbar.menu.removeItem(R.id.menu_item_filter)
+			toolbar.menu.removeItem(net.pokeranalytics.android.R.id.menu_item_filter)
-			filterMenuItem = toolbar.menu?.add(0, R.id.menu_item_filter, 0, R.string.filter)
+			filterMenuItem = toolbar.menu?.add(0, net.pokeranalytics.android.R.id.menu_item_filter, 0, net.pokeranalytics.android.R.string.filter)
-			filterMenuItem?.setIcon(R.drawable.ic_outline_filter_list)
+			filterMenuItem?.setIcon(net.pokeranalytics.android.R.drawable.ic_outline_filter_list)
 			filterMenuItem?.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM)
 		}
 	}
 
 	override fun onOptionsItemSelected(item: MenuItem?): Boolean {
 		when (item?.itemId) {
-			R.id.menu_item_filter -> {
+			net.pokeranalytics.android.R.id.menu_item_filter -> {
 				manageFilters(this)
 			}
 		}
@@ -51,9 +56,40 @@ open class FilterableFragment: RealmFragment(), FilterHandler {
 	}
 
 	override fun applyFilter() {
+		displaySelectedFilter()
 	}
 
 	override fun removeFilter() {
+		hideSelectedFilter()
+	}
+
+	private fun displaySelectedFilter() {
+
+		currentFilter(requireContext(), getRealm())?.let { filter ->
+			view?.findViewById<ViewGroup>(net.pokeranalytics.android.R.id.selectedFilter)?.let { viewGroup ->
+
+				val layoutCurrentFilter = LayoutInflater.from(requireContext()).inflate(net.pokeranalytics.android.R.layout.view_selected_filter, viewGroup, false)
+				layoutCurrentFilter.filterName.text = filter.getDisplayName(requireContext())
+				layoutCurrentFilter.deselectFilter.setOnClickListener {
+					saveFilter(requireContext(), "")
+				}
+
+				viewGroup.removeAllViews()
+				viewGroup.addView(layoutCurrentFilter)
+
+				GlobalScope.launch(Dispatchers.Main) {
+					delay(300)
+					viewGroup.visibility = View.VISIBLE
+				}
+			}
+		}
 	}
 
+	private fun hideSelectedFilter() {
+		view?.findViewById<ViewGroup>(net.pokeranalytics.android.R.id.selectedFilter).let {
+			GlobalScope.launch(Dispatchers.Main) {
+				it?.visibility = View.GONE
+			}
+		}
+	}
 }

app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt

@@ -202,7 +202,7 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa
 
 	override fun onDataSaved() {
 		super.onDataSaved()
-		customField.cleanDeletedEntries(getRealm())
+		customField.cleanEntries(getRealm())
 	}
 
 	/**

app/src/main/java/net/pokeranalytics/android/ui/interfaces/FilterHandler.kt

@@ -1,18 +1,12 @@
 package net.pokeranalytics.android.ui.interfaces
 
 import android.content.Context
-import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import io.realm.Realm
 import io.realm.kotlin.where
-import net.pokeranalytics.android.R
-import net.pokeranalytics.android.model.LiveData
-import net.pokeranalytics.android.model.filter.Filterable
 import net.pokeranalytics.android.model.realm.Filter
-import net.pokeranalytics.android.ui.activity.DataListActivity
 import net.pokeranalytics.android.ui.activity.FiltersActivity
 import net.pokeranalytics.android.util.Preferences
-import timber.log.Timber
 
 enum class FilterActivityRequestCode {
     SELECT_FILTER,
@@ -41,7 +35,11 @@ interface FilterHandler {
     fun saveFilter(context: Context, filterId:String) {
         Preferences.setActiveFilterId(filterId, context)
         filterWasUpdated = true
+        if (filterId.isNotEmpty()) {
             this.applyFilter()
+        } else {
+            this.removeFilter()
+        }
     }
 
     fun currentFilter(context: Context, realm: Realm): Filter? {
@@ -62,6 +60,12 @@ interface FilterHandler {
 
         val context = fragment.requireContext()
         val filterId =  Preferences.getActiveFilterId(context)
+
+        FiltersActivity.newInstanceForResult(fragment = fragment, currentFilterable = currentFilterable)
+
+
+
+        /*
         val filterSelected = filterId != null
 
         val realm = Realm.getDefaultInstance()
@@ -101,5 +105,6 @@ interface FilterHandler {
             }
 
         builder.show()
+        */
     }
 }

app/src/main/res/layout/fragment_feed.xml

@@ -3,6 +3,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/container"
+	android:animateLayoutChanges="true"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	tools:context=".ui.activity.HomeActivity">
@@ -47,6 +48,15 @@
 
 	</com.google.android.material.appbar.AppBarLayout>
 
+	<FrameLayout
+		android:id="@+id/selectedFilter"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:visibility="gone"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/appBar" />
+
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recyclerView"
 		android:layout_width="0dp"
@@ -54,7 +64,7 @@
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/appBar"
+		app:layout_constraintTop_toBottomOf="@+id/selectedFilter"
 		tools:listitem="@layout/row_feed_session" />
 
 	<androidx.appcompat.widget.AppCompatTextView

app/src/main/res/layout/fragment_filters.xml

@@ -19,17 +19,6 @@
 			app:title="Poker Analytics"
 			app:titleTextColor="@color/white" />
 
-			<com.google.android.material.chip.ChipGroup
-				android:id="@+id/mostUsedFilters"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center_vertical"
-				android:layout_marginStart="8dp"
-				android:layout_marginEnd="8dp"
-				android:layout_marginBottom="8dp"
-				app:chipSpacing="8dp"
-				app:singleSelection="true" />
-
 	</com.google.android.material.appbar.AppBarLayout>
 
 	<androidx.core.widget.NestedScrollView
@@ -47,11 +36,51 @@
 				android:id="@+id/recyclerView"
 				android:layout_width="0dp"
 				android:layout_height="0dp"
-				app:layout_constraintBottom_toBottomOf="parent"
+				app:layout_constraintBottom_toTopOf="@+id/mostUsedFiltersLayout"
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toTopOf="parent" />
 
+			<androidx.constraintlayout.widget.ConstraintLayout
+				android:id="@+id/mostUsedFiltersLayout"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:background="@color/colorPrimary"
+				android:elevation="4dp"
+				android:padding="8dp"
+				app:layout_constraintBottom_toBottomOf="parent"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent">
+
+				<com.google.android.material.chip.ChipGroup
+					android:id="@+id/mostUsedFilters"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center_vertical"
+					android:layout_marginEnd="8dp"
+					app:chipSpacing="8dp"
+					app:layout_constraintBottom_toBottomOf="parent"
+					app:layout_constraintEnd_toStartOf="@+id/moreFilters"
+					app:layout_constraintStart_toStartOf="parent"
+					app:layout_constraintTop_toTopOf="parent"
+					app:singleSelection="true" />
+
+				<androidx.appcompat.widget.AppCompatTextView
+					android:id="@+id/moreFilters"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:background="?selectableItemBackgroundBorderless"
+					android:fontFamily="@font/roboto_bold"
+					android:gravity="center"
+					android:padding="8dp"
+					android:text="@string/all"
+					android:textAllCaps="true"
+					android:textColor="@color/green"
+					app:layout_constraintBottom_toBottomOf="parent"
+					app:layout_constraintEnd_toEndOf="parent" />
+
+			</androidx.constraintlayout.widget.ConstraintLayout>
+
 		</androidx.constraintlayout.widget.ConstraintLayout>
 
 	</androidx.core.widget.NestedScrollView>

app/src/main/res/layout/view_selected_filter.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="@color/green_lighter_gradient">
+
+	<androidx.appcompat.widget.AppCompatTextView
+		android:id="@+id/filterName"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginTop="16dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginBottom="16dp"
+		android:fontFamily="@font/roboto_medium"
+		android:textColor="@color/kaki_lighter"
+		android:textSize="16sp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toStartOf="@+id/deselectFilter"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:text="Cash Live" />
+
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@+id/deselectFilter"
+		android:layout_width="32dp"
+		android:layout_height="32dp"
+		android:layout_marginTop="8dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginBottom="8dp"
+		android:background="?selectableItemBackgroundBorderless"
+		android:padding="4dp"
+		android:src="@drawable/ic_close"
+		android:tint="@color/kaki_lighter"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>