yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rate by tap on rating

Browse Source
This commit is contained in:
NekoInverter committed 2020-10-21 19:56:14 +08:00
1 parent cdd0cec74d
commit 081177054e
4 files changed
+44 -59
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
+17 -21
View File
@@ -49,6 +49,7 @@ import android.widget.ListView;
import android.widget.RatingBar;
import android.widget.TextView;
import androidx.annotation.DrawableRes;
import androidx.annotation.IntDef;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -212,7 +213,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
@Nullable
private TextView mShare;
@Nullable
private TextView mRate;
private View mRate;
@Nullable
private TextView mSimilar;
@Nullable
@@ -554,7 +555,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
mTorrent = (TextView) ViewUtils.$$(mActions, R.id.torrent);
mArchive = (TextView) ViewUtils.$$(mActions, R.id.archive);
mShare = (TextView) ViewUtils.$$(mActions, R.id.share);
mRate = (TextView) ViewUtils.$$(mActions, R.id.rate);
mRate = ViewUtils.$$(mActions, R.id.rate);
mSimilar = (TextView) ViewUtils.$$(mActions, R.id.similar);
mSearchCover = (TextView) ViewUtils.$$(mActions, R.id.search_cover);
mNewerVersion.setOnClickListener(this);
@@ -566,7 +567,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
mRate.setOnClickListener(this);
mSimilar.setOnClickListener(this);
mSearchCover.setOnClickListener(this);
ensureActionDrawable(context);
ensureActionDrawable();
mTags = (LinearLayout) ViewUtils.$$(belowHeader, R.id.tags);
mNoTags = (TextView) ViewUtils.$$(mTags, R.id.no_tags);
@@ -722,28 +723,23 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene
return true;
}
private void setActionDrawable(TextView text, Drawable drawable) {
private void setActionDrawable(@Nullable TextView text, @DrawableRes int resId) {
if (text == null) return;
Context context = text.getContext();
Drawable drawable = DrawableManager.getVectorDrawable(context, resId);
if (drawable == null) return;
drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
text.setCompoundDrawables(null, drawable, null, null);
}
private void ensureActionDrawable(Context context) {
Drawable heart = DrawableManager.getVectorDrawable(context, R.drawable.v_heart_primary_x48);
setActionDrawable(mHeart, heart);
Drawable heartOutline = DrawableManager.getVectorDrawable(context, R.drawable.v_heart_outline_primary_x48);
setActionDrawable(mHeartOutline, heartOutline);
Drawable torrent = DrawableManager.getVectorDrawable(context, R.drawable.v_utorrent_primary_x48);
setActionDrawable(mTorrent, torrent);
Drawable archive = DrawableManager.getVectorDrawable(context, R.drawable.v_archive_primary_x48);
setActionDrawable(mArchive, archive);
Drawable share = DrawableManager.getVectorDrawable(context, R.drawable.v_share_primary_x48);
setActionDrawable(mShare, share);
Drawable rate = DrawableManager.getVectorDrawable(context, R.drawable.v_thumb_up_primary_x48);
setActionDrawable(mRate, rate);
Drawable similar = DrawableManager.getVectorDrawable(context, R.drawable.v_similar_primary_x48);
setActionDrawable(mSimilar, similar);
Drawable searchCover = DrawableManager.getVectorDrawable(context, R.drawable.v_file_find_primary_x48);
setActionDrawable(mSearchCover, searchCover);
private void ensureActionDrawable() {
setActionDrawable(mHeart, R.drawable.v_heart_primary_x48);
setActionDrawable(mHeartOutline, R.drawable.v_heart_outline_primary_x48);
setActionDrawable(mTorrent, R.drawable.v_utorrent_primary_x48);
setActionDrawable(mArchive, R.drawable.v_archive_primary_x48);
setActionDrawable(mShare, R.drawable.v_share_primary_x48);
setActionDrawable(mSimilar, R.drawable.v_similar_primary_x48);
setActionDrawable(mSearchCover, R.drawable.v_file_find_primary_x48);
}
private boolean createCircularReveal() {
app/src/main/java/com/hippo/util/DrawableManager.java
+2 -8
View File
@@ -17,21 +17,15 @@
package com.hippo.util;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.res.ResourcesCompat;
public final class DrawableManager {
public static Drawable getVectorDrawable(@NonNull Context context, @DrawableRes int resId) {
return getVectorDrawable(context.getResources(), resId, context.getTheme());
}
public static Drawable getVectorDrawable(@NonNull Resources res,
@DrawableRes int resId, @Nullable Resources.Theme theme) {
return res.getDrawable(resId, theme);
return ResourcesCompat.getDrawable(context.getResources(), resId, context.getTheme());
}
}