Skip to content

Commit e70b27c

Browse files
mathiascodemathiascode
committed
Fix incorrect theme in older Android versions
tools:targetApi is only used for the linter.
1 parent 4e4dc20 commit e70b27c

6 files changed

Lines changed: 36 additions & 14 deletions

File tree

‎app/src/main/res/values-night-v23/themes.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<style name="AppTheme" parent="BaseTheme.v23" />
4+
<style name="BaseTheme.v23" parent="BaseTheme">
5+
<item name="android:statusBarColor">@android:color/transparent</item>
6+
<item name="android:windowLightStatusBar">false</item>
7+
</style>
8+
</resources>

‎app/src/main/res/values-night-v27/themes.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<style name="AppTheme" parent="BaseTheme.v27" />
4+
<style name="BaseTheme.v27" parent="BaseTheme.v23">
5+
<item name="android:navigationBarColor">@android:color/transparent</item>
6+
<item name="android:windowLightNavigationBar">false</item>
7+
</style>
8+
</resources>

‎app/src/main/res/values-night/themes.xml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<resources xmlns:tools="http://schemas.android.com/tools">
2-
<style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">
2+
<style name="AppTheme" parent="BaseTheme" />
3+
<style name="BaseTheme" parent="Theme.Material3.DayNight.NoActionBar">
34
<item name="colorPrimary">@color/md_theme_dark_primary</item>
45
<item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
56
<item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
@@ -29,11 +30,5 @@
2930

3031
<item name="android:indeterminateTint" tools:targetApi="lollipop">?attr/colorSecondary</item>
3132
<item name="android:progressTint" tools:targetApi="lollipop">?attr/colorSecondary</item>
32-
33-
<item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
34-
<item name="android:navigationBarColor" tools:targetApi="o_mr1">@android:color/transparent</item>
35-
36-
<item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
37-
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
3833
</style>
3934
</resources>

‎app/src/main/res/values-v23/themes.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<style name="AppTheme" parent="BaseTheme.v23" />
4+
<style name="BaseTheme.v23" parent="BaseTheme">
5+
<item name="android:statusBarColor">@android:color/transparent</item>
6+
<item name="android:windowLightStatusBar">true</item>
7+
</style>
8+
</resources>

‎app/src/main/res/values-v27/themes.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<style name="AppTheme" parent="BaseTheme.v27" />
4+
<style name="BaseTheme.v27" parent="BaseTheme.v23">
5+
<item name="android:navigationBarColor">@android:color/transparent</item>
6+
<item name="android:windowLightNavigationBar">true</item>
7+
</style>
8+
</resources>

‎app/src/main/res/values/themes.xml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<resources xmlns:tools="http://schemas.android.com/tools">
2-
<style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">
2+
<style name="AppTheme" parent="BaseTheme" />
3+
<style name="BaseTheme" parent="Theme.Material3.DayNight.NoActionBar">
34
<item name="colorPrimary">@color/md_theme_light_primary</item>
45
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
56
<item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
@@ -29,12 +30,6 @@
2930

3031
<item name="android:indeterminateTint" tools:targetApi="lollipop">?attr/colorSecondary</item>
3132
<item name="android:progressTint" tools:targetApi="lollipop">?attr/colorSecondary</item>
32-
33-
<item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
34-
<item name="android:navigationBarColor" tools:targetApi="o_mr1">@android:color/transparent</item>
35-
36-
<item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
37-
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
3833
</style>
3934

4035
<style name="Preference.SwitchPreferenceCompat">

0 commit comments

Comments
 (0)