diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2021-04-21 16:58:21 +0530 |
|---|---|---|
| committer | Harsh Shandilya <me@msfjarvis.dev> | 2021-04-21 17:17:42 +0530 |
| commit | 8e9b2c6f05c9819822df68afb95668f5e727e5c9 (patch) | |
| tree | 09927ee3c8e252f2464eeb172146622e81013952 | |
| parent | 9ace8dd92816456ce00557a2f1cb0c2f7a9cef7f (diff) | |
ui: abstract out theme attributes to reduce overlap
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
| -rw-r--r-- | ui/src/main/res/values-v27/styles.xml | 22 | ||||
| -rw-r--r-- | ui/src/main/res/values/styles.xml | 4 |
2 files changed, 4 insertions, 22 deletions
diff --git a/ui/src/main/res/values-v27/styles.xml b/ui/src/main/res/values-v27/styles.xml index 180d486f..b797e105 100644 --- a/ui/src/main/res/values-v27/styles.xml +++ b/ui/src/main/res/values-v27/styles.xml @@ -1,29 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="AppTheme" parent="Theme.MaterialComponents.DayNight"> - <item name="colorPrimary">@color/primary_color</item> - <item name="colorOnPrimary">@color/color_control_normal</item> - <item name="colorPrimaryDark">@color/primary_color</item> - <item name="colorPrimaryVariant">@color/primary_light_color</item> - <item name="colorSecondary">@color/secondary_color</item> - <item name="colorOnSecondary">@color/secondary_text_color</item> - <item name="colorSurface">@color/primary_color</item> - <item name="colorOnSurface">@color/color_control_normal</item> - <item name="colorBackground">@color/primary_color</item> - <item name="colorControlNormal">@color/color_control_normal</item> - <item name="colorMultiselectActiveBackground">@color/list_multiselect_background</item> - <item name="elevationOverlayColor">@color/primary_light_color</item> - <item name="elevationOverlayEnabled">true</item> - <item name="android:colorBackground">@color/primary_color</item> + <style name="AppTheme" parent="WireGuardTheme"> <item name="android:navigationBarColor">@color/navigation_bar_color</item> - <item name="android:statusBarColor">@color/status_bar_color</item> <item name="android:windowLightNavigationBar">@bool/light_navigation_bar</item> <item name="android:windowLightStatusBar">@bool/light_status_bar</item> - <item name="android:windowBackground">@color/primary_color</item> - <item name="alertDialogTheme">@style/AppTheme.Dialog</item> - <item name="materialAlertDialogTheme">@style/AppTheme.Dialog</item> - <item name="textInputStyle">@style/TextInputLayoutBase</item> - <item name="materialCardViewStyle">@style/AppTheme.MaterialCardView</item> </style> </resources> diff --git a/ui/src/main/res/values/styles.xml b/ui/src/main/res/values/styles.xml index b50b4dd7..b90f111f 100644 --- a/ui/src/main/res/values/styles.xml +++ b/ui/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="AppTheme" parent="Theme.MaterialComponents.DayNight"> + <style name="WireGuardTheme" parent="Theme.MaterialComponents.DayNight"> <item name="colorPrimary">@color/primary_color</item> <item name="colorOnPrimary">@color/color_control_normal</item> <item name="colorPrimaryDark">@color/primary_color</item> @@ -23,6 +23,8 @@ <item name="materialCardViewStyle">@style/AppTheme.MaterialCardView</item> </style> + <style name="AppTheme" parent="WireGuardTheme" /> + <style name="AppTheme.MaterialCardView" parent="Widget.MaterialComponents.CardView"> <item name="cornerRadius">4dp</item> <item name="cardElevation">4dp</item> |