Update to Blueprint 2.2.6

jahirfiquitiva · Dec 5, 2021 · a9f2d0d · a9f2d0d
1 parent bf0f715
commit a9f2d0d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/app/src/main/res/values-v31/m3_colors.xml b/app/src/main/res/values-v31/m3_colors.xml
@@ -5,7 +5,7 @@
     <color name="m3_primaryDark">@android:color/system_neutral1_10</color>
     <color name="m3_onPrimary">@android:color/system_neutral1_900</color>
 
-    <color name="m3_accent">@android:color/system_accent1_500</color>
+    <color name="m3_accent">@android:color/system_accent1_600</color>
     <color name="m3_onAccent">@android:color/system_accent1_0</color>
 
     <color name="m3_surface">@android:color/system_neutral2_50</color>
@@ -21,6 +21,11 @@
 
     <color name="m3_bottomNavActiveIndicator">@android:color/system_neutral2_100</color>
 
+    <color name="m3_secondaryContainer">@android:color/system_accent2_600</color>
+    <color name="m3_onSecondaryContainer">@android:color/system_accent2_0</color>
+    <color name="m3_tertiaryContainer">@android:color/system_accent3_600</color>
+    <color name="m3_onTertiaryContainer">@android:color/system_accent3_0</color>
+
     <!-- Dark Theme Colors -->
     <color name="m3_darkThemePrimary">@android:color/system_neutral1_900</color>
     <color name="m3_darkThemePrimaryDark">@android:color/system_neutral1_900</color>
@@ -42,9 +47,14 @@
 
     <color name="m3_darkThemeBottomNavActiveIndicator">@android:color/system_neutral2_700</color>
 
+    <color name="m3_darkThemeSecondaryContainer">@android:color/system_accent2_200</color>
+    <color name="m3_darkThemeOnSecondaryContainer">@android:color/system_accent2_800</color>
+    <color name="m3_darkThemeTertiaryContainer">@android:color/system_accent3_200</color>
+    <color name="m3_darkThemeOnTertiaryContainer">@android:color/system_accent3_800</color>
+
     <!-- Amoled Theme Colors -->
     <color name="m3_amoledThemeAccent">@android:color/system_accent1_200</color>
+    <color name="m3_amoledThemeSurface">@android:color/system_neutral2_900</color>
     <color name="m3_amoledThemeSnackbarButtonColor">@android:color/system_accent1_500</color>
 
-    <color name="m3_amoledThemeBottomNavActiveIndicator">@color/m3_darkThemeBottomNavActiveIndicator</color>
 </resources>
diff --git a/app/src/main/res/values/m3_styles.xml b/app/src/main/res/values/m3_styles.xml
@@ -2,21 +2,21 @@
 <resources>
 
     <!-- Don't change the parent style -->
-    <style name="MyApp.Default.MaterialYou" parent="Frames.Default.MaterialYou">
+    <style name="MyApp.Default.MaterialYou" parent="Blueprint.Default.MaterialYou">
         <item name="bottomNavigationStyle">@style/MyApp.BottomNavigationView.MaterialYou</item>
         <item name="customFontBold">@font/manrope_bold_fam</item>
         <item name="customFontNormal">@font/manrope_normal_fam</item>
     </style>
 
     <!-- Don't change the parent style -->
-    <style name="MyApp.Default.Amoled.MaterialYou" parent="Frames.Default.Amoled.MaterialYou">
+    <style name="MyApp.Default.Amoled.MaterialYou" parent="Blueprint.Default.Amoled.MaterialYou">
         <item name="bottomNavigationStyle">@style/MyApp.BottomNavigationView.MaterialYou</item>
         <item name="customFontBold">@font/manrope_bold_fam</item>
         <item name="customFontNormal">@font/manrope_normal_fam</item>
     </style>
 
     <!-- Don't change the parent style -->
-    <style name="MyApp.BottomNavigationView.MaterialYou" parent="Widget.Frames.BottomNavigationView.MaterialYou">
+    <style name="MyApp.BottomNavigationView.MaterialYou" parent="Widget.Blueprint.BottomNavigationView.MaterialYou">
         <!--
             Switch bottom navigation labels visibility style
             You can use any of there:
@@ -26,7 +26,7 @@
             - selected
             Learn more: https://developer.android.com/reference/com/google/android/material/bottomnavigation/LabelVisibilityMode
         -->
-        <item name="labelVisibilityMode">auto</item>
+        <item name="labelVisibilityMode">labeled</item>
     </style>
 
 </resources>
diff --git a/buildSrc/src/main/java/MyApp.kt b/buildSrc/src/main/java/MyApp.kt
@@ -2,6 +2,6 @@
 
 object MyApp {
     const val appId = "dev.jahir.blueprint.app"
-    const val version = 225
-    const val versionName = "2.2.5"
+    const val version = 226
+    const val versionName = "2.2.6"
 }
diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
@@ -15,5 +15,5 @@ object Versions {
     const val buildTools = "30.0.2"
 
     // Blueprint
-    const val blueprint = "2.2.5"
+    const val blueprint = "2.2.6"
 }