Some refactoring (#742)

* configure enabling of shift & exchange
* refactor qr logo code
* fix rename wallet

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 900
+        versionCode 1000
-        versionName "1.19.0.2 'XXX'"
+        versionName "2.0.0.0 'Puginarug'"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java

@@ -985,16 +985,16 @@ public class LoginActivity extends BaseActivity
         File dstDir = dstWallet.getParentFile();
         String dstName = dstWallet.getName();
         try {
-            try {
+            copyFile(new File(srcDir, srcName + ".keys"), new File(dstDir, dstName + ".keys"));
+            try { // cache & address.txt are optional files
                 copyFile(new File(srcDir, srcName), new File(dstDir, dstName));
+                copyFile(new File(srcDir, srcName + ".address.txt"), new File(dstDir, dstName + ".address.txt"));
             } catch (IOException ex) {
                 Timber.d("CACHE %s", ignoreCacheError);
                 if (!ignoreCacheError) { // ignore cache backup error if backing up (can be resynced)
                     throw ex;
                 }
             }
-            copyFile(new File(srcDir, srcName + ".keys"), new File(dstDir, dstName + ".keys"));
-            copyFile(new File(srcDir, srcName + ".address.txt"), new File(dstDir, dstName + ".address.txt"));
             success = true;
         } catch (IOException ex) {
             Timber.e("wallet copy failed: %s", ex.getMessage());

app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java

@@ -385,24 +385,18 @@ public class ReceiveFragment extends Fragment {
     }
 
     private Bitmap addLogo(Bitmap qrBitmap) {
+        // addume logo & qrcode are both square
         Bitmap logo = getMoneroLogo();
-        int qrWidth = qrBitmap.getWidth();
+        final int qrSize = qrBitmap.getWidth();
-        int qrHeight = qrBitmap.getHeight();
+        final int logoSize = logo.getWidth();
-        int logoWidth = logo.getWidth();
-        int logoHeight = logo.getHeight();
 
-        Bitmap logoBitmap = Bitmap.createBitmap(qrWidth, qrHeight, Bitmap.Config.ARGB_8888);
+        Bitmap logoBitmap = Bitmap.createBitmap(qrSize, qrSize, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(logoBitmap);
         canvas.drawBitmap(qrBitmap, 0, 0, null);
         canvas.save();
-        // figure out how to scale the logo
+        final float sx = 0.2f * qrSize / logoSize;
-        float scaleSize = 1.0f;
+        canvas.scale(sx, sx, qrSize / 2f, qrSize / 2f);
-        while ((logoWidth / scaleSize) > (qrWidth / 5.) || (logoHeight / scaleSize) > (qrHeight / 5.)) {
+        canvas.drawBitmap(logo, (qrSize - logoSize) / 2f, (qrSize - logoSize) / 2f, null);
-            scaleSize *= 2;
-        }
-        float sx = 1.0f / scaleSize;
-        canvas.scale(sx, sx, qrWidth / 2f, qrHeight / 2f);
-        canvas.drawBitmap(logo, (qrWidth - logoWidth) / 2f, (qrHeight - logoHeight) / 2f, null);
         canvas.restore();
         return logoBitmap;
     }

app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java

@@ -126,6 +126,7 @@ public class WalletFragment extends Fragment
         sCurrency = view.findViewById(R.id.sCurrency);
         List<String> currencies = new ArrayList<>();
         currencies.add(Helper.BASE_CRYPTO);
+        if (Helper.SHOW_EXCHANGERATES)
             currencies.addAll(Arrays.asList(getResources().getStringArray(R.array.currency)));
         ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<>(Objects.requireNonNull(getContext()), R.layout.item_spinner_balance, currencies);
         spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);

app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java

@@ -117,8 +117,8 @@ public class SendAddressWizardFragment extends SendWizardFragment {
 
         View view = inflater.inflate(R.layout.fragment_send_address, container, false);
 
+        if (Helper.ALLOW_SHIFT) {
             tvXmrTo = view.findViewById(R.id.tvXmrTo);
-
             ibCrypto = new HashMap<>();
             for (Crypto crypto : Crypto.values()) {
                 final ImageButton button = view.findViewById(crypto.getButtonId());
@@ -142,7 +142,9 @@ public class SendAddressWizardFragment extends SendWizardFragment {
                 });
             }
             updateCryptoButtons(true);
-
+        } else {
+            view.findViewById(R.id.llExchange).setVisibility(View.GONE);
+        }
         etAddress = view.findViewById(R.id.etAddress);
         etAddress.getEditText().setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
         etAddress.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
@@ -285,6 +287,7 @@ public class SendAddressWizardFragment extends SendWizardFragment {
     }
 
     private void updateCryptoButtons(boolean noAddress) {
+        if (!Helper.ALLOW_SHIFT) return;
         for (Crypto crypto : Crypto.values()) {
             if (crypto == selectedCrypto) {
                 selectedCrypto(crypto);
@@ -447,7 +450,11 @@ public class SendAddressWizardFragment extends SendWizardFragment {
         BarcodeData barcodeData = sendListener.getBarcodeData();
         if (barcodeData != null) {
             Timber.d("GOT DATA");
-
+            if (!Helper.ALLOW_SHIFT && (barcodeData.asset != Crypto.XMR)) {
+                Timber.d("BUT ONLY XMR SUPPORTED");
+                barcodeData = null;
+                sendListener.setBarcodeData(barcodeData);
+            }
             if (barcodeData.address != null) {
                 etAddress.getEditText().setText(barcodeData.address);
                 possibleCryptos.clear();

app/src/main/java/com/m2049r/xmrwallet/util/Helper.java

@@ -57,6 +57,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.textfield.TextInputLayout;
 import com.m2049r.xmrwallet.BuildConfig;
 import com.m2049r.xmrwallet.R;
+import com.m2049r.xmrwallet.data.Crypto;
 import com.m2049r.xmrwallet.model.WalletManager;
 
 import java.io.File;
@@ -78,7 +79,10 @@ import timber.log.Timber;
 public class Helper {
     static public final String NOCRAZYPASS_FLAGFILE = ".nocrazypass";
 
-    static public final String BASE_CRYPTO = "XMR";
+    static public final String BASE_CRYPTO = Crypto.XMR.getSymbol();
+
+    static public final boolean SHOW_EXCHANGERATES = true;
+    static public final boolean ALLOW_SHIFT = true;
 
     static private final String WALLET_DIR = "wallets";
     static private final String MONERO_DIR = "monero";

app/src/main/java/com/m2049r/xmrwallet/util/Notice.java

@@ -18,8 +18,6 @@ package com.m2049r.xmrwallet.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -27,6 +25,9 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+
 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.dialog.HelpFragment;
 
@@ -44,6 +45,7 @@ public class Notice {
         synchronized (Notice.class) {
             if (notices != null) return;
             notices = new ArrayList<>();
+            if (Helper.ALLOW_SHIFT)
                 notices.add(
                         new Notice(NOTICE_SHOW_XMRTO_ENABLED_SEND,
                                 R.string.info_xmrto_enabled,

app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeEditText.java

@@ -172,6 +172,7 @@ public class ExchangeEditText extends LinearLayout {
     }
 
     protected void setCurrencyAdapter(Spinner spinner, List<String> currencies) {
+        if (Helper.SHOW_EXCHANGERATES)
             currencies.addAll(Arrays.asList(getResources().getStringArray(R.array.currency)));
         ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_item, currencies);
         spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);

app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeView.java

@@ -155,6 +155,7 @@ public class ExchangeView extends LinearLayout {
     void setCurrencyAdapter(Spinner spinner) {
         List<String> currencies = new ArrayList<>();
         currencies.add(Helper.BASE_CRYPTO);
+        if (Helper.SHOW_EXCHANGERATES)
             currencies.addAll(Arrays.asList(getResources().getStringArray(R.array.currency)));
         ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_item, currencies);
         spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
@@ -167,11 +168,7 @@ public class ExchangeView extends LinearLayout {
         etAmount = findViewById(R.id.etAmount);
         tvAmountB = findViewById(R.id.tvAmountB);
         sCurrencyA = findViewById(R.id.sCurrencyA);
-        ArrayAdapter adapter = ArrayAdapter.createFromResource(getContext(), R.array.currency, R.layout.item_spinner);
-        adapter.setDropDownViewResource(R.layout.item_spinner_dropdown_item);
-        sCurrencyA.setAdapter(adapter);
         sCurrencyB = findViewById(R.id.sCurrencyB);
-        sCurrencyB.setAdapter(adapter);
         evExchange = findViewById(R.id.evExchange);
         pbExchange = findViewById(R.id.pbExchange);
 

app/src/main/res/layout/fragment_send_address.xml

@@ -60,6 +60,7 @@
             </RelativeLayout>
 
             <LinearLayout
+                android:id="@+id/llExchange"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">

external-libs/Makefile

@@ -45,10 +45,6 @@ VERSION:
 	echo MONERUJO `git -C . branch | grep "^\*" | sed 's/^..//'` with MONERO `git -C monero branch | grep "^\*" | sed 's/^..//'` > VERSION
 
 clean:
-	-docker container rm monero-android-arm64 -f
-	-docker container rm monero-android-arm32 -f
-	-docker container rm monero-android-x86_64 -f
-	-docker container rm monero-android-x86 -f
 	-rm -rf arm64-v8a
 	-rm -rf armeabi-v7a
 	-rm -rf x86_64
@@ -57,6 +53,10 @@ clean:
 	-rm -f VERSION
 
 distclean: clean
+	-docker container rm monero-android-arm64 -f
+	-docker container rm monero-android-arm32 -f
+	-docker container rm monero-android-x86_64 -f
+	-docker container rm monero-android-x86 -f
 	-docker image rm monero-android-arm64 -f
 	-docker image rm monero-android-arm32 -f
 	-docker image rm monero-android-x86_64 -f

external-libs/VERSION

@@ -1 +1 @@
-MONERUJO feature_dockerbuild with MONERO release-v0.17.1.9-monerujo
+MONERUJO feature_refactor_some with MONERO feature_noaddress