Merge pull request #17 from joyner-perez/feature/upgrade_libs_and_clean_project

Upgrade libs and clean project

Author: cavin-macwan

.idea/gradle.xml

@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.compose)
@@ -23,20 +21,14 @@ android {
         release {
             isMinifyEnabled = false
             proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                getDefaultProguardFile(name = "proguard-android-optimize.txt"),
+                "proguard-rules.pro",
             )
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_11
-        }
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     buildFeatures {
@@ -62,4 +54,4 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
-}
+}

.idea/ktlint-plugin.xml

@@ -1,13 +1,14 @@
 [versions]
-agp = "9.0.0"
+agp = "9.0.1"
 kotlin = "2.3.10"
 coreKtx = "1.17.0"
 junit = "4.13.2"
 junitVersion = "1.3.0"
 espressoCore = "3.7.0"
 lifecycleRuntimeKtx = "2.10.0"
-activityCompose = "1.12.3"
-composeBom = "2026.01.01"
+activityCompose = "1.12.4"
+composeBom = "2026.02.00"
+mavenPublishPlugin = "0.36.0"
 permissionsCompose = "1.0.5"
 
 [libraries]

app/build.gradle.kts

@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.compose)
-    id("com.vanniktech.maven.publish") version "0.36.0"
+    id("com.vanniktech.maven.publish") version libs.versions.mavenPublishPlugin.get()
 }
 
 android {
@@ -21,8 +21,8 @@ android {
         release {
             isMinifyEnabled = false
             proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                getDefaultProguardFile(name = "proguard-android-optimize.txt"),
+                "proguard-rules.pro",
             )
         }
     }
@@ -58,14 +58,14 @@ mavenPublishing {
     publishToMavenCentral()
     signAllPublications()
 
-    coordinates("com.meticha", "permissions_compose", "1.0.5")
+    coordinates(groupId = "com.meticha", artifactId = "permissions_compose", version = libs.versions.permissionsCompose.get())
 
     pom {
         name = "permissions_compose"
         description =
             "A lightweight Android library that simplifies runtime permission management in Jetpack Compose applications."
         inceptionYear = "2025"
-        version = "1.0.5"
+        version = libs.versions.permissionsCompose.get()
         url = "https://github.com/meticha/permissions-compose.git"
         licenses {
             license {
@@ -88,4 +88,3 @@ mavenPublishing {
         }
     }
 }
-

gradle/libs.versions.toml

@@ -5,4 +5,3 @@ data class AppPermission(
     val description: String,
     val isRequired: Boolean
 )
-

permissions-compose/build.gradle.kts

@@ -54,7 +54,3 @@ object PermissionManagerConfig {
         _customSettingsUI = null
     }
 }
-
-
-
-

permissions-compose/src/main/java/com/meticha/permissions_compose/AppPermission.kt

@@ -1,6 +1,5 @@
 package com.meticha.permissions_compose
 
-
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.Text

permissions-compose/src/main/java/com/meticha/permissions_compose/CustomDialog.kt

@@ -5,10 +5,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
-import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.compose.LocalLifecycleOwner
 
-
 /**
  * Monitors lifecycle events to handle permission state after returning from Settings
  */
@@ -17,18 +15,18 @@ fun PermissionLifeCycleCheckEffect(
     permissionState: PermissionState,
     lifecycleEvent: Lifecycle.Event = Lifecycle.Event.ON_RESUME
 ) {
-
-    val observer = LifecycleEventObserver { _, event ->
-        Log.e("COMPOSE PERMISSION", "Event: $event")
-        if (event == lifecycleEvent) {
-            if (permissionState.resumedFromSettings) {
-                permissionState.requestPermission()
-                permissionState.resumedFromSettings = false
+    val observer =
+        LifecycleEventObserver { _, event ->
+            Log.e("COMPOSE PERMISSION", "Event: $event")
+            if (event == lifecycleEvent) {
+                if (permissionState.resumedFromSettings) {
+                    permissionState.requestPermission()
+                    permissionState.resumedFromSettings = false
+                }
             }
         }
-    }
     val lifecycleOwner = LocalLifecycleOwner.current
-    DisposableEffect(lifecycleOwner) {
+    DisposableEffect(key1 = lifecycleOwner) {
         lifecycleOwner.lifecycle.addObserver(observer)
         onDispose {
             lifecycleOwner.lifecycle.removeObserver(observer)

permissions-compose/src/main/java/com/meticha/permissions_compose/DefaultDialogs.kt

@@ -1,6 +1,5 @@
 package com.meticha.permissions_compose
 
-
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
@@ -22,14 +21,13 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.core.app.ActivityCompat
 import java.lang.ref.WeakReference
 
-
 @SuppressLint("ComposableNaming")
 @Composable
 fun rememberAppPermissionState(permissions: List<AppPermission>): PermissionState {
     val context = LocalContext.current
     val activity = requireNotNull(LocalActivity.current)
 
-    val permissionState = remember(permissions) { PermissionState(permissions) }
+    val permissionState = remember(key1 = permissions) { PermissionState(permissionList = permissions) }
 
     // Provide context access through composable scope
     permissionState.contextRef = WeakReference(context)
@@ -38,7 +36,7 @@ fun rememberAppPermissionState(permissions: List<AppPermission>): PermissionStat
      * Check if the permissions are added in the manifest file
      */
     permissions.forEach {
-        if (!checkPermissionAddedInManifest(it, context)) {
+        if (!checkPermissionAddedInManifest(permission = it, context)) {
             throw PermissionNotAddedException(it.permission)
         }
     }
@@ -49,18 +47,21 @@ fun rememberAppPermissionState(permissions: List<AppPermission>): PermissionStat
     )
 
     // Set up permission launcher
-    permissionState.launcher = rememberLauncherForActivityResult(
-        ActivityResultContracts.RequestPermission()
-    ) { isGranted ->
-        when {
-            isGranted -> {
-                permissionState.next()
-                permissionState.allRequiredGranted()
-            }
+    permissionState.launcher =
+        rememberLauncherForActivityResult(
+            contract = ActivityResultContracts.RequestPermission()
+        ) { isGranted ->
+            when {
+                isGranted -> {
+                    permissionState.next()
+                    permissionState.allRequiredGranted()
+                }
 
-            else -> handlePermissionDenial(permissionState, activity)
+                else -> {
+                    handlePermissionDenial(permissionState, activity)
+                }
+            }
         }
-    }
 
     // Display permission rationale popup if needed
     permissionState.currentPermission?.let { permission ->
@@ -75,7 +76,6 @@ fun rememberAppPermissionState(permissions: List<AppPermission>): PermissionStat
                             permissionState.requestPermission()
                         }
                     )
-
                 } else {
                     ShowPopup(
                         message = permission.description,
@@ -98,7 +98,6 @@ fun rememberAppPermissionState(permissions: List<AppPermission>): PermissionStat
                             openAppSettings(context)
                         }
                     )
-
                 } else {
                     ShowSettings(
                         message = permission.description,
@@ -116,25 +115,30 @@ fun rememberAppPermissionState(permissions: List<AppPermission>): PermissionStat
     return permissionState
 }
 
-
 /**
  * Handles permission denial, showing appropriate UI based on denial context
  */
-private fun handlePermissionDenial(permissionState: PermissionState, activity: Activity) {
+private fun handlePermissionDenial(
+    permissionState: PermissionState,
+    activity: Activity
+) {
     permissionState.currentPermission?.let { currentPermission ->
         when {
             currentPermission.isRequired &&
-                    ActivityCompat.shouldShowRequestPermissionRationale(
-                        activity,
-                        currentPermission.permission
-                    ) ->
+                ActivityCompat.shouldShowRequestPermissionRationale(
+                    activity,
+                    currentPermission.permission
+                ) -> {
                 permissionState.showRationalePopUp = true
+            }
 
-            currentPermission.isRequired ->
+            currentPermission.isRequired -> {
                 permissionState.showSettingsPopUp = true
+            }
 
-            else ->
+            else -> {
                 permissionState.next()
+            }
         }
     }
 }
@@ -154,7 +158,7 @@ private fun openAppSettings(context: Context) {
  * Manages the state of permission requests and their UI flows
  */
 class PermissionState(
-    permissionList: List<AppPermission>,
+    permissionList: List<AppPermission>
 ) {
     // WeakReference to context to avoid memory leaks
     lateinit var contextRef: WeakReference<Context>
@@ -166,31 +170,32 @@ class PermissionState(
     private var pendingPermissions = mutableStateListOf<AppPermission>()
 
     // Currently processing permission
-    internal var currentPermission by mutableStateOf<AppPermission?>(null)
+    internal var currentPermission by mutableStateOf<AppPermission?>(value = null)
 
     // UI state
-    internal var showRationalePopUp by mutableStateOf(false)
-    internal var showSettingsPopUp by mutableStateOf(false)
-    internal var resumedFromSettings by mutableStateOf(false)
+    internal var showRationalePopUp by mutableStateOf(value = false)
+    internal var showSettingsPopUp by mutableStateOf(value = false)
+    internal var resumedFromSettings by mutableStateOf(value = false)
 
     // Permission states
-    private var isRequiredPermissionGranted by mutableStateOf(false)
+    private var isRequiredPermissionGranted by mutableStateOf(value = false)
 
     // Permission request launcher
     internal var launcher: ManagedActivityResultLauncher<String, Boolean>? = null
 
     init {
-        allPermissions.addAll(permissionList)
-        pendingPermissions.addAll(permissionList)
+        allPermissions.addAll(elements = permissionList)
+        pendingPermissions.addAll(elements = permissionList)
     }
 
     /**
      * Checks if all required permissions are actually granted
      */
     fun allRequiredGranted(): Boolean {
-        isRequiredPermissionGranted = allPermissions
-            .filter { it.isRequired }
-            .all { isGranted(it.permission) }
+        isRequiredPermissionGranted =
+            allPermissions
+                .filter { it.isRequired }
+                .all { isGranted(it.permission) }
         return isRequiredPermissionGranted
     }
 
@@ -212,7 +217,7 @@ class PermissionState(
                 if (isGranted(permission.permission)) {
                     next() // Permission already granted, move to next
                 } else {
-                    launcher?.launch(permission.permission)
+                    launcher?.launch(input = permission.permission)
                 }
             }
         }
@@ -223,8 +228,8 @@ class PermissionState(
      */
     internal fun next() {
         if (pendingPermissions.isNotEmpty()) {
-            pendingPermissions.removeAt(0)
+            pendingPermissions.removeAt(index = 0)
         }
         requestPermission()
     }
-}
+}