From 75273ec896b369cf736f86a4a730b3c6f68fe661 Mon Sep 17 00:00:00 2001 From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com> Date: Thu, 23 Mar 2023 18:39:18 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E7=A7=BB=E5=8A=A8=20CommonCallback?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tieba/post/activities/ThreadActivity.kt | 8 +++++--- .../tieba/post/components/ClipBoardLinkDetector.kt | 14 ++++++++++---- .../post/{api => }/interfaces/CommonCallback.java | 2 +- .../tieba/post/utils/QuickPreviewUtil.kt | 2 +- 4 files changed, 17 insertions(+), 9 deletions(-) rename app/src/main/java/com/huanchengfly/tieba/post/{api => }/interfaces/CommonCallback.java (67%) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/ThreadActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/ThreadActivity.kt index dfdf0f2f..095cdbc5 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/activities/ThreadActivity.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/ThreadActivity.kt @@ -32,7 +32,6 @@ import com.huanchengfly.tieba.post.adapters.ThreadHeaderAdapter import com.huanchengfly.tieba.post.adapters.ThreadMainPostAdapter import com.huanchengfly.tieba.post.adapters.ThreadReplyAdapter import com.huanchengfly.tieba.post.api.TiebaApi -import com.huanchengfly.tieba.post.api.interfaces.CommonCallback import com.huanchengfly.tieba.post.api.models.AgreeBean import com.huanchengfly.tieba.post.api.models.CommonResponse import com.huanchengfly.tieba.post.api.models.ThreadContentBean @@ -46,6 +45,7 @@ import com.huanchengfly.tieba.post.components.dialogs.EditTextDialog import com.huanchengfly.tieba.post.fragments.threadmenu.IThreadMenuFragment import com.huanchengfly.tieba.post.fragments.threadmenu.ThreadMenuFragment import com.huanchengfly.tieba.post.goToActivity +import com.huanchengfly.tieba.post.interfaces.CommonCallback import com.huanchengfly.tieba.post.models.ReplyInfoBean import com.huanchengfly.tieba.post.models.ThreadHistoryInfoBean import com.huanchengfly.tieba.post.models.database.History @@ -687,7 +687,8 @@ class ThreadActivity : BaseActivity(), View.OnClickListener, IThreadMenuFragment DialogUtil.build(this) .setMessage(R.string.message_update_store_floor) .setPositiveButton(R.string.button_yes) { dialog: DialogInterface, _ -> - collect(object : CommonCallback { + collect(object : + CommonCallback { override fun onSuccess(data: CommonResponse) { Toast.makeText( this@ThreadActivity, @@ -1003,7 +1004,8 @@ class ThreadActivity : BaseActivity(), View.OnClickListener, IThreadMenuFragment }) } else { - collect(object : CommonCallback { + collect(object : + CommonCallback { override fun onSuccess(data: CommonResponse) { Toast.makeText( this@ThreadActivity, diff --git a/app/src/main/java/com/huanchengfly/tieba/post/components/ClipBoardLinkDetector.kt b/app/src/main/java/com/huanchengfly/tieba/post/components/ClipBoardLinkDetector.kt index ff7b6414..42e04f3a 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/components/ClipBoardLinkDetector.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/components/ClipBoardLinkDetector.kt @@ -13,12 +13,17 @@ import android.widget.ImageView import android.widget.TextView import com.huanchengfly.tieba.post.App import com.huanchengfly.tieba.post.R -import com.huanchengfly.tieba.post.api.interfaces.CommonCallback import com.huanchengfly.tieba.post.dpToPx +import com.huanchengfly.tieba.post.interfaces.CommonCallback import com.huanchengfly.tieba.post.ui.common.theme.utils.ThemeUtils -import com.huanchengfly.tieba.post.utils.* +import com.huanchengfly.tieba.post.utils.DialogUtil +import com.huanchengfly.tieba.post.utils.ImageUtil +import com.huanchengfly.tieba.post.utils.QuickPreviewUtil +import com.huanchengfly.tieba.post.utils.Util +import com.huanchengfly.tieba.post.utils.getClipBoardText +import com.huanchengfly.tieba.post.utils.getClipBoardTimestamp import org.intellij.lang.annotations.RegExp -import java.util.* +import java.util.Objects import java.util.regex.Pattern object ClipBoardLinkDetector : Application.ActivityLifecycleCallbacks { @@ -144,7 +149,8 @@ object ClipBoardLinkDetector : Application.ActivityLifecycleCallbacks { QuickPreviewUtil.getPreviewInfo( activity, url, - object : CommonCallback { + object : + CommonCallback { override fun onSuccess(data: QuickPreviewUtil.PreviewInfo) { updatePreviewView(activity, previewView, data) } diff --git a/app/src/main/java/com/huanchengfly/tieba/post/api/interfaces/CommonCallback.java b/app/src/main/java/com/huanchengfly/tieba/post/interfaces/CommonCallback.java similarity index 67% rename from app/src/main/java/com/huanchengfly/tieba/post/api/interfaces/CommonCallback.java rename to app/src/main/java/com/huanchengfly/tieba/post/interfaces/CommonCallback.java index 9739a239..029e0085 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/api/interfaces/CommonCallback.java +++ b/app/src/main/java/com/huanchengfly/tieba/post/interfaces/CommonCallback.java @@ -1,4 +1,4 @@ -package com.huanchengfly.tieba.post.api.interfaces; +package com.huanchengfly.tieba.post.interfaces; public interface CommonCallback { void onSuccess(T data); diff --git a/app/src/main/java/com/huanchengfly/tieba/post/utils/QuickPreviewUtil.kt b/app/src/main/java/com/huanchengfly/tieba/post/utils/QuickPreviewUtil.kt index 037b8b0d..41908e31 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/utils/QuickPreviewUtil.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/utils/QuickPreviewUtil.kt @@ -6,10 +6,10 @@ import android.text.TextUtils import androidx.annotation.DrawableRes import com.huanchengfly.tieba.post.R import com.huanchengfly.tieba.post.api.TiebaApi -import com.huanchengfly.tieba.post.api.interfaces.CommonCallback import com.huanchengfly.tieba.post.api.models.ForumPageBean import com.huanchengfly.tieba.post.api.models.ThreadContentBean import com.huanchengfly.tieba.post.api.retrofit.exception.TiebaException +import com.huanchengfly.tieba.post.interfaces.CommonCallback import retrofit2.Call import retrofit2.Callback import retrofit2.Response