Adding back button in settings activity and confirmation dialog in main activity

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.6.1'
 
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Oct 28 17:15:18 IST 2019
+#Wed Mar 11 20:02:17 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

skunkworks_crow/src/main/AndroidManifest.xml

@@ -45,7 +45,10 @@
                 android:value=".views.ui.main.MainActivity" />
         </activity>
         <activity android:name=".views.ui.instance.InstancesList" />
-        <activity android:name=".views.ui.settings.SettingsActivity" />
+        <activity android:name=".views.ui.settings.SettingsActivity"
+            android:parentActivityName=".views.ui.main.MainActivity">
+
+        </activity>
         <activity android:name=".views.ui.about.WebViewActivity" />
         <activity
             android:name=".views.ui.about.AboutActivity"

skunkworks_crow/src/main/java/org/odk/share/views/ui/main/MainActivity.java

@@ -106,6 +106,16 @@ protected void onCreate(Bundle savedInstanceState) {
         addListItemDivider();
     }
 
+    @Override
+    public void onBackPressed(){
+        new AlertDialog.Builder(this).setIcon(R.drawable.ic_launcher_foreground).setTitle("Closing Skunkworks Crow").setMessage("Are you sure you want to close the app")
+                .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        finish();
+                    }
+                }).setNegativeButton("No",null).show();
+    }
     private void setupAdapter() {
         formAdapter = new FormsAdapter(this, null, this, instancesDao, transferDao);
         recyclerView.setAdapter(formAdapter);

skunkworks_crow/src/main/java/org/odk/share/views/ui/settings/SettingsActivity.java

@@ -2,6 +2,7 @@
 
 import android.bluetooth.BluetoothAdapter;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
@@ -21,20 +22,25 @@
 import android.view.WindowManager;
 import android.widget.Toast;
 
+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.Toolbar;
 
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 
 import org.odk.share.R;
+import org.odk.share.views.ui.main.MainActivity;
 
 /**
  * Created by laksh on 5/27/2018.
  */
 
 public class SettingsActivity extends PreferenceActivity {
 
+
+
     EditTextPreference hotspotNamePreference;
     EditTextPreference bluetoothNamePreference;
     Preference hotspotPasswordPreference;
@@ -48,11 +54,20 @@ public class SettingsActivity extends PreferenceActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+
         super.onCreate(savedInstanceState);
         ViewGroup root = getRootView();
         Toolbar toolbar = (Toolbar) View.inflate(this, R.layout.toolbar, null);
         toolbar.setTitle(getString(R.string.settings));
         root.addView(toolbar, 0);
+        toolbar.setNavigationIcon(R.drawable.ic_back_navigation);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onBackPressed();
+            }
+
+        });
 
         addPreferencesFromResource(R.xml.preferences_menu);
         addPreferences();
@@ -75,6 +90,7 @@ private void addPreferences() {
         btSecureModePreference = (CheckBoxPreference) findPreference(PreferenceKeys.KEY_BLUETOOTH_SECURE_MODE);
         odkDestinationDirPreference = (EditTextPreference) findPreference(PreferenceKeys.KEY_ODK_DESTINATION_DIR);
 
+
         prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
 
         defaultMethodPreference.setSummary(prefs.getString(PreferenceKeys.KEY_DEFAULT_TRANSFER_METHOD,
@@ -217,16 +233,16 @@ public void onShow(DialogInterface dialog) {
                 edtpass.addTextChangedListener(new TextWatcher() {
                     @Override
                     public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                 
+
                     }
 
                     @Override
                     public void onTextChanged(CharSequence s, int start, int before, int count) {
 
                         if (edtpass.getText().toString().length() >= 8) {
-                            ((AlertDialog) dialog) .getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
+                            ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
                         } else {
-                            ((AlertDialog) dialog) .getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                            ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
                         }
                     }
 
@@ -238,12 +254,8 @@ public void afterTextChanged(Editable s) {
             }
         });
 
-
         alertDialog.show();
-
         alertDialog.setCancelable(true);
         alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
     }
-
-}
-
+}

skunkworks_crow/src/main/res/drawable/ic_back_navigation.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M20,11L7.8,11l5.6,-5.6L12,4l-8,8l8,8l1.4,-1.4L7.8,13L20,13L20,11z"
+        />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M20,11L7.8,11l5.6,-5.6L12,4l-8,8l8,8l1.4,-1.4L7.8,13L20,13L20,11z"
+        />
+</vector>