Skip to content

Commit c3c4cd0

Browse files
committed
ui: don't play with status and navigation colors on old APIs
Signed-off-by: Jason A. Donenfeld <[email protected]>
1 parent 58c1938 commit c3c4cd0

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

ui/src/main/res/values-v23/styles.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:android="http://schemas.android.com/apk/res/android">
3+
<style name="AppTheme" parent="AppThemeBase">
4+
<item name="android:statusBarColor">?android:colorBackground</item>
5+
<item name="android:windowLightStatusBar">@bool/light_status_bar</item>
6+
</style>
7+
</resources>

ui/src/main/res/values-v27/styles.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:android="http://schemas.android.com/apk/res/android">
3+
<style name="AppTheme" parent="AppThemeBase">
4+
<item name="android:statusBarColor">?android:colorBackground</item>
5+
<item name="android:windowLightStatusBar">@bool/light_status_bar</item>
6+
<item name="android:navigationBarColor">?android:colorBackground</item>
7+
<item name="android:windowLightNavigationBar">@bool/light_navigation_bar</item>
8+
</style>
9+
</resources>

ui/src/main/res/values/styles.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@
55
<item name="android:background">?attr/colorSurface</item>
66
</style>
77

8-
<style name="AppTheme" parent="WireGuardTheme">
9-
<item name="android:statusBarColor">?android:colorBackground</item>
10-
<item name="android:navigationBarColor">?android:colorBackground</item>
11-
<item name="android:windowLightNavigationBar">@bool/light_navigation_bar</item>
12-
<item name="android:windowLightStatusBar">@bool/light_status_bar</item>
8+
<style name="AppThemeBase" parent="WireGuardTheme">
139
<item name="materialCardViewStyle">@style/WireGuardTheme.MaterialCardView</item>
1410
<item name="toolbarStyle">@style/WireGuardTheme.Toolbar</item>
1511
<item name="bottomSheetDialogTheme">@style/WireGuardTheme.BottomSheetDialog</item>
1612
</style>
1713

14+
<!-- Various additional API-specific features in values-v*/styles.xml -->
15+
<style name="AppTheme" parent="AppThemeBase"/>
16+
1817
<style name="WireGuardTheme.MaterialCardView" parent="Widget.Material3.CardView.Elevated">
1918
<item name="cornerRadius">4dp</item>
2019
<item name="contentPadding">8dp</item>

0 commit comments

Comments
 (0)