From f0bd55f00f537d262ce6ce65a3cad9cf101686c1 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Feb 2024 17:31:26 +0800 Subject: [PATCH 1/5] Fix collect layout --- app/src/mobile/AndroidManifest.xml | 3 ++- app/src/mobile/res/layout/activity_collect.xml | 4 ++-- app/src/mobile/res/layout/adapter_collect_record.xml | 2 +- app/src/mobile/res/layout/adapter_collect_word.xml | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/mobile/AndroidManifest.xml b/app/src/mobile/AndroidManifest.xml index c9ecbaecf..db303f5a3 100644 --- a/app/src/mobile/AndroidManifest.xml +++ b/app/src/mobile/AndroidManifest.xml @@ -72,7 +72,8 @@ + android:screenOrientation="fullUser" + android:windowSoftInputMode="adjustPan" /> @@ -92,10 +92,10 @@ android:id="@+id/wordRecycler" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_margin="10dp" android:clipChildren="false" android:clipToPadding="false" android:overScrollMode="never" - android:padding="8dp" tools:itemCount="5" tools:listitem="@layout/adapter_collect_word" /> diff --git a/app/src/mobile/res/layout/adapter_collect_record.xml b/app/src/mobile/res/layout/adapter_collect_record.xml index f82f511b7..9cfd4231d 100644 --- a/app/src/mobile/res/layout/adapter_collect_record.xml +++ b/app/src/mobile/res/layout/adapter_collect_record.xml @@ -4,7 +4,7 @@ android:id="@+id/text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_margin="6dp" android:background="@drawable/selector_item_round" android:ellipsize="marquee" android:singleLine="true" diff --git a/app/src/mobile/res/layout/adapter_collect_word.xml b/app/src/mobile/res/layout/adapter_collect_word.xml index a31820b25..a2ed04857 100644 --- a/app/src/mobile/res/layout/adapter_collect_word.xml +++ b/app/src/mobile/res/layout/adapter_collect_word.xml @@ -4,7 +4,7 @@ android:id="@+id/text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_margin="6dp" android:background="@drawable/selector_item_round" android:ellipsize="marquee" android:singleLine="true" From 8278b794a4b56538639096b18586b919fce52732 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Feb 2024 18:43:19 +0800 Subject: [PATCH 2/5] Fix collect layout --- app/src/mobile/res/layout/activity_collect.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/mobile/res/layout/activity_collect.xml b/app/src/mobile/res/layout/activity_collect.xml index 734f0a035..bdf30c22d 100644 --- a/app/src/mobile/res/layout/activity_collect.xml +++ b/app/src/mobile/res/layout/activity_collect.xml @@ -63,6 +63,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" + android:layout_marginBottom="16dp" android:text="@string/search_record" android:textColor="@color/white" android:textSize="18sp" /> @@ -71,10 +72,13 @@ android:id="@+id/recordRecycler" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="10dp" + android:layout_marginTop="-10dp" android:clipChildren="false" android:clipToPadding="false" android:overScrollMode="never" + android:paddingStart="10dp" + android:paddingEnd="10dp" + android:paddingBottom="10dp" tools:itemCount="5" tools:listitem="@layout/adapter_collect_record" /> @@ -84,6 +88,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" + android:layout_marginBottom="16dp" android:text="@string/search_hot" android:textColor="@color/white" android:textSize="18sp" /> @@ -92,10 +97,13 @@ android:id="@+id/wordRecycler" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_margin="10dp" + android:layout_marginTop="-10dp" android:clipChildren="false" android:clipToPadding="false" android:overScrollMode="never" + android:paddingStart="10dp" + android:paddingEnd="10dp" + android:paddingBottom="10dp" tools:itemCount="5" tools:listitem="@layout/adapter_collect_word" /> From 7a66bbe446e391b2336593dbe9f9e52e21107adb Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Feb 2024 19:53:12 +0800 Subject: [PATCH 3/5] Fix collect layout --- app/src/mobile/res/layout/activity_collect.xml | 16 ++++++++-------- .../mobile/res/layout/adapter_collect_record.xml | 2 +- .../mobile/res/layout/adapter_collect_word.xml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/mobile/res/layout/activity_collect.xml b/app/src/mobile/res/layout/activity_collect.xml index bdf30c22d..1e8d575a3 100644 --- a/app/src/mobile/res/layout/activity_collect.xml +++ b/app/src/mobile/res/layout/activity_collect.xml @@ -72,13 +72,13 @@ android:id="@+id/recordRecycler" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="-10dp" + android:layout_marginTop="-8dp" android:clipChildren="false" android:clipToPadding="false" android:overScrollMode="never" - android:paddingStart="10dp" - android:paddingEnd="10dp" - android:paddingBottom="10dp" + android:paddingStart="8dp" + android:paddingEnd="8dp" + android:paddingBottom="8dp" tools:itemCount="5" tools:listitem="@layout/adapter_collect_record" /> @@ -97,13 +97,13 @@ android:id="@+id/wordRecycler" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="-10dp" + android:layout_marginTop="-8dp" android:clipChildren="false" android:clipToPadding="false" android:overScrollMode="never" - android:paddingStart="10dp" - android:paddingEnd="10dp" - android:paddingBottom="10dp" + android:paddingStart="8dp" + android:paddingEnd="8dp" + android:paddingBottom="8dp" tools:itemCount="5" tools:listitem="@layout/adapter_collect_word" /> diff --git a/app/src/mobile/res/layout/adapter_collect_record.xml b/app/src/mobile/res/layout/adapter_collect_record.xml index 9cfd4231d..f82f511b7 100644 --- a/app/src/mobile/res/layout/adapter_collect_record.xml +++ b/app/src/mobile/res/layout/adapter_collect_record.xml @@ -4,7 +4,7 @@ android:id="@+id/text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="6dp" + android:layout_margin="8dp" android:background="@drawable/selector_item_round" android:ellipsize="marquee" android:singleLine="true" diff --git a/app/src/mobile/res/layout/adapter_collect_word.xml b/app/src/mobile/res/layout/adapter_collect_word.xml index a2ed04857..a31820b25 100644 --- a/app/src/mobile/res/layout/adapter_collect_word.xml +++ b/app/src/mobile/res/layout/adapter_collect_word.xml @@ -4,7 +4,7 @@ android:id="@+id/text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="6dp" + android:layout_margin="8dp" android:background="@drawable/selector_item_round" android:ellipsize="marquee" android:singleLine="true" From e8393c2774c85d783b048c57256d03fe04aed5f5 Mon Sep 17 00:00:00 2001 From: okjack Date: Fri, 16 Feb 2024 20:00:55 +0800 Subject: [PATCH 4/5] incognito,episode --- .../fongmi/android/tv/ui/activity/VideoActivity.java | 12 ++++++++---- .../fongmi/android/tv/ui/dialog/EpisodeDialog.java | 4 ++++ app/src/main/res/values-zh-rCN/strings.xml | 2 +- .../fongmi/android/tv/ui/activity/VideoActivity.java | 1 - 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 94f910368..d3baeecfc 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -288,6 +288,11 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List private void setEpisodeSelectedPosition(int position) { getEpisodeView().setSelectedPosition(position); + if (hasKeyEvent) return; + getEpisodeView().postDelayed(() -> { + View selectedItem = getEpisodeView().getLayoutManager().findViewByPosition(position); + if (selectedItem != null) selectedItem.requestFocus(); + }, 300); } private boolean isReplay() { @@ -367,10 +372,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List mBinding.flag.addOnChildViewHolderSelectedListener(new OnChildViewHolderSelectedListener() { @Override public void onChildViewHolderSelected(@NonNull RecyclerView parent, @Nullable RecyclerView.ViewHolder child, int position, int subposition) { - if (mFlagAdapter.size() > 0) { - setFlagActivated((Flag) mFlagAdapter.get(position)); - hasKeyEvent = false; - } + if (mFlagAdapter.size() > 0) setFlagActivated((Flag) mFlagAdapter.get(position)); } }); getEpisodeView().addOnChildViewHolderSelectedListener(new OnChildViewHolderSelectedListener() { @@ -738,6 +740,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } private void updateFocus() { + hasKeyEvent = false; mEpisodePresenter.setNextFocusDown(findFocusDown(Setting.getEpisode() == 0 ? 2 : 4)); mEpisodePresenter.setNextFocusUp(findFocusUp(Setting.getEpisode() == 0 ? 2 : 4)); mQualityAdapter.setNextFocusDown(findFocusDown(1)); @@ -1079,6 +1082,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List private void showControl(View view) { mBinding.control.danmu.setVisibility(mBinding.danmaku.isPrepared() ? View.VISIBLE : View.GONE); mBinding.control.getRoot().setVisibility(View.VISIBLE); + mBinding.control.episodes.setVisibility(Setting.getFullscreenMenuKey() == 0 ? View.VISIBLE : View.GONE); view.requestFocus(); setR1Callback(); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/EpisodeDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/EpisodeDialog.java index 07d444f16..be4383fb5 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/EpisodeDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/EpisodeDialog.java @@ -152,6 +152,10 @@ public class EpisodeDialog extends BaseDialog implements ArrayPresenter.OnClickL this.binding.episodeVert.postDelayed(() -> { int position = getEpisodePosition(); setEpisodeSelectedPosition(position); + binding.episodeVert.postDelayed(() -> { + View selectedItem = binding.episodeVert.getLayoutManager().findViewByPosition(position); + if (selectedItem != null) selectedItem.requestFocus(); + }, 300); }, 1000); } diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 598346413..e1ce33d56 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -78,7 +78,7 @@ 图片尺寸 全屏菜单键 首页源锁定 - 無痕模式 + 无痕模式 DoH Proxy 缓存 diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index f75043e2d..648e44901 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -1194,7 +1194,6 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo mHistory.setPosition(position = mPlayers.getPosition()); mHistory.setDuration(duration = mPlayers.getDuration()); if (position >= 0 && duration > 0 && !Setting.isIncognito()) App.execute(() -> mHistory.update()); - if (position >= 0 && duration > 0) App.execute(() -> mHistory.update()); if (mHistory.getEnding() > 0 && duration > 0 && mHistory.getEnding() + position >= duration) { mClock.setCallback(null); checkNext(); From 6a2397a8f9dff984c0c11042a6900acaa59013f3 Mon Sep 17 00:00:00 2001 From: okjack Date: Fri, 16 Feb 2024 20:08:59 +0800 Subject: [PATCH 5/5] build.gradle --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index ed1278737..eea185135 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk 21 targetSdk 28 versionCode 225 - versionName "0214" + versionName "0217" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]