From e6d1ff3c9d155a30fd6257efbb6ed7b7faf290dd Mon Sep 17 00:00:00 2001 From: Akshay Date: Mon, 24 Apr 2023 22:30:01 +0530 Subject: [PATCH 1/4] Updated gradle and other dependency version --- app/build.gradle | 4 ++-- build.gradle | 5 ++--- easypermissions/build.gradle | 9 +++++---- gradle/wrapper/gradle-wrapper.properties | 5 +++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 731b676..513687d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,7 +29,7 @@ android { } dependencies { - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation "androidx.annotation:annotation:1.1.0" + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation "androidx.annotation:annotation:1.6.0" implementation project(':easypermissions') } diff --git a/build.gradle b/build.gradle index eac6482..aacd936 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,18 @@ buildscript { repositories { - jcenter() google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.vanniktech:gradle-maven-publish-plugin:0.14.2' } } allprojects { repositories { - jcenter() + mavenCentral() google() } } diff --git a/easypermissions/build.gradle b/easypermissions/build.gradle index 5c6af4b..fce2c9a 100644 --- a/easypermissions/build.gradle +++ b/easypermissions/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' // See: https://github.com/vanniktech/gradle-maven-publish-plugin/issues/206 ext { @@ -38,10 +39,10 @@ android { } dependencies { - api "androidx.appcompat:appcompat:1.1.0" - api "androidx.annotation:annotation:1.1.0" - api "androidx.core:core:1.3.0" - api "androidx.fragment:fragment:1.2.5" + api "androidx.appcompat:appcompat:1.6.1" + api "androidx.annotation:annotation:1.6.0" + api "androidx.core:core:1.10.0" + api "androidx.fragment:fragment:1.5.7" testImplementation 'junit:junit:4.13' testImplementation 'com.google.truth:truth:0.42' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d913..7592ed7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon Apr 24 21:29:15 IST 2023 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME From 0c0beb1b02ad049c399d040967ce6a9c0c40ab92 Mon Sep 17 00:00:00 2001 From: Akshay Date: Mon, 24 Apr 2023 22:33:24 +0530 Subject: [PATCH 2/4] Updated targetSdkVersion & compileSdkVersion to 33 and added material design dependency --- app/build.gradle | 7 ++++--- easypermissions/build.gradle | 10 ++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 513687d..32e4351 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 30 + compileSdkVersion 33 testOptions.unitTests.includeAndroidResources = true defaultConfig { applicationId "pub.devrel.easypermissions.sample" minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 33 versionCode 1 versionName "1.0" } @@ -31,5 +31,6 @@ android { dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation "androidx.annotation:annotation:1.6.0" + implementation 'com.google.android.material:material:1.8.0' implementation project(':easypermissions') -} +} \ No newline at end of file diff --git a/easypermissions/build.gradle b/easypermissions/build.gradle index fce2c9a..132353c 100644 --- a/easypermissions/build.gradle +++ b/easypermissions/build.gradle @@ -10,12 +10,12 @@ ext { apply plugin: 'com.vanniktech.maven.publish' android { - compileSdkVersion 30 + compileSdkVersion 33 testOptions.unitTests.includeAndroidResources = true defaultConfig { minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 33 versionCode 1 versionName "3.0.0" } @@ -44,6 +44,8 @@ dependencies { api "androidx.core:core:1.10.0" api "androidx.fragment:fragment:1.5.7" + implementation "com.google.android.material:material:1.8.0" + testImplementation 'junit:junit:4.13' testImplementation 'com.google.truth:truth:0.42' testImplementation 'org.robolectric:robolectric:4.1' @@ -51,3 +53,7 @@ dependencies { testImplementation 'androidx.fragment:fragment-testing:1.2.5' testImplementation 'org.mockito:mockito-core:2.23.4' } + +repositories { + mavenCentral() +} From 90efaf03ff39a906a0dd151cb3b27f54afa826bc Mon Sep 17 00:00:00 2001 From: Akshay Date: Mon, 24 Apr 2023 22:34:44 +0530 Subject: [PATCH 3/4] Fixed gradle build issue --- build.gradle | 8 ++++++++ easypermissions/build.gradle | 1 + 2 files changed, 9 insertions(+) diff --git a/build.gradle b/build.gradle index aacd936..b131fee 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,6 @@ buildscript { + ext.kotlin_version = '1.8.0' + repositories { google() mavenCentral() @@ -7,9 +9,15 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.vanniktech:gradle-maven-publish-plugin:0.14.2' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } +plugins { + id 'org.jetbrains.dokka' version '1.4.20' +} + + allprojects { repositories { mavenCentral() diff --git a/easypermissions/build.gradle b/easypermissions/build.gradle index 132353c..93eb40c 100644 --- a/easypermissions/build.gradle +++ b/easypermissions/build.gradle @@ -45,6 +45,7 @@ dependencies { api "androidx.fragment:fragment:1.5.7" implementation "com.google.android.material:material:1.8.0" + implementation(platform("org.jetbrains.kotlin:kotlin-bom:$kotlin_version")) testImplementation 'junit:junit:4.13' testImplementation 'com.google.truth:truth:0.42' From 6d065620f245facd08a9f9dbccfea45a8a470df9 Mon Sep 17 00:00:00 2001 From: Akshay Date: Mon, 24 Apr 2023 22:35:46 +0530 Subject: [PATCH 4/4] Migrated to MaterialAlertDialog and Material3 theme --- app/src/main/AndroidManifest.xml | 9 ++++++--- app/src/main/res/values/styles.xml | 6 ++---- .../pub/devrel/easypermissions/AppSettingsDialog.java | 8 +++++--- .../devrel/easypermissions/RationaleDialogConfig.java | 8 +++++--- easypermissions/src/main/res/values/styles.xml | 6 ++---- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 88db6b1..e2b04b0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,11 +6,13 @@ - + - + - + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5885930..9b07c35 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,11 +1,9 @@ - diff --git a/easypermissions/src/main/java/pub/devrel/easypermissions/AppSettingsDialog.java b/easypermissions/src/main/java/pub/devrel/easypermissions/AppSettingsDialog.java index 4407e4f..1d3c2a3 100644 --- a/easypermissions/src/main/java/pub/devrel/easypermissions/AppSettingsDialog.java +++ b/easypermissions/src/main/java/pub/devrel/easypermissions/AppSettingsDialog.java @@ -17,6 +17,8 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; + /** * Dialog to prompt the user to go to the app's settings screen and enable permissions. If the user * clicks 'OK' on the dialog, they are sent to the settings screen. The result is returned to the @@ -136,11 +138,11 @@ public void show() { */ AlertDialog showDialog(DialogInterface.OnClickListener positiveListener, DialogInterface.OnClickListener negativeListener) { - AlertDialog.Builder builder; + MaterialAlertDialogBuilder builder; if (mThemeResId != -1) { - builder = new AlertDialog.Builder(mContext, mThemeResId); + builder = new MaterialAlertDialogBuilder(mContext, mThemeResId); } else { - builder = new AlertDialog.Builder(mContext); + builder = new MaterialAlertDialogBuilder(mContext); } return builder .setCancelable(false) diff --git a/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogConfig.java b/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogConfig.java index c64999c..05a1026 100644 --- a/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogConfig.java +++ b/easypermissions/src/main/java/pub/devrel/easypermissions/RationaleDialogConfig.java @@ -7,6 +7,8 @@ import androidx.annotation.StyleRes; import androidx.appcompat.app.AlertDialog; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; + /** * Configuration for either {@link RationaleDialogFragment} or {@link RationaleDialogFragmentCompat}. */ @@ -63,11 +65,11 @@ Bundle toBundle() { } AlertDialog createSupportDialog(Context context, Dialog.OnClickListener listener) { - AlertDialog.Builder builder; + MaterialAlertDialogBuilder builder; if (theme > 0) { - builder = new AlertDialog.Builder(context, theme); + builder = new MaterialAlertDialogBuilder(context, theme); } else { - builder = new AlertDialog.Builder(context); + builder = new MaterialAlertDialogBuilder(context); } return builder .setCancelable(false) diff --git a/easypermissions/src/main/res/values/styles.xml b/easypermissions/src/main/res/values/styles.xml index 9123992..eb5f103 100644 --- a/easypermissions/src/main/res/values/styles.xml +++ b/easypermissions/src/main/res/values/styles.xml @@ -1,10 +1,8 @@ -