diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser new file mode 100644 index 0000000000000000000000000000000000000000..ef1c5cc1abd09ae3034a65f27b3c5a582e807649 Binary files /dev/null and b/.idea/caches/gradle_models.ser differ diff --git a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java index 04f6c661ac7ef12f893f58d67c8617010f9744f4..edac2c3cd7d6f5e1d0ec37b4fd9817357b634b65 100644 --- a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java +++ b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java @@ -5,7 +5,6 @@ import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.AlertDialog; import android.app.DownloadManager; -import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; import android.app.ProgressDialog; @@ -27,7 +26,9 @@ import android.os.Parcelable; import android.provider.MediaStore; import android.support.annotation.NonNull; import android.support.annotation.RequiresApi; +import android.support.design.widget.Snackbar; import android.support.v4.app.ActivityCompat; +import android.support.v4.app.FragmentManager; import android.support.v4.app.NotificationCompat; import android.support.v4.content.ContextCompat; import android.support.v4.widget.SwipeRefreshLayout; @@ -106,6 +107,8 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL private ProgressBar progressBar; private int progressStatus = 0; private Handler handler = new Handler(); + private Snackbar snackbarExitApp; + private FragmentManager fm; public static final int REQUEST_ID_MULTIPLE_PERMISSIONS = 1; @@ -189,6 +192,16 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL } }); + //Setup snackbar + snackbarExitApp = Snackbar + .make(findViewById(R.id.framelayout_container), R.string.do_you_want_to_exit, Snackbar.LENGTH_LONG) + .setAction(android.R.string.yes, new View.OnClickListener() { + public void onClick(View view) { + finish(); + moveTaskToBack(true); + } + }); + //Set buttons // Locate the button in activity_main.xml button = findViewById(R.id.MailBtn);//MailBtn @@ -1964,4 +1977,22 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); mNotificationManager.notify(001, mBuilder.build()); } + + //show snackbar to avoid exit on backpress + @Override + public void onBackPressed() { + ScrollView dashboard = findViewById(R.id.dashboard); + FragmentManager manager = getSupportFragmentManager(); + if (dashboard.getVisibility() == View.GONE){ + dashboard.setVisibility(View.VISIBLE); + return; + } + if (manager.getBackStackEntryCount() > 0) { + super.onBackPressed(); + } else { + snackbarExitApp.show(); + } + return; + } + } diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 30bc28256a28da81fb3a957a8eca18e3e2aa20f1..1e46666933165d7dd9108b3cbc18152fbd20ff6a 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -157,4 +157,5 @@ <string name="action_notes">Notes</string> <string name="NotesDialog">Para continuar, primero necesitas instalar Notas.\nPor favor, selecciona Instalar para continuar con la instalación desde F-Droid.</string> <string name="PadDialog">Para continuar, primero necesitas instalar Padland.\nPor favor, selecciona Instalar para continuar desde F-Droid.</string> + <string name="do_you_want_to_exit">do you want to exit?</string> </resources> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f5d6309b72fe66fb938c18aafd8bab702e9b6caa..c6da1101c07eb876e18de5d338a64e2debcf4d86 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -194,4 +194,5 @@ <string name="NotesDialog">Pour continuer, vous devez d\'abord installer Notes.\nVeuillez sélectionner Installer pour continuer l\'installation avec F-Droid.</string> <string name="action_notes">Notes</string> <string name="PadDialog">Pour continuer, vous devez d\'abord installer Padland.\nVeuillez sélectionner Installer pour continuer l\'installation avec F-Droid.</string> + <string name="do_you_want_to_exit">do you want to exit?</string> </resources> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7a7ff418df285f37d05282b10b352f240c09cb12..76bbd596a76c98fd98f949c2c51857e58febcd00 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -156,4 +156,5 @@ <string name="NotesDialog">Per continuare è necessario installare Notes.\nSelezionate installa per continuare con l\'installazione su F-Droid.</string> <string name="action_notes">Note</string> <string name="PadDialog">Per continuare è necessario installare Padland.\nSelezionate installa per continuare con l\'installazione su F-Droid.</string> + <string name="do_you_want_to_exit">Vuoi veramente uscire?</string> </resources> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index a0b01167fd857d6f54e7b2c9af5d7a2c71a51b56..3247e86f04bfe09d75b855a4a6b218e5be0ec1fe 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -158,4 +158,5 @@ <string name="NotesDialog">Om verder te gaan moet u eerst Notes installeren.\nSelecteer Installeren om verder te gaan met de installatie op F-Droid.</string> <string name="action_notes">Notes</string> <string name="PadDialog">Om verder te gaan moet u eerst Padland installeren.\nSelecteer Installeren om verder te gaan met de installatie op F-Droid.</string> + <string name="do_you_want_to_exit">Will je de app verlaten?</string> </resources> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 91d87dd6b3b3090e0575641ff7ed8eae498b2183..886962e1cb5771a9b1c4538a3ff9dca6d7caa702 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -156,4 +156,5 @@ <string name="NotesDialog">To continue you need to install Notes first.\nPlease select install to continue with the installatin on F-Droid.</string> <string name="action_notes">Notes</string> <string name="PadDialog">To continue you need to install Padland first.\nPlease select install to continue with the installatin on F-Droid.</string> + <string name="do_you_want_to_exit">do you want to exit?</string> </resources> diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index d64973e5a95a0c7e765a162dd71e072cfb07073b..f78e6c5e9eb4c0d6b3de8a383b8f14720c368a72 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -157,4 +157,5 @@ <string name="NotesDialog">Za nastavak je potrebno instalirati aplikaciju Beleške (Notes).\nIzaberite \'instaliraj\' i preuzmite aplikaciju pomoću F-Droid-a.</string> <string name="action_notes">Beleške</string> <string name="PadDialog">Za nastavak je potrebno instalirati aplikaciju Padland.\nIzaberite \'instaliraj\' i preuzmite aplikaciju pomoću F-Droid-a.</string> + <string name="do_you_want_to_exit">do you want to exit?</string> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6db3d7be8906c1ff4c3e3ea5e73d0694834abd44..6f614bda0407bd18b0216e3de37d8487dbfd4a5e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -157,4 +157,5 @@ <string name="NotesDialog">To continue you need to install Notes first.\nPlease select install to continue with the installation on F-Droid.</string> <string name="action_notes">Notes</string> <string name="PadDialog">To continue you need to install Padland first.\nPlease select install to continue with the installation on F-Droid.</string> + <string name="do_you_want_to_exit">Do you want to exit?</string> </resources>