Remove More tab

app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt

@@ -56,9 +56,12 @@ class HomeActivity : PokerAnalyticsActivity() {
 			R.id.navigation_reports -> {
 				displayFragment(3)
 			}
-			R.id.navigation_more -> {
+			R.id.navigation_settings -> {
 				displayFragment(4)
 			}
+//			R.id.navigation_more -> {
+//				displayFragment(4)
+//			}
 		}
 		return@OnNavigationItemSelectedListener true
 	}
@@ -183,7 +186,7 @@ class HomeActivity : PokerAnalyticsActivity() {
 				homeMenu?.findItem(R.id.filter)?.isVisible = false
 			}
 			4 -> {
-				toolbar.title = getString(R.string.more)
+				toolbar.title =  getString(R.string.services) //getString(R.string.more)
 				homeMenu?.findItem(R.id.filter)?.isVisible = false
 			}
 		}

app/src/main/java/net/pokeranalytics/android/ui/adapter/HomePagerAdapter.kt

@@ -21,7 +21,7 @@ class HomePagerAdapter(fragmentManager: FragmentManager) : FragmentStatePagerAda
 			1 -> StatisticsFragment.newInstance()
 			2 -> CalendarFragment.newInstance()
 			3 -> ReportsFragment.newInstance()
-			4 -> MoreFragment.newInstance()
+			4 -> SettingsFragment.newInstance() //  MoreFragment.newInstance()
 			else -> HistoryFragment.newInstance()
 		}
 	}
@@ -47,7 +47,7 @@ class HomePagerAdapter(fragmentManager: FragmentManager) : FragmentStatePagerAda
 			StatisticsFragment::class.java -> 1
 			CalendarFragment::class.java -> 2
 			ReportsFragment::class.java -> 3
-			MoreFragment::class.java -> 4
+			SettingsFragment::class.java -> 4
 			else -> -1
 		}
 	}

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

@@ -127,9 +127,9 @@ class SettingsFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Sta
 
 		parentActivity = activity as PokerAnalyticsActivity
 
-		parentActivity.setSupportActionBar(toolbar)
+//		parentActivity.setSupportActionBar(toolbar)
-		parentActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
+//		parentActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
-		setHasOptionsMenu(true)
+//		setHasOptionsMenu(true)
 
 		val viewManager = LinearLayoutManager(requireContext())
 		settingsAdapterRow = RowRepresentableAdapter(

app/src/main/res/layout/fragment_settings.xml

@@ -25,33 +25,33 @@
 
 	</androidx.core.widget.NestedScrollView>
 
-	<com.google.android.material.appbar.AppBarLayout
+	<!--<com.google.android.material.appbar.AppBarLayout-->
-		android:id="@+id/appBar"
+		<!--android:id="@+id/appBar"-->
-		android:layout_width="match_parent"
+		<!--android:layout_width="match_parent"-->
-		android:layout_height="128dp"
+		<!--android:layout_height="128dp"-->
-		android:theme="@style/PokerAnalyticsTheme.Toolbar.Session">
+		<!--android:theme="@style/PokerAnalyticsTheme.Toolbar.Session">-->
-
+
-		<com.google.android.material.appbar.CollapsingToolbarLayout
+		<!--<com.google.android.material.appbar.CollapsingToolbarLayout-->
-			android:id="@+id/collapsingToolbar"
+			<!--android:id="@+id/collapsingToolbar"-->
-			android:layout_width="match_parent"
+			<!--android:layout_width="match_parent"-->
-			android:layout_height="match_parent"
+			<!--android:layout_height="match_parent"-->
-			app:collapsedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.CollapsedTitleAppearance"
+			<!--app:collapsedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.CollapsedTitleAppearance"-->
-			app:contentScrim="?attr/colorPrimary"
+			<!--app:contentScrim="?attr/colorPrimary"-->
-			app:expandedTitleGravity="bottom"
+			<!--app:expandedTitleGravity="bottom"-->
-			app:expandedTitleMarginStart="72dp"
+			<!--app:expandedTitleMarginStart="72dp"-->
-			app:expandedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.ExpandedTitleAppearance"
+			<!--app:expandedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.ExpandedTitleAppearance"-->
-			app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
+			<!--app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">-->
-
+
-			<androidx.appcompat.widget.Toolbar
+			<!--<androidx.appcompat.widget.Toolbar-->
-				android:id="@+id/toolbar"
+				<!--android:id="@+id/toolbar"-->
-				android:layout_width="match_parent"
+				<!--android:layout_width="match_parent"-->
-				android:layout_height="?attr/actionBarSize"
+				<!--android:layout_height="?attr/actionBarSize"-->
-				app:layout_collapseMode="pin"
+				<!--app:layout_collapseMode="pin"-->
-				app:titleTextColor="@color/white"
+				<!--app:titleTextColor="@color/white"-->
-				app:title="@string/services" />
+				<!--app:title="@string/services" />-->
-
+
-		</com.google.android.material.appbar.CollapsingToolbarLayout>
+		<!--</com.google.android.material.appbar.CollapsingToolbarLayout>-->
-
+
-	</com.google.android.material.appbar.AppBarLayout>
+	<!--</com.google.android.material.appbar.AppBarLayout>-->
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -40,8 +40,13 @@
 		android:title="@string/reports" />
 
 	<item
-		android:id="@+id/navigation_more"
+		android:id="@+id/navigation_settings"
-		android:icon="@drawable/ic_outline_more"
+		android:icon="@drawable/ic_outline_settings"
-		android:title="@string/more" />
+		android:title="@string/services" />
+
+	<!--<item-->
+		<!--android:id="@+id/navigation_more"-->
+		<!--android:icon="@drawable/ic_outline_more"-->
+		<!--android:title="@string/more" />-->
 
 </menu>