Refactoring (mainly rename files)

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

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.*
-import android.view.View
-import android.view.ViewGroup
 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<RowRepresentable>? {
 		return rowRepresentation
@@ -98,4 +111,12 @@ class ComparisonChartFragment : PokerAnalyticsFragment(), StaticRowRepresentable
 
 	}
 
+	/**
+	 * Open change statistics
+	 */
+	private fun openChangeStatistics() {
+		//TODO
+		toast("Open change statistics")
+	}
+
 }

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)

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)

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)

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
 			}

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" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/menu/toolbar_comparison_chart.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+
+	<item
+		android:id="@+id/settings"
+		android:title="@string/services"
+		android:icon="@drawable/ic_outline_settings"
+		app:showAsAction="always" />
+
+</menu>