add transaction filtering management

app/src/main/java/net/pokeranalytics/android/model/migrations/PokerAnalyticsMigration.kt

@@ -127,7 +127,10 @@ class PokerAnalyticsMigration : RealmMigration {
                 it.addField("startDateHourMinuteComponent", Double::class.java).setNullable("startDateHourMinuteComponent", true)
                 it.addField("endDateHourMinuteComponent", Double::class.java).setNullable("endDateHourMinuteComponent", true)
             }
-			currentVersion++
+
+            schema.get("Filter")?.addField("filterableTypeOrdinal", Integer::class.java)
+
+            currentVersion++
 		}
 	}
 

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

@@ -7,6 +7,7 @@ import io.realm.kotlin.where
 import net.pokeranalytics.android.model.filter.Filterable
 import net.pokeranalytics.android.model.filter.Query
 import net.pokeranalytics.android.model.filter.QueryCondition
+import net.pokeranalytics.android.ui.interfaces.FilterableType
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.rowrepresentable.FilterCategoryRow
 import java.util.*
@@ -21,8 +22,9 @@ open class Filter : RealmObject(), RowRepresentable {
 	companion object {
 
 		// Create a new instance
-		fun newInstance(realm: Realm): Filter {
+		fun newInstance(realm: Realm, filterableType:Int): Filter {
 			val filter = Filter()
+            filter.filterableTypeOrdinal = filterableType
 			return realm.copyToRealm(filter)
 		}
 
@@ -59,6 +61,16 @@ open class Filter : RealmObject(), RowRepresentable {
 	var filterConditions: RealmList<FilterCondition> = RealmList()
 		private set
 
+    private var filterableTypeOrdinal: Int? = null
+
+    val filterableType: FilterableType
+        get() {
+            this.filterableTypeOrdinal?.let {
+                return FilterableType.values()[it]
+            }
+            return FilterableType.ALL
+        }
+
 	fun createOrUpdateFilterConditions(filterConditionRows: ArrayList<QueryCondition>) {
         println("list of querys saving: ${filterConditionRows.map { it.id }}")
         println("list of querys previous: ${this.filterConditions.map { it.queryCondition.id }}")

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

@@ -18,7 +18,6 @@ import io.realm.kotlin.where
 import kotlinx.android.synthetic.main.fragment_feed.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.LiveData
-import net.pokeranalytics.android.model.filter.Query
 import net.pokeranalytics.android.model.interfaces.Editable
 import net.pokeranalytics.android.model.realm.Filter
 import net.pokeranalytics.android.model.realm.Session
@@ -138,8 +137,14 @@ class FeedFragment : RealmFragment(), RowRepresentableDelegate, FilterHandler {
 		tabs.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
 			override fun onTabSelected(tab: TabLayout.Tab) {
 				when (tab.position) {
-					0 -> recyclerView.adapter = feedSessionAdapter
+					0 -> {
-					1 -> recyclerView.adapter = feedTransactionAdapter
+                        currentFilterable = FilterableType.SESSION
+                        recyclerView.adapter = feedSessionAdapter
+                    }
+					1 -> {
+                        currentFilterable = FilterableType.TRANSACTION
+                        recyclerView.adapter = feedTransactionAdapter
+                    }
 				}
 			}
 
@@ -162,27 +167,42 @@ class FeedFragment : RealmFragment(), RowRepresentableDelegate, FilterHandler {
 		betaLimitDate = sdf.parse("17/7/2019 10:00")
 
         val filter : Filter? = this.currentFilter(this.requireContext(), getRealm())
+        val sessionFilter: Filter? = filter?.let {
+            if (it.filterableType == FilterableType.SESSION) {
+                it
+            } else {
+                null
+            }
+        }
+
+        val transactionFilter: Filter? = filter?.let {
+            if (it.filterableType == FilterableType.TRANSACTION) {
+                it
+            } else {
+                null
+            }
+        }
 
 		// Sessions
-		this.realmSessions = filter?.results() ?: run { getRealm().where<Session>().findAll() }.sort("startDate", Sort.DESCENDING)
+		this.realmSessions = sessionFilter?.results() ?: run { getRealm().where<Session>().findAll() }.sort("startDate", Sort.DESCENDING)
         this.realmSessions.addChangeListener { _, _ ->
 			this.feedSessionAdapter.refreshData()
 			this.feedSessionAdapter.notifyDataSetChanged()
 		}
 
 
-		val pendingSessions = filter?.let {  getRealm().where<Session>().alwaysFalse().findAll() } ?: run { getRealm().where<Session>().isNull("year").isNull("month").findAll().sort("startDate", Sort.DESCENDING) }
+		val pendingSessions = sessionFilter?.let {  getRealm().where<Session>().alwaysFalse().findAll() } ?: run { getRealm().where<Session>().isNull("year").isNull("month").findAll().sort("startDate", Sort.DESCENDING) }
-		val distinctDateSessions = filter?.results("year", "month") ?: run { getRealm().where<Session>().distinct("year", "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)
 
 		// Transactions
-		this.realmTransactions = getRealm().where<Transaction>().findAll().sort("date", Sort.DESCENDING)
+		this.realmTransactions = transactionFilter?.results() ?: run { getRealm().where<Transaction>().findAll()}.sort("date", Sort.DESCENDING)
 		this.realmTransactions.addChangeListener { _, _ ->
 			this.feedTransactionAdapter.refreshData()
 			this.feedTransactionAdapter.notifyDataSetChanged()
 		}
 
-		val distinctDateTransactions = getRealm().where<Transaction>().distinct("year", "month").findAll().sort("date", Sort.DESCENDING)
+		val distinctDateTransactions = transactionFilter?.results("year", "month") ?: run { getRealm().where<Transaction>().distinct("year", "month").findAll() }.sort("date", Sort.DESCENDING)
 		this.feedTransactionAdapter = FeedTransactionRowRepresentableAdapter(this, realmTransactions, distinctDateTransactions)
 
 		val viewManager = SmoothScrollLinearLayoutManager(requireContext())

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

@@ -158,7 +158,7 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 			isUpdating = true
 		} ?: run {
 			realm.beginTransaction()
-			currentFilter = Filter.newInstance(realm)
+			currentFilter = Filter.newInstance(realm, this.filterableType.ordinal)
 			realm.commitTransaction()
 		}