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 3d70c738d..6e51f445e 100644 --- a/app/src/main/java/com/fongmi/android/tv/Setting.java +++ b/app/src/main/java/com/fongmi/android/tv/Setting.java @@ -510,6 +510,14 @@ public class Setting { return Prefers.getInt("parse_webview", 0); } + public static boolean isSiteSearch() { + return Prefers.getBoolean("site_search", false); + } + + public static void putSiteSearch(boolean search) { + Prefers.put("site_search", search); + } + public static boolean isRemoveAd() { return Prefers.getBoolean("remove_ad", false); } diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 1e37144aa..ae77272b3 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -88,6 +88,7 @@ 首页菜单键 首页源锁定 无痕模式 + 站源搜索 AI去广告 小窗返回键 首页显示站源 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 9a7d7b8ff..8a1a4fcb9 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -88,6 +88,7 @@ 首頁選單鍵 首頁源鎖定 無痕模式 + 站源搜索 AI去廣告 小窗返回鍵 首頁顯示站源 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1dea81c5f..da7b4e76a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -89,6 +89,7 @@ Home menu key Home site lock Incognito mode + Site search Remove ads Small window back key Home display name diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SiteDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SiteDialog.java index 526a49aa3..d72170c8f 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SiteDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SiteDialog.java @@ -9,6 +9,7 @@ import android.view.inputmethod.EditorInfo; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; +import com.fongmi.android.tv.Setting; import com.fongmi.android.tv.api.config.VodConfig; import com.fongmi.android.tv.bean.Site; import com.fongmi.android.tv.databinding.DialogSiteBinding; @@ -97,7 +98,7 @@ public class SiteDialog implements SiteAdapter.OnClickListener { } }); binding.search.setOnClickListener(v -> searchSite()); - if (adapter.getItemCount() < 10) binding.searchInput.setVisibility(View.GONE); + if (adapter.getItemCount() < 10 || !Setting.isSiteSearch()) binding.searchInput.setVisibility(View.GONE); } private void searchSite() { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingCustomFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingCustomFragment.java index 984be8afd..f4ed341b9 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingCustomFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingCustomFragment.java @@ -49,6 +49,7 @@ public class SettingCustomFragment extends BaseFragment { mBinding.incognitoText.setText(getSwitch(Setting.isIncognito())); mBinding.aggregatedSearchText.setText(getSwitch(Setting.isAggregatedSearch())); mBinding.homeDisplayNameText.setText(getSwitch(Setting.isHomeDisplayName())); + mBinding.siteSearchText.setText(getSwitch(Setting.isSiteSearch())); mBinding.removeAdText.setText(getSwitch(Setting.isRemoveAd())); mBinding.languageText.setText((lang = ResUtil.getStringArray(R.array.select_language))[Setting.getLanguage()]); mBinding.configCacheText.setText((configCache = ResUtil.getStringArray(R.array.select_config_cache))[Setting.getConfigCache()]); @@ -62,11 +63,11 @@ public class SettingCustomFragment extends BaseFragment { mBinding.incognito.setOnClickListener(this::setIncognito); mBinding.aggregatedSearch.setOnClickListener(this::setAggregatedSearch); mBinding.homeDisplayName.setOnClickListener(this::setHomeDisplayName); + mBinding.siteSearch.setOnClickListener(this::setSiteSearch); mBinding.removeAd.setOnClickListener(this::setRemoveAd); mBinding.language.setOnClickListener(this::setLanguage); mBinding.configCache.setOnClickListener(this::setConfigCache); mBinding.reset.setOnClickListener(this::onReset); - } private void setSize(View view) { @@ -112,6 +113,11 @@ public class SettingCustomFragment extends BaseFragment { RefreshEvent.config(); } + private void setSiteSearch(View view) { + Setting.putSiteSearch(!Setting.isSiteSearch()); + mBinding.siteSearchText.setText(getSwitch(Setting.isSiteSearch())); + } + private void setRemoveAd(View view) { Setting.putRemoveAd(!Setting.isRemoveAd()); mBinding.removeAdText.setText(getSwitch(Setting.isRemoveAd())); diff --git a/app/src/mobile/res/layout/fragment_setting_custom.xml b/app/src/mobile/res/layout/fragment_setting_custom.xml index 1a8c0090b..d4491f75f 100644 --- a/app/src/mobile/res/layout/fragment_setting_custom.xml +++ b/app/src/mobile/res/layout/fragment_setting_custom.xml @@ -178,6 +178,35 @@ + + + + + + + + + +