From abfea2235118948ec2573881cd37e660508f4a5a Mon Sep 17 00:00:00 2001
From: henrikth93 <henrikthomasson93@gmail.com>
Date: Tue, 13 Aug 2024 19:07:46 +0200
Subject: [PATCH 1/2] Removed about and settings from the top right

Removed about and settings from the top right of the menu.
---
 .../main/kotlin/be/scri/activities/AboutActivity.kt |  4 ++--
 .../main/kotlin/be/scri/activities/MainActivity.kt  |  2 +-
 .../be/scri/activities/WikimediaScribeActivity.kt   |  4 ++--
 app/src/main/res/menu/menu_main.xml                 | 13 +------------
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/app/src/main/kotlin/be/scri/activities/AboutActivity.kt b/app/src/main/kotlin/be/scri/activities/AboutActivity.kt
index d18c504f9..16eb9ea61 100644
--- 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
index 687fc6298..150a78d4a 100644
--- 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
index eb50e748a..dbac3b4e4 100644
--- 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
index 1b13619ac..e69c0f15e 100644
--- 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"/>

From 2bd94b537d9eca2e82205fcd2b6fc2c4ee034f9b Mon Sep 17 00:00:00 2001
From: henrikth93 <henrikthomasson93@gmail.com>
Date: Wed, 14 Aug 2024 11:51:31 +0200
Subject: [PATCH 2/2] Removed menu_main.xml and two functions

Removed onCreateOptionsMenu and onOptionsItemSelected. ALso removed menu_main.xml since it is not needed anymore.
---
 .../kotlin/be/scri/activities/MainActivity.kt     | 15 ---------------
 app/src/main/res/menu/menu_main.xml               |  3 ---
 2 files changed, 18 deletions(-)
 delete mode 100644 app/src/main/res/menu/menu_main.xml

diff --git a/app/src/main/kotlin/be/scri/activities/MainActivity.kt b/app/src/main/kotlin/be/scri/activities/MainActivity.kt
index 150a78d4a..8b191d71a 100644
--- 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.info -> launchAbout()
-            else -> return super.onOptionsItemSelected(item)
-        }
-        return true
-    }
-
     private fun launchSettings() {
         hideKeyboard()
         startActivity(Intent(applicationContext, SettingsActivity::class.java))
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
deleted file mode 100644
index e69c0f15e..000000000
--- a/app/src/main/res/menu/menu_main.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?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"/>