pull/323/head
okjack 2 years ago
parent bf8c96c34e
commit b64f85895f
  1. 5
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/HistoryActivity.java
  2. 3
      app/src/main/res/values-zh-rCN/strings.xml
  3. 3
      app/src/main/res/values-zh-rTW/strings.xml
  4. 3
      app/src/main/res/values/strings.xml
  5. 5
      app/src/mobile/res/values-zh-rCN/strings.xml
  6. 5
      app/src/mobile/res/values-zh-rTW/strings.xml
  7. 5
      app/src/mobile/res/values/strings.xml

@ -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 {

@ -125,6 +125,9 @@
<string name="dialog_config_hint">请输入接口…</string>
<string name="dialog_config_name">请输入名称…</string>
<string name="dialog_config_url">请输入地址…</string>
<string name="dialog_delete_record">删除全部纪录?</string>
<string name="dialog_delete_keep">收藏纪录将会全部删除。</string>
<string name="dialog_delete_history">观看纪录将会全部删除。</string>
<!-- Error -->
<string name="error_config_get">配置取得失败</string>

@ -125,6 +125,9 @@
<string name="dialog_config_hint">請輸入接口…</string>
<string name="dialog_config_name">請輸入名稱…</string>
<string name="dialog_config_url">請輸入網址…</string>
<string name="dialog_delete_record">刪除全部紀錄?</string>
<string name="dialog_delete_keep">收藏紀錄將會全部刪除。</string>
<string name="dialog_delete_history">觀看紀錄將會全部刪除。</string>
<!-- Error -->
<string name="error_config_get">配置取得失敗</string>

@ -125,6 +125,9 @@
<string name="dialog_config_hint">Please enter the config…</string>
<string name="dialog_config_name">Please enter the name…</string>
<string name="dialog_config_url">Please enter the url…</string>
<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>
<!-- Error -->
<string name="error_config_get">Configuration get failed</string>

@ -32,11 +32,6 @@
<string name="control_other">其它</string>
<string name="control_display">屏显</string>
<!-- Dialog -->
<string name="dialog_delete_record">删除全部纪录?</string>
<string name="dialog_delete_keep">收藏纪录将会全部删除。</string>
<string name="dialog_delete_history">观看纪录将会全部删除。</string>
<!-- Timer -->
<string name="timer_5">5 分钟</string>
<string name="timer_15">15 分钟</string>

@ -32,11 +32,6 @@
<string name="control_other">其它</string>
<string name="control_display">螢幕顯示</string>
<!-- Dialog -->
<string name="dialog_delete_record">刪除全部紀錄?</string>
<string name="dialog_delete_keep">收藏紀錄將會全部刪除。</string>
<string name="dialog_delete_history">觀看紀錄將會全部刪除。</string>
<!-- Timer -->
<string name="timer_5">5 分鐘</string>
<string name="timer_15">15 分鐘</string>

@ -32,11 +32,6 @@
<string name="control_other">Other</string>
<string name="control_display">Display</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>
<!-- Timer -->
<string name="timer_5">5 minutes</string>
<string name="timer_15">15 minutes</string>

Loading…
Cancel
Save