From 9cf712395b2383438cd8ac985bf42d3cd2ac21c7 Mon Sep 17 00:00:00 2001 From: okjack Date: Fri, 1 Mar 2024 08:41:35 +0800 Subject: [PATCH 1/5] update --- app/src/main/java/com/fongmi/android/tv/Setting.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/src/main/java/com/fongmi/android/tv/Setting.java b/app/src/main/java/com/fongmi/android/tv/Setting.java index e8da2c1e6..d5873bb75 100644 --- a/app/src/main/java/com/fongmi/android/tv/Setting.java +++ b/app/src/main/java/com/fongmi/android/tv/Setting.java @@ -421,6 +421,14 @@ public class Setting { return Prefers.getInt("small_window_back_key", 0); } + public static void putHomeChangeConfig(boolean change) { + Prefers.put("home_change_config", change); + } + + public static boolean isHomeChangeConfig() { + return Prefers.getBoolean("home_change_config", false); + } + public static boolean isAggregatedSearch() { return Prefers.getBoolean("aggregated_search", false); } From 8d5511e4eb804a18ae86f9466d0c3d531eb4a4b4 Mon Sep 17 00:00:00 2001 From: okjack Date: Sat, 2 Mar 2024 22:07:11 +0800 Subject: [PATCH 2/5] update --- app/src/leanback/java/com/fongmi/android/tv/bean/Func.java | 2 +- .../java/com/fongmi/android/tv/ui/activity/HomeActivity.java | 2 +- app/src/leanback/res/values-zh-rCN/strings.xml | 3 ++- app/src/leanback/res/values-zh-rTW/strings.xml | 3 ++- app/src/leanback/res/values/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 4 ++-- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/bean/Func.java b/app/src/leanback/java/com/fongmi/android/tv/bean/Func.java index e0b5446f0..3a187dfbe 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/bean/Func.java +++ b/app/src/leanback/java/com/fongmi/android/tv/bean/Func.java @@ -59,7 +59,7 @@ public class Func { @SuppressLint("NonConstantResourceId") public void setDrawable() { switch (resId) { - case R.string.home_history: + case R.string.home_history_short: this.drawable = R.drawable.ic_home_history; break; case R.string.home_vod: diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java index ba9a5598c..1be613d03 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java @@ -280,7 +280,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen adapter.add(Func.create(R.string.home_search)); adapter.add(Func.create(R.string.home_keep)); adapter.add(Func.create(R.string.home_push)); - if (Setting.getHomeMenuKey() == 1 || Setting.getHomeMenuKey() == 2) adapter.add(Func.create(R.string.home_history)); + if (Setting.getHomeMenuKey() == 1 || Setting.getHomeMenuKey() == 2) adapter.add(Func.create(R.string.home_history_short)); adapter.add(Func.create(R.string.home_setting)); ((Func) adapter.get(0)).setNextFocusLeft(((Func) adapter.get(adapter.size() - 1)).getId()); ((Func) adapter.get(adapter.size() - 1)).setNextFocusRight(((Func) adapter.get(0)).getId()); diff --git a/app/src/leanback/res/values-zh-rCN/strings.xml b/app/src/leanback/res/values-zh-rCN/strings.xml index 3cbe4c886..3a2ff55db 100644 --- a/app/src/leanback/res/values-zh-rCN/strings.xml +++ b/app/src/leanback/res/values-zh-rCN/strings.xml @@ -7,7 +7,8 @@ 收藏 推送 设置 - 历史 + 历史 + 最近观看 更新推荐 diff --git a/app/src/leanback/res/values-zh-rTW/strings.xml b/app/src/leanback/res/values-zh-rTW/strings.xml index fd040fbaa..2c06cf082 100644 --- a/app/src/leanback/res/values-zh-rTW/strings.xml +++ b/app/src/leanback/res/values-zh-rTW/strings.xml @@ -7,7 +7,8 @@ 收藏 推送 設定 - 歷史 + 歷史 + 最近觀看 更新推薦 diff --git a/app/src/leanback/res/values/strings.xml b/app/src/leanback/res/values/strings.xml index b091a85d3..b3343d098 100644 --- a/app/src/leanback/res/values/strings.xml +++ b/app/src/leanback/res/values/strings.xml @@ -7,6 +7,7 @@ Keep Push Setting + History History Recommend diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 0b18aa94a..0b7803d9b 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -78,11 +78,11 @@ 圖片尺寸 聚合搜索 全屏選單鍵 - 首页選單鍵 + 首頁選單鍵 首頁源鎖定 無痕模式 小窗返回鍵 - 首页換線 + 首頁換線 DoH Proxy 暫存 From a506d87ca7e4ab08d75cc0158206cd76a1ab892d Mon Sep 17 00:00:00 2001 From: FongMi Date: Sat, 2 Mar 2024 22:16:36 +0800 Subject: [PATCH 3/5] Fix search focus --- .../android/tv/ui/custom/CustomEditText.java | 18 ++++++++++++++++++ .../leanback/res/layout/activity_search.xml | 2 ++ 2 files changed, 20 insertions(+) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomEditText.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomEditText.java index a3d63f990..b9059c222 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomEditText.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomEditText.java @@ -3,6 +3,8 @@ package com.fongmi.android.tv.ui.custom; import android.content.Context; import android.graphics.Rect; import android.util.AttributeSet; +import android.view.KeyEvent; +import android.view.View; import android.view.animation.Animation; import androidx.annotation.NonNull; @@ -10,6 +12,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.widget.AppCompatEditText; import com.fongmi.android.tv.R; +import com.fongmi.android.tv.utils.KeyUtil; import com.fongmi.android.tv.utils.ResUtil; public class CustomEditText extends AppCompatEditText { @@ -25,11 +28,26 @@ public class CustomEditText extends AppCompatEditText { flicker = ResUtil.getAnim(R.anim.flicker); } + private View focusSearch(KeyEvent event) { + if (KeyUtil.isUpKey(event)) return getParent().focusSearch(this, FOCUS_UP); + if (KeyUtil.isDownKey(event)) return getParent().focusSearch(this, FOCUS_DOWN); + if (KeyUtil.isLeftKey(event) && getSelectionStart() == 0) return getParent().focusSearch(this, FOCUS_LEFT); + if (KeyUtil.isRightKey(event) && getSelectionStart() == getText().length()) return getParent().focusSearch(this, FOCUS_RIGHT); + return null; + } + @Override public boolean isFocused() { return true; } + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + View view = focusSearch(event); + if (view != null) view.requestFocus(); + return super.onKeyDown(keyCode, event); + } + @Override protected void onFocusChanged(boolean gainFocus, int direction, @Nullable Rect previouslyFocusedRect) { super.onFocusChanged(gainFocus, direction, previouslyFocusedRect); diff --git a/app/src/leanback/res/layout/activity_search.xml b/app/src/leanback/res/layout/activity_search.xml index 7f222250f..3c338fee8 100644 --- a/app/src/leanback/res/layout/activity_search.xml +++ b/app/src/leanback/res/layout/activity_search.xml @@ -65,6 +65,8 @@ android:layout_marginBottom="16dp" android:layout_toEndOf="@+id/mic" android:background="@null" + android:focusable="true" + android:focusableInTouchMode="true" android:hint="@string/search_keyword" android:imeOptions="actionDone" android:inputType="textCapWords|textAutoCorrect|textAutoComplete" From 8b4c99c1c42cdd4f9e87c6d9165f6a0f9b8a0ae4 Mon Sep 17 00:00:00 2001 From: FongMi Date: Sat, 2 Mar 2024 23:45:14 +0800 Subject: [PATCH 4/5] Fix search focus --- .../java/com/fongmi/android/tv/ui/custom/CustomEditText.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomEditText.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomEditText.java index b9059c222..aed954f1e 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomEditText.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomEditText.java @@ -43,8 +43,8 @@ public class CustomEditText extends AppCompatEditText { @Override public boolean onKeyDown(int keyCode, KeyEvent event) { - View view = focusSearch(event); - if (view != null) view.requestFocus(); + View v = focusSearch(event); + if (v != null) return v.requestFocus(); return super.onKeyDown(keyCode, event); } From 43bfbb56dad1907afbbe92ed1f1b2f19c96f6f5e Mon Sep 17 00:00:00 2001 From: okjack Date: Sun, 3 Mar 2024 08:20:38 +0800 Subject: [PATCH 5/5] build.gradle --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index eb12aee33..771101b03 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.fongmi.android.tv" minSdk 21 targetSdk 28 - versionCode 228 - versionName "0301" + versionCode 229 + versionName "2.2.9" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]