diff options
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/values-night/colors.xml | 14 | ||||
-rw-r--r-- | app/src/main/res/values/colors.xml | 24 | ||||
-rw-r--r-- | app/src/main/res/values/styles.xml | 13 |
3 files changed, 16 insertions, 35 deletions
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index a48081423..31c1f32ef 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -27,23 +27,15 @@ <color name="outlineVariant">#464646</color> <color name="primary">#C1C1C1</color> <color name="primaryContainer">#383838</color> - <color name="scrim">#000000</color> + <color name="scrim">@android:color/black</color> <color name="secondary">#C5C5C5</color> <color name="secondaryContainer">#454545</color> - <color name="shadow">#000000</color> + <color name="shadow">@android:color/black</color> <color name="surface">#1B1B1B</color> <color name="surfaceVariant">#464646</color> <color name="tertiary">#C9C9C9</color> <color name="tertiaryContainer">#484848</color> - <color name="colorSurfaceContainerHigh">#191919</color> - - <!-- ======================================= --> - <!-- Custom styles --> - <!-- TODO REMOVE --> - <!-- ======================================= --> - - <color name="bg_highlighted">#212121</color> - <color name="bg_card">#1e1e1e</color> + <color name="colorSurfaceContainer">#191919</color> <!-- ======================================= --> <!-- Widgets --> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index b9ec64329..17f44e0ce 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,29 +1,30 @@ <?xml version="1.0" encoding="utf-8"?> <resources> + <!-- TODO Limit usage only to where it actually is needed (Import, About, …) --> + <color name="defaultBrand">#0082C9</color> + <!-- ======================================= --> <!-- Base Theme --> <!-- ======================================= --> - <color name="defaultBrand">#0082C9</color> - <!-- Generated by android-common, grayscale by https://hexcolorcodes.org/greyscale-desaturate-color --> <color name="background">#FCFCFC</color> <color name="error">#BA1A1A</color> - <color name="onError">#FFFFFF</color> + <color name="onError">@android:color/white</color> <color name="errorContainer">#FFDAD6</color> <color name="onErrorContainer">#410002</color> <color name="inverseOnSurface">#F0F0F0</color> <color name="inversePrimary">#C1C1C1</color> <color name="inverseSurface">#303030</color> <color name="onBackground">#1B1B1B</color> - <color name="onPrimary">#FFFFFF</color> + <color name="onPrimary">@android:color/white</color> <color name="onPrimaryContainer">#161616</color> - <color name="onSecondary">#FFFFFF</color> + <color name="onSecondary">@android:color/white</color> <color name="onSecondaryContainer">#0E1D2A</color> <color name="onSurface">#1B1B1B</color> <color name="onSurfaceVariant">#464646</color> - <color name="onTertiary">#FFFFFF</color> + <color name="onTertiary">@android:color/white</color> <color name="onTertiaryContainer">#1C1C1C</color> <color name="outline">#767676</color> <color name="outlineVariant">#C6C6C6</color> @@ -37,16 +38,7 @@ <color name="surfaceVariant">#E2E2E2</color> <color name="tertiary">#606060</color> <color name="tertiaryContainer">#E4E4E4</color> - <color name="colorSurfaceContainerHigh">@color/bg_default</color> - - <!-- ======================================= --> - <!-- Custom styles --> - <!-- TODO REMOVE --> - <!-- ======================================= --> - - <color name="bottom_sheet_backdrop">#7f000000</color> - <color name="bg_highlighted">#eee</color> - <color name="bg_card">@android:color/white</color> + <color name="colorSurfaceContainer">@color/bg_default</color> <!-- ======================================= --> <!-- Widgets --> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 7f6d4c275..51fd1eaa3 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -29,10 +29,10 @@ <item name="colorTertiaryContainer">@color/tertiaryContainer</item> <!-- Used by PopupMenus --> - <item name="colorSurfaceContainer">@color/colorSurfaceContainerHigh</item> + <item name="colorSurfaceContainer">@color/colorSurfaceContainer</item> <!-- Used by Material Dialogs & Material SearchBar --> - <item name="colorSurfaceContainerHigh">@color/colorSurfaceContainerHigh</item> + <item name="colorSurfaceContainerHigh">@color/colorSurfaceContainer</item> <item name="android:windowBackground">?attr/background</item> <item name="android:statusBarColor">?attr/background</item> @@ -79,12 +79,9 @@ <item name="tabIconTint">?attr/colorPrimary</item> </style> - <style name="materialCardViewStyle" parent="Widget.Material3.CardView.Elevated"> - <item name="strokeWidth">1dp</item> - <item name="strokeColor">@color/bg_highlighted</item> - <item name="android:focusable">true</item> - <item name="cardElevation">2dp</item> - <item name="cardBackgroundColor">@color/bg_card</item> + <style name="materialCardViewStyle" parent="Widget.Material3.CardView.Outlined"> + <item name="strokeColor">?attr/colorOutlineVariant</item> + <item name="cardBackgroundColor">?attr/colorSurfaceContainer</item> </style> <style name="textAppearanceHeadlineLarge" parent="TextAppearance.Material3.HeadlineLarge"> |