diff options
author | Harsh Shandilya <me@msfjarvis.dev> | 2020-02-12 19:46:01 +0530 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-02-12 15:23:53 +0100 |
commit | d25702d99ded6946608713e670c6a6ce323f8f87 (patch) | |
tree | b4b37cdfb9fd7b33125883fe9063d1c4d93cac65 /app/src/main/res/values | |
parent | c55441332749d914d48b2aae67635adf077bfd5a (diff) |
Implement custom theming to match Google's AOSP design
Closes: #4
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'app/src/main/res/values')
-rw-r--r-- | app/src/main/res/values/attrs.xml | 5 | ||||
-rw-r--r-- | app/src/main/res/values/bools.xml | 5 | ||||
-rw-r--r-- | app/src/main/res/values/colors.xml | 21 | ||||
-rw-r--r-- | app/src/main/res/values/styles.xml | 27 |
4 files changed, 54 insertions, 4 deletions
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 86a86e63..68a8db07 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -2,5 +2,10 @@ <resources> <declare-styleable name="Multiselected"> <attr name="state_multiselected" format="boolean" /> + <attr name="colorMultiselectActiveBackground" format="reference|color"/> + </declare-styleable> + + <declare-styleable name="custom_color"> + <attr name="colorBackground" format="reference|color"/> </declare-styleable> </resources> diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml new file mode 100644 index 00000000..288f85a5 --- /dev/null +++ b/app/src/main/res/values/bools.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <bool name="light_status_bar">true</bool> + <bool name="light_navigation_bar">true</bool> +</resources> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index bc0fbdb0..9105fb22 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,8 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> -<resources> +<resources xmlns:tools="http://schemas.android.com/tools"> <!-- TODO(msf): remove these 2 hard-coded colors and replace with theme colors --> <color name="fab_label_text_color">#ffffff</color> <color name="fab_label_background_color">#444444</color> - <color name="accent">#2196F3</color> + <!-- Base palette --> + <color name="primary_color">#ffffffff</color> + <color name="primary_light_color">#ffffffff</color> + <color name="primary_dark_color">#ffcccccc</color> + <color name="secondary_color">#ff1a73e8</color> + <color name="secondary_light_color">#ff1a73e8</color> + <color name="secondary_dark_color">#ff1a73e8</color> + <color name="primary_text_color">#ff000000</color> + <color name="secondary_text_color">#ffffffff</color> + + <!-- Theme variables --> + <color name="color_control_normal">@color/primary_text_color</color> + <color name="status_bar_color">@color/primary_color</color> + <color name="navigation_bar_color">#aaffffff</color> + <color name="list_multiselect_background">#ffeeeeee</color> + <color name="mtrl_textinput_default_box_stroke_color" tools:override="true">@color/secondary_color</color> + <color name="white">#ffffffff</color> + </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 7da1aa9c..9f55fd3e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,8 +1,31 @@ <?xml version="1.0" encoding="utf-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar"> - <item name="colorAccent">@color/accent</item> + <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="colorMultiselectActiveBackground">@color/list_multiselect_background</item> + <item name="colorControlNormal">@color/color_control_normal</item> + <item name="elevationOverlayColor">@color/primary_light_color</item> + <item name="elevationOverlayEnabled">true</item> + <item name="android:statusBarColor">@color/status_bar_color</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="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents.ActionBar</item> + </style> + + <style name="AppTheme.Dialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert"> + <item name="colorPrimary">@color/secondary_color</item> + <item name="colorSecondary">@color/secondary_color</item> + <item name="android:windowBackground">?attr/colorBackground</item> </style> <style name="NoBackgroundTheme" parent="AppTheme"> |