Commit 201252b7 authored by Thomas's avatar Thomas
Browse files

Theme changes

parent b6f74cb2

app/src/main/res/values-night/themes.xml

+33 −33
Original line number Diff line number Diff line
@@ -229,18 +229,18 @@ 


    <style name="BlackAppTheme" parent="AppTheme">

        <item name="linkColor">@color/md_theme_dark_primary</item>

        <item name="colorPrimary">@color/black</item>

        <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>

        <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>

        <item name="colorPrimary">@color/dracula_comment</item>

        <item name="colorOnPrimary">@color/white</item>

        <item name="colorPrimaryContainer">@color/dracula_comment</item>

        <item name="colorOnPrimaryContainer">@color/white</item>

        <item name="colorSecondary">@color/md_theme_dark_secondary</item>

        <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>

        <item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>

        <item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>

        <item name="colorTertiary">@color/md_theme_dark_tertiary</item>

        <item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>

        <item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>

        <item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>

        <item name="colorSecondary">@color/dracula_comment</item>

        <item name="colorOnSecondary">@color/white</item>

        <item name="colorSecondaryContainer">@color/dracula_comment</item>

        <item name="colorOnSecondaryContainer">@color/white</item>

        <item name="colorTertiary">@color/dracula_comment</item>

        <item name="colorOnTertiary">@color/white</item>

        <item name="colorTertiaryContainer">@color/dracula_comment</item>

        <item name="colorOnTertiaryContainer">@color/white</item>

        <item name="colorError">@color/solarized_md_theme_dark_error</item>

        <item name="colorErrorContainer">@color/solarized_md_theme_dark_errorContainer</item>

        <item name="colorOnError">@color/solarized_md_theme_dark_onError</item>
@@ -259,18 +259,18 @@ 


    <style name="BlackAppThemeBar" parent="AppThemeBar">

        <item name="linkColor">@color/md_theme_dark_primary</item>

        <item name="colorPrimary">@color/black</item>

        <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>

        <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>

        <item name="colorPrimary">@color/dracula_comment</item>

        <item name="colorOnPrimary">@color/white</item>

        <item name="colorPrimaryContainer">@color/dracula_comment</item>

        <item name="colorOnPrimaryContainer">@color/white</item>

        <item name="colorSecondary">@color/md_theme_dark_secondary</item>

        <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>

        <item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>

        <item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>

        <item name="colorTertiary">@color/md_theme_dark_tertiary</item>

        <item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>

        <item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>

        <item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>

        <item name="colorSecondary">@color/dracula_comment</item>

        <item name="colorOnSecondary">@color/white</item>

        <item name="colorSecondaryContainer">@color/dracula_comment</item>

        <item name="colorOnSecondaryContainer">@color/white</item>

        <item name="colorTertiary">@color/dracula_comment</item>

        <item name="colorOnTertiary">@color/white</item>

        <item name="colorTertiaryContainer">@color/dracula_comment</item>

        <item name="colorOnTertiaryContainer">@color/white</item>

        <item name="colorError">@color/solarized_md_theme_dark_error</item>

        <item name="colorErrorContainer">@color/solarized_md_theme_dark_errorContainer</item>

        <item name="colorOnError">@color/solarized_md_theme_dark_onError</item>
@@ -297,18 +297,18 @@ 


    <style name="BlackAlertDialog" parent="Theme.Material3.Dark.Dialog.Alert">

        <item name="linkColor">@color/md_theme_dark_primary</item>

        <item name="colorPrimary">@color/black</item>

        <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>

        <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>

        <item name="colorPrimary">@color/dracula_comment</item>

        <item name="colorOnPrimary">@color/white</item>

        <item name="colorPrimaryContainer">@color/dracula_comment</item>

        <item name="colorOnPrimaryContainer">@color/white</item>

        <item name="colorSecondary">@color/md_theme_dark_secondary</item>

        <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>

        <item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>

        <item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>

        <item name="colorTertiary">@color/md_theme_dark_tertiary</item>

        <item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>

        <item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>

        <item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>

        <item name="colorSecondary">@color/dracula_comment</item>

        <item name="colorOnSecondary">@color/white</item>

        <item name="colorSecondaryContainer">@color/dracula_comment</item>

        <item name="colorOnSecondaryContainer">@color/white</item>

        <item name="colorTertiary">@color/dracula_comment</item>

        <item name="colorOnTertiary">@color/white</item>

        <item name="colorTertiaryContainer">@color/dracula_comment</item>

        <item name="colorOnTertiaryContainer">@color/white</item>

        <item name="colorError">@color/solarized_md_theme_dark_error</item>

        <item name="colorErrorContainer">@color/solarized_md_theme_dark_errorContainer</item>

        <item name="colorOnError">@color/solarized_md_theme_dark_onError</item>

app/src/main/res/values/colors.xml

+52 −53
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="PrivateResource">





    <color name="seed">#6750A4</color>

    <color name="md_theme_light_primary">#6750A4</color>

    <color name="seed">#2F0C7A</color>

    <color name="md_theme_light_primary">#654DB2</color>

    <color name="md_theme_light_onPrimary">#FFFFFF</color>

    <color name="md_theme_light_primaryContainer">#EADDFF</color>

    <color name="md_theme_light_onPrimaryContainer">#21005D</color>

    <color name="md_theme_light_secondary">#625B71</color>

    <color name="md_theme_light_primaryContainer">#E8DEFF</color>

    <color name="md_theme_light_onPrimaryContainer">#20005F</color>

    <color name="md_theme_light_secondary">#5E44D4</color>

    <color name="md_theme_light_onSecondary">#FFFFFF</color>

    <color name="md_theme_light_secondaryContainer">#E8DEF8</color>

    <color name="md_theme_light_onSecondaryContainer">#1D192B</color>

    <color name="md_theme_light_tertiary">#7D5260</color>

    <color name="md_theme_light_secondaryContainer">#E5DEFF</color>

    <color name="md_theme_light_onSecondaryContainer">#1B0063</color>

    <color name="md_theme_light_tertiary">#4D51BE</color>

    <color name="md_theme_light_onTertiary">#FFFFFF</color>

    <color name="md_theme_light_tertiaryContainer">#FFD8E4</color>

    <color name="md_theme_light_onTertiaryContainer">#31111D</color>

    <color name="md_theme_light_error">#B3261E</color>

    <color name="md_theme_light_tertiaryContainer">#E1E0FF</color>

    <color name="md_theme_light_onTertiaryContainer">#04006D</color>

    <color name="md_theme_light_error">#BA1A1A</color>

    <color name="md_theme_light_errorContainer">#FFDAD6</color>

    <color name="md_theme_light_onError">#FFFFFF</color>

    <color name="md_theme_light_errorContainer">#F9DEDC</color>

    <color name="md_theme_light_onErrorContainer">#410E0B</color>

    <color name="md_theme_light_outline">#79747E</color>

    <color name="md_theme_light_background">#FFFBFE</color>

    <color name="md_theme_light_onBackground">#1C1B1F</color>

    <color name="md_theme_light_surface">#FFFBFE</color>

    <color name="md_theme_light_onSurface">#1C1B1F</color>

    <color name="md_theme_light_surfaceVariant">#E7E0EC</color>

    <color name="md_theme_light_onSurfaceVariant">#49454F</color>

    <color name="md_theme_light_inverseSurface">#313033</color>

    <color name="md_theme_light_onErrorContainer">#410002</color>

    <color name="md_theme_light_background">#FFFBFF</color>

    <color name="md_theme_light_onBackground">#1C1B1E</color>

    <color name="md_theme_light_surface">#FFFBFF</color>

    <color name="md_theme_light_onSurface">#1C1B1E</color>

    <color name="md_theme_light_surfaceVariant">#E6E0EC</color>

    <color name="md_theme_light_onSurfaceVariant">#48454E</color>

    <color name="md_theme_light_outline">#79757F</color>

    <color name="md_theme_light_inverseOnSurface">#F4EFF4</color>

    <color name="md_theme_light_inversePrimary">#D0BCFF</color>

    <color name="md_theme_light_inverseSurface">#313033</color>

    <color name="md_theme_light_inversePrimary">#CDBDFF</color>

    <color name="md_theme_light_shadow">#000000</color>

    <color name="md_theme_light_surfaceTint">#6750A4</color>

    <color name="md_theme_light_outlineVariant">#CAC4D0</color>

    <color name="md_theme_light_surfaceTint">#654DB2</color>

    <color name="md_theme_light_outlineVariant">#CAC4CF</color>

    <color name="md_theme_light_scrim">#000000</color>

    <color name="md_theme_dark_primary">#8c8dff</color>

    <color name="md_theme_dark_onPrimary">#381E72</color>

    <color name="md_theme_dark_primaryContainer">#4F378B</color>

    <color name="md_theme_dark_onPrimaryContainer">#EADDFF</color>

    <color name="md_theme_dark_secondary">#CCC2DC</color>

    <color name="md_theme_dark_onSecondary">#332D41</color>

    <color name="md_theme_dark_secondaryContainer">#4A4458</color>

    <color name="md_theme_dark_onSecondaryContainer">#E8DEF8</color>

    <color name="md_theme_dark_tertiary">#EFB8C8</color>

    <color name="md_theme_dark_onTertiary">#492532</color>

    <color name="md_theme_dark_tertiaryContainer">#633B48</color>

    <color name="md_theme_dark_onTertiaryContainer">#FFD8E4</color>

    <color name="md_theme_dark_error">#F2B8B5</color>

    <color name="md_theme_dark_onError">#601410</color>

    <color name="md_theme_dark_errorContainer">#8C1D18</color>

    <color name="md_theme_dark_onErrorContainer">#F9DEDC</color>

    <color name="md_theme_dark_primary">#CDBDFF</color>

    <color name="md_theme_dark_onPrimary">#361781</color>

    <color name="md_theme_dark_primaryContainer">#4D3398</color>

    <color name="md_theme_dark_onPrimaryContainer">#E8DEFF</color>

    <color name="md_theme_dark_secondary">#C9BFFF</color>

    <color name="md_theme_dark_onSecondary">#2F009C</color>

    <color name="md_theme_dark_secondaryContainer">#4625BC</color>

    <color name="md_theme_dark_onSecondaryContainer">#E5DEFF</color>

    <color name="md_theme_dark_tertiary">#C0C1FF</color>

    <color name="md_theme_dark_onTertiary">#1A1B8F</color>

    <color name="md_theme_dark_tertiaryContainer">#3438A5</color>

    <color name="md_theme_dark_onTertiaryContainer">#E1E0FF</color>

    <color name="md_theme_dark_error">#FFB4AB</color>

    <color name="md_theme_dark_errorContainer">#93000A</color>

    <color name="md_theme_dark_onError">#690005</color>

    <color name="md_theme_dark_onErrorContainer">#FFDAD6</color>

    <color name="md_theme_dark_background">#1C1B1E</color>

    <color name="md_theme_dark_onBackground">#E6E1E6</color>

    <color name="md_theme_dark_surface">#1C1B1E</color>

    <color name="md_theme_dark_onSurface">#E6E1E6</color>

    <color name="md_theme_dark_surfaceVariant">#48454E</color>

    <color name="md_theme_dark_onSurfaceVariant">#CAC4CF</color>

    <color name="md_theme_dark_outline">#938F99</color>

    <color name="md_theme_dark_background">#1C1B1F</color>

    <color name="md_theme_dark_onBackground">#E6E1E5</color>

    <color name="md_theme_dark_surface">#1C1B1F</color>

    <color name="md_theme_dark_onSurface">#E6E1E5</color>

    <color name="md_theme_dark_surfaceVariant">#49454F</color>

    <color name="md_theme_dark_onSurfaceVariant">#CAC4D0</color>

    <color name="md_theme_dark_inverseSurface">#E6E1E5</color>

    <color name="md_theme_dark_inverseOnSurface">#313033</color>

    <color name="md_theme_dark_inversePrimary">#6750A4</color>

    <color name="md_theme_dark_inverseOnSurface">#1C1B1E</color>

    <color name="md_theme_dark_inverseSurface">#E6E1E6</color>

    <color name="md_theme_dark_inversePrimary">#654DB2</color>

    <color name="md_theme_dark_shadow">#000000</color>

    <color name="md_theme_dark_surfaceTint">#D0BCFF</color>

    <color name="md_theme_dark_outlineVariant">#49454F</color>

    <color name="md_theme_dark_surfaceTint">#CDBDFF</color>

    <color name="md_theme_dark_outlineVariant">#48454E</color>

    <color name="md_theme_dark_scrim">#000000</color>

app/src/main/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -729,11 +729,13 @@ 
        <item>Dark</item>

        <item>Solarized (Dark)</item>

        <item>Black</item>

        <item>Dracula</item>

    </string-array>

    <string-array name="SET_THEME_DEFAULT_DARK" translatable="false">

        <item>DARK</item>

        <item>SOLARIZED_DARK</item>

        <item>BLACK</item>

        <item>DRACULA</item>

    </string-array>

app/src/main/res/values/themes.xml

+3 −3
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ 




    <style name="SolarizedAppTheme" parent="AppTheme">

        <item name="linkColor">@color/solarized_md_theme_light_primaryContainer</item>

        <item name="linkColor">@color/solarized_md_theme_light_primary</item>

        <item name="colorPrimary">@color/solarized_md_theme_light_primary</item>

        <item name="colorOnPrimary">@color/solarized_md_theme_light_onPrimary</item>

        <item name="colorPrimaryContainer">@color/solarized_md_theme_light_primaryContainer</item>
@@ -163,7 +163,7 @@ 
    </style>



    <style name="SolarizedAlertDialog" parent="Theme.Material3.Light.Dialog.Alert">

        <item name="linkColor">@color/solarized_md_theme_light_primaryContainer</item>

        <item name="linkColor">@color/solarized_md_theme_light_primary</item>

        <item name="colorPrimary">@color/solarized_md_theme_light_primary</item>

        <item name="colorOnPrimary">@color/solarized_md_theme_light_onPrimary</item>

        <item name="colorPrimaryContainer">@color/solarized_md_theme_light_primaryContainer</item>
@@ -198,7 +198,7 @@ 
    </style>



    <style name="SolarizedAppThemeBar" parent="AppThemeBar">

        <item name="linkColor">@color/solarized_md_theme_light_primaryContainer</item>

        <item name="linkColor">@color/solarized_md_theme_light_primary</item>

        <item name="colorPrimary">@color/solarized_md_theme_light_primary</item>

        <item name="colorOnPrimary">@color/solarized_md_theme_light_onPrimary</item>

        <item name="colorPrimaryContainer">@color/solarized_md_theme_light_primaryContainer</item>