Skip to content

Commit

Permalink
Merge pull request #2746 from mikepenz/develop
Browse files Browse the repository at this point in the history
dev -> main
  • Loading branch information
mikepenz authored Sep 5, 2021
2 parents ff51274 + fc2d68c commit adc4d76
Show file tree
Hide file tree
Showing 12 changed files with 191 additions and 139 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

## Latest releases 🛠

- Kotlin && New | [v8.4.2](https://github.com/mikepenz/MaterialDrawer/tree/v8.4.2)
- Kotlin && New | [v8.4.3](https://github.com/mikepenz/MaterialDrawer/tree/v8.4.3)
- 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)
Expand Down
1 change: 0 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ if (getSigningFile() != null) {

android {
compileSdkVersion setup.compileSdk
buildToolsVersion setup.buildTools

defaultConfig {
minSdkVersion setup.minSdk
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.mikepenz.materialdrawer.app.drawerItems

import android.net.Uri
import androidx.annotation.ColorInt
import androidx.annotation.ColorRes
import androidx.annotation.StringRes
import androidx.recyclerview.widget.RecyclerView
import com.mikepenz.materialdrawer.holder.ColorHolder
Expand Down Expand Up @@ -41,16 +39,6 @@ abstract class CustomUrlBasePrimaryDrawerItem<T, VH : RecyclerView.ViewHolder> :
return this as T
}

fun withDescriptionTextColor(@ColorInt color: Int): T {
this.descriptionTextColor = ColorHolder.fromColor(color)
return this as T
}

fun withDescriptionTextColorRes(@ColorRes colorRes: Int): T {
this.descriptionTextColor = ColorHolder.fromColorRes(colorRes)
return this as T
}

/**
* a helper method to have the logic for all secondaryDrawerItems only once
*
Expand Down
9 changes: 4 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ buildscript {

ext {
release = [
versionName: "8.4.2",
versionCode: 8042
versionName: "8.4.3",
versionCode: 8043
]

setup = [
compileSdk: 30,
buildTools: "30.0.2",
minSdk : 16,
targetSdk : 30
]
Expand All @@ -24,7 +23,7 @@ buildscript {
drawerlayout : '1.1.1',
constraintLayout : '2.0.4',
cardview : '1.0.0',
kotlin : "1.5.21",
kotlin : "1.5.30",
fastadapter : "5.4.1",
iconics : "5.2.8",
aboutLibs : "8.9.1",
Expand All @@ -41,7 +40,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.1.0-alpha03'
classpath 'com.android.tools.build:gradle:7.1.0-alpha11'
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}"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit adc4d76

Please sign in to comment.