From b0c7a9bd498248594e51cd4b77a613ed8a3e6724 Mon Sep 17 00:00:00 2001 From: FongMi Date: Sat, 25 Mar 2023 18:27:51 +0800 Subject: [PATCH] [mobile] adjust delete message --- app/src/main/res/values-zh-rCN/strings.xml | 5 ----- app/src/main/res/values-zh-rTW/strings.xml | 5 ----- app/src/main/res/values/strings.xml | 5 ----- .../fongmi/android/tv/ui/activity/HistoryActivity.java | 7 +++++-- .../com/fongmi/android/tv/ui/activity/KeepActivity.java | 7 +++++-- .../drawable/{selector_filter.xml => selector_accent.xml} | 4 ++-- ...pe_filter_activated.xml => shape_accent_activated.xml} | 0 .../{shape_filter_normal.xml => shape_accent_normal.xml} | 0 app/src/mobile/res/layout/activity_history.xml | 5 ++++- app/src/mobile/res/layout/activity_keep.xml | 5 ++++- app/src/mobile/res/layout/adapter_value.xml | 2 +- app/src/mobile/res/values-zh-rCN/strings.xml | 8 ++++++++ app/src/mobile/res/values-zh-rTW/strings.xml | 8 ++++++++ app/src/mobile/res/values/strings.xml | 8 ++++++++ 14 files changed, 45 insertions(+), 24 deletions(-) rename app/src/mobile/res/drawable/{selector_filter.xml => selector_accent.xml} (50%) rename app/src/mobile/res/drawable/{shape_filter_activated.xml => shape_accent_activated.xml} (100%) rename app/src/mobile/res/drawable/{shape_filter_normal.xml => shape_accent_normal.xml} (100%) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 4d244239e..b4544d1c0 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -80,12 +80,7 @@ 请输入接口… 请输入地址… - - 是否清空所有收藏纪录？ - 是否清空所有观看纪录？ - - FFmpeg 加载失败 配置取得失败 配置解析失败 已经是最后一集了！ diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 33fb9dbad..254bb2cd0 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -80,12 +80,7 @@ 請輸入接口… 請輸入網址… - - 是否清空所有收藏紀錄？ - 是否清空所有觀看紀錄？ - - FFmpeg 載入失敗 配置取得失敗 配置解析失敗 已經是最後一集了！ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 91a4fa0c4..f60646167 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -80,12 +80,7 @@ Please enter the config… Please enter the url… - - Do you want to clear all keep records? - Do you want to clear all history records? - - Failed to load FFmpeg Configuration get failed Configuration parse failed It\'s the last episode! diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java index f924d2f84..8cfe914f2 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java +++ b/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 diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java index b48a5937b..144c21b5e 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/KeepActivity.java +++ b/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 diff --git a/app/src/mobile/res/drawable/selector_filter.xml b/app/src/mobile/res/drawable/selector_accent.xml similarity index 50% rename from app/src/mobile/res/drawable/selector_filter.xml rename to app/src/mobile/res/drawable/selector_accent.xml index 6fda66b7e..4fb1ab57d 100644 --- a/app/src/mobile/res/drawable/selector_filter.xml +++ b/app/src/mobile/res/drawable/selector_accent.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/mobile/res/drawable/shape_filter_activated.xml b/app/src/mobile/res/drawable/shape_accent_activated.xml similarity index 100% rename from app/src/mobile/res/drawable/shape_filter_activated.xml rename to app/src/mobile/res/drawable/shape_accent_activated.xml diff --git a/app/src/mobile/res/drawable/shape_filter_normal.xml b/app/src/mobile/res/drawable/shape_accent_normal.xml similarity index 100% rename from app/src/mobile/res/drawable/shape_filter_normal.xml rename to app/src/mobile/res/drawable/shape_accent_normal.xml diff --git a/app/src/mobile/res/layout/activity_history.xml b/app/src/mobile/res/layout/activity_history.xml index c85671635..7891513a5 100644 --- a/app/src/mobile/res/layout/activity_history.xml +++ b/app/src/mobile/res/layout/activity_history.xml @@ -1,5 +1,6 @@ @@ -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" /> diff --git a/app/src/mobile/res/layout/activity_keep.xml b/app/src/mobile/res/layout/activity_keep.xml index baf515681..763d38fb9 100644 --- a/app/src/mobile/res/layout/activity_keep.xml +++ b/app/src/mobile/res/layout/activity_keep.xml @@ -1,5 +1,6 @@ @@ -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" /> diff --git a/app/src/mobile/res/layout/adapter_value.xml b/app/src/mobile/res/layout/adapter_value.xml index d259ff023..9303212e0 100644 --- a/app/src/mobile/res/layout/adapter_value.xml +++ b/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="全部" /> \ No newline at end of file diff --git a/app/src/mobile/res/values-zh-rCN/strings.xml b/app/src/mobile/res/values-zh-rCN/strings.xml index 7f1fd0bb8..76f340684 100644 --- a/app/src/mobile/res/values-zh-rCN/strings.xml +++ b/app/src/mobile/res/values-zh-rCN/strings.xml @@ -10,6 +10,9 @@ 最近观看 + + 我的收藏 + 线路 更多 @@ -17,4 +20,9 @@ 简介 快搜“%s” + + 删除全部纪录？ + 收藏纪录将会全部删除。 + 观看纪录将会全部删除。 + \ No newline at end of file diff --git a/app/src/mobile/res/values-zh-rTW/strings.xml b/app/src/mobile/res/values-zh-rTW/strings.xml index fbf52d866..8da9806d9 100644 --- a/app/src/mobile/res/values-zh-rTW/strings.xml +++ b/app/src/mobile/res/values-zh-rTW/strings.xml @@ -10,6 +10,9 @@ 最近觀看 + + 我的收藏 + 線路 更多 @@ -17,4 +20,9 @@ 簡介 快搜「%s」 + + 刪除全部紀錄？ + 收藏紀錄將會全部刪除。 + 觀看紀錄將會全部刪除。 + \ No newline at end of file diff --git a/app/src/mobile/res/values/strings.xml b/app/src/mobile/res/values/strings.xml index 59096406d..384181b27 100644 --- a/app/src/mobile/res/values/strings.xml +++ b/app/src/mobile/res/values/strings.xml @@ -10,6 +10,9 @@ History + + Keep + Flag More @@ -17,4 +20,9 @@ Summary Searching %s + + Delete all records? + All keep records will be removed. + All history records will be removed. + \ No newline at end of file