aggregated search

2 years ago · d87bf98a21
parent c3cf1ed5e8
commit d87bf98a21
9 changed files with 84 additions and 0 deletions
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java
@ -53,6 +53,7 @@ public class SettingCustomActivity extends BaseActivity {
        mBinding.incognitoText.setText(getSwitch(Setting.isIncognito()));
        mBinding.smallWindowBackKeyText.setText((smallWindowBackKey = ResUtil.getStringArray(R.array.select_small_window_back_key))[Setting.getSmallWindowBackKey()]);
        mBinding.homeChangeConfigText.setText(getSwitch(Setting.isHomeChangeConfig()));
+        mBinding.aggregatedSearchText.setText(getSwitch(Setting.isAggregatedSearch()));
    }

    @Override
@ -71,6 +72,7 @@ public class SettingCustomActivity extends BaseActivity {
        mBinding.incognito.setOnClickListener(this::setIncognito);
        mBinding.smallWindowBackKey.setOnClickListener(this::setSmallWindowBackKey);
        mBinding.homeChangeConfig.setOnClickListener(this::setHomeChangeConfig);
+        mBinding.aggregatedSearch.setOnClickListener(this::setAggregatedSearch);
    }

    private void setQuality(View view) {
@ -158,4 +160,9 @@ public class SettingCustomActivity extends BaseActivity {
        mBinding.homeChangeConfigText.setText(getSwitch(Setting.isHomeChangeConfig()));
    }

+    private void setAggregatedSearch(View view) {
+        Setting.putAggregatedSearch(!Setting.isAggregatedSearch());
+        mBinding.aggregatedSearchText.setText(getSwitch(Setting.isAggregatedSearch()));
+    }
+
 }
--- a/app/src/leanback/res/layout/activity_setting_custom.xml
+++ b/app/src/leanback/res/layout/activity_setting_custom.xml
@ -423,6 +423,7 @@
                android:id="@+id/homeChangeConfig"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
                android:layout_weight="1"
                android:background="@drawable/selector_item"
                android:focusable="true"
@ -448,6 +449,35 @@

            </LinearLayout>

+            <LinearLayout
+                android:id="@+id/aggregatedSearch"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@drawable/selector_item"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:text="@string/setting_aggregated_search"
+                    android:textColor="@color/white"
+                    android:textSize="18sp" />
+
+                <TextView
+                    android:id="@+id/aggregatedSearchText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
+                    android:textColor="@color/white"
+                    android:textSize="18sp"
+                    tools:text="開" />
+
+            </LinearLayout>
+
        </LinearLayout>
    </LinearLayout>
 </androidx.core.widget.NestedScrollView>
--- a/app/src/main/java/com/fongmi/android/tv/Setting.java
+++ b/app/src/main/java/com/fongmi/android/tv/Setting.java
@ -421,4 +421,12 @@ public class Setting {
        return Prefers.getBoolean("home_change_config", false);
    }

+    public static boolean isAggregatedSearch() {
+        return Prefers.getBoolean("aggregated_search", false);
+    }
+
+    public static void putAggregatedSearch(boolean search) {
+        Prefers.put("aggregated_search", search);
+    }
+
 }
--- a/app/src/main/java/com/fongmi/android/tv/bean/Site.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Site.java
@ -11,6 +11,7 @@ import androidx.room.PrimaryKey;

 import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.Constant;
+import com.fongmi.android.tv.Setting;
 import com.fongmi.android.tv.db.AppDatabase;
 import com.fongmi.android.tv.gson.ExtAdapter;
 import com.github.catvod.utils.Json;
@ -194,6 +195,7 @@ public class Site implements Parcelable {
    }

    public Integer getIndexs() {
+        if (Setting.isAggregatedSearch() && (indexs == null || indexs == 1)) return 1;
        return indexs == null ? 0 : indexs;
    }

--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -76,6 +76,7 @@
    <string name="setting_custom">个性设置</string>
    <string name="setting_quality">图片品质</string>
    <string name="setting_size">图片尺寸</string>
+    <string name="setting_aggregated_search">聚合搜索</string>
    <string name="setting_fullscreen_menu_key">全屏菜单键</string>
    <string name="setting_home_site_lock">首页源锁定</string>
    <string name="setting_incognito">无痕模式</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -76,6 +76,7 @@
    <string name="setting_custom">個性設定</string>
    <string name="setting_quality">圖片品質</string>
    <string name="setting_size">圖片尺寸</string>
+    <string name="setting_aggregated_search">聚合搜索</string>
    <string name="setting_fullscreen_menu_key">全屏選單鍵</string>
    <string name="setting_home_site_lock">首頁源鎖定</string>
    <string name="setting_incognito">無痕模式</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -76,6 +76,7 @@
    <string name="setting_custom">Custom setting</string>
    <string name="setting_quality">Image quality</string>
    <string name="setting_size">Image size</string>
+    <string name="setting_aggregated_search">Aggregated search</string>
    <string name="setting_fullscreen_menu_key">Fullscreen menu key</string>
    <string name="setting_home_site_lock">Home site lock</string>
    <string name="setting_incognito">Incognito mode</string>
--- 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
@ -42,6 +42,7 @@ public class SettingCustomFragment extends BaseFragment {
        mBinding.danmuSyncText.setText(getSwitch(Setting.isDanmuSync()));
        mBinding.speedText.setText(getSpeedText());
        mBinding.incognitoText.setText(getSwitch(Setting.isIncognito()));
+        mBinding.aggregatedSearchText.setText(getSwitch(Setting.isAggregatedSearch()));
        mBinding.homeChangeConfigText.setText(getSwitch(Setting.isHomeChangeConfig()));
    }

@ -53,6 +54,7 @@ public class SettingCustomFragment extends BaseFragment {
        mBinding.speed.setOnClickListener(this::setSpeed);
        mBinding.speed.setOnLongClickListener(this::resetSpeed);
        mBinding.incognito.setOnClickListener(this::setIncognito);
+        mBinding.aggregatedSearch.setOnClickListener(this::setAggregatedSearch);
        mBinding.homeChangeConfig.setOnClickListener(this::setHomeChangeConfig);
    }

@ -98,6 +100,11 @@ public class SettingCustomFragment extends BaseFragment {
        mBinding.incognitoText.setText(getSwitch(Setting.isIncognito()));
    }

+    private void setAggregatedSearch(View view) {
+        Setting.putAggregatedSearch(!Setting.isAggregatedSearch());
+        mBinding.aggregatedSearchText.setText(getSwitch(Setting.isAggregatedSearch()));
+    }
+
    private void setHomeChangeConfig(View view) {
        Setting.putHomeChangeConfig(!Setting.isHomeChangeConfig());
        mBinding.homeChangeConfigText.setText(getSwitch(Setting.isHomeChangeConfig()));
--- a/app/src/mobile/res/layout/fragment_setting_custom.xml
+++ b/app/src/mobile/res/layout/fragment_setting_custom.xml
@ -152,6 +152,33 @@

            </LinearLayout>

+            <LinearLayout
+                android:id="@+id/aggregatedSearch"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:background="@drawable/shape_item"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="16dp"
+                    android:text="@string/setting_aggregated_search"
+                    android:textColor="@color/white"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:id="@+id/aggregatedSearchText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="end"
+                    android:textColor="@color/white"
+                    android:textSize="16sp"
+                    tools:text="開" />
+
+            </LinearLayout>
+
            <LinearLayout
                android:id="@+id/homeChangeConfig"
                android:layout_width="match_parent"