Merge pull request #10 from merail/develop

merail · web-flow · commit 5fca2c66eaaf · 2024-10-22T15:53:40.000+03:00
Delegates for requesters
diff --git a/.gitignore b/.gitignore
@@ -62,6 +62,8 @@ captures/
 .idea/appInsightsSettings.xml
 .idea/render.experimental.xml
 .idea/androidTestResultsUserPreferences.xml
+.idea/deploymentTargetSelector.xml
+.idea/other.xml
 
 # Keystore files
 # *.jks
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -20,9 +20,9 @@ android {
     buildTypes {
         release {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile(
-                "proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
             )
         }
     }
@@ -54,7 +54,7 @@ afterEvaluate {
 }
 
 dependencies {
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.11.0")
-    implementation("androidx.core:core-ktx:1.13.0")
+    implementation("androidx.appcompat:appcompat:1.7.0")
+    implementation("com.google.android.material:material:1.12.0")
+    implementation("androidx.core:core-ktx:1.13.1")
 }
diff --git a/app/src/main/java/merail/tools/permissions/RequesterDelegate.kt b/app/src/main/java/merail/tools/permissions/RequesterDelegate.kt
@@ -0,0 +1,28 @@
+package merail.tools.permissions
+
+import androidx.activity.ComponentActivity
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.LifecycleOwner
+import merail.tools.permissions.exceptions.WrongTimeAccessException
+import kotlin.properties.ReadOnlyProperty
+import kotlin.reflect.KProperty
+
+abstract class RequesterDelegate<T>(
+    activity: ComponentActivity,
+) : ReadOnlyProperty<LifecycleOwner, T>, LifecycleEventObserver {
+
+    var value: T? = null
+
+    init {
+        @Suppress("LeakingThis")
+        activity.lifecycle.addObserver(this)
+    }
+
+    override fun getValue(
+        thisRef: LifecycleOwner,
+        property: KProperty<*>,
+    ): T {
+        thisRef.lifecycle.addObserver(this)
+        return value ?: throw WrongTimeAccessException()
+    }
+}
diff --git a/app/src/main/java/merail/tools/permissions/core/common/Utils.kt b/app/src/main/java/merail/tools/permissions/core/common/Utils.kt
@@ -10,7 +10,6 @@ internal fun Activity.isPermissionDeclaredInManifest(
 ) = packageManager.getPackageInfo(
     packageName,
     PackageManager.GET_PERMISSIONS,
-).requestedPermissions
-    ?.any {
-        it == permission
-    } ?: false
+).requestedPermissions?.any {
+    it == permission
+} ?: false
diff --git a/app/src/main/java/merail/tools/permissions/core/special/SpecialPermissionType.kt b/app/src/main/java/merail/tools/permissions/core/special/SpecialPermissionType.kt
@@ -9,7 +9,7 @@ import android.provider.MediaStore
 import android.provider.Settings
 import androidx.activity.ComponentActivity
 import androidx.core.content.ContextCompat
-import merail.tools.permissions.core.common.SdkIncompatibilityException
+import merail.tools.permissions.exceptions.SdkIncompatibilityException
 import merail.tools.permissions.core.common.SettingsOpener
 
 
diff --git a/app/src/main/java/merail/tools/permissions/exceptions/SdkIncompatibilityException.kt b/app/src/main/java/merail/tools/permissions/exceptions/SdkIncompatibilityException.kt
@@ -1,3 +1,3 @@
-package merail.tools.permissions.core.common
+package merail.tools.permissions.exceptions
 
 internal class SdkIncompatibilityException : Exception()
diff --git a/app/src/main/java/merail/tools/permissions/exceptions/WrongTimeAccessException.kt b/app/src/main/java/merail/tools/permissions/exceptions/WrongTimeAccessException.kt
@@ -0,0 +1,5 @@
+package merail.tools.permissions.exceptions
+
+class WrongTimeAccessException(
+    override val message: String = "The requester wasn't initialized yet. Try to access it after Activity.onCreate method completion",
+) : Exception(message)
diff --git a/app/src/main/java/merail/tools/permissions/exceptions/WrongTimeInitializationException.kt b/app/src/main/java/merail/tools/permissions/exceptions/WrongTimeInitializationException.kt
@@ -1,4 +1,4 @@
-package merail.tools.permissions
+package merail.tools.permissions.exceptions
 
 class WrongTimeInitializationException(
     override val message: String = "You should initialize RuntimePermissionRequester in Activity.onCreate method!",
diff --git a/app/src/main/java/merail/tools/permissions/role/RoleRequester.kt b/app/src/main/java/merail/tools/permissions/role/RoleRequester.kt
@@ -9,8 +9,8 @@ import androidx.activity.ComponentActivity
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
-import merail.tools.permissions.WrongTimeInitializationException
 import merail.tools.permissions.core.role.RoleResultObserver
+import merail.tools.permissions.exceptions.WrongTimeInitializationException
 
 @RequiresApi(Build.VERSION_CODES.Q)
 class RoleRequester(
diff --git a/app/src/main/java/merail/tools/permissions/role/RoleRequesterDelegate.kt b/app/src/main/java/merail/tools/permissions/role/RoleRequesterDelegate.kt
@@ -0,0 +1,34 @@
+package merail.tools.permissions.role
+
+import android.os.Build
+import androidx.activity.ComponentActivity
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import merail.tools.permissions.RequesterDelegate
+
+fun ComponentActivity.roleRequester(
+    requestedRole: String,
+) = RoleRequesterDelegate(
+    activity = this,
+    requestedRole = requestedRole,
+)
+
+class RoleRequesterDelegate(
+    private val activity: ComponentActivity,
+    private val requestedRole: String,
+) : RequesterDelegate<RoleRequester>(
+    activity = activity,
+) {
+    override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            if (event == Lifecycle.Event.ON_CREATE) {
+                if (value == null) {
+                    value = RoleRequester(
+                        activity = activity,
+                        requestedRole = requestedRole,
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/merail/tools/permissions/runtime/RuntimePermissionRequester.kt b/app/src/main/java/merail/tools/permissions/runtime/RuntimePermissionRequester.kt
@@ -7,7 +7,7 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts.RequestMultiplePermissions
 import androidx.core.app.ActivityCompat
 import merail.tools.permissions.PermissionRequester
-import merail.tools.permissions.WrongTimeInitializationException
+import merail.tools.permissions.exceptions.WrongTimeInitializationException
 import merail.tools.permissions.core.runtime.RuntimePermissionResultObserver
 
 class RuntimePermissionRequester(
@@ -80,5 +80,4 @@ class RuntimePermissionRequester(
         this.onRuntimePermissionsRequestResult = onRuntimePermissionsRequestResult
         requestPermissionLauncher.launch(requestedPermissions)
     }
-
 }
diff --git a/app/src/main/java/merail/tools/permissions/runtime/RuntimePermissionRequesterDelegate.kt b/app/src/main/java/merail/tools/permissions/runtime/RuntimePermissionRequesterDelegate.kt
@@ -0,0 +1,38 @@
+package merail.tools.permissions.runtime
+
+import androidx.activity.ComponentActivity
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import merail.tools.permissions.RequesterDelegate
+
+fun ComponentActivity.runtimePermissionRequester(
+    requestedPermissions: Array<String>,
+) = RuntimePermissionRequesterDelegate(
+    activity = this,
+    requestedPermissions = requestedPermissions,
+)
+
+fun ComponentActivity.runtimePermissionRequester(
+    requestedPermission: String,
+) = RuntimePermissionRequesterDelegate(
+    activity = this,
+    requestedPermissions = arrayOf(requestedPermission),
+)
+
+class RuntimePermissionRequesterDelegate(
+    private val activity: ComponentActivity,
+    private val requestedPermissions: Array<String>,
+) : RequesterDelegate<RuntimePermissionRequester>(
+    activity = activity,
+) {
+    override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+        if (event == Lifecycle.Event.ON_CREATE) {
+            if (value == null) {
+                value = RuntimePermissionRequester(
+                    activity = activity,
+                    requestedPermissions = requestedPermissions,
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/merail/tools/permissions/special/SpecialPermissionRequesterDelegate.kt b/app/src/main/java/merail/tools/permissions/special/SpecialPermissionRequesterDelegate.kt
@@ -0,0 +1,31 @@
+package merail.tools.permissions.special
+
+import androidx.activity.ComponentActivity
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import merail.tools.permissions.RequesterDelegate
+
+fun ComponentActivity.specialPermissionRequester(
+    requestedPermission: String,
+) = SpecialPermissionRequesterDelegate(
+    activity = this,
+    requestedPermission = requestedPermission,
+)
+
+class SpecialPermissionRequesterDelegate(
+    private val activity: ComponentActivity,
+    private val requestedPermission: String,
+) : RequesterDelegate<SpecialPermissionRequester>(
+    activity = activity,
+) {
+    override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+        if (event == Lifecycle.Event.ON_CREATE) {
+            if (value == null) {
+                value = SpecialPermissionRequester(
+                    activity = activity,
+                    requestedPermission = requestedPermission,
+                )
+            }
+        }
+    }
+}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("com.android.library") version "8.3.1" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.23" apply false
-    id("com.android.application") version "8.3.1" apply false
+    id("com.android.library") version "8.3.2" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.25" apply false
+    id("com.android.application") version "8.3.2" apply false
 }
diff --git a/dev/build.gradle.kts b/dev/build.gradle.kts
@@ -24,19 +24,24 @@ android {
             )
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
+
     kotlinOptions {
         jvmTarget = "17"
     }
+
     buildFeatures {
         compose = true
     }
+
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.11"
+        kotlinCompilerExtensionVersion = "1.5.15"
     }
+
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -45,10 +50,10 @@ android {
 }
 
 dependencies {
-    implementation("androidx.core:core-ktx:1.13.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
-    implementation("androidx.activity:activity-compose:1.9.0")
-    implementation(platform("androidx.compose:compose-bom:2024.04.01"))
+    implementation("androidx.core:core-ktx:1.13.1")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6")
+    implementation("androidx.activity:activity-compose:1.9.3")
+    implementation(platform("androidx.compose:compose-bom:2024.10.00"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-tooling")
     implementation("androidx.compose.ui:ui-tooling-preview")
diff --git a/dev/src/main/java/me/rail/dev/DevActivity.kt b/dev/src/main/java/me/rail/dev/DevActivity.kt
diff --git a/dev/src/main/java/me/rail/dev/ui/theme/Color.kt b/dev/src/main/java/me/rail/dev/ui/theme/Color.kt
diff --git a/dev/src/main/java/me/rail/dev/ui/theme/Theme.kt b/dev/src/main/java/me/rail/dev/ui/theme/Theme.kt
diff --git a/dev/src/main/java/me/rail/dev/ui/theme/Type.kt b/dev/src/main/java/me/rail/dev/ui/theme/Type.kt

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@ android {`
`20`	`20`	`buildTypes {`
`21`	`21`	`release {`
`22`	`22`	`isMinifyEnabled = false`
`23`		`- proguardFiles(getDefaultProguardFile(`
`24`		`- "proguard-android-optimize.txt"),`
`25`		`- "proguard-rules.pro"`
	`23`	`+ proguardFiles(`
	`24`	`+ getDefaultProguardFile("proguard-android-optimize.txt"),`
	`25`	`+ "proguard-rules.pro",`
`26`	`26`	`)`
`27`	`27`	`}`
`28`	`28`	`}`
`@@ -54,7 +54,7 @@ afterEvaluate {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`dependencies {`
`57`		`- implementation("androidx.appcompat:appcompat:1.6.1")`
`58`		`- implementation("com.google.android.material:material:1.11.0")`
`59`		`- implementation("androidx.core:core-ktx:1.13.0")`
	`57`	`+ implementation("androidx.appcompat:appcompat:1.7.0")`
	`58`	`+ implementation("com.google.android.material:material:1.12.0")`
	`59`	`+ implementation("androidx.core:core-ktx:1.13.1")`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-package merail.tools.permissions.core.common`
	`1`	`+package merail.tools.permissions.exceptions`
`2`	`2`
`3`	`3`	`internal class SdkIncompatibilityException : Exception()`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package merail.tools.permissions`
	`1`	`+package merail.tools.permissions.exceptions`
`2`	`2`
`3`	`3`	`class WrongTimeInitializationException(`
`4`	`4`	`override val message: String = "You should initialize RuntimePermissionRequester in Activity.onCreate method!",`