From 8f02a18959861330dadc1a82b272edc8a50aac0e Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 2 Aug 2023 23:28:20 +0800
Subject: [PATCH] Rename flag mode

---
 .../tv/ui/activity/DetailActivity.java        |  6 ++---
 .../tv/ui/activity/SettingPlayerActivity.java | 16 ++++++++------
 .../res/layout/activity_setting_player.xml    | 22 +++++++++----------
 .../java/com/fongmi/android/tv/Setting.java   |  8 +++----
 app/src/main/res/values-zh-rCN/strings.xml    |  7 +++++-
 app/src/main/res/values-zh-rTW/strings.xml    |  7 +++++-
 app/src/main/res/values/strings.xml           |  7 +++++-
 7 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
index 758923526..e5ff3b7a6 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
@@ -471,9 +471,9 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
     }
 
     private void seamless(Vod.Flag flag, boolean force) {
-        if (Setting.isManual() && mHistory.isNew()) {
+        if (Setting.getFlag() == 1 && mHistory.isNew()) {
             hideProgress();
-        } else if (!Setting.isManual() || force) {
+        } else if (Setting.getFlag() == 0 || force) {
             Vod.Flag.Episode episode = flag.find(mHistory.getVodRemarks(), getMark() == null);
             if (episode == null || episode.isActivated()) return;
             mHistory.setVodRemarks(episode.getName());
@@ -779,7 +779,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
     }
 
     private void showPreview(Drawable resource) {
-        if (!Setting.isManual() || isVisible(mBinding.widget.progress)) return;
+        if (Setting.getFlag() == 0 || isVisible(mBinding.widget.progress)) return;
         mBinding.widget.preview.setVisibility(View.VISIBLE);
         mBinding.widget.preview.setImageDrawable(resource);
     }
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java
index 75f739b18..b020735bd 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java
@@ -20,6 +20,7 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback {
 
     private ActivitySettingPlayerBinding mBinding;
     private String[] http;
+    private String[] flag;
 
     public static void start(Activity activity) {
         activity.startActivity(new Intent(activity, SettingPlayerActivity.class));
@@ -38,9 +39,9 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback {
     protected void initView() {
         mBinding.uaText.setText(Setting.getUa());
         mBinding.tunnelText.setText(getSwitch(Setting.isTunnel()));
-        mBinding.manualText.setText(getSwitch(Setting.isManual()));
         mBinding.http.setVisibility(Players.isExo(Setting.getPlayer()) ? View.VISIBLE : View.GONE);
         mBinding.tunnel.setVisibility(Players.isExo(Setting.getPlayer()) ? View.VISIBLE : View.GONE);
+        mBinding.flagText.setText((flag = ResUtil.getStringArray(R.array.select_flag))[Setting.getFlag()]);
         mBinding.httpText.setText((http = ResUtil.getStringArray(R.array.select_exo_http))[Setting.getHttp()]);
     }
 
@@ -48,8 +49,8 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback {
     protected void initEvent() {
         mBinding.ua.setOnClickListener(this::onUa);
         mBinding.http.setOnClickListener(this::setHttp);
+        mBinding.flag.setOnClickListener(this::setFlag);
         mBinding.tunnel.setOnClickListener(this::setTunnel);
-        mBinding.manual.setOnClickListener(this::setManual);
     }
 
     private void onUa(View view) {
@@ -63,16 +64,17 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback {
         ExoUtil.reset();
     }
 
+    private void setFlag(View view) {
+        int index = Setting.getFlag();
+        Setting.putFlag(index = index == flag.length - 1 ? 0 : ++index);
+        mBinding.flagText.setText(flag[index]);
+    }
+
     private void setTunnel(View view) {
         Setting.putTunnel(!Setting.isTunnel());
         mBinding.tunnelText.setText(getSwitch(Setting.isTunnel()));
     }
 
-    private void setManual(View view) {
-        Setting.putManual(!Setting.isManual());
-        mBinding.manualText.setText(getSwitch(Setting.isManual()));
-    }
-
     @Override
     public void setUa(String ua) {
         mBinding.uaText.setText(ua);
diff --git a/app/src/leanback/res/layout/activity_setting_player.xml b/app/src/leanback/res/layout/activity_setting_player.xml
index f46997362..fb617da21 100644
--- a/app/src/leanback/res/layout/activity_setting_player.xml
+++ b/app/src/leanback/res/layout/activity_setting_player.xml
@@ -46,7 +46,7 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/http"
+            android:id="@+id/flag"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -59,23 +59,23 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
-                android:text="@string/setting_player_http"
+                android:text="@string/setting_player_flag"
                 android:textColor="@color/white"
                 android:textSize="18sp" />
 
             <TextView
-                android:id="@+id/httpText"
+                android:id="@+id/flagText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="end"
                 android:textColor="@color/white"
                 android:textSize="18sp"
-                tools:text="OkHttp" />
+                tools:text="自動" />
 
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/tunnel"
+            android:id="@+id/http"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -88,23 +88,23 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
-                android:text="@string/setting_player_tunnel"
+                android:text="@string/setting_player_http"
                 android:textColor="@color/white"
                 android:textSize="18sp" />
 
             <TextView
-                android:id="@+id/tunnelText"
+                android:id="@+id/httpText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="end"
                 android:textColor="@color/white"
                 android:textSize="18sp"
-                tools:text="關" />
+                tools:text="OkHttp" />
 
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/manual"
+            android:id="@+id/tunnel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -117,12 +117,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
-                android:text="@string/setting_player_manual"
+                android:text="@string/setting_player_tunnel"
                 android:textColor="@color/white"
                 android:textSize="18sp" />
 
             <TextView
-                android:id="@+id/manualText"
+                android:id="@+id/tunnelText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="end"
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 99f0aa4b0..cf7c1076d 100644
--- a/app/src/main/java/com/fongmi/android/tv/Setting.java
+++ b/app/src/main/java/com/fongmi/android/tv/Setting.java
@@ -183,12 +183,12 @@ public class Setting {
         Prefers.put("exo_http", http);
     }
 
-    public static boolean isManual() {
-        return Prefers.getBoolean("manual");
+    public static int getFlag() {
+        return Prefers.getInt("flag");
     }
 
-    public static void putManual(boolean manual) {
-        Prefers.put("manual", manual);
+    public static void putFlag(int mode) {
+        Prefers.put("flag", mode);
     }
 
     public static int getSiteMode() {
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index a4ac1bf6e..2adc309c5 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -68,7 +68,7 @@
     <string name="setting_player_ua">User-Agent</string>
     <string name="setting_player_http">连线方式</string>
     <string name="setting_player_tunnel">隧道模式</string>
-    <string name="setting_player_manual">手动播放</string>
+    <string name="setting_player_flag">线路播放</string>
     <string name="setting_decode">解码方式</string>
     <string name="setting_render">渲染方式</string>
     <string name="setting_scale">缩放比例</string>
@@ -136,6 +136,11 @@
         <item>OkHttp</item>
     </string-array>
 
+    <string-array name="select_flag">
+        <item>自动</item>
+        <item>手动</item>
+    </string-array>
+
     <string-array name="select_quality">
         <item>低</item>
         <item>中</item>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 216afdf2b..b00ed1315 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -68,7 +68,7 @@
     <string name="setting_player_ua">User-Agent</string>
     <string name="setting_player_http">連線方式</string>
     <string name="setting_player_tunnel">隧道模式</string>
-    <string name="setting_player_manual">手動播放</string>
+    <string name="setting_player_flag">線路播放</string>
     <string name="setting_decode">解碼方式</string>
     <string name="setting_render">渲染方式</string>
     <string name="setting_scale">縮放比例</string>
@@ -136,6 +136,11 @@
         <item>OkHttp</item>
     </string-array>
 
+    <string-array name="select_flag">
+        <item>自動</item>
+        <item>手動</item>
+    </string-array>
+
     <string-array name="select_quality">
         <item>低</item>
         <item>中</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9f1d1afc9..9d4e76f09 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -68,7 +68,7 @@
     <string name="setting_player_ua">User-Agent</string>
     <string name="setting_player_http">HTTP method</string>
     <string name="setting_player_tunnel">Tunnel mode</string>
-    <string name="setting_player_manual">Manual play</string>
+    <string name="setting_player_flag">Flag play</string>
     <string name="setting_decode">Decode</string>
     <string name="setting_render">Render</string>
     <string name="setting_scale">Scale</string>
@@ -136,6 +136,11 @@
         <item>OkHttp</item>
     </string-array>
 
+    <string-array name="select_flag">
+        <item>Auto</item>
+        <item>Manual</item>
+    </string-array>
+
     <string-array name="select_render">
         <item>Surface</item>
         <item>Texture</item>