Optimize UX

app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java

@@ -158,6 +158,10 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
         return view.getVisibility() == View.GONE;
     }
 
+    private boolean isReplay() {
+        return Prefers.getReset() == 1;
+    }
+
     @Override
     protected ViewBinding getBinding() {
         return mBinding = ActivityDetailBinding.inflate(getLayoutInflater());
@@ -197,7 +201,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
         mBinding.control.ending.setOnClickListener(view -> onEnding());
         mBinding.control.opening.setOnClickListener(view -> onOpening());
         mBinding.control.speed.setOnLongClickListener(view -> onSpeedLong());
-        mBinding.control.reset.setOnLongClickListener(view -> onResetLong());
+        mBinding.control.reset.setOnLongClickListener(view -> onResetToggle());
         mBinding.control.ending.setOnLongClickListener(view -> onEndingReset());
         mBinding.control.opening.setOnLongClickListener(view -> onOpeningReset());
         mBinding.video.setOnTouchListener((view, event) -> mKeyDown.onTouchEvent(event));
@@ -241,6 +245,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
         mBinding.control.player.setText(mPlayers.getPlayerText());
         getExo().setVisibility(mPlayers.isExo() ? View.VISIBLE : View.GONE);
         getIjk().setVisibility(mPlayers.isIjk() ? View.VISIBLE : View.GONE);
+        mBinding.control.reset.setText(ResUtil.getStringArray(R.array.select_reset)[Prefers.getReset()]);
     }
 
     private void setDecodeView() {
@@ -540,13 +545,15 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
         return true;
     }
 
-    private void onReset() {
-        getPlayer(false);
+    private boolean onReset() {
+        getPlayer(isReplay());
+        return true;
     }
 
-    private boolean onResetLong() {
-        getPlayer(true);
-        return true;
+    private boolean onResetToggle() {
+        Prefers.putReset(Math.abs(Prefers.getReset() - 1));
+        mBinding.control.reset.setText(ResUtil.getStringArray(R.array.select_reset)[Prefers.getReset()]);
+        return onReset();
     }
 
     private void onOpening() {

app/src/leanback/res/layout/view_control_vod.xml

@@ -68,9 +68,9 @@
                 android:focusable="true"
                 android:focusableInTouchMode="true"
                 android:nextFocusDown="@id/parse"
-                android:text="@string/play_reset"
                 android:textColor="@color/white"
-                android:textSize="14sp" />
+                android:textSize="14sp"
+                tools:text="刷新" />
 
             <TextView
                 android:id="@+id/player"

app/src/main/java/com/fongmi/android/tv/utils/Prefers.java

@@ -67,6 +67,14 @@ public class Prefers {
         put("wall", wall);
     }
 
+    public static int getReset() {
+        return getInt("reset", 0);
+    }
+
+    public static void putReset(int reset) {
+        put("reset", reset);
+    }
+
     public static int getPlayer() {
         return getInt("player", 0);
     }

app/src/main/res/values-zh-rCN/strings.xml

@@ -41,8 +41,6 @@
     <string name="play_next">下一集</string>
     <string name="play_prev">上一集</string>
     <string name="play_ready">准备播放：<xliff:g name="name">%s</xliff:g></string>
-    <string name="play_reset">刷新</string>
-    <string name="play_track">轨道</string>
     <string name="play_track_text">字幕</string>
     <string name="play_track_audio">音轨</string>
     <string name="play_invert">反转</string>
@@ -134,4 +132,9 @@
         <item>裁剪</item>
     </string-array>
 
+    <string-array name="select_reset">
+        <item>刷新</item>
+        <item>重播</item>
+    </string-array>
+
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -41,8 +41,6 @@
     <string name="play_next">下一集</string>
     <string name="play_prev">上一集</string>
     <string name="play_ready">準備播放：<xliff:g name="name">%s</xliff:g></string>
-    <string name="play_reset">刷新</string>
-    <string name="play_track">軌道</string>
     <string name="play_track_text">字幕</string>
     <string name="play_track_audio">音軌</string>
     <string name="play_invert">反轉</string>
@@ -134,4 +132,9 @@
         <item>裁剪</item>
     </string-array>
 
+    <string-array name="select_reset">
+        <item>刷新</item>
+        <item>重播</item>
+    </string-array>
+
 </resources>

app/src/main/res/values/strings.xml

@@ -41,8 +41,6 @@
     <string name="play_next">Next</string>
     <string name="play_prev">Prev</string>
     <string name="play_ready">Ready to play: <xliff:g name="name">%s</xliff:g></string>
-    <string name="play_reset">Reset</string>
-    <string name="play_track">Tracks</string>
     <string name="play_track_text">Text</string>
     <string name="play_track_audio">Audio</string>
     <string name="play_invert">Invert</string>
@@ -139,4 +137,9 @@
         <item>Zoom</item>
     </string-array>
 
+    <string-array name="select_reset">
+        <item>Reset</item>
+        <item>Replay</item>
+    </string-array>
+
 </resources>