Merge pull request #6 from hoangchungk53qx1/master

update sdk 33,update permission android sdk33
FunkyMuse · Jan 3, 2023 · e571c8b · e571c8b
2 parents 93a5b2f + d8bfe61
commit e571c8b
Show file tree

Hide file tree

Showing 16 changed files with 63 additions and 27 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,15 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+
+    <!-- Required only if your app needs to access videos
+         that other apps created. -->
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+
+    <!-- Required only if your app needs to access audio files
+         that other apps created. -->
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
 
     <application
         android:allowBackup="true"

diff --git a/app/src/main/java/com/crazylegend/mediapicker/FragmentResult.kt b/app/src/main/java/com/crazylegend/mediapicker/FragmentResult.kt
@@ -3,6 +3,7 @@ package com.crazylegend.mediapicker
 import android.Manifest
 import android.annotation.SuppressLint
 import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -350,6 +351,11 @@ class FragmentResult : DialogFragment(R.layout.activity_main), View.OnClickListe
     override fun onClick(clickedview: View?) {
         clickedview ?: return
         clickedID = clickedview.id
-        askForStoragePermission.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU){
+            askForStoragePermission.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+        } else {
+            askForStoragePermission.launch(Manifest.permission.READ_MEDIA_IMAGES)
+        }
+
     }
 }
diff --git a/app/src/main/java/com/crazylegend/mediapicker/MainActivity.kt b/app/src/main/java/com/crazylegend/mediapicker/MainActivity.kt
@@ -1,8 +1,10 @@
 package com.crazylegend.mediapicker
 
+import android.Manifest
 import android.Manifest.permission.READ_EXTERNAL_STORAGE
 import android.annotation.SuppressLint
 import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -332,7 +334,11 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
     override fun onClick(clickedview: View?) {
         clickedview ?: return
         clickedID = clickedview.id
-        askForStoragePermission.launch(READ_EXTERNAL_STORAGE)
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU){
+            askForStoragePermission.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+        } else {
+            askForStoragePermission.launch(Manifest.permission.READ_MEDIA_IMAGES)
+        }
     }
 
 }
diff --git a/.../main/java/com/crazylegend/audiopicker/dialogs/multi/MultiAudioPickerBottomSheetDialog.kt b/.../main/java/com/crazylegend/audiopicker/dialogs/multi/MultiAudioPickerBottomSheetDialog.kt
@@ -1,6 +1,7 @@
 package com.crazylegend.audiopicker.dialogs.multi
 
 import android.Manifest
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -54,8 +55,11 @@ internal class MultiAudioPickerBottomSheetDialog : AbstractBottomSheetDialogFrag
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        askForStoragePermission.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
-
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU){
+            askForStoragePermission.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+        } else {
+            askForStoragePermission.launch(Manifest.permission.READ_MEDIA_AUDIO)
+        }
         setupUIForMultiPicker(
                 binding.gallery, audioMultiSelectAdapter, binding.doneButton, binding.title, binding.loadingIndicator, modifier?.loadingIndicatorTint,
                 ::applyDoneButtonModifications, ::applyTitleModifications)

diff --git a/...ain/java/com/crazylegend/audiopicker/dialogs/single/SingleAudioPickerBottomSheetDialog.kt b/...ain/java/com/crazylegend/audiopicker/dialogs/single/SingleAudioPickerBottomSheetDialog.kt
@@ -2,6 +2,7 @@ package com.crazylegend.audiopicker.dialogs.single
 
 import android.Manifest
 import android.graphics.Bitmap
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -57,8 +58,11 @@ internal class SingleAudioPickerBottomSheetDialog : AbstractBottomSheetDialogFra
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        askForStoragePermission.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
-
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU){
+            askForStoragePermission.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+        } else {
+            askForStoragePermission.launch(Manifest.permission.READ_MEDIA_AUDIO)
+        }
         setupUIForSinglePicker(binding.gallery, singleAudioAdapter, binding.title, binding.loadingIndicator, modifier?.loadingIndicatorTint, ::applyTitleModifications)
         audiosVM.audio.observe(viewLifecycleOwner) {
             setupList(singleAudioAdapter, it, binding.noContentText, modifier?.noContentTextModifier)

diff --git a/audiopicker/src/main/java/com/crazylegend/audiopicker/pickers/MultiAudioPicker.kt b/audiopicker/src/main/java/com/crazylegend/audiopicker/pickers/MultiAudioPicker.kt
@@ -36,7 +36,7 @@ object MultiAudioPicker {
         }
     }
 
-    @RequiresPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
+
     fun showPicker(context: Context, modifier: MultiAudioPickerModifier.() -> Unit = {}, audioList: (list: List<AudioModel>) -> Unit = {}) {
         val manager = context.setupManager()
         val setupModifier = setupModifier(modifier)
@@ -47,7 +47,6 @@ object MultiAudioPicker {
         }
     }
 
-    @RequiresPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
     fun showPicker(fragmentManager: FragmentManager, modifier: MultiAudioPickerModifier.() -> Unit = {}, audioList: (list: List<AudioModel>) -> Unit = {}) {
         val setupModifier = setupModifier(modifier)
         with(MultiAudioPickerBottomSheetDialog()) {

diff --git a/audiopicker/src/main/java/com/crazylegend/audiopicker/pickers/SingleAudioPicker.kt b/audiopicker/src/main/java/com/crazylegend/audiopicker/pickers/SingleAudioPicker.kt
@@ -35,7 +35,6 @@ object SingleAudioPicker {
         }
     }
 
-    @RequiresPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
     fun showPicker(context: Context, pickerModifier: SingleAudioPickerModifier.() -> Unit = {}, onPickedAudio: (audio: AudioModel) -> Unit = {}) {
         val modifier = setupModifier(pickerModifier)
         val manager = context.setupManager()
@@ -46,7 +45,6 @@ object SingleAudioPicker {
         }
     }
 
-    @RequiresPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
     fun showPicker(manager: FragmentManager, pickerModifier: SingleAudioPickerModifier.() -> Unit = {}, onPickedAudio: (audio: AudioModel) -> Unit = {}) {
         val modifier = setupModifier(pickerModifier)
         with(SingleAudioPickerBottomSheetDialog()) {

diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ ext {
     coreKTX = "1.5.0"
 
     //compilation
-    compileVersion = 32
+    compileVersion = 33
     minVersion = 21
     verCode = 1
     verName = "1.0.0"
@@ -20,7 +20,7 @@ ext {
 buildscript {
     ext.kotlin_version = '1.7.10'
 
-    ext.compiledAppVersion = 32
+    ext.compiledAppVersion = 33
 
     repositories {
         google()

diff --git a/.../main/java/com/crazylegend/imagepicker/dialogs/multi/MultiImagePickerBottomSheetDialog.kt b/.../main/java/com/crazylegend/imagepicker/dialogs/multi/MultiImagePickerBottomSheetDialog.kt
@@ -1,6 +1,7 @@
 package com.crazylegend.imagepicker.dialogs.multi
 
 import android.Manifest
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -56,8 +57,11 @@ internal class MultiImagePickerBottomSheetDialog : AbstractBottomSheetDialogFrag
     @Suppress("UNCHECKED_CAST")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        askForStoragePermission.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
-
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU){
+            askForStoragePermission.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+        } else {
+            askForStoragePermission.launch(Manifest.permission.READ_MEDIA_IMAGES)
+        }
 
         setupUIForMultiPicker(
                 binding.gallery, multiSelectAdapter, binding.doneButton, binding.title, binding.loadingIndicator, modifier?.loadingIndicatorTint,

diff --git a/...ain/java/com/crazylegend/imagepicker/dialogs/single/SingleImagePickerBottomSheetDialog.kt b/...ain/java/com/crazylegend/imagepicker/dialogs/single/SingleImagePickerBottomSheetDialog.kt
@@ -1,6 +1,7 @@
 package com.crazylegend.imagepicker.dialogs.single
 
 import android.Manifest
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -57,7 +58,11 @@ internal class SingleImagePickerBottomSheetDialog : AbstractBottomSheetDialogFra
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        askForStoragePermission.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU){
+            askForStoragePermission.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+        } else {
+            askForStoragePermission.launch(Manifest.permission.READ_MEDIA_IMAGES)
+        }
         setupUIForSinglePicker(binding.gallery, singleAdapter, binding.title, binding.loadingIndicator, modifier?.loadingIndicatorTint, ::applyTitleModifications)
         imagesVM.images.observe(viewLifecycleOwner) {
             setupList(singleAdapter, it, binding.noContentText, modifier?.noContentTextModifier)

diff --git a/imagepicker/src/main/java/com/crazylegend/imagepicker/pickers/MultiImagePicker.kt b/imagepicker/src/main/java/com/crazylegend/imagepicker/pickers/MultiImagePicker.kt
@@ -37,7 +37,7 @@ object MultiImagePicker {
         }
     }
 
-    @RequiresPermission(READ_EXTERNAL_STORAGE)
+
     fun showPicker(
             context: Context, multiImagePickerModifier: BaseMultiPickerModifier.() -> Unit = {},
             imagesList: (list: List<ImageModel>) -> Unit = {}
@@ -51,7 +51,6 @@ object MultiImagePicker {
         }
     }
 
-    @RequiresPermission(READ_EXTERNAL_STORAGE)
     fun showPicker(
             fragmentManager: FragmentManager, multiImagePickerModifier: BaseMultiPickerModifier.() -> Unit = {},
             imagesList: (list: List<ImageModel>) -> Unit = {}

diff --git a/imagepicker/src/main/java/com/crazylegend/imagepicker/pickers/SingleImagePicker.kt b/imagepicker/src/main/java/com/crazylegend/imagepicker/pickers/SingleImagePicker.kt
@@ -36,7 +36,6 @@ object SingleImagePicker {
         }
     }
 
-    @RequiresPermission(READ_EXTERNAL_STORAGE)
     fun showPicker(
             context: Context,
             pickerModifier: BaseSinglePickerModifier.() -> Unit = {},
@@ -51,8 +50,6 @@ object SingleImagePicker {
         }
     }
 
-
-    @RequiresPermission(READ_EXTERNAL_STORAGE)
     fun showPicker(
             fragmentManager: FragmentManager,
             pickerModifier: BaseSinglePickerModifier.() -> Unit = {},

diff --git a/.../main/java/com/crazylegend/videopicker/dialogs/multi/MultiVideoPickerBottomSheetDialog.kt b/.../main/java/com/crazylegend/videopicker/dialogs/multi/MultiVideoPickerBottomSheetDialog.kt
@@ -1,6 +1,7 @@
 package com.crazylegend.videopicker.dialogs.multi
 
 import android.Manifest
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -54,8 +55,11 @@ internal class MultiVideoPickerBottomSheetDialog : AbstractBottomSheetDialogFrag
     @Suppress("UNCHECKED_CAST")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        askForStoragePermission.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
-
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU){
+            askForStoragePermission.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+        } else {
+            askForStoragePermission.launch(Manifest.permission.READ_MEDIA_VIDEO)
+        }
         setupUIForMultiPicker(
                 binding.gallery, multiSelectAdapter, binding.doneButton, binding.title, binding.loadingIndicator, modifier?.loadingIndicatorTint,
                 ::applyDoneButtonModifications, ::applyTitleModifications)

diff --git a/...ain/java/com/crazylegend/videopicker/dialogs/single/SingleVideoPickerBottomSheetDialog.kt b/...ain/java/com/crazylegend/videopicker/dialogs/single/SingleVideoPickerBottomSheetDialog.kt
@@ -1,6 +1,7 @@
 package com.crazylegend.videopicker.dialogs.single
 
 import android.Manifest
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -55,7 +56,11 @@ internal class SingleVideoPickerBottomSheetDialog : AbstractBottomSheetDialogFra
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        askForStoragePermission.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU){
+            askForStoragePermission.launch(Manifest.permission.READ_EXTERNAL_STORAGE)
+        } else {
+            askForStoragePermission.launch(Manifest.permission.READ_MEDIA_VIDEO)
+        }
         setupUIForSinglePicker(binding.gallery, singleAdapter, binding.title, binding.loadingIndicator, modifier?.loadingIndicatorTint, ::applyTitleModifications)
         videosVM.videos.observe(viewLifecycleOwner) {
             setupList(singleAdapter, it, binding.noContentText, modifier?.noContentTextModifier)

diff --git a/videopicker/src/main/java/com/crazylegend/videopicker/pickers/MultiVideoPicker.kt b/videopicker/src/main/java/com/crazylegend/videopicker/pickers/MultiVideoPicker.kt
@@ -37,7 +37,6 @@ object MultiVideoPicker {
         }
     }
 
-    @RequiresPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
     fun showPicker(context: Context, modifier: BaseMultiPickerModifier.() -> Unit = {}, videoList: (list: List<VideoModel>) -> Unit = {}) {
         val manager = context.setupManager()
         val setupModifier = setupModifier(modifier)
@@ -48,7 +47,6 @@ object MultiVideoPicker {
         }
     }
 
-    @RequiresPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
     fun showPicker(fragmentManager: FragmentManager, modifier: BaseMultiPickerModifier.() -> Unit = {}, videoList: (list: List<VideoModel>) -> Unit = {}) {
         val setupModifier = setupModifier(modifier)
         with(MultiVideoPickerBottomSheetDialog()) {

diff --git a/videopicker/src/main/java/com/crazylegend/videopicker/pickers/SingleVideoPicker.kt b/videopicker/src/main/java/com/crazylegend/videopicker/pickers/SingleVideoPicker.kt
@@ -36,7 +36,6 @@ object SingleVideoPicker {
         }
     }
 
-    @RequiresPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
     fun showPicker(context: Context, pickerModifier: BaseSinglePickerModifier.() -> Unit = {}, onPickedVideo: (video: VideoModel) -> Unit = {}) {
         val modifier = setupModifier(pickerModifier)
         val manager = context.setupManager()
@@ -47,7 +46,6 @@ object SingleVideoPicker {
         }
     }
 
-    @RequiresPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
     fun showPicker(fragmentManager: FragmentManager, pickerModifier: BaseSinglePickerModifier.() -> Unit = {}, onPickedVideo: (video: VideoModel) -> Unit = {}) {
         val modifier = setupModifier(pickerModifier)
         with(SingleVideoPickerBottomSheetDialog()) {