From 11a47c5f30c3678a3c6a1e478b14473865a119f3 Mon Sep 17 00:00:00 2001
From: Jonas Lochmann <git@inkompetenz.org>
Date: Mon, 28 Oct 2024 01:00:00 +0100
Subject: [PATCH] Disable ActionBar in the theme

---
 app/src/main/java/io/timelimit/android/ui/MainActivity.kt     | 2 --
 .../main/java/io/timelimit/android/ui/lock/LockActivity.kt    | 4 ----
 .../io/timelimit/android/ui/manipulation/AnnoyActivity.kt     | 2 --
 .../java/io/timelimit/android/ui/update/UpdateActivity.kt     | 2 --
 app/src/main/res/values/styles.xml                            | 4 ++--
 5 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/io/timelimit/android/ui/MainActivity.kt b/app/src/main/java/io/timelimit/android/ui/MainActivity.kt
index 3bd2739..3872c24 100644
--- a/app/src/main/java/io/timelimit/android/ui/MainActivity.kt
+++ b/app/src/main/java/io/timelimit/android/ui/MainActivity.kt
@@ -144,8 +144,6 @@ class MainActivity : AppCompatActivity(), ActivityViewModelHolder, U2fManager.De
             )
         )
 
-        supportActionBar!!.hide()
-
         U2fManager.setupActivity(this)
 
         NotificationChannels.createNotificationChannels(getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager, this)
diff --git a/app/src/main/java/io/timelimit/android/ui/lock/LockActivity.kt b/app/src/main/java/io/timelimit/android/ui/lock/LockActivity.kt
index 62e6c5d..634c77d 100644
--- a/app/src/main/java/io/timelimit/android/ui/lock/LockActivity.kt
+++ b/app/src/main/java/io/timelimit/android/ui/lock/LockActivity.kt
@@ -120,8 +120,6 @@ class LockActivity : AppCompatActivity(), ActivityViewModelHolder, U2fManager.De
             )
         )
 
-        supportActionBar!!.hide()
-
         U2fManager.setupActivity(this)
 
         val subtitleLive = syncModel.statusText.asFlow()
@@ -214,8 +212,6 @@ class LockActivity : AppCompatActivity(), ActivityViewModelHolder, U2fManager.De
             }
         }
 
-        syncModel.statusText.observe(this) { supportActionBar?.subtitle = it }
-
         currentInstances.add(this)
 
         model.init(blockedPackageName, blockedActivityName)
diff --git a/app/src/main/java/io/timelimit/android/ui/manipulation/AnnoyActivity.kt b/app/src/main/java/io/timelimit/android/ui/manipulation/AnnoyActivity.kt
index 6bf0fa7..721485a 100644
--- a/app/src/main/java/io/timelimit/android/ui/manipulation/AnnoyActivity.kt
+++ b/app/src/main/java/io/timelimit/android/ui/manipulation/AnnoyActivity.kt
@@ -89,8 +89,6 @@ class AnnoyActivity : AppCompatActivity(), ActivityViewModelHolder, U2fManager.D
             )
         )
 
-        supportActionBar!!.hide()
-
         setContent {
             Theme {
                 ScreenScaffold(
diff --git a/app/src/main/java/io/timelimit/android/ui/update/UpdateActivity.kt b/app/src/main/java/io/timelimit/android/ui/update/UpdateActivity.kt
index e213776..8698abd 100644
--- a/app/src/main/java/io/timelimit/android/ui/update/UpdateActivity.kt
+++ b/app/src/main/java/io/timelimit/android/ui/update/UpdateActivity.kt
@@ -47,8 +47,6 @@ class UpdateActivity: AppCompatActivity() {
             )
         )
 
-        supportActionBar!!.hide()
-
         setContent {
             Theme {
                 ScreenScaffold(
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3e45a3a..26ab3fa 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
 <!--
-  TimeLimit Copyright <C> 2019 - 2020 Jonas Lochmann
+  TimeLimit Copyright <C> 2019 - 2024 Jonas Lochmann
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation version 3 of the License.
@@ -15,7 +15,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorSecondary">@color/colorAccent</item>