New colors?

This commit is contained in:
Paul Schaub 2020-06-02 00:30:39 +02:00
parent 1122ece79d
commit 773ddeb218
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
2 changed files with 22 additions and 9 deletions

View file

@ -6,6 +6,14 @@
<color name="primaryDarkRed">#B71C1C</color>
<color name="secondaryBlue">#2962FF</color>
<color name="primaryColor">#283593</color>
<color name="primaryLightColor">#5f5fc4</color>
<color name="primaryDarkColor">#001064</color>
<color name="secondaryColor">#ffd600</color>
<color name="secondaryLightColor">#ffff52</color>
<color name="secondaryDarkColor">#c7a500</color>
<color name="primaryTextColor">#ffffff</color>
<color name="textBlack">#CC000000</color>
<color name="black">#000</color>
<color name="white">#FFF</color>

View file

@ -3,15 +3,20 @@
<!-- Base Theme. Insert common theme attributes here -->
<style name="Base.Theme.Mercury"
parent="Platform.Theme.Mercury">
<item name="android:colorBackground">@color/lightThemeBackground</item>
<item name="colorSurface">@color/lightThemeBackground</item>
<item name="colorPrimaryDark">@color/primaryDarkRed</item>
<item name="colorPrimary">@color/primaryRed</item>
<item name="colorSecondary">@color/secondaryBlue</item>
<item name="colorOnPrimary">@color/white</item>
<item name="colorOnSecondary">@color/white</item>
<!--<item name="android:colorBackground">@color/lightThemeBackground</item>-->
<!--<item name="colorSurface">@color/lightThemeBackground</item>-->
<item name="colorPrimaryDark">@color/primaryDarkColor</item>
<item name="colorPrimary">@color/primaryColor</item>
<item name="colorSecondary">@color/secondaryColor</item>
<item name="colorSecondaryVariant">@color/secondaryDarkColor</item>
<item name="colorOnPrimary">@color/primaryTextColor</item>
<item name="colorOnSecondary">@color/secondaryTextColor</item>
<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Primary</item>
<item name="colorOnPrimarySurface">@color/white</item>
<item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.PrimarySurface</item>
<!--<item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Surface</item>-->
<item name="bottomNavigationStyle">@style/Widget.MaterialComponents.BottomNavigationView.PrimarySurface</item>
<item name="tabStyle">@style/Widget.MaterialComponents.TabLayout</item>
@ -34,7 +39,7 @@
<!-- TODO -->
<style name="Theme.Mercury.Dark"
parent="Base.Theme.Mercury">
<item name="android:colorBackground">@color/darkThemeBackground</item>
</style>
<!-- API v19 specific theme attributes -->