Merge pull request #2775 from mikepenz/develop

dev -> main

Author: mikepenz

README.md

@@ -49,8 +49,8 @@
 
 ## Latest releases 🛠
 
-- Kotlin && New | [v8.4.5](https://github.com/mikepenz/MaterialDrawer/tree/v8.4.5)
-- Kotlin | [v7.0.0](https://github.com/mikepenz/MaterialDrawer/tree/v7.0.0) | (Builder approach like v6.x)
+- Kotlin && Material 3 | [v9.0.0](https://github.com/mikepenz/MaterialDrawer/tree/v9.0.0)
+- Kotlin | [v8.4.5](https://github.com/mikepenz/MaterialDrawer/tree/v8.4.5)
 - Java && AndroidX | [v6.1.2](https://github.com/mikepenz/MaterialDrawer/tree/v6.1.2)
 - Java && AppCompat | [v6.0.9](https://github.com/mikepenz/MaterialDrawer/tree/v6.0.9)
 
@@ -64,7 +64,7 @@ implementation "com.mikepenz:materialdrawer:${lastestMaterialDrawerRelease}"
 implementation "androidx.appcompat:appcompat:${versions.appcompat}"
 implementation "androidx.recyclerview:recyclerview:${versions.recyclerView}"
 implementation "androidx.annotation:annotation:${versions.annotation}"
-implementation "com.google.android.material:material:${versions.material}"
+implementation "com.google.android.material:material:1.5.0-alpha05" // requires at least 1.5.0-x
 implementation "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}"
 
 // Add for NavController support
@@ -100,7 +100,7 @@ The `MaterialDrawerSliderView` has to be provided as child of the `DrawerLayout`
 ### 3. Add the `DrawerStyle` to your theme
 
 ```xml
-<style name="SampleApp.DayNight" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+<style name="SampleApp.DayNight" parent="Theme.Material3.DayNight.NoActionBar">
     ...
     <item name="materialDrawerStyle">@style/Widget.MaterialDrawerStyle</item>
     <item name="materialDrawerHeaderStyle">@style/Widget.MaterialDrawerHeaderStyle</item>
@@ -110,6 +110,10 @@ The `MaterialDrawerSliderView` has to be provided as child of the `DrawerLayout`
 
 Great. Your drawer is now ready to use.
 
+### Note
+
+> Using v9.x with Material 3 theming requires a `Material3` theme as base for the activity.
+
 # Additional Setup
 ### Add items and adding some functionality
 
@@ -273,12 +277,12 @@ Create your custom style. If you don't need a custom theme see the next section,
     <item name="materialDrawerInsetForeground">#4000</item>
     <!-- MaterialDrawer specific values -->
     <item name="materialDrawerBackground">?colorSurface</item>
-    <item name="materialDrawerPrimaryText">?android:textColorPrimary</item>
-    <item name="materialDrawerPrimaryIcon">?android:textColorSecondary</item>
-    <item name="materialDrawerSecondaryText">?android:textColorSecondary</item>
-    <item name="materialDrawerSecondaryIcon">?android:textColorSecondary</item>
-    <item name="materialDrawerDividerColor">?android:textColorHint</item>
-    <item name="materialDrawerSelectedBackgroundColor">?colorPrimary</item>
+    <item name="materialDrawerPrimaryText">@color/color_drawer_item_text</item>
+    <item name="materialDrawerPrimaryIcon">@color/color_drawer_item_text</item>
+    <item name="materialDrawerSecondaryText">@color/color_drawer_item_text</item>
+    <item name="materialDrawerSecondaryIcon">@color/color_drawer_item_text</item>
+    <item name="materialDrawerDividerColor">?colorOutline</item>
+    <item name="materialDrawerSelectedBackgroundColor">?colorSecondaryContainer</item>
 </style>
 
 // define a custom header style
@@ -289,7 +293,7 @@ Create your custom style. If you don't need a custom theme see the next section,
 </style>
 
 // define the custom styles for the theme
-<style name="SampleApp" parent="Theme.MaterialComponents.Light.NoActionBar">
+<style name="SampleApp" parent="Theme.Material3.Light.NoActionBar">
     ...
     <item name="materialDrawerStyle">@style/Widget.MaterialDrawerStyleCustom</item>
     <item name="materialDrawerHeaderStyle">@style/Widget.MaterialDrawerHeaderStyleCustom</item>

app/src/main/java/com/mikepenz/materialdrawer/app/CustomApplication.kt

@@ -7,6 +7,7 @@ import android.widget.ImageView
 import androidx.multidex.MultiDexApplication
 import coil.clear
 import coil.load
+import com.google.android.material.color.DynamicColors
 import com.mikepenz.iconics.Iconics
 import com.mikepenz.iconics.IconicsDrawable
 import com.mikepenz.iconics.utils.backgroundColorRes
@@ -24,6 +25,8 @@ class CustomApplication : MultiDexApplication() {
 
         Iconics.init(this)
 
+        DynamicColors.applyToActivitiesIfAvailable(this)
+
         //initialize and create the image loader logic
         /*
         DrawerImageLoader.init(object : AbstractDrawerImageLoader() {

app/src/main/java/com/mikepenz/materialdrawer/app/DrawerActivity.kt

@@ -8,9 +8,8 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/colorPrimary"
         android:elevation="4dp"
-        android:theme="@style/ThemeOverlay.MaterialComponents.Dark" />
+        android:theme="@style/ThemeOverlay.Material3.Dark" />
 
     <FrameLayout
         android:layout_width="match_parent"

app/src/main/res/layout/activity_mini_drawer.xml

@@ -14,9 +14,7 @@
             android:id="@+id/toolbar"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
             android:elevation="4dp"
-            android:theme="@style/ThemeOverlay.MaterialComponents.Dark"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

app/src/main/res/layout/activity_sample.xml

@@ -14,9 +14,7 @@
             android:id="@+id/toolbar"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
             android:elevation="4dp"
-            android:theme="@style/ThemeOverlay.MaterialComponents.Dark"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

app/src/main/res/layout/activity_sample_crossfader.xml

@@ -8,9 +8,8 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/colorPrimary"
         android:elevation="4dp"
-        android:theme="@style/ThemeOverlay.MaterialComponents.Dark" />
+        android:theme="@style/ThemeOverlay.Material3.Dark" />
 
     <FrameLayout
         android:id="@+id/fragment_container"

app/src/main/res/layout/activity_sample_fragment.xml

@@ -14,9 +14,8 @@
             android:id="@+id/toolbar"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
             android:elevation="4dp"
-            android:theme="@style/ThemeOverlay.MaterialComponents.Dark"
+            android:theme="@style/ThemeOverlay.Material3.Dark"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

app/src/main/res/layout/activity_sample_fullscreen.xml

@@ -14,9 +14,8 @@
             android:id="@+id/toolbar"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
             android:elevation="4dp"
-            android:theme="@style/ThemeOverlay.MaterialComponents.Dark"
+            android:theme="@style/ThemeOverlay.Material3.Dark"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

app/src/main/res/layout/activity_sample_nav.xml

@@ -59,8 +59,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/material_drawer_padding"
         android:layout_marginLeft="@dimen/material_drawer_padding"
-        android:layout_marginEnd="0dp"
-        android:layout_marginRight="0dp"
+        android:layout_marginEnd="@dimen/material_drawer_padding"
+        android:layout_marginRight="@dimen/material_drawer_padding"
         android:fontFamily="sans-serif"
         android:gravity="center"
         android:lines="1"