Merge pull request #2755 from mikepenz/develop

dev -> main
mikepenz · Oct 22, 2021 · 8619a29 · 8619a29
2 parents 0d4d786 + d3194c9
commit 8619a29
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@
 
 ## Latest releases 🛠
 
-- Kotlin && New | [v8.4.4](https://github.com/mikepenz/MaterialDrawer/tree/v8.4.4)
+- 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)
 - 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)

diff --git a/app/build.gradle b/app/build.gradle
@@ -73,7 +73,7 @@ dependencies {
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:${versions.swiperefreshLayout}"
 
     // used to showcase how to load images
-    implementation("io.coil-kt:coil:1.3.2")
+    implementation("io.coil-kt:coil:1.4.0")
 
     // the sample uses more advanced functions of the fastadapter
     // https://github.com/mikepenz/FastAdapter/

diff --git a/build.gradle b/build.gradle
@@ -3,8 +3,8 @@ buildscript {
 
     ext {
         release = [
-                versionName: "8.4.4",
-                versionCode: 8044
+                versionName: "8.4.5",
+                versionCode: 8045
         ]
 
         setup = [
@@ -25,8 +25,8 @@ buildscript {
                 cardview          : '1.0.0',
                 kotlin            : "1.5.31",
                 fastadapter       : "5.5.1",
-                iconics           : "5.3.1",
-                aboutLibs         : "8.9.1",
+                iconics           : "5.3.2",
+                aboutLibs         : "8.9.4",
                 navigation        : "2.3.5",
                 detekt            : '1.18.1',
                 slidingpaneLayout : "1.1.0",
@@ -40,7 +40,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.0-alpha13'
+        classpath 'com.android.tools.build:gradle:7.2.0-alpha02'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:${versions.navigation}"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${versions.detekt}"

diff --git a/materialdrawer/src/main/res/layout/material_drawer_compact_header.xml b/materialdrawer/src/main/res/layout/material_drawer_compact_header.xml
@@ -71,7 +71,7 @@
         android:layout_marginStart="@dimen/material_drawer_vertical_padding"
         android:layout_marginLeft="@dimen/material_drawer_vertical_padding"
         android:clickable="true"
-        android:elevation="2dp"
+        android:elevation="@dimen/material_drawer_account_header_profile_elevation"
         android:focusable="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -81,7 +81,7 @@
         android:id="@+id/material_drawer_account_header_current_badge"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:elevation="4dp"
+        android:elevation="@dimen/material_drawer_account_header_profile_badge_elevation"
         android:fontFamily="sans-serif"
         android:gravity="center"
         android:lines="1"

diff --git a/materialdrawer/src/main/res/layout/material_drawer_header.xml b/materialdrawer/src/main/res/layout/material_drawer_header.xml
@@ -32,7 +32,7 @@
         android:layout_marginLeft="@dimen/material_drawer_vertical_padding"
         android:layout_marginTop="@dimen/material_drawer_account_header_horizontal_top"
         android:clickable="true"
-        android:elevation="2dp"
+        android:elevation="@dimen/material_drawer_account_header_profile_elevation"
         android:focusable="true"
         android:scaleType="fitCenter"
         app:layout_constraintStart_toStartOf="parent"
@@ -42,7 +42,7 @@
         android:id="@+id/material_drawer_account_header_current_badge"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:elevation="4dp"
+        android:elevation="@dimen/material_drawer_account_header_profile_badge_elevation"
         android:fontFamily="sans-serif"
         android:gravity="center"
         android:lines="1"
@@ -64,7 +64,7 @@
         android:layout_marginEnd="@dimen/material_drawer_vertical_padding"
         android:layout_marginRight="@dimen/material_drawer_vertical_padding"
         android:clickable="true"
-        android:elevation="2dp"
+        android:elevation="@dimen/material_drawer_account_header_profile_small_elevation"
         android:focusable="true"
         android:scaleType="fitCenter"
         android:visibility="visible"
@@ -75,7 +75,7 @@
         android:id="@+id/material_drawer_account_header_small_first_badge"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:elevation="4dp"
+        android:elevation="@dimen/material_drawer_account_header_profile_badge_elevation"
         android:fontFamily="sans-serif"
         android:gravity="center"
         android:lines="1"
@@ -97,7 +97,7 @@
         android:layout_marginEnd="@dimen/material_drawer_vertical_padding"
         android:layout_marginRight="@dimen/material_drawer_vertical_padding"
         android:clickable="true"
-        android:elevation="2dp"
+        android:elevation="@dimen/material_drawer_account_header_profile_small_elevation"
         android:focusable="true"
         android:scaleType="fitCenter"
         android:visibility="visible"
@@ -108,7 +108,7 @@
         android:id="@+id/material_drawer_account_header_small_second_badge"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:elevation="4dp"
+        android:elevation="@dimen/material_drawer_account_header_profile_badge_elevation"
         android:fontFamily="sans-serif"
         android:gravity="center"
         android:lines="1"
@@ -130,7 +130,7 @@
         android:layout_marginEnd="@dimen/material_drawer_vertical_padding"
         android:layout_marginRight="@dimen/material_drawer_vertical_padding"
         android:clickable="true"
-        android:elevation="2dp"
+        android:elevation="@dimen/material_drawer_account_header_profile_small_elevation"
         android:focusable="true"
         android:scaleType="fitCenter"
         android:visibility="visible"
@@ -141,7 +141,7 @@
         android:id="@+id/material_drawer_account_header_small_third_badge"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:elevation="4dp"
+        android:elevation="@dimen/material_drawer_account_header_profile_badge_elevation"
         android:fontFamily="sans-serif"
         android:gravity="center"
         android:lines="1"

diff --git a/materialdrawer/src/main/res/values/dimens.xml b/materialdrawer/src/main/res/values/dimens.xml
@@ -36,6 +36,9 @@
     <dimen name="material_drawer_account_header_dropdown_padding">1dp</dimen>
     <dimen name="material_drawer_account_header_dropdown_margin_bottom">18dp</dimen>
     <dimen name="material_drawer_account_header_non_compact_padding">56dp</dimen>
+    <dimen name="material_drawer_account_header_profile_elevation">2dp</dimen>
+    <dimen name="material_drawer_account_header_profile_small_elevation">2dp</dimen>
+    <dimen name="material_drawer_account_header_profile_badge_elevation">4dp</dimen>
 
     <!-- General profileIcon margins for the drawer item -->
     <dimen name="material_drawer_item_padding">8dp</dimen>