From 94074dce9230f635238eb3592c6fcf2dd4e6404d Mon Sep 17 00:00:00 2001 From: FongMi Date: Tue, 7 Feb 2023 18:45:23 +0800 Subject: [PATCH] Clean code --- .../fongmi/android/tv/ui/activity/DetailActivity.java | 10 +++++++--- app/src/leanback/res/layout/adapter_parse.xml | 1 - app/src/leanback/res/layout/adapter_part.xml | 1 - app/src/leanback/res/layout/view_widget_vod.xml | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index dbefba8b8..9e0707de7 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -142,6 +142,10 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis return (Vod.Flag) mFlagAdapter.get(mBinding.flag.getSelectedPosition()); } + private Vod.Flag getFlag() { + return (Vod.Flag) mFlagAdapter.get(mBinding.flag.getSelectedPosition()); + } + private int getEpisodePosition() { for (int i = 0; i < mEpisodeAdapter.size(); i++) if (((Vod.Flag.Episode) mEpisodeAdapter.get(i)).isActivated()) return i; return 0; @@ -320,7 +324,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis private void getPlayer(boolean replay) { Vod.Flag.Episode item = (Vod.Flag.Episode) mEpisodeAdapter.get(getEpisodePosition()); mBinding.widget.title.setText(getString(R.string.detail_title, mBinding.name.getText(), item.getName())); - mViewModel.playerContent(getKey(), getVodFlag().getFlag(), item.getUrl()); + mViewModel.playerContent(getKey(), getFlag().getFlag(), item.getUrl()); Clock.get().setCallback(null); updateHistory(item, replay); showProgress(); @@ -404,7 +408,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis private void reverseEpisode() { for (int i = 0; i < mFlagAdapter.size(); i++) Collections.reverse(((Vod.Flag) mFlagAdapter.get(i)).getEpisodes()); - setEpisodeAdapter(getVodFlag().getEpisodes()); + setEpisodeAdapter(getFlag().getEpisodes()); mBinding.episode.setSelectedPosition(getEpisodePosition()); } @@ -704,7 +708,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis mHistory.setPosition(position); mHistory.setEpisodeUrl(item.getUrl()); mHistory.setVodRemarks(item.getName()); - mHistory.setVodFlag(getVodFlag().getFlag()); + mHistory.setVodFlag(getFlag().getFlag()); mHistory.setCreateTime(System.currentTimeMillis()); } diff --git a/app/src/leanback/res/layout/adapter_parse.xml b/app/src/leanback/res/layout/adapter_parse.xml index fa6c27582..7056279b9 100644 --- a/app/src/leanback/res/layout/adapter_parse.xml +++ b/app/src/leanback/res/layout/adapter_parse.xml @@ -10,7 +10,6 @@ android:gravity="center" android:nextFocusUp="@id/action" android:nextFocusDown="@id/timeBar" - android:singleLine="true" android:textColor="@color/text" android:textSize="14sp" tools:text="解析" /> \ No newline at end of file diff --git a/app/src/leanback/res/layout/adapter_part.xml b/app/src/leanback/res/layout/adapter_part.xml index 196533688..4cce77a36 100644 --- a/app/src/leanback/res/layout/adapter_part.xml +++ b/app/src/leanback/res/layout/adapter_part.xml @@ -10,7 +10,6 @@ android:focusableInTouchMode="true" android:gravity="center" android:nextFocusUp="@id/array" - android:singleLine="true" android:textColor="@color/white" android:textSize="16sp" tools:text="分詞" /> \ No newline at end of file diff --git a/app/src/leanback/res/layout/view_widget_vod.xml b/app/src/leanback/res/layout/view_widget_vod.xml index dd6c12837..0ef25d15a 100644 --- a/app/src/leanback/res/layout/view_widget_vod.xml +++ b/app/src/leanback/res/layout/view_widget_vod.xml @@ -86,7 +86,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:background="@drawable/shape_item_activated" + android:background="@color/black_40" android:gravity="center" android:orientation="vertical" android:padding="16dp" @@ -115,7 +115,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:background="@drawable/shape_item_activated" + android:background="@color/black_40" android:gravity="center" android:orientation="vertical" android:padding="16dp"