public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-21 05:45:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

#1482 Tall story thumbnails

Browse source
This commit is contained in:
sictiru 2021-06-30 06:31:42 -07:00
parent 73c3714401
commit bab852f903
5 changed files with 68 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clients/android/NewsBlur/res/drawable/shape_story_thumbnail_small.xml Normal file
View file

@ -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>

8
clients/android/NewsBlur/res/layout/view_story_row.xml
View file

@ -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

1
clients/android/NewsBlur/res/values/dimens.xml
View file

@ -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>

35
clients/android/NewsBlur/src/com/newsblur/database/StoryViewAdapter.java
View file

@ -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)) {

41
clients/android/NewsBlur/src/com/newsblur/view/StoryThumbnailView.kt Normal file
View file

@ -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)
}
}
}