Merge pull request #25 from yangyiyu08/main

upgrade and add icon

app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdk = 26
         targetSdk = 33
-        versionCode = 3
-        versionName = "1.3"
+        versionCode = 5
+        versionName = "1.5"
         applicationId = android.namespace
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -43,17 +43,15 @@ android {
 }
 
 dependencies {
-    implementation("androidx.core:core-ktx:1.9.0")
+    implementation("androidx.core:core-ktx:1.10.1")
     implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.8.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.0")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
+    implementation("com.google.android.material:material:1.9.0")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
 
     implementation("com.google.guava:guava:31.1-jre")
-    implementation("com.google.protobuf:protobuf-java:3.21.2")
-    implementation("com.android.tools.build:apksig:7.4.2")
-    implementation("com.android.tools.build:bundletool:1.14.0")
+    implementation("com.google.protobuf:protobuf-java:3.23.0")
+    implementation("com.android.tools.build:apksig:8.0.1")
+    implementation("com.android.tools.build:bundletool:1.15.0")
     implementation("org.bouncycastle:bcprov-jdk15on:1.70")
 
     testImplementation("junit:junit:4.13.2")

app/src/main/AndroidManifest.xml

@@ -6,13 +6,11 @@
         android:extractNativeLibs="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.MyApplication">
         <activity
             android:name=".activity.MainActivity"
-            android:exported="true"
-            android:theme="@style/Theme.MyApplication">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

app/src/main/java/com/shapun/apkaabconverter/fragment/AABToApkDialogFragment.kt

@@ -33,7 +33,7 @@ class AABToApkDialogFragment : BaseDialogFragment<DialogAabToApkBinding>() {
     private var mApkUri: Uri? = null
     private var mLogger: Logger? = null
     private val mResultLauncherSelectApkPath = registerForActivityResult(
-        CreateDocument("*/*")
+        CreateDocument("application/octet-stream")
     ) {
         if (it != null) {
             val contentResolver = requireContext().contentResolver

app/src/main/java/com/shapun/apkaabconverter/fragment/ApkToAABDialogFragment.kt

@@ -79,7 +79,8 @@ class ApkToAABDialogFragment : BaseDialogFragment<DialogApkToAabBinding>() {
         "**.[wW][mM][aA]",
         "**.[wW][mM][vV]",
         "**.[xX][mM][fF]"
-    )
+    ).shuffled()
+
     private val mResultLauncherSelectApk = registerForActivityResult(
         ActivityResultContracts.GetContent()
     ) {
@@ -94,7 +95,7 @@ class ApkToAABDialogFragment : BaseDialogFragment<DialogApkToAabBinding>() {
         }
     }
     private val mResultLauncherSelectAABPath =
-        registerForActivityResult(CreateDocument("*/*")) {
+        registerForActivityResult(CreateDocument("application/octet-stream")) {
             if (it != null) {
                 val name: String = Utils.queryName(contentResolver, it)
                 if (name.endsWith(".aab")) {

app/src/main/res/layout/activity_main.xml

@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
 	android:gravity="center"
-    tools:context=".MainActivity" >
+    tools:context=".activity.MainActivity" >
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_aab_to_apk"

app/src/main/res/layout/dialog_apk_to_aab.xml

@@ -58,7 +58,7 @@
            android:id="@+id/cb_default_gradle_config"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-           android:text="Use default AGP config (partially implemented)"
+           android:text="Use default AGP config"
            android:checked="true"
            tools:ignore="HardcodedText" />
         <TextView

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Aug 05 11:35:36 UTC 2022
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -7,9 +7,9 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        kotlin("android") version "1.8.0" apply false
-        id("com.android.application") version "7.4.0" apply false
-        id("com.android.library") version "7.4.0" apply false
+        kotlin("android") version "1.8.20" apply false
+        id("com.android.application") version "8.0.1" apply false
+        id("com.android.library") version "8.0.1" apply false
     }
 }
 dependencyResolutionManagement {