From a87704b00d8c8bc73292d0993763ecd4dec32356 Mon Sep 17 00:00:00 2001
From: MChen321 <76930316+MChen321@users.noreply.github.com>
Date: Wed, 21 Sep 2022 00:59:09 -0500
Subject: Fixed Gray Overlay in Image (#1111)

* Added a clear search bar text button

* Made caption disappear/show when tapping on image and removed gray overlay when no caption.
---
 .../fragments/ViewRedditGalleryImageOrGifFragment.java | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'app/src/main')

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewRedditGalleryImageOrGifFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewRedditGalleryImageOrGifFragment.java
index db4cfeb0..527dd40d 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewRedditGalleryImageOrGifFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewRedditGalleryImageOrGifFragment.java
@@ -215,6 +215,12 @@ public class ViewRedditGalleryImageOrGifFragment extends Fragment {
 
         loadImage();
 
+        String caption = media.caption;
+        String captionUrl = media.captionUrl;
+        boolean captionIsEmpty = TextUtils.isEmpty(caption);
+        boolean captionUrlIsEmpty = TextUtils.isEmpty(captionUrl);
+        boolean captionTextOrUrlIsNotEmpty = !captionIsEmpty || !captionUrlIsEmpty;
+
         imageView.setOnClickListener(view -> {
             if (activity.isActionBarHidden()) {
                 activity.getWindow().getDecorView().setSystemUiVisibility(0);
@@ -222,6 +228,9 @@ public class ViewRedditGalleryImageOrGifFragment extends Fragment {
                 if (activity.isUseBottomAppBar()) {
                     bottomAppBarMenu.setVisibility(View.VISIBLE);
                 }
+                if (captionTextOrUrlIsNotEmpty){
+                    bottomAppBar.setVisibility(View.VISIBLE);
+                }
             } else {
                 hideAppBar();
             }
@@ -263,11 +272,7 @@ public class ViewRedditGalleryImageOrGifFragment extends Fragment {
             });
         }
 
-        String caption = media.caption;
-        String captionUrl = media.captionUrl;
-        boolean captionIsEmpty = TextUtils.isEmpty(caption);
-        boolean captionUrlIsEmpty = TextUtils.isEmpty(captionUrl);
-        if (!captionIsEmpty || !captionUrlIsEmpty) {
+        if (captionTextOrUrlIsNotEmpty) {
             isUseBottomCaption = true;
 
             if (!activity.isUseBottomAppBar()) {
@@ -314,6 +319,8 @@ public class ViewRedditGalleryImageOrGifFragment extends Fragment {
                 captionUrlTextView.setVisibility(View.VISIBLE);
                 captionUrlTextView.setHighlightColor(Color.TRANSPARENT);
             }
+        } else {
+            bottomAppBar.setVisibility(View.GONE);
         }
 
         return rootView;
@@ -331,6 +338,7 @@ public class ViewRedditGalleryImageOrGifFragment extends Fragment {
         if (activity.isUseBottomAppBar()) {
             bottomAppBarMenu.setVisibility(View.GONE);
         }
+        bottomAppBar.setVisibility(View.GONE);
     }
 
     private void loadImage() {
-- 
cgit v1.2.3