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 c8512d55..f4bccafc 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
@@ -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
}
}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/HomePagerAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/HomePagerAdapter.kt
index f749a4db..d9f0c784 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/HomePagerAdapter.kt
+++ b/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
}
}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
index b396874f..d4cbd1b5 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
+++ b/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.supportActionBar?.setDisplayHomeAsUpEnabled(true)
- setHasOptionsMenu(true)
+// parentActivity.setSupportActionBar(toolbar)
+// parentActivity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
+// setHasOptionsMenu(true)
val viewManager = LinearLayoutManager(requireContext())
settingsAdapterRow = RowRepresentableAdapter(
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 8542d548..e1d3e396 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -25,33 +25,33 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/navigation_home.xml b/app/src/main/res/menu/navigation_home.xml
index 6ac0f33b..1ec55274 100644
--- a/app/src/main/res/menu/navigation_home.xml
+++ b/app/src/main/res/menu/navigation_home.xml
@@ -40,8 +40,13 @@
android:title="@string/reports" />