From bab852f9034dc532857a1eb7d7dd1b9e3ccbe040 Mon Sep 17 00:00:00 2001
From: sictiru <dan.andrei91@gmail.com>
Date: Wed, 30 Jun 2021 06:31:42 -0700
Subject: [PATCH] #1482 Tall story thumbnails

---
 .../drawable/shape_story_thumbnail_small.xml  |  4 ++
 .../NewsBlur/res/layout/view_story_row.xml    |  8 ++--
 .../android/NewsBlur/res/values/dimens.xml    |  1 +
 .../newsblur/database/StoryViewAdapter.java   | 35 ++++++++--------
 .../com/newsblur/view/StoryThumbnailView.kt   | 41 +++++++++++++++++++
 5 files changed, 68 insertions(+), 21 deletions(-)
 create mode 100644 clients/android/NewsBlur/res/drawable/shape_story_thumbnail_small.xml
 create mode 100644 clients/android/NewsBlur/src/com/newsblur/view/StoryThumbnailView.kt

diff --git a/clients/android/NewsBlur/res/drawable/shape_story_thumbnail_small.xml b/clients/android/NewsBlur/res/drawable/shape_story_thumbnail_small.xml
new file mode 100644
index 000000000..8fbcce785
--- /dev/null
+++ b/clients/android/NewsBlur/res/drawable/shape_story_thumbnail_small.xml
@@ -0,0 +1,4 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="@dimen/thumbnails_corner_radius" />
+</shape>
diff --git a/clients/android/NewsBlur/res/layout/view_story_row.xml b/clients/android/NewsBlur/res/layout/view_story_row.xml
index 952d13079..47bd27a25 100644
--- a/clients/android/NewsBlur/res/layout/view_story_row.xml
+++ b/clients/android/NewsBlur/res/layout/view_story_row.xml
@@ -34,22 +34,24 @@
         right to the left.
     -->
 
-    <ImageView
+    <com.newsblur.view.StoryThumbnailView
         android:id="@+id/story_item_thumbnail_right"
         android:layout_width="90dp"
         android:layout_height="90dp"
         android:layout_marginTop="1dp"
         android:layout_marginBottom="1dp"
+        android:layout_alignParentTop="true"
         android:layout_alignParentRight="true"
         android:visibility="gone" />
 
-    <ImageView
+    <com.newsblur.view.StoryThumbnailView
         android:id="@+id/story_item_thumbnail_left"
         android:layout_width="90dp"
         android:layout_height="90dp"
+        android:layout_alignParentTop="true"
+        android:layout_toRightOf="@id/story_item_favicon_borderbar_2"
         android:layout_marginTop="1dp"
         android:layout_marginBottom="1dp"
-        android:layout_toRightOf="@id/story_item_favicon_borderbar_2"
         android:visibility="gone" />
 
     <ImageView
diff --git a/clients/android/NewsBlur/res/values/dimens.xml b/clients/android/NewsBlur/res/values/dimens.xml
index 9c8116ff1..be0a2097b 100644
--- a/clients/android/NewsBlur/res/values/dimens.xml
+++ b/clients/android/NewsBlur/res/values/dimens.xml
@@ -2,5 +2,6 @@
 <resources>
     <dimen name="thumbnails_small_size">54dp</dimen>
     <dimen name="thumbnails_size">120dp</dimen>
+    <dimen name="thumbnails_corner_radius">4dp</dimen>
     <dimen name="extra_line_spacing">4dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/clients/android/NewsBlur/src/com/newsblur/database/StoryViewAdapter.java b/clients/android/NewsBlur/src/com/newsblur/database/StoryViewAdapter.java
index c66693342..401b20ffc 100644
--- a/clients/android/NewsBlur/src/com/newsblur/database/StoryViewAdapter.java
+++ b/clients/android/NewsBlur/src/com/newsblur/database/StoryViewAdapter.java
@@ -43,6 +43,7 @@ import com.newsblur.util.StoryListStyle;
 import com.newsblur.util.StoryUtils;
 import com.newsblur.util.ThumbnailStyle;
 import com.newsblur.util.UIUtils;
+import com.newsblur.view.StoryThumbnailView;
 
 /**
  * Story list adapter, RecyclerView style.
@@ -322,8 +323,8 @@ public class StoryViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
         View leftBarOne;
         View leftBarTwo;
         ImageView intelDot;
-        ImageView thumbViewRight;
-        ImageView thumbViewLeft;
+        StoryThumbnailView thumbViewRight;
+        StoryThumbnailView thumbViewLeft;
         ImageView feedIconView;
         TextView feedTitleView;
         TextView storyTitleView;
@@ -553,16 +554,12 @@ public class StoryViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
             // the view will display a stale, recycled thumb before the new one loads if the old is not cleared
             if (thumbnailStyle == ThumbnailStyle.LEFT_LARGE || thumbnailStyle == ThumbnailStyle.LEFT_SMALL) {
                 int thumbSizeGuess = vh.thumbViewLeft.getMeasuredHeight();
-                boolean roundCorners = thumbnailStyle == ThumbnailStyle.LEFT_SMALL;
-                vh.thumbViewLeft.setImageDrawable(null);
-                vh.thumbLoader = FeedUtils.thumbnailLoader.displayImage(story.thumbnailUrl, vh.thumbViewLeft, roundCorners, true, thumbSizeGuess, true);
+                vh.thumbLoader = FeedUtils.thumbnailLoader.displayImage(story.thumbnailUrl, vh.thumbViewLeft.imageView, false, true, thumbSizeGuess, true);
                 vh.thumbViewRight.setVisibility(View.GONE);
                 vh.thumbViewLeft.setVisibility(View.VISIBLE);
             } else if (thumbnailStyle == ThumbnailStyle.RIGHT_LARGE || thumbnailStyle == ThumbnailStyle.RIGHT_SMALL) {
                 int thumbSizeGuess = vh.thumbViewRight.getMeasuredHeight();
-                boolean roundCorners = thumbnailStyle == ThumbnailStyle.RIGHT_SMALL;
-                vh.thumbViewRight.setImageDrawable(null);
-                vh.thumbLoader = FeedUtils.thumbnailLoader.displayImage(story.thumbnailUrl, vh.thumbViewRight, roundCorners, true, thumbSizeGuess, true);
+                vh.thumbLoader = FeedUtils.thumbnailLoader.displayImage(story.thumbnailUrl, vh.thumbViewRight.imageView, false, true, thumbSizeGuess, true);
                 vh.thumbViewLeft.setVisibility(View.GONE);
                 vh.thumbViewRight.setVisibility(View.VISIBLE);
             }
@@ -633,8 +630,8 @@ public class StoryViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
             vh.leftBarOne.getBackground().setAlpha(255);
             vh.leftBarTwo.getBackground().setAlpha(255);
             vh.intelDot.setImageAlpha(255);
-            vh.thumbViewLeft.setImageAlpha(255);
-            vh.thumbViewRight.setImageAlpha(255);
+            vh.thumbViewLeft.imageView.setImageAlpha(255);
+            vh.thumbViewRight.imageView.setImageAlpha(255);
             vh.feedIconView.setImageAlpha(255);
             vh.feedTitleView.setAlpha(1.0f);
             vh.storyTitleView.setAlpha(1.0f);
@@ -643,8 +640,8 @@ public class StoryViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
             vh.leftBarOne.getBackground().setAlpha(READ_STORY_ALPHA_B255);
             vh.leftBarTwo.getBackground().setAlpha(READ_STORY_ALPHA_B255);
             vh.intelDot.setImageAlpha(READ_STORY_ALPHA_B255);
-            vh.thumbViewLeft.setImageAlpha(READ_STORY_ALPHA_B255);
-            vh.thumbViewRight.setImageAlpha(READ_STORY_ALPHA_B255);
+            vh.thumbViewLeft.imageView.setImageAlpha(READ_STORY_ALPHA_B255);
+            vh.thumbViewRight.imageView.setImageAlpha(READ_STORY_ALPHA_B255);
             vh.feedIconView.setImageAlpha(READ_STORY_ALPHA_B255);
             vh.feedTitleView.setAlpha(READ_STORY_ALPHA);
             vh.storyTitleView.setAlpha(READ_STORY_ALPHA);
@@ -688,20 +685,22 @@ public class StoryViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 
         RelativeLayout.LayoutParams params = null;
         if (thumbnailStyle == ThumbnailStyle.LEFT_LARGE || thumbnailStyle == ThumbnailStyle.LEFT_SMALL) {
+            vh.thumbViewLeft.setThumbnailStyle(thumbnailStyle);
             params = (RelativeLayout.LayoutParams) vh.thumbViewLeft.getLayoutParams();
         } else if (thumbnailStyle == ThumbnailStyle.RIGHT_LARGE || thumbnailStyle == ThumbnailStyle.RIGHT_SMALL) {
+            vh.thumbViewRight.setThumbnailStyle(thumbnailStyle);
             params = (RelativeLayout.LayoutParams) vh.thumbViewRight.getLayoutParams();
         }
-        if (params != null && params.height != sizeDp) {
-            params.height = sizeDp;
+        if (params != null && params.width != sizeDp) {
             params.width = sizeDp;
         }
         if (params != null && (thumbnailStyle == ThumbnailStyle.RIGHT_SMALL || thumbnailStyle == ThumbnailStyle.LEFT_SMALL)) {
-            params.addRule(RelativeLayout.CENTER_VERTICAL);
-            params.setMarginStart(UIUtils.dp2px(context, 8));
+            int verticalMargin = UIUtils.dp2px(context, 10);
+            params.setMargins(UIUtils.dp2px(context, 8), verticalMargin, 0, verticalMargin);
+            params.addRule(RelativeLayout.ALIGN_BOTTOM, vh.storySnippet.getId());
         } else if (params != null) {
-            params.addRule(RelativeLayout.ALIGN_TOP);
-            params.setMarginStart(0);
+            params.setMargins(0, 0, 0, 0);
+            params.height = sizeDp;
         }
 
         if (this.ignoreReadStatus || (! story.read)) {
diff --git a/clients/android/NewsBlur/src/com/newsblur/view/StoryThumbnailView.kt b/clients/android/NewsBlur/src/com/newsblur/view/StoryThumbnailView.kt
new file mode 100644
index 000000000..01e971575
--- /dev/null
+++ b/clients/android/NewsBlur/src/com/newsblur/view/StoryThumbnailView.kt
@@ -0,0 +1,41 @@
+package com.newsblur.view
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.FrameLayout
+import android.widget.ImageView
+import com.newsblur.R
+import com.newsblur.util.ThumbnailStyle
+
+class StoryThumbnailView : FrameLayout {
+
+    lateinit var imageView: ImageView
+
+    constructor(context: Context) : super(context) {
+        init(context)
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        init(context)
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        init(context)
+    }
+
+    private fun init(context: Context) {
+        clipToOutline = true
+        imageView = ImageView(context)
+        imageView.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
+        imageView.scaleType = ImageView.ScaleType.CENTER_CROP
+        addView(imageView)
+    }
+
+    fun setThumbnailStyle(thumbnailStyle: ThumbnailStyle) {
+        if (thumbnailStyle == ThumbnailStyle.LEFT_SMALL || thumbnailStyle == ThumbnailStyle.RIGHT_SMALL) {
+            setBackgroundResource(R.drawable.shape_story_thumbnail_small)
+        } else {
+            setBackgroundResource(0)
+        }
+    }
+}
\ No newline at end of file