Seil0/teapod
1
0
Fork 0
Code Issues 7 Pull Requests Releases 17 Wiki Activity

initial migration to material 3

Browse Source
This commit is contained in:
Jannik
2023-03-29 16:16:31 +02:00
parent fdcb76e26e
commit 47e1f6bd49
26 changed files with 338 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
app/src/main/res/values/colors.xml
View File

@ -2,6 +2,10 @@
<resources>
<!-- base theme colors -->
<color name="colorPrimary">#66aa00</color>
<color name="colorOnPrimary">#FFFFFF</color>
<color name="colorSecondary">#607d8b</color>
<color name="colorTertiary">#899579</color>
<color name="colorPrimaryLight">#99dc45</color>
<color name="colorPrimaryDark">#317a00</color>
<color name="colorAccent">#607d8b</color>
@ -15,6 +19,8 @@
<color name="textBackgroundLight">#55000000</color>
<color name="iconColorLight">#99000000</color>
<color name="buttonBackgroundLight">#000000</color>
<color name="buttonTextColorLight">#ffffff</color>
<!-- dark theme colors -->
<color name="themePrimaryDark">#121212</color>
@ -24,6 +30,7 @@
<color name="textBackgroundDark">#55ffffff</color>
<color name="iconColorDark">#99ffffff</color>
<color name="buttonBackgroundDark">#ffffff</color>
<color name="buttonTextColorDark">#000000</color>
<color name="controlHighlightDark">#11ffffff</color>
<!-- player colors -->
@ -31,4 +38,67 @@
<color name="ic_launcher_background">#ffffff</color>
<color name="ic_splash_background">#ffffff</color>
<!-- material3 colors -->
<color name="seed">#66aa00</color>
<color name="md_theme_light_primary">#3E6A00</color>
<color name="md_theme_light_onPrimary">#FFFFFF</color>
<color name="md_theme_light_primaryContainer">#99d853</color>
<color name="md_theme_light_onPrimaryContainer">#0F2000</color>
<color name="md_theme_light_secondary">#416916</color>
<color name="md_theme_light_onSecondary">#FFFFFF</color>
<color name="md_theme_light_secondaryContainer">#C1F18E</color>
<color name="md_theme_light_onSecondaryContainer">#0E2000</color>
<color name="md_theme_light_tertiary">#006783</color>
<color name="md_theme_light_onTertiary">#FFFFFF</color>
<color name="md_theme_light_tertiaryContainer">#BDE9FF</color>
<color name="md_theme_light_onTertiaryContainer">#001F2A</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_onErrorContainer">#410002</color>
<color name="md_theme_light_background">#FDFCF5</color>
<color name="md_theme_light_onBackground">#1B1C18</color>
<color name="md_theme_light_surface">#FDFCF5</color>
<color name="md_theme_light_onSurface">#1B1C18</color>
<color name="md_theme_light_surfaceVariant">#E1E4D5</color>
<color name="md_theme_light_onSurfaceVariant">#44483D</color>
<color name="md_theme_light_outline">#75796C</color>
<color name="md_theme_light_inverseOnSurface">#F2F1E9</color>
<color name="md_theme_light_inverseSurface">#30312C</color>
<color name="md_theme_light_inversePrimary">#92DA3E</color>
<color name="md_theme_light_shadow">#000000</color>
<color name="md_theme_light_surfaceTint">#3E6A00</color>
<color name="md_theme_light_outlineVariant">#C5C8BA</color>
<color name="md_theme_light_scrim">#000000</color>
<color name="md_theme_dark_primary">#92DA3E</color>
<color name="md_theme_dark_onPrimary">#1E3700</color>
<color name="md_theme_dark_primaryContainer">#2D5000</color>
<color name="md_theme_dark_onPrimaryContainer">#ACF758</color>
<color name="md_theme_dark_secondary">#A6D475</color>
<color name="md_theme_dark_onSecondary">#1D3700</color>
<color name="md_theme_dark_secondaryContainer">#2C5000</color>
<color name="md_theme_dark_onSecondaryContainer">#C1F18E</color>
<color name="md_theme_dark_tertiary">#65D3FF</color>
<color name="md_theme_dark_onTertiary">#003546</color>
<color name="md_theme_dark_tertiaryContainer">#004D64</color>
<color name="md_theme_dark_onTertiaryContainer">#BDE9FF</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">#1B1C18</color>
<color name="md_theme_dark_onBackground">#E3E3DB</color>
<color name="md_theme_dark_surface">#1B1C18</color>
<color name="md_theme_dark_onSurface">#E3E3DB</color>
<color name="md_theme_dark_surfaceVariant">#44483D</color>
<color name="md_theme_dark_onSurfaceVariant">#C5C8BA</color>
<color name="md_theme_dark_outline">#8E9285</color>
<color name="md_theme_dark_inverseOnSurface">#1B1C18</color>
<color name="md_theme_dark_inverseSurface">#E3E3DB</color>
<color name="md_theme_dark_inversePrimary">#3E6A00</color>
<color name="md_theme_dark_shadow">#000000</color>
<color name="md_theme_dark_surfaceTint">#92DA3E</color>
<color name="md_theme_dark_outlineVariant">#44483D</color>
<color name="md_theme_dark_scrim">#000000</color>
</resources>

57
app/src/main/res/values/styles.xml
View File

@ -1,14 +1,51 @@
<resources>
<!-- application themes -->
<style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<style name="AppTheme.DayNight" parent="Theme.Material3.DayNight.NoActionBar">
<!-- <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorOnPrimary">@color/colorOnPrimary</item>
<item name="colorOutline">#ffffff</item>
<item name="colorSurfaceVariant">#c5c8ba</item>
<item name="colorOnPrimaryContainer">#2d5000</item>
<item name="colorPrimaryContainer">@color/colorSecondary</item>
<item name="colorSecondary">@color/colorSecondary</item>
<item name="colorTertiary">@color/colorTertiary</item>
<item name="materialButtonStyle">@style/Widget.App.Button.DayNight</item>
<item name="popupMenuStyle">@style/Widget.App.PopupMenu</item>
<item name="searchViewStyle">@style/SearchViewStyle</item>
<item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>-->
</style>
<style name="AppTheme.Light" parent="AppTheme">
<style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">
<!-- <item name="materialButtonStyle">@style/Widget.App.Button</item>-->
<item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>
<item name="colorPrimary">@color/seed</item>
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_light_secondary</item>
<item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_light_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_light_error</item>
<item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
<item name="colorOnError">@color/md_theme_light_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
<item name="colorSurface">@color/md_theme_light_surface</item>
<item name="colorOnSurface">@color/md_theme_light_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
<item name="colorOutline">@color/md_theme_light_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
</style>
<!-- <style name="AppTheme.Light" parent="AppTheme">
<item name="themePrimary">@color/themePrimaryLight</item>
<item name="themeSecondary">@color/themeSecondaryLight</item>
<item name="textPrimary">@color/textPrimaryLight</item>
@ -34,8 +71,12 @@
<item name="buttonBackground">@color/buttonBackgroundDark</item>
<item name="materialAlertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog.Dark</item>
<!-- change on click indicator color for manually set components -->
&lt;!&ndash; change on click indicator color for manually set components &ndash;&gt;
<item name="colorControlHighlight">@color/controlHighlightDark</item>
</style>-->
<style name="Widget.App.Button.DayNight" parent="Widget.App.Button">
<item name="shapeAppearance">@style/ShapeAppearance.Material3.SmallComponent</item>
</style>
<!-- dialog themes -->
@ -79,7 +120,7 @@
<item name="windowSplashScreenAnimationDuration">200</item>
<!-- Set the theme of the Activity that directly follows your splash screen. -->
<item name="postSplashScreenTheme">@style/AppTheme.Dark</item> # Required.
<item name="postSplashScreenTheme">@style/AppTheme</item> # Required.
</style>
<!-- shapes -->
@ -90,7 +131,7 @@
<!-- popup menus -->
<style name="Widget.App.PopupMenu" parent="Widget.MaterialComponents.PopupMenu">
<item name="android:popupBackground">?themeSecondary</item>
<!-- <item name="android:popupBackground">?themeSecondary</item>-->
</style>
<!-- fullscreen dialog fragments -->

40
app/src/main/res/values/themes.xml Normal file
View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Widget.App.Button" parent="Widget.Material3.Button">
<item name="backgroundTint">@color/buttonBackgroundLight</item>
<item name="android:textColor">@color/buttonTextColorLight</item>
<item name="iconTint">@color/buttonTextColorLight</item>
</style>
<style name="AppThemeGenerated" parent="Theme.Material3.Light.NoActionBar">
<!-- <item name="materialButtonStyle">@style/Widget.App.Button</item>-->
<item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>
<item name="colorPrimary">@color/seed</item>
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_light_secondary</item>
<item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_light_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_light_error</item>
<item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
<item name="colorOnError">@color/md_theme_light_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
<item name="android:colorBackground">@color/md_theme_light_background</item>
<item name="colorOnBackground">@color/md_theme_light_onBackground</item>
<item name="colorSurface">@color/md_theme_light_surface</item>
<item name="colorOnSurface">@color/md_theme_light_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
<item name="colorOutline">@color/md_theme_light_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
</style>
</resources>