From a8fd6628982cf533316c549fa5dcbd03f2335098 Mon Sep 17 00:00:00 2001 From: HuanCheng65 <609486518@qq.com> Date: Sun, 10 Apr 2022 13:12:15 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=8D=A2=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../activities/TranslucentThemeActivity.kt | 8 +-- .../post/adapters/InsertPhotoAdapter.java | 4 +- .../tieba/post/components/MyImageEngine.java | 66 ------------------- 4 files changed, 7 insertions(+), 73 deletions(-) delete mode 100644 app/src/main/java/com/huanchengfly/tieba/post/components/MyImageEngine.java diff --git a/README.md b/README.md index 583200ea..10703907 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ #

Tieba Lite

- CircleCI + CircleCI Status diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/TranslucentThemeActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/TranslucentThemeActivity.kt index 0a7d5e6e..6101c8d3 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/activities/TranslucentThemeActivity.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/TranslucentThemeActivity.kt @@ -35,7 +35,6 @@ import com.huanchengfly.tieba.post.adapters.TranslucentThemeColorAdapter import com.huanchengfly.tieba.post.adapters.WallpaperAdapter import com.huanchengfly.tieba.post.api.LiteApi import com.huanchengfly.tieba.post.api.retrofit.doIfSuccess -import com.huanchengfly.tieba.post.components.MyImageEngine import com.huanchengfly.tieba.post.components.MyLinearLayoutManager import com.huanchengfly.tieba.post.components.dividers.HorizontalSpacesDecoration import com.huanchengfly.tieba.post.components.transformations.BlurTransformation @@ -52,6 +51,7 @@ import com.yanzhenjie.permission.Action import com.yanzhenjie.permission.runtime.Permission import com.zhihu.matisse.Matisse import com.zhihu.matisse.MimeType +import com.zhihu.matisse.engine.impl.GlideEngine import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.launch import java.io.File @@ -457,9 +457,9 @@ class TranslucentThemeActivity : BaseActivity(), View.OnClickListener, OnSeekBar } R.id.select_pic -> askPermission { Matisse.from(this) - .choose(MimeType.ofImage()) - .theme(if (ThemeUtil.isNightMode(this)) R.style.Matisse_Dracula else R.style.Matisse_Zhihu) - .imageEngine(MyImageEngine()) + .choose(MimeType.ofImage()) + .theme(if (ThemeUtil.isNightMode(this)) R.style.Matisse_Dracula else R.style.Matisse_Zhihu) + .imageEngine(GlideEngine()) .forResult(REQUEST_CODE_CHOOSE) } R.id.custom_color -> { diff --git a/app/src/main/java/com/huanchengfly/tieba/post/adapters/InsertPhotoAdapter.java b/app/src/main/java/com/huanchengfly/tieba/post/adapters/InsertPhotoAdapter.java index 566ea5e6..4adf96b6 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/adapters/InsertPhotoAdapter.java +++ b/app/src/main/java/com/huanchengfly/tieba/post/adapters/InsertPhotoAdapter.java @@ -16,7 +16,6 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.huanchengfly.tieba.post.R; import com.huanchengfly.tieba.post.activities.ReplyActivity; -import com.huanchengfly.tieba.post.components.MyImageEngine; import com.huanchengfly.tieba.post.components.MyViewHolder; import com.huanchengfly.tieba.post.components.transformations.RadiusTransformation; import com.huanchengfly.tieba.post.models.PhotoInfoBean; @@ -26,6 +25,7 @@ import com.yanzhenjie.permission.Action; import com.yanzhenjie.permission.runtime.Permission; import com.zhihu.matisse.Matisse; import com.zhihu.matisse.MimeType; +import com.zhihu.matisse.engine.impl.GlideEngine; import java.util.ArrayList; import java.util.Collections; @@ -97,7 +97,7 @@ public class InsertPhotoAdapter extends RecyclerView.Adapter { .countable(true) .maxSelectable(10 - fileList.size()) .theme(ThemeUtil.isNightMode(mContext) ? R.style.Matisse_Dracula : R.style.Matisse_Zhihu) - .imageEngine(new MyImageEngine()) + .imageEngine(new GlideEngine()) .forResult(ReplyActivity.REQUEST_CODE_CHOOSE)); } }); diff --git a/app/src/main/java/com/huanchengfly/tieba/post/components/MyImageEngine.java b/app/src/main/java/com/huanchengfly/tieba/post/components/MyImageEngine.java deleted file mode 100644 index 85d82095..00000000 --- a/app/src/main/java/com/huanchengfly/tieba/post/components/MyImageEngine.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.huanchengfly.tieba.post.components; - -import android.content.Context; -import android.graphics.drawable.Drawable; -import android.net.Uri; -import android.widget.ImageView; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.Priority; -import com.bumptech.glide.request.RequestOptions; -import com.zhihu.matisse.engine.ImageEngine; - -public class MyImageEngine implements ImageEngine { - - @Override - public void loadThumbnail(Context context, int resize, Drawable placeholder, ImageView imageView, Uri uri) { - Glide.with(context) - .asBitmap() - .load(uri) - .apply(new RequestOptions() - .centerCrop() - .placeholder(placeholder) - .override(resize, resize)) - .into(imageView); - } - - @Override - public void loadGifThumbnail(Context context, int resize, Drawable placeholder, ImageView imageView, - Uri uri) { - Glide.with(context) - .asBitmap() - .load(uri) - .apply(new RequestOptions() - .placeholder(placeholder) - .override(resize, resize) - .centerCrop()) - .into(imageView); - } - - @Override - public void loadImage(Context context, int resizeX, int resizeY, ImageView imageView, Uri uri) { - Glide.with(context) - .load(uri) - .apply(new RequestOptions() - .override(resizeX, resizeY) - .priority(Priority.HIGH) - .fitCenter()) - .into(imageView); - } - - @Override - public void loadGifImage(Context context, int resizeX, int resizeY, ImageView imageView, Uri uri) { - Glide.with(context) - .asGif() - .load(uri) - .apply(new RequestOptions() - .override(resizeX, resizeY) - .priority(Priority.HIGH)) - .into(imageView); - } - - @Override - public boolean supportAnimatedGif() { - return true; - } -}