READ_MEDIA_IMAGES 권한 삭제 (#153)

Author: wjshim2003

app/src/main/AndroidManifest.xml

@@ -13,7 +13,6 @@
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
 
     <queries>
         <package android:name="com.google.android.apps.maps" />

app/src/main/java/com/wafflestudio/siksha2/ui/menuDetail/LeaveReviewFragment.kt

@@ -11,6 +11,8 @@ import android.text.InputFilter
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
@@ -47,12 +49,25 @@ class LeaveReviewFragment : Fragment() {
 
     private val requestPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
         if (isGranted) {
-            launchGalleryIntent()
+            launchPhotoPicker()
         } else {
             showToast("사진 업로드를 위해 사진 권한을 허용해 주세요.")
         }
     }
 
+    private val pickMedia: ActivityResultLauncher<PickVisualMediaRequest>? =
+        if (Build.VERSION.SDK_INT >= 33) {
+            registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
+                uri?.let {
+                    vm.addImageUri(it, onFailure = {
+                        requireContext().showToast(getString(R.string.leave_review_max_image_toast))
+                    })
+                }
+            }
+        } else {
+            null
+        }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -173,24 +188,32 @@ class LeaveReviewFragment : Fragment() {
 
         binding.addImageButton.setOnClickListener {
             requestPermission(onGranted = {
-                launchGalleryIntent()
+                launchPhotoPicker()
             })
         }
     }
 
     private fun requestPermission(onGranted: () -> Unit) {
-        val permission = if (Build.VERSION.SDK_INT >= 33) Manifest.permission.READ_MEDIA_IMAGES else Manifest.permission.READ_EXTERNAL_STORAGE
+        if (Build.VERSION.SDK_INT >= 33) {
+            onGranted()
+            return
+        }
+        val permission = Manifest.permission.READ_EXTERNAL_STORAGE
         if (ContextCompat.checkSelfPermission(requireActivity(), permission) == PackageManager.PERMISSION_GRANTED) {
             onGranted()
         } else {
             requestPermissionLauncher.launch(permission)
         }
     }
 
-    private fun launchGalleryIntent() {
-        val intent = Intent(Intent.ACTION_PICK)
-            .setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "image/*")
-        galleryLauncher.launch(intent)
+    private fun launchPhotoPicker() {
+        if (Build.VERSION.SDK_INT >= 33) {
+            pickMedia!!.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
+        } else {
+            val intent = Intent(Intent.ACTION_PICK)
+                .setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "image/*")
+            galleryLauncher.launch(intent)
+        }
     }
 
     companion object {