chteufleur
/
MyTrackingDog
1
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.kingpenguin.tk/chteufleur/MyTrackingDog

This commit is contained in:
Chteufleur 2018-10-17 19:26:46 +02:00
parent 957136391f 3ce84a5f1e
commit 36f58c3fd1
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/fr/chteufleur/mytrackingdog/MainActivity.java
View File

@ -304,26 +304,27 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu
@Override @Override
public void onBackPressed() { public void onBackPressed() {
if (serviceTrackingDog.isDogActivated() || serviceTrackingDog.isTraceurActivated()) { if (mDrawerLayout.isDrawerOpen(GravityCompat.START)) {
Toast.makeText(ctx, "Une trace est en cours d'enregistrement.", Toast.LENGTH_LONG).show(); mDrawerLayout.closeDrawer(GravityCompat.START);
return ; } else {
} if (serviceTrackingDog.isDogActivated() || serviceTrackingDog.isTraceurActivated()) {
Toast.makeText(ctx, "Une trace est en cours d'enregistrement.", Toast.LENGTH_LONG).show();
return;
}
super.onBackPressed(); super.onBackPressed();
pause(); pause();
if (serviceTrackingDog != null) { if (serviceTrackingDog != null) {
serviceTrackingDog.close(); serviceTrackingDog.close();
}
zoomed = false;
} }
zoomed = false;
} }
//</editor-fold> //</editor-fold>
//<editor-fold defaultstate="collapsed" desc="Menu management"> //<editor-fold defaultstate="collapsed" desc="Menu management">
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.drawer_view, menu);
Menu _menu = navigationView.getMenu(); Menu _menu = navigationView.getMenu();
_menu.findItem(R.id.action_qr_code_generator).setEnabled(false); _menu.findItem(R.id.action_qr_code_generator).setEnabled(false);
_menu.findItem(R.id.action_qr_code_reader).setEnabled(false); _menu.findItem(R.id.action_qr_code_reader).setEnabled(false);