From 9db89965c0cf3a80e63307a62ece027392081b92 Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Sat, 9 Apr 2022 16:48:30 +0500
Subject: [PATCH] Start migration to Material 3

Theme was generated here
https://material-foundation.github.io/material-theme-builder/#/custom
Primary: BB86FC
Secondary: 655A70
Tertiary: 805159
Neutral: 605D62
---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../res/layout/fragment_authentication.xml    | 14 ++--
 .../main/res/layout/fragment_disclaimer.xml   | 14 ++--
 .../main/res/layout/fragment_recipe_info.xml  |  2 +-
 .../res/layout/view_holder_instruction.xml    |  2 +-
 app/src/main/res/values-night/themes.xml      | 44 ++++++++-----
 app/src/main/res/values/colors.xml            | 66 ++++++++++++++++---
 app/src/main/res/values/styles.xml            |  8 +--
 app/src/main/res/values/themes.xml            | 45 ++++++++-----
 9 files changed, 133 insertions(+), 64 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a72e4e7..3c9d105 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
 		android:roundIcon="@mipmap/ic_launcher"
 		android:supportsRtl="true"
 		tools:ignore="UnusedAttribute"
-		android:theme="@style/Theme.Mealient">
+		android:theme="@style/AppTheme">
 		<activity
 			android:name=".ui.activity.MainActivity"
 			android:exported="true">
diff --git a/app/src/main/res/layout/fragment_authentication.xml b/app/src/main/res/layout/fragment_authentication.xml
index 8355ea2..098f119 100644
--- a/app/src/main/res/layout/fragment_authentication.xml
+++ b/app/src/main/res/layout/fragment_authentication.xml
@@ -42,11 +42,11 @@
 	</com.google.android.material.textfield.TextInputLayout>
 
     <Button
-        android:id="@+id/button"
-        android:text="@string/fragment_authentication_button_login"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        style="@style/SmallMarginButton"
-        app:layout_constraintTop_toBottomOf="@+id/password_input_layout" />
+		android:id="@+id/button"
+		style="@style/SmallMarginButton"
+		android:text="@string/fragment_authentication_button_login"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/password_input_layout" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_disclaimer.xml b/app/src/main/res/layout/fragment_disclaimer.xml
index fface31..15a2098 100644
--- a/app/src/main/res/layout/fragment_disclaimer.xml
+++ b/app/src/main/res/layout/fragment_disclaimer.xml
@@ -8,20 +8,16 @@
 
 	<com.google.android.material.card.MaterialCardView
 		android:id="@+id/main_text_holder"
-		style="@style/Widget.MaterialComponents.CardView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginHorizontal="20dp"
 		android:layout_marginTop="40dp"
-		android:elevation="0dp"
-		app:cardCornerRadius="@dimen/rounded_corner_size_default"
-		app:cardForegroundColor="#26C4C4C4"
+		app:cardElevation="8dp"
+		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintBottom_toTopOf="@+id/okay"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"
-		app:strokeColor="#FFDCC8BF"
-		app:strokeWidth="1dp">
+		app:shapeAppearance="@style/ShapeAppearance.AllCornersRounded">
 
 		<TextView
 			android:id="@+id/main_text"
@@ -36,11 +32,9 @@
 
 	<Button
 		android:id="@+id/okay"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_margin="@dimen/margin_small"
 		android:clickable="false"
 		tools:text="Okay (3 seconds)"
+		style="@style/SmallMarginButton"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/main_text_holder" />
diff --git a/app/src/main/res/layout/fragment_recipe_info.xml b/app/src/main/res/layout/fragment_recipe_info.xml
index 620b25e..e564fa7 100644
--- a/app/src/main/res/layout/fragment_recipe_info.xml
+++ b/app/src/main/res/layout/fragment_recipe_info.xml
@@ -77,7 +77,7 @@
 			android:layout_marginHorizontal="8dp"
 			android:layout_marginTop="11dp"
 			android:layout_marginBottom="20dp"
-			app:cardCornerRadius="@dimen/rounded_corner_size_default"
+			app:shapeAppearance="@style/ShapeAppearance.AllCornersRounded"
 			app:cardElevation="10dp"
 			app:layout_constraintBottom_toTopOf="@+id/instructions_header"
 			app:layout_constraintEnd_toStartOf="@+id/end_guide"
diff --git a/app/src/main/res/layout/view_holder_instruction.xml b/app/src/main/res/layout/view_holder_instruction.xml
index 676aaba..cee4dda 100644
--- a/app/src/main/res/layout/view_holder_instruction.xml
+++ b/app/src/main/res/layout/view_holder_instruction.xml
@@ -4,7 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_margin="8dp"
-	app:cardCornerRadius="@dimen/rounded_corner_size_default"
+	app:shapeAppearance="@style/ShapeAppearance.AllCornersRounded"
 	app:cardElevation="10dp"
 	android:layout_height="wrap_content">
 
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index d497cab..9a4a570 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,17 +1,31 @@
 <resources>
-	<!-- Base application theme. -->
-	<style name="Theme.Mealient" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-		<!-- Primary brand color. -->
-		<item name="colorPrimary">@color/purple_200</item>
-		<item name="colorPrimaryVariant">@color/purple_700</item>
-		<item name="colorOnPrimary">@color/black</item>
-		<!-- Secondary brand color. -->
-		<item name="colorSecondary">@color/teal_200</item>
-		<item name="colorSecondaryVariant">@color/teal_200</item>
-		<item name="colorOnSecondary">@color/black</item>
-		<!-- Status bar color. -->
-		<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-		<!-- Customize your theme here. -->
-		<item name="android:overScrollMode">never</item>
-	</style>
+
+    <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
+        <item name="colorPrimary">@color/md_theme_dark_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</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="colorError">@color/md_theme_dark_error</item>
+        <item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_dark_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_dark_background</item>
+        <item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
+        <item name="colorSurface">@color/md_theme_dark_surface</item>
+        <item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_dark_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_dark_primaryInverse</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a7dfdbc..904f3be 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -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>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e959f9b..93dfff0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -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>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index edfdfac..c7ddac7 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -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>
\ No newline at end of file