refactor: update Proguard rules and enable edge-to-edge display

ChochaNaresh · ChochaNaresh · commit 351894307b4f · 2025-06-26T21:18:35.000+05:30
This commit updates the Proguard rules for both the library and sample app to use a simpler configuration. It also enables edge-to-edge display in all Activities within the `filepickerlibrary` by calling `enableEdgeToEdge()` in their `onCreate` methods.

Additionally, the sample app's version code and name have been incremented, and some minor UI adjustments have been made to the `FilePickerWithResultList` composable. Test dependencies and Kotlin JVM target settings have been removed from the library's build script.
diff --git a/filepickerlibrary/build.gradle.kts b/filepickerlibrary/build.gradle.kts
@@ -45,10 +45,6 @@ android {
         sourceCompatibility = JavaVersion.valueOf(libs.versions.jdkVersion.get())
         targetCompatibility = JavaVersion.valueOf(libs.versions.jdkVersion.get())
     }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.valueOf(libs.versions.jdkVersion.get()).toString()
-    }
 }
 
 dependencies {
@@ -73,24 +69,6 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
-
-    // JUnit
-    testImplementation("junit:junit:4.13.2")
-
-    // AndroidX Test
-    testImplementation("androidx.test:core:1.5.0")
-    testImplementation("androidx.test:runner:1.5.2")
-    testImplementation("androidx.test.ext:junit:1.1.5")
-
-    // Robolectric for (Android framework simulation in unit tests)
-    testImplementation("org.robolectric:robolectric:4.10.3")
-
-    // Mockito for mock(ing)
-    testImplementation("org.mockito:mockito-core:5.7.0")
-    testImplementation("org.mockito:mockito-inline:5.2.0")
-    // For mocking final classes)
-    // Optional: If you( need to mock Kotlin classes better)
-    testImplementation("org.mockito.kotlin:mockito-kotlin:5.2.1")
 }
 
 mavenPublishing {
diff --git a/filepickerlibrary/proguard-rules.pro b/filepickerlibrary/proguard-rules.pro
@@ -1,34 +1 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.kts.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-# -renamesourcefileattribute SourceFile
--keepclasseswithmembernames class com.nareshchocha.filepickerlibrary.models.**{
-    *;
-}
-#-keepclassmembers class * extends com.nareshchocha.filepickerlibrary.models.BaseConfig {
- #    *;
- #}
- #-keepclassmembers class * extends com.nareshchocha.filepickerlibrary.models.PickMediaType {
- #    *;
- #}
-
--keepclassmembers class * extends androidx.appcompat.app.AppCompatActivity {
-    *;
-}
+-keep,allowobfuscation class com.nareshchocha.filepickerlibrary.** {*;}
diff --git a/filepickerlibrary/src/main/java/com/nareshchocha/filepickerlibrary/ui/activitys/DocumentFilePickerActivity.kt b/filepickerlibrary/src/main/java/com/nareshchocha/filepickerlibrary/ui/activitys/DocumentFilePickerActivity.kt
@@ -6,6 +6,7 @@ import android.os.Build
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -64,6 +65,7 @@ internal class DocumentFilePickerActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         if (mDocumentFilePickerConfig == null) {
             setCanceledResult(getString(R.string.document_file_picker_config_null_error))
             return
diff --git a/filepickerlibrary/src/main/java/com/nareshchocha/filepickerlibrary/ui/activitys/ImageCaptureActivity.kt b/filepickerlibrary/src/main/java/com/nareshchocha/filepickerlibrary/ui/activitys/ImageCaptureActivity.kt
@@ -7,6 +7,7 @@ import android.os.Build
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -79,6 +80,7 @@ internal class ImageCaptureActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         if (mImageCaptureConfig == null) {
             imageFile?.delete()
             setCanceledResult(getString(R.string.image_capture_config_null_error))
diff --git a/filepickerlibrary/src/main/java/com/nareshchocha/filepickerlibrary/ui/activitys/MediaFilePickerActivity.kt b/filepickerlibrary/src/main/java/com/nareshchocha/filepickerlibrary/ui/activitys/MediaFilePickerActivity.kt
@@ -7,6 +7,7 @@ import android.os.Build
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -65,6 +66,7 @@ internal class MediaFilePickerActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         if (mPickMediaConfig == null) {
             setCanceledResult(getString(R.string.media_file_picker_config_null_error))
             return
diff --git a/filepickerlibrary/src/main/java/com/nareshchocha/filepickerlibrary/ui/activitys/PopUpActivity.kt b/filepickerlibrary/src/main/java/com/nareshchocha/filepickerlibrary/ui/activitys/PopUpActivity.kt
@@ -6,6 +6,7 @@ import android.os.Build
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.background
 import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Column
@@ -68,6 +69,7 @@ internal class PopUpActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         setContent {
             val pickerData = mPickerData
             if (pickerData == null) {
diff --git a/filepickerlibrary/src/main/java/com/nareshchocha/filepickerlibrary/ui/activitys/VideoCaptureActivity.kt b/filepickerlibrary/src/main/java/com/nareshchocha/filepickerlibrary/ui/activitys/VideoCaptureActivity.kt
@@ -7,6 +7,7 @@ import android.os.Build
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -77,6 +78,7 @@ internal class VideoCaptureActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         if (mVideoCaptureConfig == null) {
             videoFile?.delete()
             setCanceledResult(getString(R.string.image_capture_config_null_error))
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -22,8 +22,8 @@ android {
             libs.versions.targetSdk
                 .get()
                 .toInt()
-        versionCode = 1
-        versionName = "0.4.0"
+        versionCode = 2
+        versionName = "0.5.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/sample/proguard-rules.pro b/sample/proguard-rules.pro
@@ -1,21 +1 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.kts.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-keep,allowobfuscation class com.nareshchocha.filepicker.** {*;}
diff --git a/sample/src/main/java/com/nareshchocha/filepicker/components/FilePickerWithResultList.kt b/sample/src/main/java/com/nareshchocha/filepicker/components/FilePickerWithResultList.kt
@@ -20,7 +20,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
@@ -46,17 +45,17 @@ fun FilePickerWithResultList(pickedFiles: List<PickedFile>) {
 
                 "video" -> {
                     Row(
-                        modifier = Modifier
-                            .background(
-                                color = MaterialTheme.colorScheme.secondaryContainer,
-                                shape = RoundedCornerShape(8.dp)
-                            )
-                            .padding(12.dp)
+                        modifier =
+                            Modifier
+                                .background(
+                                    color = MaterialTheme.colorScheme.secondaryContainer,
+                                    shape = RoundedCornerShape(8.dp)
+                                ).padding(12.dp)
                     ) {
                         Icon(
                             imageVector = Icons.Default.Videocam,
                             contentDescription = "Video",
-                            tint = Color(0xFF1976D2),
+                            tint = MaterialTheme.colorScheme.outline,
                             modifier = Modifier.padding(end = 8.dp)
                         )
                         Text(
@@ -73,8 +72,7 @@ fun FilePickerWithResultList(pickedFiles: List<PickedFile>) {
                                 .background(
                                     color = MaterialTheme.colorScheme.outline,
                                     shape = RoundedCornerShape(8.dp)
-                                )
-                                .padding(12.dp)
+                                ).padding(12.dp)
                     ) {
                         Text(
                             text = "URI: ${file.uri}",
