UX Improvements

.gitignore

@@ -11,22 +11,4 @@
 
 /app/build
 
-.idea/.name
-
-.idea/compiler.xml
-
-.idea/copyright/profiles_settings.xml
-
-.idea/encodings.xml
-
-.idea/gradle.xml
-
-.idea/misc.xml
-
-.idea/modules.xml
-
-.idea/runConfigurations.xml
-
-.idea/vcs.xml
-
-.idea/caches/
+.idea

app/src/main/AndroidManifest.xml

@@ -42,17 +42,10 @@
                 <action android:name="com.greenaddress.abcore.BitcoinConfEditActivity"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".AboutActivity"
-            android:label="@string/title_activity_about"/>
         <activity
             android:name=".SettingsActivity"
             android:label="@string/title_activity_settings"
             android:noHistory="true"/>
-        <activity
-            android:name=".DownloadSettingsActivity"
-            android:label="@string/title_activity_download_settings"
-            android:noHistory="true"/>
         <activity
             android:name=".PeerActivity"
             android:label="@string/title_activity_peer"

app/src/main/java/com/greenaddress/abcore/ABCoreBaseActivity.java

@@ -0,0 +1,50 @@
+package com.greenaddress.abcore;
+
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class ABCoreBaseActivity extends AppCompatActivity {
+
+    @Override
+    public boolean onCreateOptionsMenu(final Menu menu) {
+        final MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(final MenuItem item) {
+        // Handle item selection
+        switch (item.getItemId()) {
+            case R.id.main:
+                startActivity(new Intent(this, MainActivity.class));
+                return true;
+            case R.id.configuration:
+                startActivity(new Intent(this, SettingsActivity.class));
+                return true;
+            case R.id.peerview:
+                startActivity(new Intent(this, PeerActivity.class));
+                return true;
+            case R.id.debug:
+                startActivity(new Intent(this, LogActivity.class));
+                return true;
+            case R.id.console:
+                startActivity(new Intent(this, ConsoleActivity.class));
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    protected void setUpTopNavBar(){
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        final String useDistribution = prefs.getString("usedistribution", "core");
+        getSupportActionBar().setSubtitle(getString(R.string.subtitle, useDistribution));
+    }
+}

app/src/main/java/com/greenaddress/abcore/AppCompatPreferenceActivity.java

@@ -33,7 +33,7 @@ protected void onPostCreate(Bundle savedInstanceState) {
         getDelegate().onPostCreate(savedInstanceState);
     }
 
-    ActionBar getSupportActionBar() {
+    protected ActionBar getSupportActionBar() {
         return getDelegate().getSupportActionBar();
     }
 

app/src/main/java/com/greenaddress/abcore/ConsoleActivity.java

@@ -17,7 +17,7 @@
 
 import com.google.android.material.snackbar.Snackbar;
 
-public class ConsoleActivity extends AppCompatActivity {
+public class ConsoleActivity extends ABCoreBaseActivity {
 
     private RPCResponseReceiver rpcResponseReceiver;
 
@@ -26,11 +26,7 @@ protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_console);
 
-        final Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        final String useDistribution = prefs.getString("usedistribution", "core");
-        getSupportActionBar().setSubtitle(getString(R.string.subtitle, useDistribution));
+        setUpTopNavBar();
 
         final EditText console = findViewById(R.id.editText2);
         console.setOnEditorActionListener(new TextView.OnEditorActionListener() {

app/src/main/java/com/greenaddress/abcore/DownloadActivity.java

@@ -4,20 +4,18 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 
 import com.google.android.material.snackbar.Snackbar;
 
@@ -27,7 +25,9 @@ public class DownloadActivity extends AppCompatActivity {
     private final static String TAG = DownloadActivity.class.getName();
     private DownloadInstallCoreResponseReceiver mDownloadInstallCoreResponseReceiver;
     private ProgressBar mPB;
-    private Button mButton;
+    private Button mButtonCore;
+    private Button mButtonKnots;
+    private Button mButtonLiquid;
     private TextView mTvStatus;
     private TextView mTvDetails;
     private View mContent;
@@ -63,18 +63,20 @@ private void showSnackMsg(final String msg) {
     protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_download);
-        final Toolbar toolbar = findViewById(R.id.toolbar);
         mPB = findViewById(R.id.progressBar);
         mTvStatus = findViewById(R.id.textView);
-        mButton = findViewById(R.id.button);
+        mButtonCore = findViewById(R.id.buttonCore);
+        mButtonKnots = findViewById(R.id.buttonKnots);
+        mButtonLiquid = findViewById(R.id.buttonLiquid);
         mTvDetails = findViewById(R.id.textViewDetails);
         mContent = findViewById(android.R.id.content);
-        setSupportActionBar(toolbar);
 
         try {
             Utils.getArch();
         } catch (final Utils.ABIsUnsupported e) {
-            mButton.setEnabled(false);
+            mButtonCore.setEnabled(false);
+            mButtonKnots.setEnabled(false);
+            mButtonLiquid.setEnabled(false);
             final String msg = getString(R.string.abis_unsupported, TextUtils.join(",", Build.SUPPORTED_ABIS));
             mTvStatus.setText(msg);
             showSnackMsg(msg);
@@ -100,43 +102,54 @@ public void onResume() {
             mDownloadInstallCoreResponseReceiver = new DownloadInstallCoreResponseReceiver();
         downloadFilter.addCategory(Intent.CATEGORY_DEFAULT);
         registerReceiver(mDownloadInstallCoreResponseReceiver, downloadFilter);
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        final SharedPreferences.Editor e = prefs.edit();
 
-        mButton.setOnClickListener(new View.OnClickListener() {
+        mButtonCore.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(final View view) {
+                e.putString("usedistribution","core");
+                e.apply();
                 mPB.setVisibility(View.VISIBLE);
                 startService(new Intent(DownloadActivity.this, DownloadInstallCoreIntentService.class));
-                mButton.setEnabled(false);
                 disableWhileDownloading();
             }
         });
 
+        mButtonKnots.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(final View view) {
+                e.putString("usedistribution","knots");
+                e.apply();
+                mPB.setVisibility(View.VISIBLE);
+                startService(new Intent(DownloadActivity.this, DownloadInstallCoreIntentService.class));
+                disableWhileDownloading();
+            }
+        });
+
+        mButtonLiquid.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(final View view) {
+                e.putString("usedistribution","liquid");
+                e.apply();
+                mPB.setVisibility(View.VISIBLE);
+                startService(new Intent(DownloadActivity.this, DownloadInstallCoreIntentService.class));
+                disableWhileDownloading();
+            }
+        });
+
+
         if (DownloadInstallCoreIntentService.HAS_BEEN_STARTED)
             disableWhileDownloading();
     }
 
     private void disableWhileDownloading() {
-        mButton.setEnabled(false);
+        mButtonCore.setEnabled(false);
+        mButtonKnots.setEnabled(false);
+        mButtonLiquid.setEnabled(false);
         mTvStatus.setText(R.string.waitfetchingconfiguring);
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(final Menu menu) {
-        final MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.download, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
-        // Handle item selection
-        if (item.getItemId() == R.id.download_distributions) {
-            startActivity(new Intent(this, DownloadSettingsActivity.class));
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
     public class DownloadInstallCoreResponseReceiver extends BroadcastReceiver {
         public static final String ACTION_RESP =
                 "com.greenaddress.intent.action.MESSAGE_PROCESSED";
@@ -154,7 +167,9 @@ public void onReceive(final Context context, final Intent intent) {
                     mPB.setProgress(0);
                     mPB.setVisibility(View.GONE);
                     mTvDetails.setText(exe);
-                    mButton.setEnabled(true);
+                    mButtonCore.setEnabled(true);
+                    mButtonKnots.setEnabled(true);
+                    mButtonLiquid.setEnabled(true);
                     mTvStatus.setText(R.string.failedretry);
                     break;
                 case "ABCOREUPDATE":