Funkwhale
/
Audinaut-subsonic-app-android
mirror of https://github.com/nvllsvm/Audinaut
1
0
Fork 0
Code Issues Releases Wiki Activity

Consolidate onBackPressed logic

This commit is contained in:
Andrew Rabert 2018-04-23 23:40:06 -04:00
parent 0a1cc75cc4
commit 8222a3f449
2 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/net/nullsum/audinaut/activity/SubsonicActivity.java
View File

@ -533,21 +533,13 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
finish();
}
boolean onBackPressedSupport() {
if (drawerOpen) {
drawer.closeDrawers();
return false;
} else if (backStack.size() > 0) {
removeCurrent();
return false;
} else {
return true;
}
}
@Override
public void onBackPressed() {
if (onBackPressedSupport()) {
if (drawerOpen) {
drawer.closeDrawers();
} else if (backStack.size() > 0) {
removeCurrent();
} else {
super.onBackPressed();
}
}

12
app/src/main/java/net/nullsum/audinaut/activity/SubsonicFragmentActivity.java
View File

@ -421,18 +421,10 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
public void onBackPressed() {
if (slideUpPanel.getPanelState() == SlidingUpPanelLayout.PanelState.EXPANDED && secondaryFragment == null) {
slideUpPanel.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
} else if (onBackPressedSupport()) {
finish();
}
}
@Override
boolean onBackPressedSupport() {
if (slideUpPanel.getPanelState() == SlidingUpPanelLayout.PanelState.EXPANDED) {
} else if (slideUpPanel.getPanelState() == SlidingUpPanelLayout.PanelState.EXPANDED) {
removeCurrent();
return false;
} else {
return super.onBackPressedSupport();
super.onBackPressed();
}
}