diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java b/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java index 515d2d8a..02cdb39e 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java @@ -118,9 +118,9 @@ public class WalletFragment extends Fragment tvProgress = view.findViewById(R.id.tvProgress); pbProgress = view.findViewById(R.id.pbProgress); tvBalance = view.findViewById(R.id.tvBalance); - showBalance(Helper.getDisplayAmount(0)); + showBalance(); tvUnconfirmedAmount = view.findViewById(R.id.tvUnconfirmedAmount); - showUnconfirmed(0); + showUnconfirmed(); ivSynced = view.findViewById(R.id.ivSynced); sCurrency = view.findViewById(R.id.sCurrency); @@ -205,7 +205,18 @@ public class WalletFragment extends Fragment super.onViewCreated(view, savedInstanceState); } - void showBalance(String balance) { + String amountToString(double amount) { + if (!Helper.BASE_CRYPTO.equals(balanceCurrency)) { // not XMR + double amountB = amount * balanceRate; + return Helper.getFormattedAmount(amountB, false); + } else { // XMR + return Helper.getFormattedAmount(amount, true); + } + } + + void showBalance() { + double amountA = Helper.getDecimalAmount(unlockedBalance).doubleValue(); + String balance = amountToString(amountA); tvBalance.setText(balance); final boolean streetMode = activityCallback.isStreetMode(); if (!streetMode) { @@ -218,13 +229,14 @@ public class WalletFragment extends Fragment setStreetModeBackground(streetMode); } - void showUnconfirmed(double unconfirmedAmount) { + void showUnconfirmed() { + double unconfirmedAmount = Helper.getDecimalAmount(balance - unlockedBalance).doubleValue(); if (activityCallback.isStreetMode() || unconfirmedAmount == 0) { tvUnconfirmedAmount.setText(null); tvUnconfirmedAmount.setVisibility(View.GONE); } else { - String unconfirmed = Helper.getFormattedAmount(unconfirmedAmount, true); - tvUnconfirmedAmount.setText(getResources().getString(R.string.xmr_unconfirmed_amount, unconfirmed)); + String unconfirmed = amountToString(unconfirmedAmount); + tvUnconfirmedAmount.setText(getResources().getString(R.string.xmr_unconfirmed_amount, unconfirmed, balanceCurrency)); tvUnconfirmedAmount.setVisibility(View.VISIBLE); } } @@ -232,15 +244,8 @@ public class WalletFragment extends Fragment void updateBalance() { if (isExchanging) return; // wait for exchange to finish - it will fire this itself then. // at this point selection is XMR in case of error - String displayB; - double amountA = Helper.getDecimalAmount(unlockedBalance).doubleValue(); - if (!Helper.BASE_CRYPTO.equals(balanceCurrency)) { // not XMR - double amountB = amountA * balanceRate; - displayB = Helper.getFormattedAmount(amountB, false); - } else { // XMR - displayB = Helper.getFormattedAmount(amountA, true); - } - showBalance(displayB); + showBalance(); + showUnconfirmed(); } String balanceCurrency = Helper.BASE_CRYPTO; @@ -249,11 +254,11 @@ public class WalletFragment extends Fragment private final ExchangeApi exchangeApi = ServiceHelper.getExchangeApi(); void refreshBalance() { - double unconfirmedXmr = Helper.getDecimalAmount(balance - unlockedBalance).doubleValue(); - showUnconfirmed(unconfirmedXmr); if (sCurrency.getSelectedItemPosition() == 0) { // XMR - double amountXmr = Helper.getDecimalAmount(unlockedBalance).doubleValue(); - showBalance(Helper.getFormattedAmount(amountXmr, true)); + balanceCurrency = Helper.BASE_CRYPTO; + balanceRate = 1.0; + showBalance(); + showUnconfirmed(); } else { // not XMR String currency = (String) sCurrency.getSelectedItem(); Timber.d(currency); @@ -298,8 +303,7 @@ public class WalletFragment extends Fragment public void exchangeFailed() { sCurrency.setSelection(0, true); // default to XMR - double amountXmr = Helper.getDecimalAmount(unlockedBalance).doubleValue(); - showBalance(Helper.getFormattedAmount(amountXmr, true)); + showBalance(); hideExchanging(); } diff --git a/app/src/main/res/values-cat/strings.xml b/app/src/main/res/values-cat/strings.xml index 7be3375c..9f26e0f6 100644 --- a/app/src/main/res/values-cat/strings.xml +++ b/app/src/main/res/values-cat/strings.xml @@ -134,7 +134,7 @@ Rebre Enviar - + %1$s XMR sense confirmar + + %1$s %2$s sense confirmar Servei de monerujo diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 677a39cd..d71e5d63 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -135,7 +135,7 @@ Empfange Sende - + %1$s XMR unbestätigt + + %1$s %2$s unbestätigt monerujo Service diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index fedd248a..bb0a6123 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -123,7 +123,7 @@ Λήψη Αποστολή - + %1$s XMR μη επιβεβαιωμένα + + %1$s %2$s μη επιβεβαιωμένα Υπηρεσία monerujo diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 91aa7f3b..36e63408 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -134,7 +134,7 @@ Ricevi Doni - + %1$s XMR nekonfirmite + + %1$s %2$s nekonfirmite monerujo Servo diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c9f51fb9..4e6c6ebd 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -86,7 +86,7 @@ Recibir Enviar - + %1$s XMR sin confirmar + + %1$s %2$s sin confirmar Servicio de Monerujo diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index e8e7e5b6..9e4680c3 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -132,7 +132,7 @@ Küsi raha Saada - + %1$s XMR kinnitamata + + %1$s %2$s kinnitamata monerujo teenus diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 0e26d938..b5450fde 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -232,7 +232,7 @@ مقدار - +%1$s XMR + +%1$s %2$s تایید نشده است diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 88349354..1c0d0faa 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -134,7 +134,7 @@ Recevoir Envoyer - + %1$s XMR non confirmés + + %1$s %2$s non confirmés Service monerujo diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index dfdd5eb4..9af228d0 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -132,7 +132,7 @@ Fogadás Küldés - + %1$s XMR függőben + + %1$s %2$s függőben monerujo szolgáltatás diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 04040256..7f9dc8da 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -134,7 +134,7 @@ Ricevi Invia - + %1$s XMR non confermati + + %1$s %2$s non confermati Servizio monerujo diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 74eb85c4..5d6d2a56 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -134,7 +134,7 @@ 受取り 送金 - + %1$s XMR が未承認 + + %1$s %2$s が未承認 monerujo のサービス diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 269381f9..3893d149 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -132,7 +132,7 @@ Motta Gi - + %1$s XMR ubekrefta + + %1$s %2$s ubekrefta monerujo tjeneste diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index afd86984..56e06fcf 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -132,7 +132,7 @@ Ontvangen Geven - + %1$s XMR onbevestigd + + %1$s %2$s onbevestigd monerujo-service diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 082f77e0..8d6096cb 100755 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -133,7 +133,7 @@ Receber Enviar - + %1$s XMR não confirmado + + %1$s %2$s não confirmado Serviço monerujo diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 1ddbfb55..65e8e1fa 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -130,7 +130,7 @@ Receber Enviar - + %1$s XMR não confirmado + + %1$s %2$s não confirmado Serviço monerujo diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 079b12a0..ee344349 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -123,7 +123,7 @@ Primește Trimite - + %1$s XMR neconfirmat + + %1$s %2$s neconfirmat Serviciul monerujo diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 246c2a10..c5ba957c 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -133,7 +133,7 @@ Получить Передать - + %1$s XMR неподтвержденно + + %1$s %2$s неподтвержденно Служба Monerujo diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 8040eed7..d2baa46b 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -133,7 +133,7 @@ Prijať Poslať - + %1$s XMR nepotvrdených + + %1$s %2$s nepotvrdených monerujo Service diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 63149e05..5aa4368c 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -135,7 +135,7 @@ Primljeno Daj - + %1$s XMR nepotvrđeno + + %1$s %2$s nepotvrđeno monerujo Servis diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 7d5119e3..ee18c9b7 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -131,7 +131,7 @@ Ta emot Ge - + %1$s XMR obekräftade + + %1$s %2$s obekräftade monerujo-tjänsten diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index c470f66f..57d81002 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -136,7 +136,7 @@ பெறு அனுப்பு - + %1$s XMR உறுதிப்படுத்தப்படவில்லை + + %1$s %2$s உறுதிப்படுத்தப்படவில்லை monerujo சேவை diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index c21145dd..281be23e 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -133,7 +133,7 @@ Отримати Відправити - + %1$s XMR непідтверджено + + %1$s %2$s непідтверджено Служба monerujo diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index f223e34a..32c732af 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -99,7 +99,7 @@ (只读) 收款 发送 - + %1$s XMR未确认 + + %1$s %2$s未确认 monerujo服务 已同步: 区块剩余 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 9447bc2d..ee646dea 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -133,7 +133,7 @@ 接收 發送 - + %1$s 未確認的 XMR + + %1$s 未確認的 %2$s monerujo 服務 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 92763ba1..99062742 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -139,7 +139,7 @@ Receive Give - + %1$s XMR unconfirmed + + %1$s %2$s unconfirmed monerujo Service