feat: パフォーマンス改善

pantasystem · Jun 26, 2023 · 5b0d082 · 5b0d082
1 parent c773f35
commit 5b0d082
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 37 deletions.
diff --git a/..._android_ui/src/main/java/net/pantasystem/milktea/common_android_ui/ReactionViewHelper.kt b/..._android_ui/src/main/java/net/pantasystem/milktea/common_android_ui/ReactionViewHelper.kt
@@ -83,13 +83,20 @@ object ReactionViewHelper {
 
             if (emoji != null) {
                 //Log.d("ReactionViewHelper", "カスタム絵文字を発見した: ${emoji}")
-                GlideApp.with(reactionImageView.context)
-                    .load(emoji.cachePath)
-                    .error(
-                        GlideApp.with(reactionImageView.context)
-                            .load(emoji.url ?: emoji.uri)
-                    )
-                    .into(reactionImageView)
+                if (emoji.cachePath == null) {
+                    GlideApp.with(reactionImageView.context)
+                        .load(emoji.url ?: emoji.uri)
+                        .into(reactionImageView)
+                } else {
+                    GlideApp.with(reactionImageView.context)
+                        .load(emoji.cachePath)
+                        .error(
+                            GlideApp.with(reactionImageView.context)
+                                .load(emoji.url ?: emoji.uri)
+                        )
+                        .into(reactionImageView)
+                }
+
                 reactionImageView.setMemoVisibility(View.VISIBLE)
                 reactionStringView.setMemoVisibility(View.GONE)
                 return

diff --git a/...atures/note/src/main/java/net/pantasystem/milktea/note/reaction/NoteReactionViewHelper.kt b/...atures/note/src/main/java/net/pantasystem/milktea/note/reaction/NoteReactionViewHelper.kt
@@ -57,17 +57,26 @@ object NoteReactionViewHelper {
             )
 
 
-            GlideApp.with(reactionImageTypeView.context)
-                .load(emoji.cachePath)
-                .error(
-                    GlideApp.with(reactionImageTypeView.context)
-                        .load(emoji.url ?: emoji.uri)
-                        .override(imageViewWidthPx.toInt(), imageViewHeightPx.toInt())
-                        .addListener(SaveImageAspectRequestListener(emoji, context))
-                )
-                .override(imageViewWidthPx.toInt(), imageViewHeightPx.toInt())
-                .addListener(SaveImageAspectRequestListener(emoji, context))
-                .into(reactionImageTypeView)
+            if (emoji.cachePath == null) {
+                GlideApp.with(reactionImageTypeView.context)
+                    .load(emoji.url ?: emoji.uri)
+                    .override(imageViewWidthPx.toInt(), imageViewHeightPx.toInt())
+                    .addListener(SaveImageAspectRequestListener(emoji, context))
+                    .into(reactionImageTypeView)
+            } else {
+                GlideApp.with(reactionImageTypeView.context)
+                    .load(emoji.cachePath)
+                    .error(
+                        GlideApp.with(reactionImageTypeView.context)
+                            .load(emoji.url ?: emoji.uri)
+                            .override(imageViewWidthPx.toInt(), imageViewHeightPx.toInt())
+                            .addListener(SaveImageAspectRequestListener(emoji, context))
+                    )
+                    .override(imageViewWidthPx.toInt(), imageViewHeightPx.toInt())
+                    .addListener(SaveImageAspectRequestListener(emoji, context))
+                    .into(reactionImageTypeView)
+            }
+
         }
     }
 

diff --git a/...note/src/main/java/net/pantasystem/milktea/note/reaction/choices/EmojiListItemsAdapter.kt b/...note/src/main/java/net/pantasystem/milktea/note/reaction/choices/EmojiListItemsAdapter.kt
@@ -75,28 +75,38 @@ class EmojiListItemsAdapter(
                             )
                         )
                     }
-                    GlideApp.with(binding.reactionImagePreview.context)
-                        .load(item.emoji.cachePath)
-                        // FIXME: webpの場合うまく表示できなくなる
-//                    .centerCrop()
-                        .addListener(
-                            SaveImageAspectRequestListener(
-                                item.emoji,
-                                binding.root.context
+                    if (item.emoji.cachePath == null) {
+                        GlideApp.with(binding.reactionImagePreview.context)
+                            .load(item.emoji.url ?: item.emoji.uri)
+                            .addListener(
+                                SaveImageAspectRequestListener(
+                                    item.emoji,
+                                    binding.root.context
+                                )
                             )
-                        )
-                        .error(
-                            GlideApp.with(binding.reactionImagePreview.context)
-                                .load(item.emoji.url ?: item.emoji.uri)
-                                .addListener(
-                                    SaveImageAspectRequestListener(
-                                        item.emoji,
-                                        binding.root.context
-                                    )
+                            .into(binding.reactionImagePreview)
+                    } else {
+                        GlideApp.with(binding.reactionImagePreview.context)
+                            .load(item.emoji.cachePath)
+                            .addListener(
+                                SaveImageAspectRequestListener(
+                                    item.emoji,
+                                    binding.root.context
                                 )
-                        )
+                            )
+                            .error(
+                                GlideApp.with(binding.reactionImagePreview.context)
+                                    .load(item.emoji.url ?: item.emoji.uri)
+                                    .addListener(
+                                        SaveImageAspectRequestListener(
+                                            item.emoji,
+                                            binding.root.context
+                                        )
+                                    )
+                            )
+                            .into(binding.reactionImagePreview)
 
-                        .into(binding.reactionImagePreview)
+                    }
 
                     binding.reactionStringPreview.setMemoVisibility(View.GONE)
                     binding.reactionImagePreview.setMemoVisibility(View.VISIBLE)