PocketChange (#901)

m2049r · Jun 5, 2023 · bf1829f · bf1829f
1 parent bc4aa0f
commit bf1829f
Show file tree

Hide file tree

Showing 64 changed files with 1,179 additions and 320 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 3200
-        versionName "3.2.0 'Decoy Selection'"
+        versionCode 3307
+        versionName "3.3.7 'Pocket Change'"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

diff --git a/app/src/main/cpp/monerujo.cpp b/app/src/main/cpp/monerujo.cpp
diff --git a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
@@ -658,11 +658,11 @@ private void showNet(NetworkType net) {
                 break;
             case NetworkType_Testnet:
                 toolbar.setSubtitle(getString(R.string.connect_testnet));
-                toolbar.setBackgroundResource(ThemeHelper.getThemedResourceId(this, R.attr.colorPrimaryDark));
+                toolbar.setBackgroundResource(ThemeHelper.getThemedResourceId(this, androidx.appcompat.R.attr.colorPrimaryDark));
                 break;
             case NetworkType_Stagenet:
                 toolbar.setSubtitle(getString(R.string.connect_stagenet));
-                toolbar.setBackgroundResource(ThemeHelper.getThemedResourceId(this, R.attr.colorPrimaryDark));
+                toolbar.setBackgroundResource(ThemeHelper.getThemedResourceId(this, androidx.appcompat.R.attr.colorPrimaryDark));
                 break;
             default:
                 throw new IllegalStateException("NetworkType unknown: " + net);

diff --git a/app/src/main/java/com/m2049r/xmrwallet/TxFragment.java b/app/src/main/java/com/m2049r/xmrwallet/TxFragment.java
@@ -79,6 +79,7 @@ public TxFragment() {
     private TextView tvTxPaymentId;
     private TextView tvTxBlockheight;
     private TextView tvTxAmount;
+    private TextView tvTxPocketChangeAmount;
     private TextView tvTxFee;
     private TextView tvTxTransfers;
     private TextView etTxNotes;
@@ -116,6 +117,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         tvTxPaymentId = view.findViewById(R.id.tvTxPaymentId);
         tvTxBlockheight = view.findViewById(R.id.tvTxBlockheight);
         tvTxAmount = view.findViewById(R.id.tvTxAmount);
+        tvTxPocketChangeAmount = view.findViewById(R.id.tvTxPocketChangeAmount);
         tvTxFee = view.findViewById(R.id.tvTxFee);
         tvTxTransfers = view.findViewById(R.id.tvTxTransfers);
         etTxNotes = view.findViewById(R.id.etTxNotes);
@@ -249,8 +251,10 @@ private void show() {
         }
         String sign = (info.direction == TransactionInfo.Direction.Direction_In ? "+" : "-");
 
-        long realAmount = info.amount;
-        tvTxAmount.setText(sign + Wallet.getDisplayAmount(realAmount));
+        tvTxAmount.setText(sign + Wallet.getDisplayAmount(info.amount));
+        final long pcAmount = info.getPocketChangeAmount();
+        tvTxPocketChangeAmount.setVisibility(pcAmount > 0 ? View.VISIBLE : View.GONE);
+        tvTxPocketChangeAmount.setText(getString(R.string.pocketchange_tx_detail, Wallet.getDisplayAmount(pcAmount)));
 
         if ((info.fee > 0)) {
             String fee = Wallet.getDisplayAmount(info.fee);

diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
@@ -52,8 +52,8 @@
 import com.m2049r.xmrwallet.data.Subaddress;
 import com.m2049r.xmrwallet.data.TxData;
 import com.m2049r.xmrwallet.data.UserNotes;
-import com.m2049r.xmrwallet.dialog.CreditsFragment;
 import com.m2049r.xmrwallet.dialog.HelpFragment;
+import com.m2049r.xmrwallet.dialog.PocketChangeFragment;
 import com.m2049r.xmrwallet.fragment.send.SendAddressWizardFragment;
 import com.m2049r.xmrwallet.fragment.send.SendFragment;
 import com.m2049r.xmrwallet.ledger.LedgerProgressDialog;
@@ -82,7 +82,8 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
         WalletFragment.DrawerLocker,
         NavigationView.OnNavigationItemSelectedListener,
         SubaddressFragment.Listener,
-        SubaddressInfoFragment.Listener {
+        SubaddressInfoFragment.Listener,
+        PocketChangeFragment.Listener {
 
     public static final String REQUEST_ID = "id";
     public static final String REQUEST_PW = "pw";
@@ -285,8 +286,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
             onWalletRescan();
         } else if (itemId == R.id.action_info) {
             onWalletDetails();
-        } else if (itemId == R.id.action_credits) {
-            CreditsFragment.display(getSupportFragmentManager());
         } else if (itemId == R.id.action_share) {
             onShareTxInfo();
         } else if (itemId == R.id.action_help_tx_info) {
@@ -301,6 +300,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
             HelpFragment.display(getSupportFragmentManager(), R.string.help_send);
         } else if (itemId == R.id.action_rename) {
             onAccountRename();
+        } else if (itemId == R.id.action_pocketchange) {
+            PocketChangeFragment.display(getSupportFragmentManager(), getWallet().getPocketChangeSetting());
         } else if (itemId == R.id.action_subaddresses) {
             showSubaddresses(true);
         } else if (itemId == R.id.action_streetmode) {
@@ -422,7 +423,7 @@ public void showNet() {
                 break;
             case NetworkType_Stagenet:
             case NetworkType_Testnet:
-                toolbar.setBackgroundResource(ThemeHelper.getThemedResourceId(this, R.attr.colorPrimaryDark));
+                toolbar.setBackgroundResource(ThemeHelper.getThemedResourceId(this, androidx.appcompat.R.attr.colorPrimaryDark));
                 break;
             default:
                 throw new IllegalStateException("Unsupported Network: " + WalletManager.getInstance().getNetworkType());
@@ -628,6 +629,7 @@ public void onWalletOpen(final Wallet.Device device) {
 
     @Override
     public void onWalletStarted(final Wallet.Status walletStatus) {
+        loadPocketChangeSettings();
         runOnUiThread(() -> {
             dismissProgressDialog();
             if (walletStatus == null) {
@@ -1104,6 +1106,7 @@ public void onAccountRename() {
 
     public void setAccountIndex(int accountIndex) {
         getWallet().setAccountIndex(accountIndex);
+        loadPocketChangeSettings();
         selectedSubaddressIndex = 0;
     }
 
@@ -1214,4 +1217,19 @@ public void showSubaddress(View view, final int subaddressIndex) {
         b.putInt("subaddressIndex", subaddressIndex);
         replaceFragmentWithTransition(view, new SubaddressInfoFragment(), null, b);
     }
+
+    @Override
+    public void setPocketChange(Wallet.PocketChangeSetting setting) {
+        SharedPreferences.Editor editor = getPrefs().edit();
+        editor.putString(getWallet().getAddress() + "_PC", setting.toPrefString());
+        editor.apply();
+        getWallet().setPocketChangeSetting(setting);
+    }
+
+
+    public void loadPocketChangeSettings() {
+        final String settings = getPrefs().getString(getWallet().getAddress() + "_PC", "0");
+        getWallet().setPocketChangeSetting(Wallet.PocketChangeSetting.from(settings));
+    }
+
 }
diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java b/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java
@@ -112,7 +112,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         flExchange = view.findViewById(R.id.flExchange);
         ((ProgressBar) view.findViewById(R.id.pbExchange)).getIndeterminateDrawable().
                 setColorFilter(
-                        ThemeHelper.getThemedColor(getContext(), R.attr.colorPrimaryVariant),
+                        ThemeHelper.getThemedColor(getContext(), com.google.android.material.R.attr.colorPrimaryVariant),
                         android.graphics.PorterDuff.Mode.MULTIPLY);
 
         tvProgress = view.findViewById(R.id.tvProgress);

diff --git a/app/src/main/java/com/m2049r/xmrwallet/data/NodeInfo.java b/app/src/main/java/com/m2049r/xmrwallet/data/NodeInfo.java
@@ -270,7 +270,7 @@ public void showInfo(TextView view, String info, boolean isError) {
                 (hostAddress.isOnion() ? "&nbsp;.onion&nbsp;&nbsp;" : ""), " " + info));
         view.setText(text);
         if (isError)
-            view.setTextColor(ThemeHelper.getThemedColor(ctx, R.attr.colorError));
+            view.setTextColor(ThemeHelper.getThemedColor(ctx, androidx.appcompat.R.attr.colorError));
         else
             view.setTextColor(ThemeHelper.getThemedColor(ctx, android.R.attr.textColorSecondary));
     }