Merge branch 'NextAlone:dev' into dev

LiuYi0526 · Feb 7, 2024 · 7408ed7 · 7408ed7
2 parents c364359 + 99fc6e7
commit 7408ed7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/AvatarPreviewPagerIndicator.java b/TMessagesProj/src/main/java/org/telegram/ui/AvatarPreviewPagerIndicator.java
@@ -364,10 +364,6 @@ public void onRelease() {
         postInvalidateOnAnimation();
     }
 
-    @Override
-    public void onClick() {
-    }
-
     @Override
     public void onPhotosLoaded() {
     }

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ProfileGalleryView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ProfileGalleryView.java
@@ -41,6 +41,8 @@
 
 import java.util.ArrayList;
 
+import tw.nekomimi.nekogram.NekoConfig;
+
 public class ProfileGalleryView extends CircularViewPager implements NotificationCenter.NotificationCenterDelegate {
 
     private final PointF downPoint = new PointF();
@@ -129,7 +131,7 @@ public interface Callback {
 
         void onRelease();
 
-        void onClick();
+        default void onClick() {};
 
         void onPhotosLoaded();
 
@@ -1227,9 +1229,9 @@ public void onAnimationReady(ImageReceiver imageReceiver) {
 
             item.imageView.setRoundRadius(roundTopRadius, roundTopRadius, roundBottomRadius, roundBottomRadius);
 
-            item.imageView.setOnClickListener(__ -> {
-                callback.onClick();
-            });
+            if (NekoConfig.disablePhotoSideAction.Bool()) {
+                item.imageView.setOnClickListener(__ -> callback.onClick());
+            }
 
             item.imageView.setTag(realPosition);