Put correct navigation tabs

feature/top10
Laurent 7 years ago
parent d48ef78515
commit 97dc033d23
  1. 5
      app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
  2. 2
      app/src/main/java/net/pokeranalytics/android/ui/activity/NewDataMenuActivity.kt
  3. 34
      app/src/main/res/menu/navigation_home.xml

@ -48,12 +48,9 @@ class HomeActivity : PokerAnalyticsActivity() {
R.id.navigation_reports -> { R.id.navigation_reports -> {
displayFragment(3) displayFragment(3)
} }
R.id.navigation_settings -> { R.id.navigation_more -> {
displayFragment(4) displayFragment(4)
} }
// R.id.navigation_more -> {
// displayFragment(4)
// }
} }
return@OnNavigationItemSelectedListener true return@OnNavigationItemSelectedListener true
} }

@ -40,7 +40,7 @@ class NewDataMenuActivity : PokerAnalyticsActivity() {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { // used to fix Oreo crash if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { // used to fix Oreo crash
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
} }
setContentView(R.layout.activity_new_data) setContentView(R.layout.activity_new_data)

@ -1,24 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android">
<!-- //CLEAN
<item
android:id="@+id/navigation_history"
android:icon="@drawable/ic_outline_history"
android:titleResId="@string/feed" />
<item
android:id="@+id/navigation_stats"
android:icon="@drawable/ic_outline_chart"
android:titleResId="@string/statIds" />
<item
android:id="@+id/navigation_settings"
android:icon="@drawable/ic_outline_settings"
android:titleResId="@string/services" />
-->
<item <item
android:id="@+id/navigation_history" android:id="@+id/navigation_history"
android:icon="@drawable/ic_outline_history" android:icon="@drawable/ic_outline_history"
@ -39,14 +21,14 @@
android:icon="@drawable/ic_outline_chart_bar" android:icon="@drawable/ic_outline_chart_bar"
android:title="@string/reports" /> android:title="@string/reports" />
<item
android:id="@+id/navigation_settings"
android:icon="@drawable/ic_outline_settings"
android:title="@string/services" />
<!--<item--> <!--<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> </menu>

Loading…
Cancel
Save