Migrate to single activity

.github/workflows/android.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Required files
         run: echo $GOOGLE_SERVICES_JSON > app/google-services.json

app/build.gradle.kts

@@ -1,23 +1,34 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
+
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin)
+    alias(libs.plugins.kotlinx.serialization)
     alias(libs.plugins.ksp)
+    alias(libs.plugins.baselineprofile)
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.room)
     alias(libs.plugins.ktlint.gradle)
     id("kotlin-parcelize")
     id("com.google.android.gms.oss-licenses-plugin")
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_11
+    }
+}
+
 android {
     compileSdk = 36
 
     defaultConfig {
         applicationId = "com.anod.appwatcher"
-        minSdk = 27
+        minSdk = 31
         targetSdk = 36
-        versionCode = 16900
-        versionName = "1.6.9"
+        versionCode = 17000
+        versionName = "1.7.0"
     }
 
     buildFeatures {
@@ -44,13 +55,13 @@ android {
             isMinifyEnabled = false
             applicationIdSuffix = ".debug"
             versionNameSuffix = "-debug"
-            proguardFile(getDefaultProguardFile("proguard-android.txt"))
+            proguardFile(getDefaultProguardFile("proguard-android-optimize.txt"))
             proguardFile("proguard-project.txt")
         }
         getByName("release") {
             isMinifyEnabled = true
             isShrinkResources = true
-            proguardFile(getDefaultProguardFile("proguard-android.txt"))
+            proguardFile(getDefaultProguardFile("proguard-android-optimize.txt"))
             proguardFile("proguard-project.pro")
             signingConfig = signingConfigs.getByName("release")
         }
@@ -68,10 +79,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    kotlinOptions {
-        jvmTarget = "11"
-    }
-
     packaging {
         resources {
             excludes += "META-INF/DEPENDENCIES"
@@ -96,20 +103,22 @@ dependencies {
     ktlintRuleset(libs.ktlint.compose)
     // AndroidX
     implementation(libs.androidx.appcompat) // AppCompatActivity
+    implementation(libs.androidx.activity)
     implementation(libs.androidx.palette)
     implementation(libs.work.runtime)
     implementation(libs.work.runtime.ktx)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.core.splashscreen)
 
-    implementation(libs.androidx.compose.material.icons.core)
-    implementation(libs.androidx.compose.material.icons.extended)
+    implementation(libs.androidx.navigation3.ui)
+    implementation(libs.androidx.navigation3.adaptive)
 
     implementation(libs.paging.common)
     implementation(libs.paging.compose.android)
 
+    implementation(libs.kotlinx.serialization.json)
+
     // Compose
-    implementation(libs.androidx.activity.compose)
     implementation(libs.runtime.tracing)
 
     implementation(libs.ktor.client.core)

app/src/main/AndroidManifest.xml

@@ -22,7 +22,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <!-- for checkin Wi-Fi -->
+    <!-- for checking Wi-Fi -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <!-- for Export -->
@@ -35,7 +35,6 @@
 
     <application
         android:name=".AppWatcherApplication"
-        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="false"
@@ -56,27 +55,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".MarketSearchActivity"
-            android:resizeableActivity="true"
-            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:label="@string/activity_market" />
-        <activity
-            android:name=".wishlist.WishListActivity"
-            android:label="@string/wishlist" />
-        <activity
-            android:name=".userLog.UserLogActivity"
-            android:label="@string/log" />
-
-        <activity
-            android:name=".sync.SchedulesHistoryActivity"
-            android:label="@string/refresh_history" />
-
-        <activity
-            android:name=".history.HistoryListActivity"
-            android:label="@string/purchase_history" />
-
-        <activity
-            android:name=".AppWatcherActivity"
+            android:name="com.anod.appwatcher.AppWatcherActivity"
             android:clearTaskOnLaunch="true"
             android:resizeableActivity="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
@@ -90,34 +69,21 @@
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
         </activity>
-        <activity android:name=".tags.TagWatchListComposeActivity" />
         <activity
-            android:name=".NotificationActivity"
+            android:name="com.anod.appwatcher.NotificationActivity"
             android:exported="true"
             android:noHistory="true"
             android:taskAffinity="com.anod.appwatcher.notification"
             android:theme="@style/InvisibleTheme" />
-        <activity
-            android:name=".SettingsActivity"
-            android:resizeableActivity="true"
-            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:label="@string/preferences" />
-
-        <activity
-            android:name=".installed.InstalledActivity"
-            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:resizeableActivity="true" />
-
         <activity
             android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
             android:theme="@style/Theme.AppCompat.DayNight" />
-
         <activity
             android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
             android:theme="@style/Theme.AppCompat.DayNight" />
 
         <provider
-            android:name=".database.DbContentProvider"
+            android:name="com.anod.appwatcher.database.DbContentProvider"
             android:authorities="${applicationId}"
             android:label="@string/app_name"
             android:syncable="true"
@@ -144,7 +110,7 @@
         </provider>
 
         <receiver
-            android:name=".installed.PackageRemovedReceiver"
+            android:name="com.anod.appwatcher.installed.PackageRemovedReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />