migrate to androidx.paging.compose; update SQLCipher to 4.9.0; add AutofillManager integration; update Gradle and CI configs; various UI and code improvements

Author: softartdev

.github/workflows/android.yml

@@ -13,26 +13,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        api-level: [ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35 ]
+        api-level: [ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36 ]
     steps:
       - name: Check out
         uses: actions/checkout@v4
-      - name: Cached Konan
-        uses: actions/cache@v4
-        with:
-          path: ~/.konan
-          key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-konan-
-      - name: Cached Gradle
-        uses: actions/cache@v4
-        with:
-          path: ~/.gradle
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-gradle-
       - name: Set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: 'oracle'
           java-version: 17
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          cache-read-only: false
+          cache-overwrite-existing: true
       - name: Decrypt large secret
         run: ./.github/scripts/decrypt_secret.sh
         env:
@@ -50,22 +44,16 @@ jobs:
     steps:
       - name: Check out
         uses: actions/checkout@v4
-      - name: Cached Konan
-        uses: actions/cache@v4
-        with:
-          path: ~/.konan
-          key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-konan-
-      - name: Cached Gradle
-        uses: actions/cache@v4
-        with:
-          path: ~/.gradle
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-gradle-
       - name: Set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: 'oracle'
           java-version: 17
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          cache-read-only: false
+          cache-overwrite-existing: true
       - name: Decrypt large secret
         run: ./.github/scripts/decrypt_secret.sh
         env:

.github/workflows/desktop.yaml

@@ -16,22 +16,16 @@ jobs:
     steps:
       - name: Check out
         uses: actions/checkout@v4
-      - name: Cached Konan
-        uses: actions/cache@v4
-        with:
-          path: ~/.konan
-          key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-konan-
-      - name: Cached Gradle
-        uses: actions/cache@v4
-        with:
-          path: ~/.gradle
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-gradle-
       - name: Set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: 'oracle'
           java-version: 17
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          cache-read-only: false
+          cache-overwrite-existing: true
       - name: Packaging
         run: ./gradlew packageReleaseDistributionForCurrentOS #TODO packageRelease
       - name: Release

.github/workflows/ios.yml

@@ -13,26 +13,20 @@ jobs:
     steps:
       - name: Check out
         uses: actions/checkout@v4
-      - name: Cached Konan
-        uses: actions/cache@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          path: ~/.konan
-          key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-konan-
-      - name: Cached Gradle
-        uses: actions/cache@v4
+          distribution: 'oracle'
+          java-version: 17
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
-          path: ~/.gradle
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-gradle-
+          cache-read-only: false
+          cache-overwrite-existing: true
       - name: Decrypt large secret
         run: ./.github/scripts/decrypt_secret.sh
         env:
           LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
-        with:
-          java-version: 17
       - name: Download the Apple Worldwide Developer Relations Intermediate Certificate
         working-directory: ./iosApp/fastlane
         run: curl -o AppleWWDRCAG3.cer https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer

.github/workflows/kmp.yml

@@ -22,9 +22,12 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'oracle'
-          java-version: '17'
+          java-version: 17
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          cache-read-only: false
+          cache-overwrite-existing: true
       - name: Build
         run: ./gradlew build
       - name: Archive build-output artifacts
@@ -44,7 +47,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        api-level: [ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35 ]
+        api-level: [ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36 ]
         target: [default]
     steps:
       - name: Check out
@@ -53,9 +56,12 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'oracle'
-          java-version: '17'
+          java-version: 17
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          cache-read-only: false
+          cache-overwrite-existing: true
       - name: Enable KVM
         run: |
           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules

android-compose-app/build.gradle.kts

@@ -2,6 +2,7 @@
 
 import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
 import com.google.firebase.crashlytics.buildtools.gradle.tasks.UploadMappingFileTask
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 plugins {
@@ -13,15 +14,18 @@ plugins {
     alias(libs.plugins.crashlytics)
 }
 apply(from = "$rootDir/gradle/common-android-sign-conf.gradle")
+
+kotlin.compilerOptions.jvmTarget = JvmTarget.fromTarget(libs.versions.jdk.get())
+
 android {
     namespace = "com.softartdev.notedelight"
     compileSdk = libs.versions.compileSdk.get().toInt()
     defaultConfig {
         applicationId = "com.softartdev.noteroom"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
-        versionCode = 837
-        versionName = "8.3.7"
+        versionCode = 838
+        versionName = "8.3.8"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments["clearPackageData"] = "true"
         vectorDrawables.useSupportLibrary = true
@@ -47,9 +51,6 @@ android {
         sourceCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
         targetCompatibility = JavaVersion.toVersion(libs.versions.jdk.get().toInt())
     }
-    kotlinOptions {
-        jvmTarget = libs.versions.jdk.get()
-    }
     tasks.withType<KotlinCompilationTask<*>>().configureEach {
         compilerOptions.freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
     }
@@ -77,7 +78,6 @@ dependencies {
     debugImplementation(compose.uiTooling)
     debugImplementation(libs.androidx.compose.test.manifest)
     implementation(libs.androidx.navigation.compose)
-    implementation(libs.androidx.paging.compose)
     implementation(libs.material.theme.prefs)
     implementation(libs.napier)
     implementation(platform(libs.koin.bom))

android-compose-app/src/androidTest/java/com/softartdev/notedelight/CryptInstrumentedTest.kt

@@ -5,6 +5,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import com.softartdev.notedelight.model.PlatformSQLiteState
 import com.softartdev.notedelight.repository.SafeRepo
+import io.github.aakira.napier.Napier
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -21,6 +22,7 @@ class CryptInstrumentedTest {
     fun cryptTest() {
         assertEquals(PlatformSQLiteState.DOES_NOT_EXIST, safeRepo.databaseState)
         safeRepo.buildDbIfNeed()
+        Napier.d("notes count = ${safeRepo.noteDAO.count}")
         assertEquals(PlatformSQLiteState.UNENCRYPTED, safeRepo.databaseState)
         safeRepo.encrypt(SpannableStringBuilder(password))
         assertEquals(PlatformSQLiteState.ENCRYPTED, safeRepo.databaseState)

android-compose-app/src/androidTest/java/com/softartdev/notedelight/CryptUseCaseInstrumentedTest.kt

@@ -5,6 +5,7 @@ import androidx.test.filters.MediumTest
 import com.softartdev.notedelight.model.PlatformSQLiteState
 import com.softartdev.notedelight.repository.SafeRepo
 import com.softartdev.notedelight.usecase.crypt.*
+import io.github.aakira.napier.Napier
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
@@ -27,6 +28,7 @@ class CryptUseCaseInstrumentedTest {
     @Test
     fun cryptTest() = runBlocking {
         safeRepo.buildDbIfNeed()
+        Napier.d("notes count = ${safeRepo.noteDAO.count}")
         assertFalse(dbIsEncrypted)
         changePasswordUseCase(null, password)
         assertTrue(dbIsEncrypted)

core/data/db-room/src/androidMain/kotlin/com/softartdev/notedelight/db/AndroidDatabaseHolder.kt

@@ -10,10 +10,9 @@ class AndroidDatabaseHolder(
     context: Context,
     passphrase: CharSequence,
 ) : RoomDbHolder {
-    private val dbPath: String = context.getDatabasePath(SafeRepo.DB_NAME).absolutePath
 
     val noteDatabase: NoteDatabase = Room
-        .databaseBuilder(context, NoteDatabase::class.java, dbPath)
+        .databaseBuilder(context, NoteDatabase::class.java, SafeRepo.DB_NAME)
         .openHelperFactory(SafeHelperFactory.fromUser(SpannableStringBuilder(passphrase)))
         .fallbackToDestructiveMigrationOnDowngrade(false)
         .build()

core/data/db-room/src/iosMain/kotlin/com/softartdev/notedelight/db/IosCipherUtils.kt

@@ -12,16 +12,18 @@ import platform.Foundation.*
 
 object IosCipherUtils {
 
+    private val nsFileManager = NSFileManager.defaultManager
+
     private val dbDirPath: String by lazy {
-        val paths: List<*> = NSSearchPathForDirectoriesInDomains(
-            directory = NSApplicationSupportDirectory,
-            domainMask = NSUserDomainMask,
-            expandTilde = true
+        val documentDirectory: NSURL? = nsFileManager.URLForDirectory(
+            directory = NSDocumentDirectory,
+            inDomain = NSUserDomainMask,
+            appropriateForURL = null,
+            create = false,
+            error = null,
         )
-        val zeroPath: NSString = paths.first() as NSString
-        return@lazy zeroPath.stringByAppendingPathComponent(str = "databases")
+        return@lazy requireNotNull(documentDirectory?.path)
     }
-    private val nsFileManager = NSFileManager.defaultManager
 
     fun getDatabaseState(dbName: String): PlatformSQLiteState {
         var result = PlatformSQLiteState.DOES_NOT_EXIST

core/data/db-room/src/iosMain/kotlin/com/softartdev/notedelight/db/IosDatabaseHolder.kt

@@ -1,11 +1,8 @@
-@file:OptIn(ExperimentalForeignApi::class)
-
 package com.softartdev.notedelight.db
 
 import androidx.room.Room
 import androidx.sqlite.driver.bundled.BundledSQLiteDriver
 import com.softartdev.notedelight.repository.SafeRepo
-import kotlinx.cinterop.ExperimentalForeignApi
 
 class IosDatabaseHolder(
     key: String? = null,