diff --git a/app/src/main/java/com/livinglifetechway/quickpermissions_sample/MainActivity.kt b/app/src/main/java/com/livinglifetechway/quickpermissions_sample/MainActivity.kt index b4cf7cd..906eff1 100644 --- a/app/src/main/java/com/livinglifetechway/quickpermissions_sample/MainActivity.kt +++ b/app/src/main/java/com/livinglifetechway/quickpermissions_sample/MainActivity.kt @@ -1,11 +1,11 @@ package com.livinglifetechway.quickpermissions_sample +import android.content.Intent import android.databinding.DataBindingUtil import android.os.Bundle import android.support.v7.app.AppCompatActivity import com.livinglifetechway.quickpermissions_sample.databinding.ActivityMainBinding import com.livinglifetechway.quickpermissions_sample.kotlin.AllKotlinActivity -import org.jetbrains.anko.startActivity class MainActivity : AppCompatActivity() { @@ -16,7 +16,9 @@ class MainActivity : AppCompatActivity() { mBinding = DataBindingUtil.setContentView(this, R.layout.activity_main) mBinding.buttonKotlinAll.setOnClickListener { - startActivity() + Intent(this, AllKotlinActivity::class.java).apply { + startActivity(this) + } } } diff --git a/build.gradle b/build.gradle index b32dd72..0ca2b37 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.21' - ext.gradle_version = '3.3.2' + ext.kotlin_version = '1.6.21' + ext.gradle_version = '7.1.2' repositories { google() jcenter() @@ -20,7 +20,7 @@ allprojects { repositories { google() jcenter() - maven { url "http://jitpack.io/" } + maven { url "https://jitpack.io/" } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 91d50c7..ebe9983 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Mar 09 13:16:34 IST 2019 +#Sun Sep 01 17:44:02 EEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip diff --git a/quickpermissions-kotlin/build.gradle b/quickpermissions-kotlin/build.gradle index 56c5e38..4a1756c 100644 --- a/quickpermissions-kotlin/build.gradle +++ b/quickpermissions-kotlin/build.gradle @@ -30,7 +30,6 @@ dependencies { androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'org.jetbrains.anko:anko-commons:0.10.5' } repositories { mavenCentral() diff --git a/quickpermissions-kotlin/src/main/java/com/livinglifetechway/quickpermissions_kotlin/util/PermissionCheckerFragment.kt b/quickpermissions-kotlin/src/main/java/com/livinglifetechway/quickpermissions_kotlin/util/PermissionCheckerFragment.kt index 4262859..eb20129 100644 --- a/quickpermissions-kotlin/src/main/java/com/livinglifetechway/quickpermissions_kotlin/util/PermissionCheckerFragment.kt +++ b/quickpermissions-kotlin/src/main/java/com/livinglifetechway/quickpermissions_kotlin/util/PermissionCheckerFragment.kt @@ -8,8 +8,8 @@ import android.os.Bundle import android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS import android.support.v4.app.ActivityCompat import android.support.v4.app.Fragment +import android.support.v7.app.AlertDialog import android.util.Log -import org.jetbrains.anko.alert /** * This fragment holds the single permission request and holds it until the flow is completed @@ -148,15 +148,15 @@ class PermissionCheckerFragment : Fragment() { return } - activity?.alert { - message = quickPermissionsRequest?.permanentlyDeniedMessage.orEmpty() - positiveButton("SETTINGS") { + AlertDialog.Builder(requireActivity()) + .setMessage(quickPermissionsRequest?.permanentlyDeniedMessage.orEmpty()) + .setPositiveButton("SETTINGS") { _, _ -> openAppSettings() } - negativeButton("CANCEL") { + .setNegativeButton("CANCEL") { _, _ -> clean() - } - }?.apply { isCancelable = false }?.show() + }.setCancelable(false) + .show() return } @@ -168,15 +168,15 @@ class PermissionCheckerFragment : Fragment() { return } - activity?.alert { - message = quickPermissionsRequest?.rationaleMessage.orEmpty() - positiveButton("TRY AGAIN") { + AlertDialog.Builder(requireActivity()) + .setMessage(quickPermissionsRequest?.rationaleMessage.orEmpty()) + .setPositiveButton("TRY AGAIN") { _, _ -> requestPermissionsFromUser() } - negativeButton("CANCEL") { + .setNegativeButton("CANCEL") { _, _ -> clean() - } - }?.apply { isCancelable = false }?.show() + }.setCancelable(false) + .show() return }