Avoid multiple inflate of the menu

feature/top10
Aurelien Hubert 7 years ago
parent eaeb29d5de
commit c20b63e752
  1. 1
      app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
  2. 3
      app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt
  3. 1
      app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
  4. 1
      app/src/main/java/net/pokeranalytics/android/ui/fragment/FiltersFragment.kt
  5. 1
      app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt

@ -73,6 +73,7 @@ class HomeActivity : PokerAnalyticsActivity() {
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
menu?.clear()
menuInflater.inflate(R.menu.toolbar_home, menu)
this.homeMenu = menu
//TODO: Change queryWith button visibility

@ -10,10 +10,10 @@ import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
import net.pokeranalytics.android.ui.adapter.ComparisonChartPagerAdapter
import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
import net.pokeranalytics.android.ui.extensions.toast
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.ui.extensions.toast
class ComparisonChartFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate {
@ -55,6 +55,7 @@ class ComparisonChartFragment : PokerAnalyticsFragment(), StaticRowRepresentable
}
override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
menu?.clear()
inflater?.inflate(R.menu.toolbar_comparison_chart, menu)
this.comparisonChartMenu = menu
super.onCreateOptionsMenu(menu, inflater)

@ -52,6 +52,7 @@ open class EditableDataFragment : PokerAnalyticsFragment(), RowRepresentableDele
}
override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
menu?.clear()
inflater?.inflate(R.menu.toolbar_editable_data, menu)
this.editableMenu = menu
updateMenuUI()

@ -71,6 +71,7 @@ open class FiltersFragment : PokerAnalyticsFragment(), StaticRowRepresentableDat
}
override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
menu?.clear()
inflater?.inflate(R.menu.toolbar_editable_data, menu)
this.filterMenu = menu
updateMenuUI()

@ -63,6 +63,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate {
}
override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
menu?.clear()
inflater?.inflate(R.menu.toolbar_session, menu)
this.sessionMenu = menu
updateMenuUI()

Loading…
Cancel
Save