mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-09-22 12:03:09 -04:00
#2111 moved colors to themes
This commit is contained in:
parent
0d78704956
commit
ff3003a2d7
@ -1,23 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<!--Top level DayNight theme to be used in AndroidManifest.xml-->
|
||||
<style name="KiwixTheme" parent="Base.KiwixTheme">
|
||||
<!-- Dark theme customisations here-->
|
||||
<item name="colorPrimary">@color/denim_blue400</item>
|
||||
|
||||
<item name="colorSurface">@color/mine_shaft_gray900</item>
|
||||
<item name="colorError">@color/froly_pink300</item>
|
||||
<item name="textSecondary">@color/mine_shaft_gray350</item>
|
||||
<item name="textTertiary">@color/mine_shaft_gray500</item>
|
||||
<item name="cardViewBackground">@color/mine_shaft_gray850</item>
|
||||
|
||||
|
||||
<item name="colorOnPrimary">@color/alabaster_white</item>
|
||||
<item name="colorOnSurface">@color/alabaster_white</item>
|
||||
<item name="colorOnError">@color/alabaster_white</item>
|
||||
|
||||
<!--Black has a contrast ratio of 6.9:1 vs
|
||||
white which has a ratio of 3.05:1 (on froly_pink300)-->
|
||||
<item name="colorOnError">@color/black</item>
|
||||
<item name="textSecondary">@color/mine_shaft_gray350</item>
|
||||
<item name="textTertiary">@color/mine_shaft_gray500</item>
|
||||
<item name="cardViewBackground">@color/mine_shaft_gray850</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
@ -2,16 +2,35 @@
|
||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<!--Top level theme to be used in AndroidManifest.xml-->
|
||||
<style name="KiwixTheme" parent="Base.KiwixTheme" />
|
||||
|
||||
<!--Base custom theme which will be shared between both light and dark theme variants-->
|
||||
<style name="Base.KiwixTheme" parent="Base.MaterialThemeBuilder">
|
||||
<!--Material color attributes -->
|
||||
<style name="KiwixTheme" parent="Base.KiwixTheme">
|
||||
|
||||
<!--colorPrimary colors map to components and elements, such as app bars and buttons. -->
|
||||
<!--colorSecondary colors are most often used as accents on components, such as FABs and -->
|
||||
<!--selection controls.-->
|
||||
<item name="colorPrimary">@color/denim_blue800</item>
|
||||
|
||||
<!--colorBackground appears behind scrollable content and is used for the default window-->
|
||||
<!--background. colorSurface is mapped to the surface of components such as cards, sheets-->
|
||||
<!--and menus. colorError is used to indicate an error state for components such as-->
|
||||
<!--text fields.-->
|
||||
<item name="colorSurface">@color/alabaster_white</item>
|
||||
<item name="colorError">@color/monza_red</item>
|
||||
|
||||
<!--"On" colors define how text, icons and strokes are colored in relation to the surface-->
|
||||
<!--on which they appear.-->
|
||||
<item name="colorOnPrimary">@color/white</item>
|
||||
<item name="colorOnSurface">@color/black</item>
|
||||
<item name="colorOnError">@color/alabaster_white</item>
|
||||
|
||||
<item name="textSecondary">@color/mine_shaft_gray700</item>
|
||||
<item name="textTertiary">@color/mine_shaft_gray500</item>
|
||||
<item name="cardViewBackground">@color/alabaster_white</item>
|
||||
</style>
|
||||
|
||||
<!--Base custom theme which will be shared between both light and dark theme variants-->
|
||||
<style name="Base.KiwixTheme" parent="Base.MaterialThemeBuilder">
|
||||
<!--Material color attributes -->
|
||||
|
||||
<item name="colorPrimaryVariant">?colorPrimary</item>
|
||||
<item name="colorSecondary">?colorPrimary</item>
|
||||
<item name="colorSecondaryVariant">?colorPrimary</item>
|
||||
@ -19,25 +38,9 @@
|
||||
<!--Material snackbar attributes-->
|
||||
<item name="maxActionInlineWidth">128dp</item>
|
||||
|
||||
<!--colorBackground appears behind scrollable content and is used for the default window-->
|
||||
<!--background. colorSurface is mapped to the surface of components such as cards, sheets-->
|
||||
<!--and menus. colorError is used to indicate an error state for components such as-->
|
||||
<!--text fields.-->
|
||||
<item name="colorSurface">@color/alabaster_white</item>
|
||||
<item name="android:colorBackground">?colorSurface</item>
|
||||
<item name="colorError">@color/monza_red</item>
|
||||
|
||||
<!--"On" colors define how text, icons and strokes are colored in relation to the surface-->
|
||||
<!--on which they appear.-->
|
||||
<item name="colorOnPrimary">@color/white</item>
|
||||
<item name="colorOnSecondary">?colorOnPrimary</item>
|
||||
<item name="colorOnSurface">@color/black</item>
|
||||
<item name="colorOnBackground">?colorOnSurface</item>
|
||||
<item name="colorOnError">@color/alabaster_white</item>
|
||||
|
||||
<item name="textSecondary">@color/mine_shaft_gray700</item>
|
||||
<item name="textTertiary">@color/mine_shaft_gray500</item>
|
||||
<item name="cardViewBackground">@color/alabaster_white</item>
|
||||
|
||||
<!--Material type attributes-->
|
||||
<item name="textAppearanceHeadline1">@style/TextAppearance.KiwixTheme.Headline1</item>
|
||||
|
Loading…
x
Reference in New Issue
Block a user