Merge pull request #76 from tindy2013/master

Use different tag for ImagePickerFragment and MediaPickerFragment
icerockdev · Apr 11, 2024 · cdb8271 · cdb8271
2 parents e899ae1 + 4ae33c1
commit cdb8271
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/media/src/androidMain/kotlin/dev/icerock/moko/media/picker/MediaPickerController.kt b/media/src/androidMain/kotlin/dev/icerock/moko/media/picker/MediaPickerController.kt
@@ -24,12 +24,14 @@ actual interface MediaPickerController {
     companion object {
         operator fun invoke(
             permissionsController: PermissionsController,
-            pickerFragmentTag: String = "MediaControllerPicker",
+            mediaPickerFragmentTag: String = "MediaControllerMediaPicker",
+            imagePickerFragmentTag: String = "MediaControllerImagePicker",
             filePickerFragmentTag: String = "FileMediaControllerPicker"
         ): MediaPickerController {
             return MediaPickerControllerImpl(
                 permissionsController = permissionsController,
-                pickerFragmentTag = pickerFragmentTag,
+                mediaPickerFragmentTag = mediaPickerFragmentTag,
+                imagePickerFragmentTag = imagePickerFragmentTag,
                 filePickerFragmentTag = filePickerFragmentTag
             )
         }

diff --git a/media/src/androidMain/kotlin/dev/icerock/moko/media/picker/MediaPickerControllerImpl.kt b/media/src/androidMain/kotlin/dev/icerock/moko/media/picker/MediaPickerControllerImpl.kt
@@ -19,7 +19,8 @@ import kotlin.coroutines.suspendCoroutine
 
 internal class MediaPickerControllerImpl(
     override val permissionsController: PermissionsController,
-    private val pickerFragmentTag: String,
+    private val mediaPickerFragmentTag: String,
+    private val imagePickerFragmentTag: String,
     private val filePickerFragmentTag: String
 ) : MediaPickerController {
     var fragmentManager: FragmentManager? = null
@@ -57,14 +58,14 @@ internal class MediaPickerControllerImpl(
             permissionsController.providePermission(permission)
         }
 
-        val currentFragment: Fragment? = fragmentManager.findFragmentByTag(pickerFragmentTag)
+        val currentFragment: Fragment? = fragmentManager.findFragmentByTag(imagePickerFragmentTag)
         val imagePickerFragment: ImagePickerFragment = if (currentFragment != null) {
             currentFragment as ImagePickerFragment
         } else {
             ImagePickerFragment.newInstance(maxWidth, maxHeight).also {
                 fragmentManager
                     .beginTransaction()
-                    .add(it, pickerFragmentTag)
+                    .add(it, imagePickerFragmentTag)
                     .commitNow()
             }
         }
@@ -86,14 +87,14 @@ internal class MediaPickerControllerImpl(
 
         permissionsController.providePermission(Permission.GALLERY)
 
-        val currentFragment: Fragment? = fragmentManager.findFragmentByTag(pickerFragmentTag)
+        val currentFragment: Fragment? = fragmentManager.findFragmentByTag(mediaPickerFragmentTag)
         val pickerFragment: MediaPickerFragment = if (currentFragment != null) {
             currentFragment as MediaPickerFragment
         } else {
             MediaPickerFragment().apply {
                 fragmentManager
                     .beginTransaction()
-                    .add(this, pickerFragmentTag)
+                    .add(this, mediaPickerFragmentTag)
                     .commitNow()
             }
         }
@@ -117,7 +118,7 @@ internal class MediaPickerControllerImpl(
             FilePickerFragment().apply {
                 fragmentManager
                     .beginTransaction()
-                    .add(this, pickerFragmentTag)
+                    .add(this, filePickerFragmentTag)
                     .commitNow()
             }
         }