atridad/Mealient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Start migration to Material 3

Browse Source 
Theme was generated here
https://material-foundation.github.io/material-theme-builder/#/custom
Primary: BB86FC
Secondary: 655A70
Tertiary: 805159
Neutral: 605D62
This commit is contained in:
Kirill Kamakin
2022-04-09 16:48:30 +05:00
parent d52c428ea5
commit 9db89965c0
9 changed files with 133 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,58 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
<color name="purple_700">#FF3700B3</color>
<color name="teal_200">#FF03DAC5</color>
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="primary">#FF9D76DC</color>
<color name="md_theme_light_primary">#7743B5</color>
<color name="md_theme_light_onPrimary">#FFFFFF</color>
<color name="md_theme_light_primaryContainer">#EFDBFF</color>
<color name="md_theme_light_onPrimaryContainer">#290054</color>
<color name="md_theme_light_secondary">#655A70</color>
<color name="md_theme_light_onSecondary">#FFFFFF</color>
<color name="md_theme_light_secondaryContainer">#ECDDF7</color>
<color name="md_theme_light_onSecondaryContainer">#201829</color>
<color name="md_theme_light_tertiary">#805159</color>
<color name="md_theme_light_onTertiary">#FFFFFF</color>
<color name="md_theme_light_tertiaryContainer">#FFD9DF</color>
<color name="md_theme_light_onTertiaryContainer">#321118</color>
<color name="md_theme_light_error">#BA1B1B</color>
<color name="md_theme_light_errorContainer">#FFDAD4</color>
<color name="md_theme_light_onError">#FFFFFF</color>
<color name="md_theme_light_onErrorContainer">#410001</color>
<color name="md_theme_light_background">#FFFBFC</color>
<color name="md_theme_light_onBackground">#1D1B1E</color>
<color name="md_theme_light_surface">#FFFBFC</color>
<color name="md_theme_light_onSurface">#1D1B1E</color>
<color name="md_theme_light_surfaceVariant">#E8DFEB</color>
<color name="md_theme_light_onSurfaceVariant">#4A454E</color>
<color name="md_theme_light_outline">#7B757E</color>
<color name="md_theme_light_inverseOnSurface">#F5EFF3</color>
<color name="md_theme_light_inverseSurface">#322F33</color>
<color name="md_theme_light_inversePrimary">#DBB8FF</color>
<color name="md_theme_light_shadow">#000000</color>
<color name="md_theme_light_primaryInverse">#DBB8FF</color>
<color name="md_theme_dark_primary">#DBB8FF</color>
<color name="md_theme_dark_onPrimary">#460283</color>
<color name="md_theme_dark_primaryContainer">#5E289B</color>
<color name="md_theme_dark_onPrimaryContainer">#EFDBFF</color>
<color name="md_theme_dark_secondary">#CFC1DA</color>
<color name="md_theme_dark_onSecondary">#362D40</color>
<color name="md_theme_dark_secondaryContainer">#4D4357</color>
<color name="md_theme_dark_onSecondaryContainer">#ECDDF7</color>
<color name="md_theme_dark_tertiary">#F2B7C0</color>
<color name="md_theme_dark_onTertiary">#4B252C</color>
<color name="md_theme_dark_tertiaryContainer">#653A42</color>
<color name="md_theme_dark_onTertiaryContainer">#FFD9DF</color>
<color name="md_theme_dark_error">#FFB4A9</color>
<color name="md_theme_dark_errorContainer">#930006</color>
<color name="md_theme_dark_onError">#680003</color>
<color name="md_theme_dark_onErrorContainer">#FFDAD4</color>
<color name="md_theme_dark_background">#1D1B1E</color>
<color name="md_theme_dark_onBackground">#E7E1E5</color>
<color name="md_theme_dark_surface">#1D1B1E</color>
<color name="md_theme_dark_onSurface">#E7E1E5</color>
<color name="md_theme_dark_surfaceVariant">#4A454E</color>
<color name="md_theme_dark_onSurfaceVariant">#CCC4CF</color>
<color name="md_theme_dark_outline">#958E98</color>
<color name="md_theme_dark_inverseOnSurface">#1D1B1E</color>
<color name="md_theme_dark_inverseSurface">#E7E1E5</color>
<color name="md_theme_dark_inversePrimary">#7743B5</color>
<color name="md_theme_dark_shadow">#000000</color>
<color name="md_theme_dark_primaryInverse">#7743B5</color>
</resources>

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

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="SmallMarginTextInputLayoutStyle" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
<style name="SmallMarginTextInputLayoutStyle">
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_margin">@dimen/margin_small</item>
@@ -13,17 +13,17 @@
<item name="android:layout_margin">@dimen/margin_small</item>
</style>
<style name="ShapeAppearance.AllCornersRounded" parent="ShapeAppearance.MaterialComponents">
<style name="ShapeAppearance.AllCornersRounded" parent="ShapeAppearance.Material3.LargeComponent">
<item name="cornerSize">@dimen/rounded_corner_size_default</item>
</style>
<!-- This is a workaround to support always round corners of the bottom sheet
See more at https://github.com/material-components/material-components-android/pull/437#issuecomment-852461685 -->
<style name="NoShapeBottomSheetDialog" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog">
<style name="NoShapeBottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
<item name="bottomSheetStyle">@style/NoShapeBottomSheet</item>
</style>
<style name="NoShapeBottomSheet" parent="Widget.MaterialComponents.BottomSheet.Modal">
<style name="NoShapeBottomSheet" parent="Widget.Material3.BottomSheet.Modal">
<item name="shapeAppearance">@null</item>
<item name="shapeAppearanceOverlay">@null</item>
<item name="android:background">@drawable/recipe_info_background</item>

45
app/src/main/res/values/themes.xml
View File

@@ -1,17 +1,32 @@
<resources>
<!-- Base application theme. -->
<style name="Theme.Mealient" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryVariant">@color/purple_700</item>
<item name="colorOnPrimary">@color/white</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/teal_200</item>
<item name="colorSecondaryVariant">@color/teal_700</item>
<item name="colorOnSecondary">@color/black</item>
<!-- Status bar color. -->
<item name="android:statusBarColor">?attr/colorPrimary</item>
<!-- Customize your theme here. -->
<item name="android:overScrollMode">never</item>
</style>
<style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
<item name="colorPrimary">@color/md_theme_light_primary</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_primaryInverse</item>
<item name="android:overScrollMode">never</item>
</style>
</resources>