diff --git a/app/build.gradle b/app/build.gradle
index 731b6762..32e43516 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"
}
@@ -29,7 +29,8 @@ 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 'com.google.android.material:material:1.8.0'
implementation project(':easypermissions')
-}
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 88db6b13..e2b04b01 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 5885930d..9b07c35a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,11 +1,9 @@
-
diff --git a/build.gradle b/build.gradle
index eac6482c..b131feea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,19 +1,26 @@
buildscript {
+ ext.kotlin_version = '1.8.0'
+
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'
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
+plugins {
+ id 'org.jetbrains.dokka' version '1.4.20'
+}
+
+
allprojects {
repositories {
- jcenter()
+ mavenCentral()
google()
}
}
diff --git a/easypermissions/build.gradle b/easypermissions/build.gradle
index 5c6af4bc..93eb40cb 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 {
@@ -9,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"
}
@@ -38,10 +39,13 @@ 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"
+
+ 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'
@@ -50,3 +54,7 @@ dependencies {
testImplementation 'androidx.fragment:fragment-testing:1.2.5'
testImplementation 'org.mockito:mockito-core:2.23.4'
}
+
+repositories {
+ mavenCentral()
+}
diff --git a/easypermissions/src/main/java/pub/devrel/easypermissions/AppSettingsDialog.java b/easypermissions/src/main/java/pub/devrel/easypermissions/AppSettingsDialog.java
index 4407e4fc..1d3c2a3e 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 c64999c6..05a1026e 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 91239929..eb5f103c 100644
--- a/easypermissions/src/main/res/values/styles.xml
+++ b/easypermissions/src/main/res/values/styles.xml
@@ -1,10 +1,8 @@
-