From 17df7c3faf2479a82e5deea32571e0317131c6f8 Mon Sep 17 00:00:00 2001 From: m2049r Date: Mon, 28 Aug 2023 19:24:45 +0200 Subject: [PATCH] Pocket Change V2 (#914) * show PC on btc confirm * random slots to refill --- app/build.gradle | 14 ++++---- app/src/main/AndroidManifest.xml | 4 +++ .../com/m2049r/xmrwallet/WalletActivity.java | 3 +- .../com/m2049r/xmrwallet/data/TxData.java | 13 +++++--- .../send/SendBtcConfirmWizardFragment.java | 12 +++++++ .../res/layout/fragment_send_btc_confirm.xml | 33 +++++++++++++++---- app/src/main/res/values-cat/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-eo/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-et/strings.xml | 2 +- app/src/main/res/values-fa/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-nb/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 4 +-- app/src/main/res/values-ro/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values-sr/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-ta/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 4 +-- build.gradle | 2 +- 32 files changed, 88 insertions(+), 47 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bb70949d45..e862fb3dc4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,15 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 33 - buildToolsVersion '33.0.2' ndkVersion '17.2.4988734' defaultConfig { applicationId "com.m2049r.xmrwallet" + buildToolsVersion = '34.0.0' + compileSdk 33 minSdkVersion 21 - targetSdkVersion 31 - versionCode 3307 - versionName "3.3.7 'Pocket Change'" + targetSdkVersion 33 + versionCode 3308 + versionName "3.3.8 'Pocket Change'" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { @@ -126,11 +126,11 @@ dependencies { implementation 'androidx.core:core:1.10.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.3.0' + implementation 'androidx.recyclerview:recyclerview:1.3.1' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.preference:preference:1.2.0' + implementation 'androidx.preference:preference:1.2.1' implementation 'com.google.android.material:material:1.9.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f67213290d..4e0e0e1ef8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,10 @@ + + diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java index 3112dd948a..7f2b359736 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java +++ b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java @@ -629,7 +629,6 @@ public void onWalletOpen(final Wallet.Device device) { @Override public void onWalletStarted(final Wallet.Status walletStatus) { - loadPocketChangeSettings(); runOnUiThread(() -> { dismissProgressDialog(); if (walletStatus == null) { @@ -648,6 +647,8 @@ else if (!walletStatus.isOk()) haveWallet = true; invalidateOptionsMenu(); + loadPocketChangeSettings(); + if (requestStreetMode) onEnableStreetMode(); final WalletFragment walletFragment = getWalletFragment(); diff --git a/app/src/main/java/com/m2049r/xmrwallet/data/TxData.java b/app/src/main/java/com/m2049r/xmrwallet/data/TxData.java index e799744526..5053459d0d 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/data/TxData.java +++ b/app/src/main/java/com/m2049r/xmrwallet/data/TxData.java @@ -26,6 +26,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Random; import java.util.Set; import lombok.Data; @@ -136,8 +137,9 @@ public int describeContents() { ////////////////////////// final static public int POCKETCHANGE_IDX = 1; // subaddress index of first pocketchange slot - final static public int POCKETCHANGE_SLOTS = 10; // number of pocketchange slots - final static public int POCKETCHANGE_IDX_MAX = POCKETCHANGE_IDX + POCKETCHANGE_SLOTS - 1; + final static public int POCKETCHANGE_SLOTS_MIN = 6; // min number of pocketchange slots + final static public int POCKETCHANGE_SLOTS_MAX = 14; // max number of pocketchange slots + final static public int POCKETCHANGE_IDX_MAX = POCKETCHANGE_IDX + POCKETCHANGE_SLOTS_MAX - 1; @Data static private class PocketChangeSlot { @@ -171,8 +173,8 @@ public void createPocketChange(Wallet wallet) { List coins = wallet.getCoinsInfos(true); Set spendableSubaddressIdx = new HashSet<>(); PocketChangeSlot reserves = new PocketChangeSlot(); // everything not in a slot spendable - PocketChangeSlot[] slots = new PocketChangeSlot[POCKETCHANGE_SLOTS]; - for (int i = 0; i < POCKETCHANGE_SLOTS; i++) { + PocketChangeSlot[] slots = new PocketChangeSlot[POCKETCHANGE_SLOTS_MAX]; + for (int i = 0; i < POCKETCHANGE_SLOTS_MAX; i++) { slots[i] = new PocketChangeSlot(); } for (CoinsInfo coin : coins) { @@ -205,7 +207,8 @@ public void createPocketChange(Wallet wallet) { // find any slots to fill if possible: List slotsToFill = new ArrayList<>(); List slotToFillAmounts = new ArrayList<>(); - for (int i = 0; i < POCKETCHANGE_SLOTS; i++) { + final int randomSlotCount = new Random().nextInt(POCKETCHANGE_SLOTS_MAX - POCKETCHANGE_SLOTS_MIN + 1) + POCKETCHANGE_SLOTS_MIN; + for (int i = 0; i < randomSlotCount; i++) { if (slots[i].getAmount() < pocketChangeAmount) { final long topupAmount = pocketChangeAmount - slots[i].getAmount(); if (topupAmount <= spendableAmount) { diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java index cac4786e5f..6e45a91531 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendBtcConfirmWizardFragment.java @@ -74,6 +74,9 @@ public void setSendListener(SendConfirmWizardFragment.Listener listener) { private View llConfirmSend; private Button bSend; private View pbProgressSend; + private TextView tvTxChange; + private View llPocketChange; + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -92,6 +95,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, tvTxFee = view.findViewById(R.id.tvTxFee); tvTxTotal = view.findViewById(R.id.tvTxTotal); + tvTxChange = view.findViewById(R.id.tvTxChange); + llPocketChange = view.findViewById(R.id.llPocketChange); llStageA = view.findViewById(R.id.llStageA); evStageA = view.findViewById(R.id.evStageA); @@ -217,6 +222,13 @@ public void transactionCreated(final String txTag, final PendingTransaction pend tvTxFee.setText(Wallet.getDisplayAmount(pendingTransaction.getFee())); tvTxTotal.setText(Wallet.getDisplayAmount( pendingTransaction.getFee() + pendingTransaction.getAmount())); + final long change = pendingTransaction.getPocketChange(); + if (change > 0) { + llPocketChange.setVisibility(View.VISIBLE); + tvTxChange.setText(Wallet.getDisplayAmount(change)); + } else { + llPocketChange.setVisibility(View.GONE); + } updateSendButton(); }); } else { diff --git a/app/src/main/res/layout/fragment_send_btc_confirm.xml b/app/src/main/res/layout/fragment_send_btc_confirm.xml index 72a2fb98b0..6c872bb16c 100644 --- a/app/src/main/res/layout/fragment_send_btc_confirm.xml +++ b/app/src/main/res/layout/fragment_send_btc_confirm.xml @@ -169,6 +169,31 @@ android:orientation="vertical" android:visibility="invisible"> + + + + + + + + android:textAlignment="textStart" /> @@ -209,8 +232,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/send_total_btc_label" - android:textAlignment="textStart" - android:textSize="16sp" /> + android:textAlignment="textStart" /> diff --git a/app/src/main/res/values-cat/strings.xml b/app/src/main/res/values-cat/strings.xml index b1bbabc0c2..29322c9f77 100644 --- a/app/src/main/res/values-cat/strings.xml +++ b/app/src/main/res/values-cat/strings.xml @@ -443,7 +443,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9a86b01a8f..0efa7163cc 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -444,7 +444,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 26ef78b73e..6ebfcb361b 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -445,7 +445,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index f5712a7f5d..136a6a38fd 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -443,7 +443,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index d485947dd1..9ed714cd74 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -435,7 +435,7 @@ Modo calle activado\nSólo se ºmostrarán transacciones nuevas - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 39b5266bd4..f5c97eec35 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -443,7 +443,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index f95076966c..e20d93285a 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -683,7 +683,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a833e5331d..23700d7c69 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -449,7 +449,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index b8d054ba0e..a32d33265e 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -447,7 +447,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d1fdfb3644..de83956691 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -448,7 +448,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a4cb112a85..f9b3575758 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -448,7 +448,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index bf1a34cf1c..faf4813507 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -445,7 +445,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 9cff464d4a..0a7a5e5e55 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -445,7 +445,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 5d5dad03e4..e06300eb24 100755 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -438,7 +438,7 @@ aqui. Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index b9f3d2e00f..8fad92126e 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -449,8 +449,8 @@ Street Mode enabled\nOnly new transactions will be shown - 10 × %1$3.1f XMR - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. + Create Change APPLY diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index de4df5086b..49f4a6bbea 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -445,7 +445,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 60d57abe84..3aba64f217 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -449,7 +449,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 43325dd174..4c474481d0 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -446,7 +446,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 7c77758c62..9458f85f2c 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -444,7 +444,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 4bbba34f2f..97c4a98bfc 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -437,7 +437,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 9faee4d387..0099692874 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -443,7 +443,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 9bd8ff7036..932c25c3b9 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -449,7 +449,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index a274c89e94..a115f3e0c1 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -370,7 +370,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 2e34e61353..858f7bcc6b 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -444,7 +444,7 @@ Street Mode enabled\nOnly new transactions will be shown - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1cf4aef652..3fe8097a76 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -522,10 +522,10 @@ Street Mode enabled\nOnly new transactions will be shown PocketChange - 10 × %1$3.1f XMR + %1$3.1f XMR PocketChange +%1$s - To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain 10 coins of the selected amount. + To reduce waiting time on repeated spending, Monerujo can create spare change at the expense of higher fees. It\'ll try to create and maintain at least 6 coins of the selected amount. Create Change APPLY diff --git a/build.gradle b/build.gradle index 5c6eb2fca0..4dfc678dea 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.1' + classpath 'com.android.tools.build:gradle:8.1.0' } }