Merge pull request #410 from Silent1566/dev2

merge: 合并 origin/beta 最新代码（PR#407-#409）并复评修复 TV 浅色迁移的日间白底白字回归
2026-10-08 19:44:46 +00:00 · 2026-10-06 19:27:21 +08:00 · 2026-10-06 19:27:21 +08:00 · 414babc1b5
commit 414babc1b5
parent cb82755ae8 990f8039d7
65 changed files with 1365 additions and 510 deletions
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ThemeDialog.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ThemeDialog.java
--- a/app/src/leanback/res/layout/activity_setting.xml
+++ b/app/src/leanback/res/layout/activity_setting.xml
--- a/app/src/leanback/res/layout/activity_setting_ad.xml
+++ b/app/src/leanback/res/layout/activity_setting_ad.xml
--- a/app/src/leanback/res/layout/activity_setting_ai.xml
+++ b/app/src/leanback/res/layout/activity_setting_ai.xml
--- a/app/src/leanback/res/layout/activity_setting_appearance.xml
+++ b/app/src/leanback/res/layout/activity_setting_appearance.xml
--- a/app/src/leanback/res/layout/activity_setting_danmaku.xml
+++ b/app/src/leanback/res/layout/activity_setting_danmaku.xml
--- a/app/src/leanback/res/layout/activity_setting_enhance.xml
+++ b/app/src/leanback/res/layout/activity_setting_enhance.xml
--- a/app/src/leanback/res/layout/activity_setting_personal.xml
+++ b/app/src/leanback/res/layout/activity_setting_personal.xml
--- a/app/src/leanback/res/layout/activity_setting_player.xml
+++ b/app/src/leanback/res/layout/activity_setting_player.xml
--- a/app/src/leanback/res/layout/activity_setting_subtitle.xml
+++ b/app/src/leanback/res/layout/activity_setting_subtitle.xml
--- a/app/src/leanback/res/layout/activity_setting_tmdb.xml
+++ b/app/src/leanback/res/layout/activity_setting_tmdb.xml
--- a/app/src/leanback/res/layout/activity_video.xml
+++ b/app/src/leanback/res/layout/activity_video.xml
--- a/app/src/leanback/res/layout/adapter_array.xml
+++ b/app/src/leanback/res/layout/adapter_array.xml
--- a/app/src/leanback/res/layout/adapter_channel.xml
+++ b/app/src/leanback/res/layout/adapter_channel.xml
--- a/app/src/leanback/res/layout/adapter_device.xml
+++ b/app/src/leanback/res/layout/adapter_device.xml
--- a/app/src/leanback/res/layout/adapter_doh.xml
+++ b/app/src/leanback/res/layout/adapter_doh.xml
--- a/app/src/leanback/res/layout/adapter_epg_data.xml
+++ b/app/src/leanback/res/layout/adapter_epg_data.xml
--- a/app/src/leanback/res/layout/adapter_episode.xml
+++ b/app/src/leanback/res/layout/adapter_episode.xml
--- a/app/src/leanback/res/layout/adapter_episode_card.xml
+++ b/app/src/leanback/res/layout/adapter_episode_card.xml
--- a/app/src/leanback/res/layout/adapter_episode_dialog.xml
+++ b/app/src/leanback/res/layout/adapter_episode_dialog.xml
--- a/app/src/leanback/res/layout/adapter_episode_page.xml
+++ b/app/src/leanback/res/layout/adapter_episode_page.xml
--- a/app/src/leanback/res/layout/adapter_file.xml
+++ b/app/src/leanback/res/layout/adapter_file.xml
--- a/app/src/leanback/res/layout/adapter_filter.xml
+++ b/app/src/leanback/res/layout/adapter_filter.xml
--- a/app/src/leanback/res/layout/adapter_flag.xml
+++ b/app/src/leanback/res/layout/adapter_flag.xml
--- a/app/src/leanback/res/layout/adapter_func.xml
+++ b/app/src/leanback/res/layout/adapter_func.xml
--- a/app/src/leanback/res/layout/adapter_group.xml
+++ b/app/src/leanback/res/layout/adapter_group.xml
--- a/app/src/leanback/res/layout/adapter_header.xml
+++ b/app/src/leanback/res/layout/adapter_header.xml
--- a/app/src/leanback/res/layout/adapter_home_button.xml
+++ b/app/src/leanback/res/layout/adapter_home_button.xml
--- a/app/src/leanback/res/layout/adapter_keyboard_text.xml
+++ b/app/src/leanback/res/layout/adapter_keyboard_text.xml
--- a/app/src/leanback/res/layout/adapter_live.xml
+++ b/app/src/leanback/res/layout/adapter_live.xml
--- a/app/src/leanback/res/layout/adapter_parse.xml
+++ b/app/src/leanback/res/layout/adapter_parse.xml
--- a/app/src/leanback/res/layout/adapter_part.xml
+++ b/app/src/leanback/res/layout/adapter_part.xml
--- a/app/src/leanback/res/layout/adapter_quality.xml
+++ b/app/src/leanback/res/layout/adapter_quality.xml
--- a/app/src/leanback/res/layout/adapter_quick.xml
+++ b/app/src/leanback/res/layout/adapter_quick.xml
--- a/app/src/leanback/res/layout/adapter_search.xml
+++ b/app/src/leanback/res/layout/adapter_search.xml
--- a/app/src/leanback/res/layout/adapter_search_hot_word.xml
+++ b/app/src/leanback/res/layout/adapter_search_hot_word.xml
--- a/app/src/leanback/res/layout/adapter_search_list.xml
+++ b/app/src/leanback/res/layout/adapter_search_list.xml
--- a/app/src/leanback/res/layout/adapter_search_record.xml
+++ b/app/src/leanback/res/layout/adapter_search_record.xml
--- a/app/src/leanback/res/layout/adapter_search_word.xml
+++ b/app/src/leanback/res/layout/adapter_search_word.xml
--- a/app/src/leanback/res/layout/adapter_site_switch.xml
+++ b/app/src/leanback/res/layout/adapter_site_switch.xml
--- a/app/src/leanback/res/layout/adapter_type.xml
+++ b/app/src/leanback/res/layout/adapter_type.xml
--- a/app/src/leanback/res/layout/adapter_vod.xml
+++ b/app/src/leanback/res/layout/adapter_vod.xml
--- a/app/src/leanback/res/layout/adapter_vod_list.xml
+++ b/app/src/leanback/res/layout/adapter_vod_list.xml
--- a/app/src/leanback/res/layout/adapter_vod_oval.xml
+++ b/app/src/leanback/res/layout/adapter_vod_oval.xml
--- a/app/src/leanback/res/layout/adapter_vod_rect.xml
+++ b/app/src/leanback/res/layout/adapter_vod_rect.xml
--- a/app/src/leanback/res/layout/dialog_danmaku.xml
+++ b/app/src/leanback/res/layout/dialog_danmaku.xml
--- a/app/src/leanback/res/layout/dialog_danmaku_setting.xml
+++ b/app/src/leanback/res/layout/dialog_danmaku_setting.xml
--- a/app/src/leanback/res/layout/dialog_episode.xml
+++ b/app/src/leanback/res/layout/dialog_episode.xml
--- a/app/src/leanback/res/layout/dialog_episode_list.xml
+++ b/app/src/leanback/res/layout/dialog_episode_list.xml
--- a/app/src/leanback/res/layout/dialog_offset.xml
+++ b/app/src/leanback/res/layout/dialog_offset.xml
--- a/app/src/leanback/res/layout/dialog_quick_search.xml
+++ b/app/src/leanback/res/layout/dialog_quick_search.xml
--- a/app/src/leanback/res/layout/dialog_timer.xml
+++ b/app/src/leanback/res/layout/dialog_timer.xml
--- a/app/src/leanback/res/layout/dialog_title.xml
+++ b/app/src/leanback/res/layout/dialog_title.xml
--- a/app/src/leanback/res/layout/dialog_track.xml
+++ b/app/src/leanback/res/layout/dialog_track.xml
--- a/app/src/leanback/res/layout/view_empty.xml
+++ b/app/src/leanback/res/layout/view_empty.xml
--- a/app/src/leanback/res/layout/view_progress.xml
+++ b/app/src/leanback/res/layout/view_progress.xml
--- a/app/src/leanback/res/values/webhtv_tokens.xml
+++ b/app/src/leanback/res/values/webhtv_tokens.xml
--- a/app/src/main/java/com/fongmi/android/tv/theme/ThemeController.java
+++ b/app/src/main/java/com/fongmi/android/tv/theme/ThemeController.java
--- a/app/src/main/res/values/webhtv_styles.xml
+++ b/app/src/main/res/values/webhtv_styles.xml
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ThemeDialog.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/ThemeDialog.java
--- a/app/src/test/java/com/fongmi/android/tv/theme/LeanbackForegroundContrastTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/theme/LeanbackForegroundContrastTest.java
--- a/app/src/test/java/com/fongmi/android/tv/theme/ThemeBaseWiringTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/theme/ThemeBaseWiringTest.java
--- a/app/src/testLeanback/java/com/fongmi/android/tv/ui/activity/TvFocusRingContractTest.java
+++ b/app/src/testLeanback/java/com/fongmi/android/tv/ui/activity/TvFocusRingContractTest.java
--- a/docs/C40-beta-merge-review-dev2-20261006.md
+++ b/docs/C40-beta-merge-review-dev2-20261006.md
--- a/docs/TV-LIGHT-THEME-20261005-tv-light-theme-defect.md
+++ b/docs/TV-LIGHT-THEME-20261005-tv-light-theme-defect.md