From 88d2ec619ae182fce3fd7e666045a456c9217b97 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Fri, 17 May 2019 16:40:06 +0200 Subject: [PATCH 1/3] Fix import --- .../net/pokeranalytics/android/ui/fragment/CalendarFragment.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt index 04e7087a..dd2e05a7 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt @@ -12,6 +12,7 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch +import net.pokeranalytics.android.R import net.pokeranalytics.android.calculus.Calculator import net.pokeranalytics.android.calculus.ComputedResults import net.pokeranalytics.android.calculus.Stat @@ -74,7 +75,7 @@ class CalendarFragment : ResultsObserverFragment(), CoroutineScope, StaticRowRep override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { super.onCreateView(inflater, container, savedInstanceState) - return inflater.inflate(net.pokeranalytics.android.R.layout.fragment_calendar, container, false) + return inflater.inflate(R.layout.fragment_calendar, container, false) } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { From 06b2be86732cb6e2a528fbeca4877ebd886e6c29 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Fri, 17 May 2019 16:40:45 +0200 Subject: [PATCH 2/3] Update Filterable Fragment --- .../android/ui/fragment/FeedFragment.kt | 5 ++--- .../ui/fragment/components/FilterableFragment.kt | 15 +-------------- .../fragment/components/PokerAnalyticsFragment.kt | 4 ++-- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt index 9702f0b9..fa6d129e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt @@ -26,7 +26,7 @@ import net.pokeranalytics.android.ui.activity.* import net.pokeranalytics.android.ui.adapter.FeedSessionRowRepresentableAdapter import net.pokeranalytics.android.ui.adapter.FeedTransactionRowRepresentableAdapter import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate -import net.pokeranalytics.android.ui.fragment.components.RealmFragment +import net.pokeranalytics.android.ui.fragment.components.FilterableFragment import net.pokeranalytics.android.ui.interfaces.FilterActivityRequestCode import net.pokeranalytics.android.ui.interfaces.FilterableType import net.pokeranalytics.android.ui.view.RowRepresentable @@ -36,7 +36,7 @@ import java.text.SimpleDateFormat import java.util.* -class FeedFragment : RealmFragment(), RowRepresentableDelegate { +class FeedFragment : FilterableFragment(), RowRepresentableDelegate { companion object { @@ -68,7 +68,6 @@ class FeedFragment : RealmFragment(), RowRepresentableDelegate { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - setFilterable(true) initUI() initData() } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt index 8879865c..4f89c398 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/FilterableFragment.kt @@ -3,7 +3,6 @@ package net.pokeranalytics.android.ui.fragment.components import android.os.Bundle import android.view.* import androidx.appcompat.widget.Toolbar -import androidx.fragment.app.Fragment import net.pokeranalytics.android.R import net.pokeranalytics.android.ui.interfaces.FilterHandler import net.pokeranalytics.android.ui.interfaces.FilterableType @@ -15,16 +14,11 @@ import timber.log.Timber * - Access to the filters actions (new, select, modify, remove) * - ... */ -open class FilterableFragment: Fragment(), FilterHandler { +open class FilterableFragment: RealmFragment(), FilterHandler { override var currentFilterable: FilterableType = FilterableType.ALL private var filterMenuItem: MenuItem? = null - private var displayFilter: Boolean = false - set(value) { - field = value - filterMenuItem?.isVisible = displayFilter - } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { setHasOptionsMenu(true) @@ -41,7 +35,6 @@ open class FilterableFragment: Fragment(), FilterHandler { filterMenuItem = toolbar.menu?.add(0, R.id.menu_item_filter, 0, R.string.filter) filterMenuItem?.setIcon(R.drawable.ic_outline_filter_list) filterMenuItem?.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM) - filterMenuItem?.isVisible = displayFilter } } @@ -63,10 +56,4 @@ open class FilterableFragment: Fragment(), FilterHandler { override fun removeFilter() { } - /** - * Set the current fragment as filterable - */ - fun setFilterable(filterable: Boolean) { - this.displayFilter = filterable - } } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/PokerAnalyticsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/PokerAnalyticsFragment.kt index 70ff698a..3bbf1d13 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/PokerAnalyticsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/PokerAnalyticsFragment.kt @@ -3,12 +3,12 @@ package net.pokeranalytics.android.ui.fragment.components import android.os.Bundle import android.view.View import androidx.appcompat.widget.Toolbar +import androidx.fragment.app.Fragment import com.crashlytics.android.Crashlytics import net.pokeranalytics.android.R import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity -import net.pokeranalytics.android.ui.interfaces.FilterHandler -open class PokerAnalyticsFragment : FilterableFragment(), FilterHandler { +open class PokerAnalyticsFragment : Fragment() { private var loaderDialogFragment: LoaderDialogFragment? = null var parentActivity: PokerAnalyticsActivity? = null From b15c6e2452e8022f5e91828c9584c7ae37cfd274 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Fri, 17 May 2019 16:42:12 +0200 Subject: [PATCH 3/3] Remove method --- .../net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt index 7cbc1f29..ca28348e 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatisticsFragment.kt @@ -58,7 +58,6 @@ class StatisticsFragment : ResultsObserverFragment(), FilterHandler { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - setFilterable(true) initUI() launchStatComputation() }