From 1c7d2ffcddec1d4173ab8c51fecf660da7b09e85 Mon Sep 17 00:00:00 2001 From: FongMi Date: Sun, 12 Mar 2023 12:54:24 +0800 Subject: [PATCH] [mobile] clean code --- .../tv/ui/activity/DetailActivity.java | 29 ++++--------------- app/src/mobile/res/layout/activity_detail.xml | 13 --------- app/src/mobile/res/values-zh-rCN/strings.xml | 2 -- app/src/mobile/res/values-zh-rTW/strings.xml | 2 -- app/src/mobile/res/values/strings.xml | 2 -- 5 files changed, 5 insertions(+), 43 deletions(-) diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index d70952cbd..e01b0ee72 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -8,13 +8,11 @@ import android.content.res.Configuration; import android.graphics.Rect; import android.os.Bundle; import android.text.Html; -import android.text.Layout; import android.util.Rational; import android.util.TypedValue; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -import android.view.ViewTreeObserver; import android.widget.RelativeLayout; import android.widget.TextView; @@ -210,7 +208,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis protected void initEvent() { mBinding.control.seek.setListener(mPlayers); mBinding.name.setOnClickListener(view -> onName()); - mBinding.more.setOnClickListener(view -> onMore()); + mBinding.content.setOnClickListener(view -> onContent()); mBinding.reverse.setOnClickListener(view -> onReverse()); mBinding.control.full.setOnClickListener(view -> onFull()); mBinding.control.keep.setOnClickListener(view -> onKeep()); @@ -341,7 +339,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis setOther(mBinding.other, item); checkFlag(item); checkKeepImg(); - checkLine(); } private void setText(TextView view, int resId, String text) { @@ -359,21 +356,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis view.setText(Utils.substring(sb.toString(), 2)); } - private void checkLine() { - mBinding.content.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { - @Override - public void onGlobalLayout() { - mBinding.content.getViewTreeObserver().removeOnGlobalLayoutListener(this); - Layout layout = mBinding.content.getLayout(); - if (layout != null) { - int lines = layout.getLineCount() - 1; - boolean ellipse = layout.getEllipsisCount(lines) > 0; - mBinding.more.setVisibility(ellipse ? View.VISIBLE : View.GONE); - } - } - }); - } - @Override public void onItemClick(Vod.Flag item) { if (item.isActivated()) return; @@ -425,9 +407,8 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis initSearch(name, false); } - private void onMore() { - boolean more = getString(R.string.detail_content_expand).equals(mBinding.more.getText().toString()); - mBinding.more.setText(more ? R.string.detail_content_collapse : R.string.detail_content_expand); + private void onContent() { + boolean more = mBinding.content.getMaxLines() == 2; mBinding.content.setMaxLines(more ? Integer.MAX_VALUE : 2); } @@ -1092,8 +1073,8 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis @Override public void onConfigurationChanged(@NonNull Configuration newConfig) { super.onConfigurationChanged(newConfig); - if (ResUtil.isLand(this)) enterFullscreen(); - else if (ResUtil.isPort(this) && !isRotate()) exitFullscreen(); + if (ResUtil.isPort(this) && !isRotate()) exitFullscreen(); + else if (ResUtil.isLand(this)) enterFullscreen(); else if (isFullscreen()) Utils.hideSystemUI(this); } diff --git a/app/src/mobile/res/layout/activity_detail.xml b/app/src/mobile/res/layout/activity_detail.xml index 5385e3f7c..ec97bd7ed 100644 --- a/app/src/mobile/res/layout/activity_detail.xml +++ b/app/src/mobile/res/layout/activity_detail.xml @@ -234,19 +234,6 @@ android:textSize="14sp" tools:text="一個身世神秘的少年范閒（張若昀飾），因對自身身世的好奇而離開故鄉澹州，前赴南慶京都。范閒在京中各大勢力之間遊走，以探查自己屢遭刺殺的原因。其間結識靖王世子、二皇子，與太子、長公主等人對抗，並遊歷四方、闖蕩江湖，卻意外發現這世界隱藏著的秘密。本劇第一季上半部主要描述范閒在南慶京都追查刺殺的幕後黑手，京中各式人等對范閒繼承內庫的態度和應對，以及監察院院長陳萍萍希望范閒接掌監察院所做的一切舉動。下半部劇情發生在北齊上京。南慶駐北齊上京諜報首領言冰雲被北齊官方抓獲，慶帝與陳萍萍同意用已被關在監察院大牢多年的前北魏諜報首領肖恩交換言冰雲，並派范閒親率南慶使團負責此事。" /> - - 线路 选集 简介 - 展开 - 收起 快搜“%s” \ No newline at end of file diff --git a/app/src/mobile/res/values-zh-rTW/strings.xml b/app/src/mobile/res/values-zh-rTW/strings.xml index 726e7ca89..83ba36225 100644 --- a/app/src/mobile/res/values-zh-rTW/strings.xml +++ b/app/src/mobile/res/values-zh-rTW/strings.xml @@ -13,8 +13,6 @@ 線路 選集 簡介 - 展開 - 收起 快搜「%s」 \ No newline at end of file diff --git a/app/src/mobile/res/values/strings.xml b/app/src/mobile/res/values/strings.xml index efd758f49..253f83dde 100644 --- a/app/src/mobile/res/values/strings.xml +++ b/app/src/mobile/res/values/strings.xml @@ -13,8 +13,6 @@ Flag Episode Summary - Expand - Collapse Searching %s \ No newline at end of file