From dc3783427d70c750456d2495dec516b5fe0e3293 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Fri, 12 Apr 2019 14:46:45 +0200 Subject: [PATCH] Refactoring (mainly rename files) --- .../android/ui/activity/HomeActivity.kt | 2 +- .../ui/fragment/ComparisonChartFragment.kt | 27 ++++++++++++++++--- .../ui/fragment/EditableDataFragment.kt | 2 +- .../android/ui/fragment/FiltersFragment.kt | 2 +- .../android/ui/fragment/SessionFragment.kt | 2 +- .../bottomsheet/BottomSheetFragment.kt | 2 +- app/src/main/res/layout/activity_home.xml | 2 +- .../{navigation.xml => navigation_home.xml} | 0 ...heet_menu.xml => toolbar_bottom_sheet.xml} | 0 .../res/menu/toolbar_comparison_chart.xml | 11 ++++++++ ...ble_data.xml => toolbar_editable_data.xml} | 0 .../menu/{home_menu.xml => toolbar_home.xml} | 0 ...ession_toolbar.xml => toolbar_session.xml} | 0 13 files changed, 41 insertions(+), 9 deletions(-) rename app/src/main/res/menu/{navigation.xml => navigation_home.xml} (100%) rename app/src/main/res/menu/{bottom_sheet_menu.xml => toolbar_bottom_sheet.xml} (100%) create mode 100644 app/src/main/res/menu/toolbar_comparison_chart.xml rename app/src/main/res/menu/{editable_data.xml => toolbar_editable_data.xml} (100%) rename app/src/main/res/menu/{home_menu.xml => toolbar_home.xml} (100%) rename app/src/main/res/menu/{session_toolbar.xml => toolbar_session.xml} (100%) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt index 096a6de5..af6939bb 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt @@ -73,7 +73,7 @@ class HomeActivity : PokerAnalyticsActivity() { } override fun onCreateOptionsMenu(menu: Menu?): Boolean { - menuInflater.inflate(R.menu.home_menu, menu) + menuInflater.inflate(R.menu.toolbar_home, menu) this.homeMenu = menu //TODO: Change filter button visibility homeMenu?.findItem(R.id.filter)?.isVisible = true diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt index 787402bf..ec221671 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt @@ -1,9 +1,7 @@ package net.pokeranalytics.android.ui.fragment import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup +import android.view.* import kotlinx.android.synthetic.main.fragment_comparison_chart.* import net.pokeranalytics.android.R import net.pokeranalytics.android.ui.activity.BankrollActivity @@ -15,6 +13,7 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.rowrepresentable.MoreTabRow +import net.pokeranalytics.android.util.extensions.toast class ComparisonChartFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate { @@ -40,6 +39,7 @@ class ComparisonChartFragment : PokerAnalyticsFragment(), StaticRowRepresentable private lateinit var parentActivity: PokerAnalyticsActivity private lateinit var viewPagerAdapter: ComparisonChartPagerAdapter + private var comparisonChartMenu: Menu? = null // Life Cycle @@ -54,6 +54,19 @@ class ComparisonChartFragment : PokerAnalyticsFragment(), StaticRowRepresentable initUI() } + override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) { + inflater?.inflate(R.menu.toolbar_comparison_chart, menu) + this.comparisonChartMenu = menu + super.onCreateOptionsMenu(menu, inflater) + } + + override fun onOptionsItemSelected(item: MenuItem?): Boolean { + when (item!!.itemId) { + R.id.settings -> openChangeStatistics() + } + return true + } + // Rows override fun adapterRows(): List? { return rowRepresentation @@ -98,4 +111,12 @@ class ComparisonChartFragment : PokerAnalyticsFragment(), StaticRowRepresentable } + /** + * Open change statistics + */ + private fun openChangeStatistics() { + //TODO + toast("Open change statistics") + } + } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt index 44e8b118..9b0123c7 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt @@ -52,7 +52,7 @@ open class EditableDataFragment : PokerAnalyticsFragment(), RowRepresentableDele } override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) { - inflater?.inflate(R.menu.editable_data, menu) + inflater?.inflate(R.menu.toolbar_editable_data, menu) this.editableMenu = menu updateMenuUI() super.onCreateOptionsMenu(menu, inflater) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt index 8a9915a4..c470f429 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt @@ -71,7 +71,7 @@ open class FiltersFragment : PokerAnalyticsFragment(), StaticRowRepresentableDat } override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) { - inflater?.inflate(R.menu.editable_data, menu) + inflater?.inflate(R.menu.toolbar_editable_data, menu) this.filterMenu = menu updateMenuUI() super.onCreateOptionsMenu(menu, inflater) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt index 41fdd733..45767d22 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt @@ -63,7 +63,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate { } override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) { - inflater?.inflate(R.menu.session_toolbar, menu) + inflater?.inflate(R.menu.toolbar_session, menu) this.sessionMenu = menu updateMenuUI() super.onCreateOptionsMenu(menu, inflater) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt index 57c17392..f883c7f2 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt @@ -97,7 +97,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() { private fun initUI() { row.let { bottomSheetToolbar.title = row.localizedTitle(requireContext()) - bottomSheetToolbar.inflateMenu(R.menu.bottom_sheet_menu) + bottomSheetToolbar.inflateMenu(R.menu.toolbar_bottom_sheet) bottomSheetToolbar.setOnMenuItemClickListener { false } diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 275db019..d5788e1c 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -34,6 +34,6 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" - app:menu="@menu/navigation" /> + app:menu="@menu/navigation_home" /> \ No newline at end of file diff --git a/app/src/main/res/menu/navigation.xml b/app/src/main/res/menu/navigation_home.xml similarity index 100% rename from app/src/main/res/menu/navigation.xml rename to app/src/main/res/menu/navigation_home.xml diff --git a/app/src/main/res/menu/bottom_sheet_menu.xml b/app/src/main/res/menu/toolbar_bottom_sheet.xml similarity index 100% rename from app/src/main/res/menu/bottom_sheet_menu.xml rename to app/src/main/res/menu/toolbar_bottom_sheet.xml diff --git a/app/src/main/res/menu/toolbar_comparison_chart.xml b/app/src/main/res/menu/toolbar_comparison_chart.xml new file mode 100644 index 00000000..2132026e --- /dev/null +++ b/app/src/main/res/menu/toolbar_comparison_chart.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/editable_data.xml b/app/src/main/res/menu/toolbar_editable_data.xml similarity index 100% rename from app/src/main/res/menu/editable_data.xml rename to app/src/main/res/menu/toolbar_editable_data.xml diff --git a/app/src/main/res/menu/home_menu.xml b/app/src/main/res/menu/toolbar_home.xml similarity index 100% rename from app/src/main/res/menu/home_menu.xml rename to app/src/main/res/menu/toolbar_home.xml diff --git a/app/src/main/res/menu/session_toolbar.xml b/app/src/main/res/menu/toolbar_session.xml similarity index 100% rename from app/src/main/res/menu/session_toolbar.xml rename to app/src/main/res/menu/toolbar_session.xml