Image editor (#5296)

Co-authored-by: Crossle Song <[email protected]>
MixinNetwork · Jan 24, 2025 · 8e815e0 · 8e815e0
1 parent 81856bc
commit 8e815e0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/app/src/main/java/one/mixin/android/extension/UrlExtension.kt b/app/src/main/java/one/mixin/android/extension/UrlExtension.kt
@@ -421,7 +421,7 @@ fun Uri.getCapturedImage(contentResolver: ContentResolver): Bitmap =
         }
     }
 
-fun Uri.isVideo(context: Context) : Boolean{
+fun Uri.isVideo(context: Context): Boolean {
     val mimeType = context.contentResolver.getType(this)
     return mimeType.equals(MimeType.MPEG.toString())
         || mimeType.equals(MimeType.MP4.toString())
@@ -432,4 +432,14 @@ fun Uri.isVideo(context: Context) : Boolean{
         || mimeType.equals(MimeType.WEBM.toString())
         || mimeType.equals(MimeType.TS.toString())
         || mimeType.equals(MimeType.AVI.toString())
+}
+
+fun Uri.isWebp(context: Context): Boolean {
+    val mimeType = context.contentResolver.getType(this)
+    return mimeType.equals(MimeType.WEBP.toString(), true)
+}
+
+fun Uri.isGif(context: Context): Boolean {
+    val mimeType = context.contentResolver.getType(this)
+    return mimeType.equals(MimeType.GIF.toString(), true)
 }
diff --git a/app/src/main/java/one/mixin/android/ui/conversation/ConversationFragment.kt b/app/src/main/java/one/mixin/android/ui/conversation/ConversationFragment.kt
@@ -120,9 +120,11 @@ import one.mixin.android.extension.hideKeyboard
 import one.mixin.android.extension.inTransaction
 import one.mixin.android.extension.isAuto
 import one.mixin.android.extension.isBluetoothHeadsetOrWiredHeadset
+import one.mixin.android.extension.isGif
 import one.mixin.android.extension.isImageSupport
 import one.mixin.android.extension.isStickerSupport
 import one.mixin.android.extension.isVideo
+import one.mixin.android.extension.isWebp
 import one.mixin.android.extension.lateOneHours
 import one.mixin.android.extension.networkConnected
 import one.mixin.android.extension.nowInUtc
@@ -1067,8 +1069,10 @@ class ConversationFragment() :
             uri?.let {
                 if (it.isVideo(requireContext())) {
                     showPreview(it, isVideo = true) { videoUri, start, end -> sendVideoMessage(videoUri, start, end) }
+                } else if (it.isGif(requireContext()) || it.isWebp(requireContext())) {
+                    showPreview(uri, getString(R.string.Send), false) { uri, _, _ -> sendImageMessage(uri) }
                 } else {
-                    sendImageMessage(it)
+                    getEditorResult.launch(Pair(uri, getString(R.string.Send)))
                 }
             }
         }