Removed about and settings from the top right

Removed about and settings from the top right of the menu.
scribe-org · Aug 13, 2024 · abfea22 · abfea22
1 parent 6f3bd1d
commit abfea22
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 17 deletions.
diff --git a/app/src/main/kotlin/be/scri/activities/AboutActivity.kt b/app/src/main/kotlin/be/scri/activities/AboutActivity.kt
@@ -57,7 +57,7 @@ class AboutActivity : BaseSimpleActivity(), GestureDetector.OnGestureListener{
                     return@OnNavigationItemSelectedListener true
                 }
 
-                R.id.about ->  {
+                R.id.info ->  {
                     return@OnNavigationItemSelectedListener true }
                 R.id.installation -> {
                     startActivity(Intent(applicationContext, MainActivity::class.java))
@@ -67,7 +67,7 @@ class AboutActivity : BaseSimpleActivity(), GestureDetector.OnGestureListener{
             }
             false
         })
-        bottomNavigationView.selectedItemId = R.id.about
+        bottomNavigationView.selectedItemId = R.id.info
     }
 
 

diff --git a/app/src/main/kotlin/be/scri/activities/MainActivity.kt b/app/src/main/kotlin/be/scri/activities/MainActivity.kt
@@ -116,7 +116,7 @@ class MainActivity : SimpleActivity(), GestureDetector.OnGestureListener {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.settings -> launchSettings()
-            R.id.about -> launchAbout()
+            R.id.info -> launchAbout()
             else -> return super.onOptionsItemSelected(item)
         }
         return true

diff --git a/app/src/main/kotlin/be/scri/activities/WikimediaScribeActivity.kt b/app/src/main/kotlin/be/scri/activities/WikimediaScribeActivity.kt
@@ -30,7 +30,7 @@ class WikimediaScribeActivity : BaseSimpleActivity(){
                     return@OnNavigationItemSelectedListener true
                 }
 
-                R.id.about ->  {
+                R.id.info ->  {
                     return@OnNavigationItemSelectedListener true }
                 R.id.installation -> {
                     startActivity(Intent(applicationContext, MainActivity::class.java))
@@ -40,7 +40,7 @@ class WikimediaScribeActivity : BaseSimpleActivity(){
             }
             false
         })
-        bottomNavigationView.selectedItemId = R.id.about
+        bottomNavigationView.selectedItemId = R.id.info
     }
 
     }

diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
@@ -1,14 +1,3 @@
 <?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:icon="@drawable/ic_settings_cog_vector"
-        android:title="@string/settings"
-        app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/about"
-        android:icon="@drawable/ic_info_vector"
-        android:title="@string/about"
-        app:showAsAction="ifRoom" />
-</menu>
+    xmlns:app="http://schemas.android.com/apk/res-auto"/>