pref: 优化平板适配

This commit is contained in:
HuanCheng65 2022-08-24 14:28:53 +08:00
parent 12612f1956
commit b67da26b16
No known key found for this signature in database
GPG Key ID: E9031EF91A805148
4 changed files with 12 additions and 8 deletions

View File

@ -38,13 +38,8 @@ public class ForumDivider extends RecyclerView.ItemDecoration implements Tintabl
@Override @Override
public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) { public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
super.getItemOffsets(outRect, view, parent, state); super.getItemOffsets(outRect, view, parent, state);
int position = parent.getChildAdapterPosition(view) - 1;
if (ExtensionsKt.isTablet(parent.getContext())) { if (ExtensionsKt.isTablet(parent.getContext())) {
if (position % 2 == 0) { outRect.set(mDividerHeight / 2, 0, mDividerHeight / 2, mDividerHeight);
outRect.set(0, 0, mDividerHeight / 2, mDividerHeight);
} else {
outRect.set(mDividerHeight / 2, 0, 0, mDividerHeight);
}
} else if (mOrientation == LinearLayoutManager.VERTICAL) { } else if (mOrientation == LinearLayoutManager.VERTICAL) {
outRect.set(0, 0, 0, mDividerHeight); outRect.set(0, 0, 0, mDividerHeight);
} else { } else {

View File

@ -158,7 +158,7 @@ class MyInfoFragment : BaseFragment(), View.OnClickListener, CompoundButton.OnCh
e.printStackTrace() e.printStackTrace()
mRefreshView.isRefreshing = false mRefreshView.isRefreshing = false
if (e !is TiebaException) { if (e !is TiebaException) {
Util.showNetworkErrorSnackbar(mRefreshView) { refresh(needLogin) } showErrorSnackBar(mRefreshView, e)
} else { } else {
attachContext.toastShort("错误 ${e.getErrorMessage()}") attachContext.toastShort("错误 ${e.getErrorMessage()}")
} }

View File

@ -9,12 +9,14 @@ import android.graphics.drawable.Drawable
import android.graphics.drawable.GradientDrawable import android.graphics.drawable.GradientDrawable
import android.graphics.drawable.RippleDrawable import android.graphics.drawable.RippleDrawable
import android.net.Uri import android.net.Uri
import android.util.Log
import android.view.View import android.view.View
import androidx.annotation.ColorInt import androidx.annotation.ColorInt
import androidx.browser.customtabs.CustomTabColorSchemeParams import androidx.browser.customtabs.CustomTabColorSchemeParams
import androidx.browser.customtabs.CustomTabsIntent import androidx.browser.customtabs.CustomTabsIntent
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import com.huanchengfly.tieba.post.* import com.huanchengfly.tieba.post.*
import com.huanchengfly.tieba.post.activities.ThreadActivity
import com.huanchengfly.tieba.post.activities.WebViewActivity import com.huanchengfly.tieba.post.activities.WebViewActivity
import com.huanchengfly.tieba.post.api.retrofit.exception.TiebaException import com.huanchengfly.tieba.post.api.retrofit.exception.TiebaException
import com.huanchengfly.tieba.post.ui.common.theme.utils.ColorStateListUtils import com.huanchengfly.tieba.post.ui.common.theme.utils.ColorStateListUtils
@ -132,6 +134,7 @@ fun getIntermixedColorBackground(
} }
fun launchUrl(context: Context, url: String) { fun launchUrl(context: Context, url: String) {
Log.i("launchUrl", url)
val uri = Uri.parse(url) val uri = Uri.parse(url)
val host = uri.host val host = uri.host
val path = uri.path val path = uri.path
@ -156,6 +159,12 @@ fun launchUrl(context: Context, url: String) {
return return
} }
if (!path.contains("android_asset")) { if (!path.contains("android_asset")) {
if (host == "tieba.baidu.com" && path.startsWith("/p/")) {
context.goToActivity<ThreadActivity> {
putExtra("url", url)
}
return
}
val isTiebaLink = val isTiebaLink =
host.contains("tieba.baidu.com") || host.contains("wappass.baidu.com") || host.contains( host.contains("tieba.baidu.com") || host.contains("wappass.baidu.com") || host.contains(
"ufosdk.baidu.com" "ufosdk.baidu.com"

View File

@ -16,7 +16,7 @@
window:secondaryActivityName="*/*" /> window:secondaryActivityName="*/*" />
<SplitPairFilter <SplitPairFilter
window:primaryActivityName=".activities.ThreadActivity" window:primaryActivityName=".activities.ThreadActivity"
window:secondaryActivityName="*/*" /> window:secondaryActivityName=".activities.WebViewActivity" />
<SplitPairFilter <SplitPairFilter
window:primaryActivityName=".activities.MessageActivity" window:primaryActivityName=".activities.MessageActivity"
window:secondaryActivityName=".activities.FloorActivity" /> window:secondaryActivityName=".activities.FloorActivity" />