fix(UI): Compatibility issues(systemBars, photo permissions) (#367)

Co-authored-by: rosuH <hi@rosuh.me>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>

Author: rosuH

.github/workflows/pr_pre_check.yml

@@ -1,48 +1,58 @@
-name: Basic Check
-
-env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=1g" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
-  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
+name: PR Checks
 
 on:
   pull_request:
-    types: [opened,reopened,synchronize]
+    types: [opened, reopened, synchronize]
     branches:
       - master
+    paths-ignore:
+      - '**/*.md'
+      - 'fastlane/**'
+      - 'static/**'
+      - 'captures/**'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
-  check:
-    name: Check
+  build:
+    name: Compile (app:assembleDebug)
     runs-on: ubuntu-latest
+    timeout-minutes: 30
+    if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }}
     steps:
-      - uses: actions/checkout@v4
-      - name: Skip duplicate actions
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          cancel_others: true
-      - uses: actions/setup-java@v4
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
-          distribution: 'zulu'
-          java-version: 17
-          cache: 'gradle'
-      - uses: gradle/actions/setup-gradle@v4
-        with:
-          gradle-version: wrapper
-          gradle-home-cache-cleanup: true
-#      - run: ./gradlew spotlessCheck
-  simple_compile:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-java@v4
+          fetch-depth: 1
+          persist-credentials: false
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v2
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 17
-          cache: 'gradle'
-      - uses: gradle/actions/setup-gradle@v4
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: wrapper
+          cache-read-only: ${{ github.event_name == 'pull_request' }}
           gradle-home-cache-cleanup: true
-      - name: Build apk with Gradle
-        run: ./gradlew :app:assembleDebug
+
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+
+      - name: Build debug APK (skip lint/tests)
+        run: ./gradlew :app:assembleDebug -x lint -x test --stacktrace

app/build.gradle.kts

@@ -16,8 +16,8 @@ android {
         applicationId = "me.rosuh.easywatermark"
         minSdk = (Apps.minSdk)
         targetSdk = (Apps.targetSdk)
-        versionCode = 20906
-        versionName = "2.9.6"
+        versionCode = 21000
+        versionName = "2.10.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 

app/src/main/AndroidManifest.xml

@@ -8,8 +8,17 @@
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
+
+    <!-- Devices running Android 12L (API level 32) or lower  -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
+
+    <!-- Devices running Android 13 (API level 33) or higher -->
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
 
+    <!-- To handle the reselection within the app on devices running Android 14
+         or higher if your app targets Android 14 (API level 34) or higher.  -->
+    <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
+
     <application
         android:name=".MyApp"
         android:allowBackup="true"

app/src/main/java/me/rosuh/easywatermark/ui/MainActivity.kt

@@ -20,13 +20,15 @@ import android.view.View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
 import android.widget.Button
 import android.widget.TextView
 import android.widget.Toast
-import androidx.activity.result.ActivityResultCallback
 import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
 import androidx.core.view.forEach
 import androidx.fragment.app.commit
 import androidx.lifecycle.Lifecycle
@@ -52,7 +54,6 @@ import me.rosuh.easywatermark.ui.panel.*
 import me.rosuh.easywatermark.ui.widget.CenterLayoutManager
 import me.rosuh.easywatermark.ui.widget.LaunchView
 import me.rosuh.easywatermark.utils.FileUtils
-import me.rosuh.easywatermark.utils.PickImageContract
 import me.rosuh.easywatermark.utils.VibrateHelper
 import me.rosuh.easywatermark.utils.ktx.*
 import me.rosuh.easywatermark.utils.onItemClick
@@ -61,14 +62,22 @@ import me.rosuh.easywatermark.utils.onItemClick
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
-    private lateinit var pickIconLauncher: ActivityResultLauncher<String>
+    private lateinit var pickIconPhotoPickerLauncher: ActivityResultLauncher<PickVisualMediaRequest>
+    private lateinit var pickMultiplePhotoPickerLauncher: ActivityResultLauncher<PickVisualMediaRequest>
+    private lateinit var pickIconLegacyLauncher: ActivityResultLauncher<String>
     private val viewModel: MainViewModel by viewModels()
 
     private val currentBgColor: Int
         get() = ((launchView.parent as? View?)?.background as? ColorDrawable)?.color ?: colorSurface
 
     private lateinit var requestPermissionLauncher: ActivityResultLauncher<String>
 
+    private var pendingPermissionAction: (() -> Unit)? = null
+
+    private val isSystemPhotoPickerAvailable by lazy {
+        ActivityResultContracts.PickVisualMedia.isPhotoPickerAvailable(this)
+    }
+
     private val contentFunList: List<FuncTitleModel> by lazy {
         listOf(
             FuncTitleModel(
@@ -227,19 +236,32 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun registerResultCallback() {
-        pickIconLauncher =
-            registerForActivityResult(PickImageContract()) { uri: Uri? ->
-                handleActivityResult(REQ_PICK_ICON, listOf(uri))
+        pickMultiplePhotoPickerLauncher =
+            registerForActivityResult(ActivityResultContracts.PickMultipleVisualMedia()) { uris ->
+                handlePickedMedia(REQ_CODE_PICK_IMAGE, uris)
+            }
+        pickIconPhotoPickerLauncher =
+            registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
+                val result = uri?.let(::listOf) ?: emptyList()
+                handlePickedMedia(REQ_PICK_ICON, result)
+            }
+        pickIconLegacyLauncher =
+            registerForActivityResult(ActivityResultContracts.GetContent()) { uri: Uri? ->
+                val result = uri?.let(::listOf) ?: emptyList()
+                handlePickedMedia(REQ_PICK_ICON, result)
             }
         requestPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
             if (isGranted) {
+                pendingPermissionAction?.invoke()
+                pendingPermissionAction = null
                 return@registerForActivityResult
             }
             Toast.makeText(
                 this,
                 getString(R.string.request_permission_failed),
                 Toast.LENGTH_SHORT
             ).show()
+            pendingPermissionAction = null
         }
     }
 
@@ -441,9 +463,7 @@ class MainActivity : AppCompatActivity() {
         }
         // pick image button
         launchView.ivSelectedPhotoTips.setOnClickListener {
-            checkReadingPermission(requestPermissionLauncher) {
-                performFileSearch(REQ_CODE_PICK_IMAGE)
-            }
+            performFileSearch(REQ_CODE_PICK_IMAGE)
         }
         // setting bg
         launchView.ivPhoto.apply {
@@ -595,9 +615,7 @@ class MainActivity : AppCompatActivity() {
                 TextContentDisplayFragment.replaceShow(this, launchView.fcFunctionDetail.id)
             }
             FuncTitleModel.FuncType.Icon -> {
-                checkReadingPermission(requestPermissionLauncher) {
-                    performFileSearch(REQ_PICK_ICON)
-                }
+                performFileSearch(REQ_PICK_ICON)
             }
             FuncTitleModel.FuncType.Color -> {
                 ColorFragment.replaceShow(this, launchView.fcFunctionDetail.id)
@@ -664,9 +682,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         R.id.action_pick -> {
-            checkReadingPermission(requestPermissionLauncher) {
-                performFileSearch(REQ_CODE_PICK_IMAGE)
-            }
+            performFileSearch(REQ_CODE_PICK_IMAGE)
             true
         }
 
@@ -683,33 +699,44 @@ class MainActivity : AppCompatActivity() {
      * Fires an intent to spin up the "file chooser" UI and select an image.
      */
     private fun performFileSearch(requestCode: Int) {
-        if (requestCode == REQ_PICK_ICON) {
-            val mime = "image/*"
-            val result = kotlin.runCatching {
-                when (requestCode) {
-                    REQ_PICK_ICON -> {
-                        pickIconLauncher.launch(mime)
-                    }
-                }
-            }
+        val request = PickVisualMediaRequest.Builder()
+            .setMediaType(ActivityResultContracts.PickVisualMedia.ImageOnly)
+            .build()
 
-            if (result.isFailure) {
-                Toast.makeText(
-                    this,
-                    getString(R.string.tips_not_app_can_open_images),
-                    Toast.LENGTH_LONG
-                ).show()
-                Log.i("performFileSearch", result.exceptionOrNull()?.message ?: "No msg provided")
+        if (isSystemPhotoPickerAvailable) {
+            launchView.logoView.stop()
+            when (requestCode) {
+                REQ_PICK_ICON -> pickIconPhotoPickerLauncher.launch(request)
+                else -> pickMultiplePhotoPickerLauncher.launch(request)
             }
-        } else {
-            GalleryFragment().apply {
+            return
+        }
+
+        val launchLegacyPicker = {
+            if (requestCode == REQ_PICK_ICON) {
                 launchView.logoView.stop()
-                doOnDismiss {
-                    launchView.logoView.start()
-                }
-                show(supportFragmentManager, "GalleryFragment")
+                pickIconLegacyLauncher.launch("image/*")
+            } else {
+                openLegacyGallery()
             }
         }
+
+        pendingPermissionAction = launchLegacyPicker
+        checkReadingPermission(requestPermissionLauncher, grant = {
+            val action = pendingPermissionAction
+            pendingPermissionAction = null
+            action?.invoke()
+        })
+    }
+
+    private fun openLegacyGallery() {
+        GalleryFragment().apply {
+            launchView.logoView.stop()
+            doOnDismiss {
+                launchView.logoView.start()
+            }
+            show(supportFragmentManager, "GalleryFragment")
+        }
     }
 
     private fun dealWithImage(uri: List<Uri>) {
@@ -724,10 +751,11 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun handleActivityResult(requestCode: Int, list: List<Uri?>?) {
-        val finalList = list?.filterNotNull()?.filter {
+    private fun handlePickedMedia(requestCode: Int, list: List<Uri>) {
+        launchView.logoView.start()
+        val finalList = list.filter {
             FileUtils.isImage(this.contentResolver, it)
-        } ?: emptyList()
+        }
         if (finalList.isEmpty()) {
             Toast.makeText(
                 this,
@@ -823,7 +851,12 @@ class MainActivity : AppCompatActivity() {
     }
 
     fun requestPermission(block: () -> Unit) {
-        checkWritingPermission(requestPermissionLauncher, grant = block)
+        pendingPermissionAction = block
+        checkWritingPermission(requestPermissionLauncher, grant = {
+            val action = pendingPermissionAction
+            pendingPermissionAction = null
+            action?.invoke()
+        })
     }
 
     companion object {