[mobile] adjust delete message

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

@@ -80,12 +80,7 @@
     <string name="dialog_config_hint">请输入接口…</string>
     <string name="dialog_config_url">请输入地址…</string>
 
-    <!-- Ask -->
-    <string name="ask_keep_delete">是否清空所有收藏纪录？</string>
-    <string name="ask_history_delete">是否清空所有观看纪录？</string>
-
     <!-- Error -->
-    <string name="error_so_load">FFmpeg 加载失败</string>
     <string name="error_config_get">配置取得失败</string>
     <string name="error_config_parse">配置解析失败</string>
     <string name="error_play_next">已经是最后一集了！</string>

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

@@ -80,12 +80,7 @@
     <string name="dialog_config_hint">請輸入接口…</string>
     <string name="dialog_config_url">請輸入網址…</string>
 
-    <!-- Ask -->
-    <string name="ask_keep_delete">是否清空所有收藏紀錄？</string>
-    <string name="ask_history_delete">是否清空所有觀看紀錄？</string>
-
     <!-- Error -->
-    <string name="error_so_load">FFmpeg 載入失敗</string>
     <string name="error_config_get">配置取得失敗</string>
     <string name="error_config_parse">配置解析失敗</string>
     <string name="error_play_next">已經是最後一集了！</string>

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

@@ -80,12 +80,7 @@
     <string name="dialog_config_hint">Please enter the config…</string>
     <string name="dialog_config_url">Please enter the url…</string>
 
-    <!-- Ask -->
-    <string name="ask_keep_delete">Do you want to clear all keep records?</string>
-    <string name="ask_history_delete">Do you want to clear all history records?</string>
-
     <!-- Error -->
-    <string name="error_so_load">Failed to load FFmpeg</string>
     <string name="error_config_get">Configuration get failed</string>
     <string name="error_config_parse">Configuration parse failed</string>
     <string name="error_play_next">It\'s the last episode!</string>

app/src/mobile/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java

@@ -55,11 +55,12 @@ public class HistoryActivity extends BaseActivity implements HistoryAdapter.OnCl
 
     private void getHistory() {
         mAdapter.addAll(History.get());
+        mBinding.delete.setVisibility(mAdapter.getItemCount() > 0 ? View.VISIBLE : View.GONE);
     }
 
     private void onDelete(View view) {
         if (mAdapter.isDelete()) {
-            new MaterialAlertDialogBuilder(this).setMessage(R.string.ask_history_delete).setNegativeButton(R.string.dialog_negative, null).setPositiveButton(R.string.dialog_positive, (dialog, which) -> mAdapter.clear()).show();
+            new MaterialAlertDialogBuilder(this).setTitle(R.string.dialog_delete_record).setMessage(R.string.dialog_delete_history).setNegativeButton(R.string.dialog_negative, null).setPositiveButton(R.string.dialog_positive, (dialog, which) -> mAdapter.clear()).show();
         } else if (mAdapter.getItemCount() > 0) {
             mAdapter.setDelete(true);
         } else {
@@ -80,7 +81,9 @@ public class HistoryActivity extends BaseActivity implements HistoryAdapter.OnCl
     @Override
     public void onItemDelete(History item) {
         mAdapter.remove(item.delete());
-        if (mAdapter.getItemCount() == 0) mAdapter.setDelete(false);
+        if (mAdapter.getItemCount() > 0) return;
+        mBinding.delete.setVisibility(View.GONE);
+        mAdapter.setDelete(false);
     }
 
     @Override

app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java

@@ -58,11 +58,12 @@ public class KeepActivity extends BaseActivity implements KeepAdapter.OnClickLis
 
     private void getKeep() {
         mAdapter.addAll(Keep.getVod());
+        mBinding.delete.setVisibility(mAdapter.getItemCount() > 0 ? View.VISIBLE : View.GONE);
     }
 
     private void onDelete(View view) {
         if (mAdapter.isDelete()) {
-            new MaterialAlertDialogBuilder(this).setMessage(R.string.ask_keep_delete).setNegativeButton(R.string.dialog_negative, null).setPositiveButton(R.string.dialog_positive, (dialog, which) -> mAdapter.clear()).show();
+            new MaterialAlertDialogBuilder(this).setTitle(R.string.dialog_delete_record).setMessage(R.string.dialog_delete_keep).setNegativeButton(R.string.dialog_negative, null).setPositiveButton(R.string.dialog_positive, (dialog, which) -> mAdapter.clear()).show();
         } else if (mAdapter.getItemCount() > 0) {
             mAdapter.setDelete(true);
         } else {
@@ -100,7 +101,9 @@ public class KeepActivity extends BaseActivity implements KeepAdapter.OnClickLis
     @Override
     public void onItemDelete(Keep item) {
         mAdapter.remove(item.delete());
-        if (mAdapter.getItemCount() == 0) mAdapter.setDelete(false);
+        if (mAdapter.getItemCount() > 0) return;
+        mBinding.delete.setVisibility(View.GONE);
+        mAdapter.setDelete(false);
     }
 
     @Override

app/src/mobile/res/drawable/selector_accent.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/shape_filter_activated" android:state_activated="true" />
-    <item android:drawable="@drawable/shape_filter_normal" />
+    <item android:drawable="@drawable/shape_accent_activated" android:state_activated="true" />
+    <item android:drawable="@drawable/shape_accent_normal" />
 </selector>

app/src/mobile/res/layout/activity_history.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
@@ -32,7 +33,9 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:background="?attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_vod_delete" />
+                android:src="@drawable/ic_vod_delete"
+                android:visibility="gone"
+                tools:visibility="visible" />
 
         </LinearLayout>
 

app/src/mobile/res/layout/activity_keep.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true">
@@ -32,7 +33,9 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:background="?attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_vod_delete" />
+                android:src="@drawable/ic_vod_delete"
+                android:visibility="gone"
+                tools:visibility="visible" />
 
         </LinearLayout>
 

app/src/mobile/res/layout/adapter_value.xml

@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:layout_marginStart="4dp"
     android:layout_marginEnd="4dp"
-    android:background="@drawable/selector_filter"
+    android:background="@drawable/selector_accent"
     android:textColor="@color/white"
     android:textSize="14sp"
     tools:text="全部" />

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

@@ -10,6 +10,9 @@
     <!-- History -->
     <string name="history">最近观看</string>
 
+    <!-- Keep -->
+    <string name="keep">我的收藏</string>
+
     <!-- Detail -->
     <string name="detail_flag">线路</string>
     <string name="detail_more">更多</string>
@@ -17,4 +20,9 @@
     <string name="detail_content">简介</string>
     <string name="detail_search">快搜“<xliff:g name="name">%s</xliff:g>”</string>
 
+    <!-- Dialog -->
+    <string name="dialog_delete_record">删除全部纪录？</string>
+    <string name="dialog_delete_keep">收藏纪录将会全部删除。</string>
+    <string name="dialog_delete_history">观看纪录将会全部删除。</string>
+
 </resources>

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

@@ -10,6 +10,9 @@
     <!-- History -->
     <string name="history">最近觀看</string>
 
+    <!-- Keep -->
+    <string name="keep">我的收藏</string>
+
     <!-- Detail -->
     <string name="detail_flag">線路</string>
     <string name="detail_more">更多</string>
@@ -17,4 +20,9 @@
     <string name="detail_content">簡介</string>
     <string name="detail_search">快搜「<xliff:g name="name">%s</xliff:g>」</string>
 
+    <!-- Dialog -->
+    <string name="dialog_delete_record">刪除全部紀錄？</string>
+    <string name="dialog_delete_keep">收藏紀錄將會全部刪除。</string>
+    <string name="dialog_delete_history">觀看紀錄將會全部刪除。</string>
+
 </resources>

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

@@ -10,6 +10,9 @@
     <!-- History -->
     <string name="history">History</string>
 
+    <!-- Keep -->
+    <string name="keep">Keep</string>
+
     <!-- Detail -->
     <string name="detail_flag">Flag</string>
     <string name="detail_more">More</string>
@@ -17,4 +20,9 @@
     <string name="detail_content">Summary</string>
     <string name="detail_search">Searching <xliff:g name="name">%s</xliff:g></string>
 
+    <!-- Dialog -->
+    <string name="dialog_delete_record">Delete all records?</string>
+    <string name="dialog_delete_keep">All keep records will be removed.</string>
+    <string name="dialog_delete_history">All history records will be removed.</string>
+
 </resources>