Skip to content

Commit 8619a29

Browse files
authored
Merge pull request #2755 from mikepenz/develop
dev -> main
2 parents 0d4d786 + d3194c9 commit 8619a29

File tree

6 files changed

+20
-17
lines changed

6 files changed

+20
-17
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
## Latest releases 🛠
5151

52-
- Kotlin && New | [v8.4.4](https://github.com/mikepenz/MaterialDrawer/tree/v8.4.4)
52+
- Kotlin && New | [v8.4.5](https://github.com/mikepenz/MaterialDrawer/tree/v8.4.5)
5353
- Kotlin | [v7.0.0](https://github.com/mikepenz/MaterialDrawer/tree/v7.0.0) | (Builder approach like v6.x)
5454
- Java && AndroidX | [v6.1.2](https://github.com/mikepenz/MaterialDrawer/tree/v6.1.2)
5555
- Java && AppCompat | [v6.0.9](https://github.com/mikepenz/MaterialDrawer/tree/v6.0.9)

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ dependencies {
7373
implementation "androidx.swiperefreshlayout:swiperefreshlayout:${versions.swiperefreshLayout}"
7474

7575
// used to showcase how to load images
76-
implementation("io.coil-kt:coil:1.3.2")
76+
implementation("io.coil-kt:coil:1.4.0")
7777

7878
// the sample uses more advanced functions of the fastadapter
7979
// https://github.com/mikepenz/FastAdapter/

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ buildscript {
33

44
ext {
55
release = [
6-
versionName: "8.4.4",
7-
versionCode: 8044
6+
versionName: "8.4.5",
7+
versionCode: 8045
88
]
99

1010
setup = [
@@ -25,8 +25,8 @@ buildscript {
2525
cardview : '1.0.0',
2626
kotlin : "1.5.31",
2727
fastadapter : "5.5.1",
28-
iconics : "5.3.1",
29-
aboutLibs : "8.9.1",
28+
iconics : "5.3.2",
29+
aboutLibs : "8.9.4",
3030
navigation : "2.3.5",
3131
detekt : '1.18.1',
3232
slidingpaneLayout : "1.1.0",
@@ -40,7 +40,7 @@ buildscript {
4040
mavenCentral()
4141
}
4242
dependencies {
43-
classpath 'com.android.tools.build:gradle:7.1.0-alpha13'
43+
classpath 'com.android.tools.build:gradle:7.2.0-alpha02'
4444
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
4545
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:${versions.navigation}"
4646
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${versions.detekt}"

materialdrawer/src/main/res/layout/material_drawer_compact_header.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
android:layout_marginStart="@dimen/material_drawer_vertical_padding"
7272
android:layout_marginLeft="@dimen/material_drawer_vertical_padding"
7373
android:clickable="true"
74-
android:elevation="2dp"
74+
android:elevation="@dimen/material_drawer_account_header_profile_elevation"
7575
android:focusable="true"
7676
app:layout_constraintBottom_toBottomOf="parent"
7777
app:layout_constraintStart_toStartOf="parent"
@@ -81,7 +81,7 @@
8181
android:id="@+id/material_drawer_account_header_current_badge"
8282
android:layout_width="wrap_content"
8383
android:layout_height="wrap_content"
84-
android:elevation="4dp"
84+
android:elevation="@dimen/material_drawer_account_header_profile_badge_elevation"
8585
android:fontFamily="sans-serif"
8686
android:gravity="center"
8787
android:lines="1"

materialdrawer/src/main/res/layout/material_drawer_header.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
android:layout_marginLeft="@dimen/material_drawer_vertical_padding"
3333
android:layout_marginTop="@dimen/material_drawer_account_header_horizontal_top"
3434
android:clickable="true"
35-
android:elevation="2dp"
35+
android:elevation="@dimen/material_drawer_account_header_profile_elevation"
3636
android:focusable="true"
3737
android:scaleType="fitCenter"
3838
app:layout_constraintStart_toStartOf="parent"
@@ -42,7 +42,7 @@
4242
android:id="@+id/material_drawer_account_header_current_badge"
4343
android:layout_width="wrap_content"
4444
android:layout_height="wrap_content"
45-
android:elevation="4dp"
45+
android:elevation="@dimen/material_drawer_account_header_profile_badge_elevation"
4646
android:fontFamily="sans-serif"
4747
android:gravity="center"
4848
android:lines="1"
@@ -64,7 +64,7 @@
6464
android:layout_marginEnd="@dimen/material_drawer_vertical_padding"
6565
android:layout_marginRight="@dimen/material_drawer_vertical_padding"
6666
android:clickable="true"
67-
android:elevation="2dp"
67+
android:elevation="@dimen/material_drawer_account_header_profile_small_elevation"
6868
android:focusable="true"
6969
android:scaleType="fitCenter"
7070
android:visibility="visible"
@@ -75,7 +75,7 @@
7575
android:id="@+id/material_drawer_account_header_small_first_badge"
7676
android:layout_width="wrap_content"
7777
android:layout_height="wrap_content"
78-
android:elevation="4dp"
78+
android:elevation="@dimen/material_drawer_account_header_profile_badge_elevation"
7979
android:fontFamily="sans-serif"
8080
android:gravity="center"
8181
android:lines="1"
@@ -97,7 +97,7 @@
9797
android:layout_marginEnd="@dimen/material_drawer_vertical_padding"
9898
android:layout_marginRight="@dimen/material_drawer_vertical_padding"
9999
android:clickable="true"
100-
android:elevation="2dp"
100+
android:elevation="@dimen/material_drawer_account_header_profile_small_elevation"
101101
android:focusable="true"
102102
android:scaleType="fitCenter"
103103
android:visibility="visible"
@@ -108,7 +108,7 @@
108108
android:id="@+id/material_drawer_account_header_small_second_badge"
109109
android:layout_width="wrap_content"
110110
android:layout_height="wrap_content"
111-
android:elevation="4dp"
111+
android:elevation="@dimen/material_drawer_account_header_profile_badge_elevation"
112112
android:fontFamily="sans-serif"
113113
android:gravity="center"
114114
android:lines="1"
@@ -130,7 +130,7 @@
130130
android:layout_marginEnd="@dimen/material_drawer_vertical_padding"
131131
android:layout_marginRight="@dimen/material_drawer_vertical_padding"
132132
android:clickable="true"
133-
android:elevation="2dp"
133+
android:elevation="@dimen/material_drawer_account_header_profile_small_elevation"
134134
android:focusable="true"
135135
android:scaleType="fitCenter"
136136
android:visibility="visible"
@@ -141,7 +141,7 @@
141141
android:id="@+id/material_drawer_account_header_small_third_badge"
142142
android:layout_width="wrap_content"
143143
android:layout_height="wrap_content"
144-
android:elevation="4dp"
144+
android:elevation="@dimen/material_drawer_account_header_profile_badge_elevation"
145145
android:fontFamily="sans-serif"
146146
android:gravity="center"
147147
android:lines="1"

materialdrawer/src/main/res/values/dimens.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
<dimen name="material_drawer_account_header_dropdown_padding">1dp</dimen>
3737
<dimen name="material_drawer_account_header_dropdown_margin_bottom">18dp</dimen>
3838
<dimen name="material_drawer_account_header_non_compact_padding">56dp</dimen>
39+
<dimen name="material_drawer_account_header_profile_elevation">2dp</dimen>
40+
<dimen name="material_drawer_account_header_profile_small_elevation">2dp</dimen>
41+
<dimen name="material_drawer_account_header_profile_badge_elevation">4dp</dimen>
3942

4043
<!-- General profileIcon margins for the drawer item -->
4144
<dimen name="material_drawer_item_padding">8dp</dimen>

0 commit comments

Comments
 (0)