Disroot/disapp
Disroot
/
disapp
8
8
Fork 2
Code Issues 3 Pull Requests Projects Releases 7 Wiki Activity

Fixed exiting app on backpress \o/

This commit is contained in:
massimiliano 2019-02-18 20:25:22 +01:00
parent 1d1a5f908b
commit 079e4af13b
9 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/gradle_models.ser Normal file
View File

Binary file not shown.

33
app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
View File

@ -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;
}
}

1
app/src/main/res/values-es/strings.xml
View File

@ -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>

1
app/src/main/res/values-fr/strings.xml
View File

@ -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>

1
app/src/main/res/values-it/strings.xml
View File

@ -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>

1
app/src/main/res/values-nl/strings.xml
View File

@ -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>

1
app/src/main/res/values-pt/strings.xml
View File

@ -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>

1
app/src/main/res/values-sr/strings.xml
View File

@ -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>

1
app/src/main/res/values/strings.xml
View File

@ -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>