diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2023-03-30 16:05:41 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2023-03-30 16:05:41 +0200 |
| commit | c3c4cd05b14b2f98655c39d151c4440ab09301bf (patch) | |
| tree | d1dfdfc0ef66ec0d6e7ecc2f7fd972a3f829d728 /ui | |
| parent | ui: do not allow double clicking fab to show menu twice (diff) | |
| download | wireguard-android-c3c4cd05b14b2f98655c39d151c4440ab09301bf.tar.xz wireguard-android-c3c4cd05b14b2f98655c39d151c4440ab09301bf.zip | |
ui: don't play with status and navigation colors on old APIs
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/src/main/res/values-v23/styles.xml | 7 | ||||
| -rw-r--r-- | ui/src/main/res/values-v27/styles.xml | 9 | ||||
| -rw-r--r-- | ui/src/main/res/values/styles.xml | 9 |
3 files changed, 20 insertions, 5 deletions
diff --git a/ui/src/main/res/values-v23/styles.xml b/ui/src/main/res/values-v23/styles.xml new file mode 100644 index 00000000..f6c74dd4 --- /dev/null +++ b/ui/src/main/res/values-v23/styles.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + <style name="AppTheme" parent="AppThemeBase"> + <item name="android:statusBarColor">?android:colorBackground</item> + <item name="android:windowLightStatusBar">@bool/light_status_bar</item> + </style> +</resources> diff --git a/ui/src/main/res/values-v27/styles.xml b/ui/src/main/res/values-v27/styles.xml new file mode 100644 index 00000000..752801f9 --- /dev/null +++ b/ui/src/main/res/values-v27/styles.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + <style name="AppTheme" parent="AppThemeBase"> + <item name="android:statusBarColor">?android:colorBackground</item> + <item name="android:windowLightStatusBar">@bool/light_status_bar</item> + <item name="android:navigationBarColor">?android:colorBackground</item> + <item name="android:windowLightNavigationBar">@bool/light_navigation_bar</item> + </style> +</resources> diff --git a/ui/src/main/res/values/styles.xml b/ui/src/main/res/values/styles.xml index 5c400abc..74b4e80c 100644 --- a/ui/src/main/res/values/styles.xml +++ b/ui/src/main/res/values/styles.xml @@ -5,16 +5,15 @@ <item name="android:background">?attr/colorSurface</item> </style> - <style name="AppTheme" parent="WireGuardTheme"> - <item name="android:statusBarColor">?android:colorBackground</item> - <item name="android:navigationBarColor">?android:colorBackground</item> - <item name="android:windowLightNavigationBar">@bool/light_navigation_bar</item> - <item name="android:windowLightStatusBar">@bool/light_status_bar</item> + <style name="AppThemeBase" parent="WireGuardTheme"> <item name="materialCardViewStyle">@style/WireGuardTheme.MaterialCardView</item> <item name="toolbarStyle">@style/WireGuardTheme.Toolbar</item> <item name="bottomSheetDialogTheme">@style/WireGuardTheme.BottomSheetDialog</item> </style> + <!-- Various additional API-specific features in values-v*/styles.xml --> + <style name="AppTheme" parent="AppThemeBase"/> + <style name="WireGuardTheme.MaterialCardView" parent="Widget.Material3.CardView.Elevated"> <item name="cornerRadius">4dp</item> <item name="contentPadding">8dp</item> |