Merge pull request #3123 from YusefOuda/feature/subreddit-banner-in-s…

…idebar Show subreddit banner on the top of the sidebar (if exists)
Haptic-Apps · May 24, 2020 · 87669e1 · 87669e1
2 parents 96e345d + 4db2cab
commit 87669e1
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 0 deletions.
diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java b/app/src/main/java/me/ccrama/redditslide/Activities/MainActivity.java
@@ -2862,6 +2862,15 @@ public void onClick(View v) {
         } else {
             findViewById(R.id.subimage).setVisibility(View.GONE);
         }
+        String bannerImage = subreddit.getBannerImage();
+        if (bannerImage != null && !bannerImage.isEmpty()) {
+            findViewById(R.id.sub_banner).setVisibility(View.VISIBLE);
+            ((Reddit) getApplication()).getImageLoader()
+                    .displayImage(bannerImage,
+                            (ImageView) findViewById(R.id.sub_banner));
+        } else {
+            findViewById(R.id.sub_banner).setVisibility(View.GONE);
+        }
         ((TextView) findViewById(R.id.subscribers)).setText(
                 getString(R.string.subreddit_subscribers_string,
                         subreddit.getLocalizedSubscriberCount()));

diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SubredditView.java b/app/src/main/java/me/ccrama/redditslide/Activities/SubredditView.java
@@ -1777,6 +1777,15 @@ public void onCancel(
             } else {
                 findViewById(R.id.subimage).setVisibility(View.GONE);
             }
+            String bannerImage = subreddit.getBannerImage();
+            if (bannerImage != null && !bannerImage.isEmpty()) {
+                findViewById(R.id.sub_banner).setVisibility(View.VISIBLE);
+                ((Reddit) getApplication()).getImageLoader()
+                        .displayImage(bannerImage,
+                                (ImageView) findViewById(R.id.sub_banner));
+            } else {
+                findViewById(R.id.sub_banner).setVisibility(View.GONE);
+            }
             ((TextView) findViewById(R.id.subscribers)).setText(
                     getString(R.string.subreddit_subscribers_string,
                             subreddit.getLocalizedSubscriberCount()));

diff --git a/app/src/main/java/me/ccrama/redditslide/Fragments/CommentPage.java b/app/src/main/java/me/ccrama/redditslide/Fragments/CommentPage.java
@@ -1680,6 +1680,15 @@ public void onClick(
                         } else {
                             sidebar.findViewById(R.id.subimage).setVisibility(View.GONE);
                         }
+                        String bannerImage = baseSub.getBannerImage();
+                        if (bannerImage != null && !bannerImage.isEmpty()) {
+                            sidebar.findViewById(R.id.sub_banner).setVisibility(View.VISIBLE);
+                            ((Reddit) getContext().getApplicationContext()).getImageLoader()
+                                    .displayImage(bannerImage,
+                                            (ImageView) sidebar.findViewById(R.id.sub_banner));
+                        } else {
+                            sidebar.findViewById(R.id.sub_banner).setVisibility(View.GONE);
+                        }
                         ((TextView) sidebar.findViewById(R.id.subscribers)).setText(
                                 getString(R.string.subreddit_subscribers_string,
                                         baseSub.getLocalizedSubscriberCount()));

diff --git a/app/src/main/java/me/ccrama/redditslide/Views/RedditItemView.java b/app/src/main/java/me/ccrama/redditslide/Views/RedditItemView.java
@@ -269,6 +269,15 @@ private void doSidebar(Subreddit subreddit, View content) {
         } else {
             content.findViewById(R.id.subimage).setVisibility(View.GONE);
         }
+        String bannerImage = subreddit.getBannerImage();
+        if (bannerImage != null && !bannerImage.isEmpty()) {
+            findViewById(R.id.sub_banner).setVisibility(View.VISIBLE);
+            ((Reddit) ((PeekViewActivity) getContext()).getApplication()).getImageLoader()
+                    .displayImage(bannerImage,
+                            (ImageView) findViewById(R.id.sub_banner));
+        } else {
+            findViewById(R.id.sub_banner).setVisibility(View.GONE);
+        }
         ((TextView) content.findViewById(R.id.subscribers)).setText(
                 getContext().getString(R.string.subreddit_subscribers_string,
                         subreddit.getLocalizedSubscriberCount()));

diff --git a/app/src/main/res/layout/subinfo.xml b/app/src/main/res/layout/subinfo.xml
@@ -22,6 +22,13 @@
                 android:indeterminate="true"
                 android:padding="0dp"/>
 
+        <ImageView
+            android:id="@+id/sub_banner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scaleType="centerCrop"
+            android:padding="0dp"/>
+
         <LinearLayout
                 android:id="@+id/header_sub"
                 android:layout_width="match_parent"