Remove back confirm

pull/362/head
FongMi 2 years ago
parent 3470ebf25f
commit b96ec0412f
  1. 9
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
  2. 9
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  3. 1
      app/src/main/res/values-zh-rCN/strings.xml
  4. 1
      app/src/main/res/values-zh-rTW/strings.xml
  5. 1
      app/src/main/res/values/strings.xml
  6. 10
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java

@ -72,7 +72,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
private ArrayObjectAdapter mAdapter;
private SiteViewModel mViewModel;
private boolean loading;
private boolean confirm;
private Result mResult;
private Clock mClock;
@ -278,12 +277,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
return -1;
}
private void setConfirm() {
confirm = true;
Notify.show(R.string.app_exit);
App.post(() -> confirm = false, 5000);
}
public boolean isLoading() {
return loading;
}
@ -457,8 +450,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
setHistoryDelete(false);
} else if (mBinding.recycler.getSelectedPosition() != 0) {
mBinding.recycler.scrollToPosition(0);
} else if (!confirm) {
setConfirm();
} else {
finish();
}

@ -94,7 +94,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
private Runnable mR3;
private Runnable mR4;
private Clock mClock;
private boolean confirm;
private int toggleCount;
private int count;
@ -850,12 +849,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
hideCenter();
}
private void setConfirm() {
confirm = true;
Notify.show(R.string.app_exit);
App.post(() -> confirm = false, 5000);
}
public int getToggleCount() {
return toggleCount;
}
@ -1009,8 +1002,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
hideEpg();
} else if (isVisible(mBinding.recycler)) {
hideUI();
} else if (!confirm) {
setConfirm();
} else {
super.onBackPressed();
}

@ -2,7 +2,6 @@
<!-- App -->
<string name="app_name">影视</string>
<string name="app_exit">再按一次返回键退出</string>
<!-- Vod -->
<string name="vod_last">上次看到<xliff:g name="name">%s</xliff:g></string>

@ -2,7 +2,6 @@
<!-- App -->
<string name="app_name">影視</string>
<string name="app_exit">再按一次返回鍵退出</string>
<!-- Vod -->
<string name="vod_last">上次看到<xliff:g name="name">%s</xliff:g></string>

@ -2,7 +2,6 @@
<!-- App -->
<string name="app_name">TV</string>
<string name="app_exit">Press back again to exit</string>
<!-- Vod -->
<string name="vod_last">Last seen <xliff:g name="name">%s</xliff:g></string>

@ -49,7 +49,6 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
private ActivityMainBinding mBinding;
private FragmentStateManager mManager;
private boolean confirm;
@Override
protected ViewBinding getBinding() {
@ -163,12 +162,6 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
return true;
}
private void setConfirm() {
confirm = true;
Notify.show(R.string.app_exit);
App.post(() -> confirm = false, 5000);
}
public void change(int position) {
mManager.change(position);
}
@ -213,8 +206,7 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
} else if (mManager.isVisible(1)) {
mBinding.navigation.setSelectedItemId(R.id.vod);
} else if (mManager.canBack(0)) {
if (!confirm) setConfirm();
else finish();
finish();
}
}

Loading…
Cancel
Save