yetangitu/timelimit-android
1
0
Fork 0
mirror of https://codeberg.org/timelimit/timelimit-android.git synced 2025-10-03 09:49:25 +02:00
Code Issues Projects Releases Wiki Activity

Disable ActionBar in the theme

Browse source
This commit is contained in:
Jonas Lochmann 2024-10-28 01:00:00 +01:00
parent 15ae018589
commit 11a47c5f30
No known key found for this signature in database
GPG key ID: 8B8C9AEE10FA5B36
5 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/io/timelimit/android/ui/MainActivity.kt
View file

@ -144,8 +144,6 @@ class MainActivity : AppCompatActivity(), ActivityViewModelHolder, U2fManager.De
) )
) )
supportActionBar!!.hide()
U2fManager.setupActivity(this) U2fManager.setupActivity(this)
NotificationChannels.createNotificationChannels(getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager, this) NotificationChannels.createNotificationChannels(getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager, this)

4
app/src/main/java/io/timelimit/android/ui/lock/LockActivity.kt
View file

@ -120,8 +120,6 @@ class LockActivity : AppCompatActivity(), ActivityViewModelHolder, U2fManager.De
) )
) )
supportActionBar!!.hide()
U2fManager.setupActivity(this) U2fManager.setupActivity(this)
val subtitleLive = syncModel.statusText.asFlow() 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) currentInstances.add(this)
model.init(blockedPackageName, blockedActivityName) model.init(blockedPackageName, blockedActivityName)

2
app/src/main/java/io/timelimit/android/ui/manipulation/AnnoyActivity.kt
View file

@ -89,8 +89,6 @@ class AnnoyActivity : AppCompatActivity(), ActivityViewModelHolder, U2fManager.D
) )
) )
supportActionBar!!.hide()
setContent { setContent {
Theme { Theme {
ScreenScaffold( ScreenScaffold(

2
app/src/main/java/io/timelimit/android/ui/update/UpdateActivity.kt
View file

@ -47,8 +47,6 @@ class UpdateActivity: AppCompatActivity() {
) )
) )
supportActionBar!!.hide()
setContent { setContent {
Theme { Theme {
ScreenScaffold( ScreenScaffold(

4
app/src/main/res/values/styles.xml
View file

@ -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 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation version 3 of the License. the Free Software Foundation version 3 of the License.
@ -15,7 +15,7 @@
<resources> <resources>
<!-- Base application theme. --> <!-- 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="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorSecondary">@color/colorAccent</item> <item name="colorSecondary">@color/colorAccent</item>