Don't reset group on back button press

This commit is contained in:
Sylvia van Os
2021-09-08 20:04:19 +02:00
parent 98c41ec003
commit 9ba07982bf
2 changed files with 8 additions and 18 deletions

View File

@@ -5,6 +5,7 @@
- Improved support for screen readers
- Don't crash when trying to open a video from gallery
- Swipe support on loyalty card view screen
- Don't reset group on back button press
## v2.4.0 - 81 (2021-08-29)

View File

@@ -356,27 +356,16 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
@Override
public void onBackPressed()
{
if (mMenu == null)
{
super.onBackPressed();
return;
}
if (mMenu != null) {
SearchView searchView = (SearchView) mMenu.findItem(R.id.action_search).getActionView();
SearchView searchView = (SearchView) mMenu.findItem(R.id.action_search).getActionView();
if (!searchView.isIconified())
{
searchView.setIconified(true);
} else {
TabLayout groupsTabLayout = findViewById(R.id.groups);
if (groupsTabLayout.getVisibility() == View.VISIBLE && selectedTab != 0) {
selectedTab = 0;
groupsTabLayout.selectTab(groupsTabLayout.getTabAt(0));
} else {
super.onBackPressed();
if (!searchView.isIconified()) {
searchView.setIconified(true);
return;
}
}
super.onBackPressed();
}
private void updateLoyaltyCardList(String filterText, Object tag)