Merge pull request #56 from henrikth93/main

Removed about and settings from the top right
scribe-org · Aug 14, 2024 · a3e69e1 · a3e69e1
2 parents 6fe15ed + 2bd94b5
commit a3e69e1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 33 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
@@ -107,21 +107,6 @@ class MainActivity : SimpleActivity(), GestureDetector.OnGestureListener {
 
 
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.menu_main, menu)
-        updateMenuItemColors(menu)
-        return true
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.settings -> launchSettings()
-            R.id.about -> launchAbout()
-            else -> return super.onOptionsItemSelected(item)
-        }
-        return true
-    }
-
     private fun launchSettings() {
         hideKeyboard()
         startActivity(Intent(applicationContext, SettingsActivity::class.java))

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