diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java index 85e8abd5a..9a002f60b 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java @@ -8,12 +8,14 @@ import androidx.viewbinding.ViewBinding; import com.fongmi.android.tv.App; import com.fongmi.android.tv.Product; +import com.fongmi.android.tv.R; import com.fongmi.android.tv.bean.History; import com.fongmi.android.tv.databinding.ActivityHistoryBinding; import com.fongmi.android.tv.event.RefreshEvent; import com.fongmi.android.tv.ui.adapter.HistoryAdapter; import com.fongmi.android.tv.ui.base.BaseActivity; import com.fongmi.android.tv.ui.custom.SpaceItemDecoration; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -53,6 +55,7 @@ public class HistoryActivity extends BaseActivity implements HistoryAdapter.OnCl } private void getHistory() { + mBinding.delete.setFocusable(false); mAdapter.addAll(History.get()); App.post(() -> { mBinding.delete.setVisibility(mAdapter.getItemCount() > 0 ? View.VISIBLE : View.GONE); @@ -63,7 +66,7 @@ public class HistoryActivity extends BaseActivity implements HistoryAdapter.OnCl private void onDelete(View view) { if (mAdapter.isDelete()) { - mAdapter.clear(); + 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 { diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 335fd8784..3fd148754 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -125,6 +125,9 @@ 请输入接口… 请输入名称… 请输入地址… + 删除全部纪录? + 收藏纪录将会全部删除。 + 观看纪录将会全部删除。 配置取得失败 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 21163e69e..97997a45d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -125,6 +125,9 @@ 請輸入接口… 請輸入名稱… 請輸入網址… + 刪除全部紀錄? + 收藏紀錄將會全部刪除。 + 觀看紀錄將會全部刪除。 配置取得失敗 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d3f45f497..7595fda53 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -125,6 +125,9 @@ Please enter the config… Please enter the name… Please enter the url… + Delete all records? + All keep records will be removed. + All history records will be removed. Configuration get failed diff --git a/app/src/mobile/res/values-zh-rCN/strings.xml b/app/src/mobile/res/values-zh-rCN/strings.xml index 7d40b5958..936f31c9b 100644 --- a/app/src/mobile/res/values-zh-rCN/strings.xml +++ b/app/src/mobile/res/values-zh-rCN/strings.xml @@ -32,11 +32,6 @@ 其它 屏显 - - 删除全部纪录? - 收藏纪录将会全部删除。 - 观看纪录将会全部删除。 - 5 分钟 15 分钟 diff --git a/app/src/mobile/res/values-zh-rTW/strings.xml b/app/src/mobile/res/values-zh-rTW/strings.xml index e37ed3200..c39ef2632 100644 --- a/app/src/mobile/res/values-zh-rTW/strings.xml +++ b/app/src/mobile/res/values-zh-rTW/strings.xml @@ -32,11 +32,6 @@ 其它 螢幕顯示 - - 刪除全部紀錄? - 收藏紀錄將會全部刪除。 - 觀看紀錄將會全部刪除。 - 5 分鐘 15 分鐘 diff --git a/app/src/mobile/res/values/strings.xml b/app/src/mobile/res/values/strings.xml index 7701c0257..8cf93148f 100644 --- a/app/src/mobile/res/values/strings.xml +++ b/app/src/mobile/res/values/strings.xml @@ -32,11 +32,6 @@ Other Display - - Delete all records? - All keep records will be removed. - All history records will be removed. - 5 minutes 15 minutes