From 61d19c70665f3698d953de228b955eeaca7b02d3 Mon Sep 17 00:00:00 2001 From: m2049r Date: Wed, 26 Apr 2023 07:25:04 +0200 Subject: [PATCH 01/15] remove next arrow --- app/src/main/res/layout/item_transaction.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/src/main/res/layout/item_transaction.xml b/app/src/main/res/layout/item_transaction.xml index 613bdd98..d593ea3b 100644 --- a/app/src/main/res/layout/item_transaction.xml +++ b/app/src/main/res/layout/item_transaction.xml @@ -111,14 +111,9 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_gravity="center" - android:layout_weight="6" + android:layout_weight="5" android:gravity="center" tools:text="2017-05-22 21:32" /> - From f1b6f859de9093bd374162d31cdc55309a916721 Mon Sep 17 00:00:00 2001 From: m2049r Date: Wed, 26 Apr 2023 07:34:18 +0200 Subject: [PATCH 02/15] show subaddress info above label --- app/src/main/res/layout/item_subaddress.xml | 26 ++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/res/layout/item_subaddress.xml b/app/src/main/res/layout/item_subaddress.xml index 5348a287..974a41f6 100644 --- a/app/src/main/res/layout/item_subaddress.xml +++ b/app/src/main/res/layout/item_subaddress.xml @@ -12,27 +12,27 @@ android:layout_height="match_parent" android:padding="8dp"> - - + + Date: Wed, 26 Apr 2023 07:37:20 +0200 Subject: [PATCH 03/15] show full subaddress in details --- .../main/java/com/m2049r/xmrwallet/SubaddressInfoFragment.java | 2 +- app/src/main/res/layout/fragment_subaddressinfo.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/m2049r/xmrwallet/SubaddressInfoFragment.java b/app/src/main/java/com/m2049r/xmrwallet/SubaddressInfoFragment.java index 59f68a10..1691671d 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/SubaddressInfoFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/SubaddressInfoFragment.java @@ -76,7 +76,7 @@ public class SubaddressInfoFragment extends Fragment etName.getEditText().setText(subaddress.getDisplayLabel()); tvAddress.setText(getContext().getString(R.string.subbaddress_info_subtitle, - subaddress.getAddressIndex(), subaddress.getSquashedAddress())); + subaddress.getAddressIndex(), subaddress.getAddress())); etName.getEditText().setOnFocusChangeListener((v, hasFocus) -> { if (!hasFocus) { diff --git a/app/src/main/res/layout/fragment_subaddressinfo.xml b/app/src/main/res/layout/fragment_subaddressinfo.xml index 5310fbca..1cd522c9 100644 --- a/app/src/main/res/layout/fragment_subaddressinfo.xml +++ b/app/src/main/res/layout/fragment_subaddressinfo.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/header_top_first" android:transitionName="@string/subaddress_info_transition_name" - tools:text="#1: 8AioXCmK...aGivEa7C" /> + tools:text="#1: 83ALRYDTkLULDpDpDYEtWfc8EQxp7z77FNENX43aiJpzGd5pRY1HPLMBpQdXTvvJozePR7UEhYWT3d2H5w9kBgCZ6AtWFd4" /> Date: Wed, 26 Apr 2023 07:55:26 +0200 Subject: [PATCH 04/15] fix colour of service logo & use it for receive qr code --- app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java | 2 +- app/src/main/res/drawable/ic_monerujo.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java b/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java index 06621ff7..a08e1446 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java @@ -403,7 +403,7 @@ public class ReceiveFragment extends Fragment { private Bitmap getMoneroLogo() { if (logo == null) { - logo = Helper.getBitmap(getContext(), R.drawable.ic_monero_logo_b); + logo = Helper.getBitmap(getContext(), R.drawable.ic_monerujo); } return logo; } diff --git a/app/src/main/res/drawable/ic_monerujo.xml b/app/src/main/res/drawable/ic_monerujo.xml index 88d43061..5c9dbb49 100644 --- a/app/src/main/res/drawable/ic_monerujo.xml +++ b/app/src/main/res/drawable/ic_monerujo.xml @@ -17,14 +17,14 @@ android:translateX="1013.0865" android:translateY="153.4532"> From 1ece6bfbebdd7e81ac263143f60e3ec83f516112 Mon Sep 17 00:00:00 2001 From: m2049r Date: Wed, 26 Apr 2023 08:15:02 +0200 Subject: [PATCH 05/15] move status above sum --- .../com/m2049r/xmrwallet/WalletActivity.java | 2 +- .../com/m2049r/xmrwallet/WalletFragment.java | 2 +- app/src/main/res/layout/fragment_wallet.xml | 62 +++++++++---------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java index 5ab6ad7b..d8854453 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java +++ b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java @@ -451,7 +451,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste if (extras != null) { String walletId = extras.getString(REQUEST_ID); if (walletId != null) { - setTitle(walletId, getString(R.string.status_wallet_connecting)); + setTitle(walletId); } } updateProgress(); diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java b/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java index acd94cdd..e8066ff2 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java @@ -460,7 +460,7 @@ public class WalletFragment extends Fragment int x = 100 - Math.round(100f * n / (1f * daemonHeight - firstBlock)); if (x == 0) x = 101; // indeterminate setProgress(x); - ivSynced.setVisibility(View.GONE); + ivSynced.setVisibility(View.INVISIBLE); } else { sync = getString(R.string.status_synced) + " " + formatter.format(wallet.getBlockChainHeight()); ivSynced.setVisibility(View.VISIBLE); diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml index 80aa34dd..6c16186e 100644 --- a/app/src/main/res/layout/fragment_wallet.xml +++ b/app/src/main/res/layout/fragment_wallet.xml @@ -24,6 +24,37 @@ android:layout_margin="8dp" android:orientation="vertical"> + + + + + + + + + @@ -97,37 +128,6 @@ android:gravity="center" tools:text="+ 0.00 unconfirmed" /> - - - - - - - - Date: Wed, 26 Apr 2023 08:25:33 +0200 Subject: [PATCH 06/15] make streetmode label better --- app/src/main/res/layout/fragment_wallet.xml | 5 +++-- 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 | 2 ++ 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 | 2 ++ 26 files changed, 53 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml index 6c16186e..9028ceaa 100644 --- a/app/src/main/res/layout/fragment_wallet.xml +++ b/app/src/main/res/layout/fragment_wallet.xml @@ -61,11 +61,12 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 675d1a09..9a0bd03e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -450,4 +450,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 2b0fa077..5ae3bd42 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -451,4 +451,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index a963d9fd..654a6607 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -451,4 +451,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index b7f0f79e..5f65939c 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -442,4 +442,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 25354390..369f3f68 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -449,4 +449,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index fef00cf0..f074c400 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -702,4 +702,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d4854a83..f6714104 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -455,4 +455,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index cb216e2e..d1b1df7b 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -453,4 +453,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 4247fccd..e28586de 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -454,4 +454,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 08eafb77..5260f4eb 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -454,4 +454,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 5b7af370..8e9b36ac 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -451,4 +451,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d246cffa..e9bd8f84 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -451,4 +451,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 0696aff8..a4631170 100755 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -444,4 +444,6 @@ aqui. Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index b77a2bbd..c5ca4ec9 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -455,4 +455,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 7698cadf..effbf624 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -451,4 +451,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4b7cbcd3..3beb1288 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -455,4 +455,6 @@ Не удалось создать QR! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 5dab2001..ca77542a 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -452,4 +452,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 6f12fecd..9a5d7fe6 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -450,4 +450,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 90b47c71..66ffb58c 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -443,4 +443,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 56b785bb..7f9d2457 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -449,4 +449,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 42221f9a..6d42337e 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -455,4 +455,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index f79200c1..b64d0deb 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -375,4 +375,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index e4a7951d..cafc139c 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -450,4 +450,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6c53eb0e..5376523e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -528,4 +528,6 @@ Failed to create QR for sharing! Transaction amount locked until block %1$d (in %2$d blocks ≈ %3$,.2f days) + + Street Mode enabled\nOnly new transactions will be shown From c53dd300bc3f274a91e2c9ba07ee9a41ef863ef7 Mon Sep 17 00:00:00 2001 From: m2049r Date: Wed, 26 Apr 2023 08:39:30 +0200 Subject: [PATCH 07/15] update dependencies --- app/build.gradle | 14 +++++++------- build.gradle | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 281098be..25f6dcd3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.m2049r.xmrwallet" minSdkVersion 21 targetSdkVersion 31 - versionCode 3100 - versionName "3.1.0 'Fluorine Fermi'" + versionCode 3110 + versionName "3.1.1 'Fluorine Fermi'" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { @@ -121,16 +121,16 @@ static def getId(name) { } dependencies { - implementation 'androidx.core:core:1.7.0' - implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'androidx.core:core:1.10.0' + implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.recyclerview:recyclerview:1.3.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.preference:preference:1.2.0' - implementation 'com.google.android.material:material:1.6.0' + implementation 'com.google.android.material:material:1.8.0' implementation 'me.dm7.barcodescanner:zxing:1.9.8' implementation "com.squareup.okhttp3:okhttp:4.9.3" diff --git a/build.gradle b/build.gradle index 175257df..e7ec15b1 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.0' + classpath 'com.android.tools.build:gradle:7.2.2' } } From 9fa710f75b8e61fd6e9eb4266de213e0c5d9c34d Mon Sep 17 00:00:00 2001 From: m2049r Date: Thu, 27 Apr 2023 23:58:08 +0200 Subject: [PATCH 08/15] fix build warnings --- app/CMakeLists.txt | 1 + app/build.gradle | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 08904bfb..fee7685c 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.4.1) +project(monerujo) message(STATUS ABI_INFO = ${ANDROID_ABI}) add_library( monerujo diff --git a/app/build.gradle b/app/build.gradle index 25f6dcd3..8a5448cf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 31 + compileSdkVersion 33 buildToolsVersion '30.0.3' ndkVersion '17.2.4988734' defaultConfig { @@ -121,6 +121,8 @@ static def getId(name) { } dependencies { + implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0")) + implementation 'androidx.core:core:1.10.0' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.legacy:legacy-support-v4:1.0.0' From 93c11fb90e9d0c26156ed4fe79872f91173abfde Mon Sep 17 00:00:00 2001 From: m2049r Date: Sun, 30 Apr 2023 17:04:05 +0200 Subject: [PATCH 09/15] update build tools version --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 8a5448cf..6fb15637 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 33 - buildToolsVersion '30.0.3' + buildToolsVersion '33.0.2' ndkVersion '17.2.4988734' defaultConfig { applicationId "com.m2049r.xmrwallet" From 4da2106f04efdf0374d95c4d5045d059f2deda15 Mon Sep 17 00:00:00 2001 From: m2049r Date: Sun, 30 Apr 2023 17:16:20 +0200 Subject: [PATCH 10/15] show active account in drawer --- .../main/java/com/m2049r/xmrwallet/WalletActivity.java | 3 ++- app/src/main/res/drawable/ic_outline_folder_24.xml | 10 ++++++++++ .../main/res/drawable/ic_outline_folder_open_24.xml | 10 ++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/drawable/ic_outline_folder_24.xml create mode 100644 app/src/main/res/drawable/ic_outline_folder_open_24.xml diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java index d8854453..af3a48ac 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java +++ b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java @@ -1028,13 +1028,14 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste final Wallet wallet = getWallet(); if (wallet != null) { final int n = wallet.getNumAccounts(); + final int currentAccount = getWallet().getAccountIndex(); final boolean showBalances = (n > 1) && !isStreetMode(); for (int i = 0; i < n; i++) { final String label = (showBalances ? getString(R.string.label_account, wallet.getAccountLabel(i), Helper.getDisplayAmount(wallet.getBalance(i), 2)) : wallet.getAccountLabel(i)); final MenuItem item = menu.add(R.id.accounts_list, getAccountId(i), 2 * i, label); - item.setIcon(R.drawable.ic_account_balance_wallet_black_24dp); + item.setIcon(i == currentAccount ? R.drawable.ic_outline_folder_open_24 : R.drawable.ic_outline_folder_24); if (i == wallet.getAccountIndex()) item.setChecked(true); } diff --git a/app/src/main/res/drawable/ic_outline_folder_24.xml b/app/src/main/res/drawable/ic_outline_folder_24.xml new file mode 100644 index 00000000..7b57b5ce --- /dev/null +++ b/app/src/main/res/drawable/ic_outline_folder_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_outline_folder_open_24.xml b/app/src/main/res/drawable/ic_outline_folder_open_24.xml new file mode 100644 index 00000000..ed4ea36d --- /dev/null +++ b/app/src/main/res/drawable/ic_outline_folder_open_24.xml @@ -0,0 +1,10 @@ + + + From 7546637c89de70cba54574b048a595229a692d67 Mon Sep 17 00:00:00 2001 From: m2049r Date: Sun, 30 Apr 2023 17:37:03 +0200 Subject: [PATCH 11/15] remove NFC support --- app/src/main/AndroidManifest.xml | 1 - .../com/m2049r/xmrwallet/BaseActivity.java | 174 ------------------ .../com/m2049r/xmrwallet/ReceiveFragment.java | 6 - .../com/m2049r/xmrwallet/WalletActivity.java | 6 +- .../send/SendAddressWizardFragment.java | 7 - app/src/main/res/drawable/ic_nfc.xml | 9 - app/src/main/res/layout/fragment_receive.xml | 14 +- .../main/res/layout/fragment_send_address.xml | 13 -- app/src/main/res/values-cat/strings.xml | 9 - app/src/main/res/values-de/strings.xml | 9 - app/src/main/res/values-el/strings.xml | 9 - app/src/main/res/values-eo/strings.xml | 11 -- app/src/main/res/values-es/strings.xml | 9 - app/src/main/res/values-et/strings.xml | 9 - app/src/main/res/values-fa/strings.xml | 22 --- app/src/main/res/values-fr/strings.xml | 9 - app/src/main/res/values-hu/strings.xml | 9 - app/src/main/res/values-it/strings.xml | 9 - app/src/main/res/values-ja/strings.xml | 9 - app/src/main/res/values-nb/strings.xml | 9 - app/src/main/res/values-nl/strings.xml | 9 - app/src/main/res/values-pt-rBR/strings.xml | 9 - app/src/main/res/values-pt/strings.xml | 9 - app/src/main/res/values-ro/strings.xml | 9 - app/src/main/res/values-ru/strings.xml | 9 - app/src/main/res/values-sk/strings.xml | 9 - app/src/main/res/values-sr/strings.xml | 9 - app/src/main/res/values-sv/strings.xml | 9 - app/src/main/res/values-ta/strings.xml | 9 - app/src/main/res/values-uk/strings.xml | 9 - app/src/main/res/values-zh-rCN/strings.xml | 8 - app/src/main/res/values-zh-rTW/strings.xml | 9 - app/src/main/res/values/strings.xml | 9 - 33 files changed, 2 insertions(+), 467 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_nfc.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4e9ab3e7..f6721329 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,7 +7,6 @@ - diff --git a/app/src/main/java/com/m2049r/xmrwallet/BaseActivity.java b/app/src/main/java/com/m2049r/xmrwallet/BaseActivity.java index 1f1f9b19..4a4881bb 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/BaseActivity.java +++ b/app/src/main/java/com/m2049r/xmrwallet/BaseActivity.java @@ -16,36 +16,18 @@ package com.m2049r.xmrwallet; -import android.app.PendingIntent; import android.content.Context; -import android.content.Intent; -import android.net.Uri; -import android.nfc.FormatException; -import android.nfc.NdefMessage; -import android.nfc.NdefRecord; -import android.nfc.NfcAdapter; -import android.nfc.Tag; -import android.nfc.tech.Ndef; -import android.os.AsyncTask; -import android.os.Build; -import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.os.PowerManager; -import android.widget.Toast; import androidx.annotation.CallSuper; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; import com.m2049r.xmrwallet.data.BarcodeData; import com.m2049r.xmrwallet.dialog.ProgressDialog; -import com.m2049r.xmrwallet.fragment.send.SendFragment; import com.m2049r.xmrwallet.ledger.Ledger; import com.m2049r.xmrwallet.ledger.LedgerProgressDialog; -import java.io.IOException; - import timber.log.Timber; public class BaseActivity extends SecureActivity @@ -141,91 +123,6 @@ public class BaseActivity extends SecureActivity Timber.d("WakeLock released"); } - - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - initNfc(); - } - - @Override - protected void onPostResume() { - super.onPostResume(); - if (nfcAdapter != null) { - nfcAdapter.enableForegroundDispatch(this, nfcPendingIntent, null, null); - // intercept all techs so we can tell the user their tag is no good - } - } - - @Override - protected void onPause() { - Timber.d("onPause()"); - if (nfcAdapter != null) - nfcAdapter.disableForegroundDispatch(this); - super.onPause(); - } - - @Override - protected void onNewIntent(Intent intent) { - super.onNewIntent(intent); - processNfcIntent(intent); - } - - // NFC stuff - private NfcAdapter nfcAdapter; - private PendingIntent nfcPendingIntent; - - public void initNfc() { - nfcAdapter = NfcAdapter.getDefaultAdapter(this); - if (nfcAdapter == null) // no NFC support - return; - nfcPendingIntent = PendingIntent.getActivity(this, 0, - new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), - Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_IMMUTABLE : 0); - } - - private void processNfcIntent(Intent intent) { - String action = intent.getAction(); - Timber.d("ACTION=%s", action); - if (NfcAdapter.ACTION_NDEF_DISCOVERED.equals(action) - || NfcAdapter.ACTION_TAG_DISCOVERED.equals(action) - || NfcAdapter.ACTION_TECH_DISCOVERED.equals(action)) { - Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG); - Ndef ndef = Ndef.get(tag); - if (ndef == null) { - Toast.makeText(this, getString(R.string.nfc_tag_unsupported), Toast.LENGTH_LONG).show(); - return; - } - - Fragment f = getSupportFragmentManager().findFragmentById(R.id.fragment_container); - if (f instanceof ReceiveFragment) { - // We want to write a Tag from the ReceiveFragment - BarcodeData bc = ((ReceiveFragment) f).getBarcodeData(); - if (bc != null) { - new AsyncWriteTag(ndef, bc.getUri()).execute(); - } // else wallet is not loaded yet or receive is otherwise not ready - ignore - } else if (f instanceof SendFragment) { - // We want to read a Tag for the SendFragment - NdefMessage ndefMessage = ndef.getCachedNdefMessage(); - if (ndefMessage == null) { - Toast.makeText(this, getString(R.string.nfc_tag_read_undef), Toast.LENGTH_LONG).show(); - return; - } - NdefRecord firstRecord = ndefMessage.getRecords()[0]; - Uri uri = firstRecord.toUri(); // we insist on the first record - if (uri == null) { - Toast.makeText(this, getString(R.string.nfc_tag_read_undef), Toast.LENGTH_LONG).show(); - } else { - BarcodeData bc = BarcodeData.fromString(uri.toString()); - if (bc == null) - Toast.makeText(this, getString(R.string.nfc_tag_read_undef), Toast.LENGTH_LONG).show(); - else - onUriScanned(bc); - } - } - } - } - // this gets called only if we get data @CallSuper void onUriScanned(BarcodeData barcodeData) { @@ -239,75 +136,4 @@ public class BaseActivity extends SecureActivity barcodeData = null; return popped; } - - private class AsyncWriteTag extends AsyncTask { - - Ndef ndef; - Uri uri; - String errorMessage = null; - - AsyncWriteTag(Ndef ndef, Uri uri) { - this.ndef = ndef; - this.uri = uri; - } - - @Override - protected void onPreExecute() { - super.onPreExecute(); - showProgressDialog(R.string.progress_nfc_write); - } - - @Override - protected Boolean doInBackground(Void... params) { - if (params.length != 0) return false; - try { - writeNdef(ndef, uri); - return true; - } catch (IOException | FormatException ex) { - Timber.e(ex); - } catch (IllegalArgumentException ex) { - errorMessage = ex.getMessage(); - Timber.d(errorMessage); - } finally { - try { - ndef.close(); - } catch (IOException ex) { - Timber.e(ex); - } - } - return false; - } - - @Override - protected void onPostExecute(Boolean result) { - super.onPostExecute(result); - if (isDestroyed()) { - return; - } - dismissProgressDialog(); - if (!result) { - if (errorMessage != null) - Toast.makeText(getApplicationContext(), errorMessage, Toast.LENGTH_LONG).show(); - else - Toast.makeText(getApplicationContext(), getString(R.string.nfc_write_failed), Toast.LENGTH_LONG).show(); - } else { - Toast.makeText(getApplicationContext(), getString(R.string.nfc_write_successful), Toast.LENGTH_SHORT).show(); - } - } - } - - void writeNdef(Ndef ndef, Uri uri) throws IOException, FormatException { - NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(this); - if (nfcAdapter == null) return; // no NFC support here - - NdefRecord recordNFC = NdefRecord.createUri(uri); - NdefMessage message = new NdefMessage(recordNFC); - ndef.connect(); - int tagSize = ndef.getMaxSize(); - int msgSize = message.getByteArrayLength(); - Timber.d("tagSize=%d, msgSIze=%d, uriSize=%d", tagSize, msgSize, uri.toString().length()); - if (tagSize < msgSize) - throw new IllegalArgumentException(getString(R.string.nfc_tag_size, tagSize, msgSize)); - ndef.writeNdefMessage(message); - } } diff --git a/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java b/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java index a08e1446..b05662c4 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java @@ -22,7 +22,6 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.drawable.BitmapDrawable; import android.net.Uri; -import android.nfc.NfcManager; import android.os.Bundle; import android.text.Editable; import android.text.Html; @@ -191,11 +190,6 @@ public class ReceiveFragment extends Fragment { throw new IllegalStateException("no wallet info"); } - View tvNfc = view.findViewById(R.id.tvNfc); - NfcManager manager = (NfcManager) getContext().getSystemService(Context.NFC_SERVICE); - if ((manager != null) && (manager.getDefaultAdapter() != null)) - tvNfc.setVisibility(View.VISIBLE); - return view; } diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java index af3a48ac..cb65fbac 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java +++ b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java @@ -925,12 +925,8 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste @Override void onUriScanned(BarcodeData barcodeData) { super.onUriScanned(barcodeData); - boolean processed = false; if (onUriScannedListener != null) { - processed = onUriScannedListener.onUriScanned(barcodeData); - } - if (!processed || (onUriScannedListener == null)) { - Toast.makeText(this, getString(R.string.nfc_tag_read_what), Toast.LENGTH_LONG).show(); + onUriScannedListener.onUriScanned(barcodeData); } } diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java index f25ad19b..2a4a2e12 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java @@ -17,12 +17,10 @@ package com.m2049r.xmrwallet.fragment.send; import android.content.Context; -import android.nfc.NfcManager; import android.os.Bundle; import android.text.Editable; import android.text.Html; import android.text.InputType; -import android.text.Spanned; import android.text.TextWatcher; import android.util.Patterns; import android.view.KeyEvent; @@ -268,11 +266,6 @@ public class SendAddressWizardFragment extends SendWizardFragment { etDummy.setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS); etDummy.requestFocus(); - View tvNfc = view.findViewById(R.id.tvNfc); - NfcManager manager = (NfcManager) getContext().getSystemService(Context.NFC_SERVICE); - if ((manager != null) && (manager.getDefaultAdapter() != null)) - tvNfc.setVisibility(View.VISIBLE); - return view; } diff --git a/app/src/main/res/drawable/ic_nfc.xml b/app/src/main/res/drawable/ic_nfc.xml deleted file mode 100644 index 2821ae80..00000000 --- a/app/src/main/res/drawable/ic_nfc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/fragment_receive.xml b/app/src/main/res/layout/fragment_receive.xml index c4bea6e0..91b2c70c 100644 --- a/app/src/main/res/layout/fragment_receive.xml +++ b/app/src/main/res/layout/fragment_receive.xml @@ -90,8 +90,8 @@ android:id="@+id/cvQrCode" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_above="@id/tvNfc" android:layout_alignParentTop="true" + android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" android:layout_margin="16dp" android:backgroundTint="#ffffffff" @@ -120,18 +120,6 @@ android:adjustViewBounds="true" android:src="#fff" /> - - diff --git a/app/src/main/res/layout/fragment_send_address.xml b/app/src/main/res/layout/fragment_send_address.xml index 375e0f0e..784e6045 100644 --- a/app/src/main/res/layout/fragment_send_address.xml +++ b/app/src/main/res/layout/fragment_send_address.xml @@ -175,7 +175,6 @@ android:inputType="textMultiLine" android:textAlignment="textStart" /> - - - diff --git a/app/src/main/res/values-cat/strings.xml b/app/src/main/res/values-cat/strings.xml index de0dd2e6..129efd0e 100644 --- a/app/src/main/res/values-cat/strings.xml +++ b/app/src/main/res/values-cat/strings.xml @@ -305,15 +305,6 @@ %1$s adjunt %1$s separat - Escrivint etiquetatge - Escriptura d\'Etiquetatge fallit! - Escriptura d\'Etiquetatge exitosa - L\'etiquetatge no suporta NDEF! - L\'etiquetatge proporciona %1$d bits, però es necessiten %2$d! - No entenc l\'etiquetatge! - No sé què vols! - NFC Disponible! - Mostra Secrets! Mode de Carrer diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9a0bd03e..c48f0d1f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -308,15 +308,6 @@ Löse OpenAlias auf… OpenAlias ohne DNSSEC – Adresse kann gefälscht sein! - Schreibe Tag - Schreiben des Tags fehlgeschlagen! - Tag erfolgreich geschrieben - Tag unterstützt NDEF nicht! - Tag bietet %1$d Bytes, aber wir brauchen %2$d! - Ich verstehe den Tag nicht! - Ich weiß nicht, was du willst! - NFC verfügbar! - Node Version inkompatibel – bitte updaten! Zeige Geheimnisse! diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 5ae3bd42..7b74c42c 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -298,15 +298,6 @@ %1$s attached %1$s detached - Writing Tag - Writing Tag failed! - Writing Tag successful - Tag does not support NDEF! - Tag provides %1$d bytes, but we need %2$d! - I don\'t understand the Tag! - I don\'t know what you want! - NFC Available! - Description (optional) OpenAlias address not available diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 654a6607..e5aa30c6 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -305,20 +305,9 @@ %1$s kunligita %1$s malligita - Skribante etikedon - Etikedsribo malsukcesis! - Etikedskribo sukcesis - Etikedo ne subtenas NDEF! - La etikedo provizas %1$d bajtojn, sed ni bezonas %2$d! - Mi ne komprenas la etikedon! - Damne, kion vi volas?! - NFC disponeblas! - - Montru sekretojn! Strata moduso - Node-o-matiC permesiĝas, frapetu por detaloj. Lasta ĝisdatigita bloko: %1$s Nodoj diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 5f65939c..040c0be2 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -288,15 +288,6 @@ %1$s adjunto %1$s separado - Escribiento Etiqueta - ¡Escritura de Etiqueta fallida! - Escritura de Etiqueta exitosa - ¡Etiqueta no soporta NDEF! - La etiqueta provee %1$d bytes, pero necesitamos %2$d! - ¡No comprendo la etiqueta! - ¡No sé lo que pides! - ¡NFC disponible! - Descripción (opcional) Dirección OpenAlias no disponible diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 369f3f68..eadd219b 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -300,15 +300,6 @@ %1$s lisatud %1$s eemaldatud - Kirjutan silti - Sildi kirjutamine ebaõnnestus! - Sildi kirjutamine õnnestus - Silt ei toeta NDEF\'i! - Sildil on %1$d baiti, kuid meil on vaja %2$d! - Ma ei oska seda silti lugeda! - Ma ei tea, mida sa tahad! - NFC on saadaval! - Serveri versioon ei sobi - palun uuenda! Näita salajast infot diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index f074c400..0b474335 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -467,28 +467,6 @@ جدا شد - نوشتن برچسب - نوشتن برچسب شکست خورد! - نوشتن برچسب موفق بود - برچسب از - NDEF - پشتیبانی نمیکند - - - برچسب - %1$d - بایت فراهم کرد، ولی ما - %2$d - بایت نیاز داریم! - - من برچسب را متوجه نمی‌شوم! - نمیدونم از جونم چی میخوای! - - قابلیت - NFC - دردسترس است! - - نمایش اسرار! حالت خیابان diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f6714104..3a28c5cf 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -299,15 +299,6 @@ %1$s connecté %1$s déconnecté - Écriture du Tag - Échec de l\'écriture du Tag ! - Tag écrit avec succès - le Tag ne supporte pas NDEF ! - Le Tag donne %1$d octets, mais il en faut %2$d ! - Je ne comprend pas le Tag ! - Je ne sais pas ce que vous voulez ! - NFC Disponible ! - Langue Utiliser la Langue du Système diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index d1b1df7b..6e89261e 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -298,15 +298,6 @@ %1$s csatlakoztatva %1$s leválasztva - Címke írása - Sikertelen címkeírás! - Sikeres címkeírás - A címke nem támogatja az NDEF-et! - A címke %1$d byte-os, de %2$d kellene! - Nem értem a címkét! - Nem tudom, mit akarsz! - NFC elérhető! - Description (optional) OpenAlias address not available diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e28586de..750e6726 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -301,15 +301,6 @@ %1$s allegati %1$s allegati - Scrivendo tag - Scrittura tag fallita! - Scrittura tag riuscita - La tag non supporta NDEF! - La Tag fornisce %1$d bytes, ma ne servono %2$d! - Non capisco la tag! - Non capisco cosa mi hai chiesto! - NFC disponibile! - Descrizione (opzionale) Indirizzo OpenAlias non disponibile diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 5260f4eb..cba4ef86 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -304,15 +304,6 @@ %1$s が取り付けられました %1$s が取り外されました - タグ書き込み中 - タグ書き込みに失敗! - タグ書き込みに成功 - タグはNDEFをサポートしていません! - タグは %1$d バイトを提供していますが, 私達は %2$d が必要です! - タグを理解できません! - あなたが何をしたいのかわかりません! - NFCが利用可能です! - シークレットを見せてください! ストリートモード diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 8e9b36ac..c1f9c6b6 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -298,15 +298,6 @@ %1$s attached %1$s detached - Writing Tag - Writing Tag failed! - Writing Tag successful - Tag does not support NDEF! - Tag provides %1$d bytes, but we need %2$d! - I don\'t understand the Tag! - I don\'t know what you want! - NFC Available! - Description (optional) OpenAlias address not available diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index e9bd8f84..b2f6dec1 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -296,15 +296,6 @@ %1$s gekoppeld %1$s losgemaakt - Tag wordt geschreven - Tag schrijven mislukt! - Tag is geschreven - Tag ondersteunt NDEF niet! - Tag levert %1$d bytes, maar we hebben er %2$d nodig! - Ik begrijp de Tag niet! - Ik weet niet wat je wilt! - NFC beschikbaar! - Omschrijving (optioneel) OpenAlias-adres niet beschikbaar diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index a4631170..974049aa 100755 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -297,15 +297,6 @@ %1$s conectado %1$s desconectado - Escrevendo tag - Erro ao escrever a tag! - Sucesso ao escrever a tag - A tag não suporta NDEF! - Tag disponibiliza %1$d bytes, mas precisamos de %2$d! - Não consigo ler a tag! - Não sei o que você quer! - NFC disponível! - Mostrar Segredos! Modo Rua diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index c5ca4ec9..841c0ea0 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -300,15 +300,6 @@ %1$s Ligado %1$s Desligado - Escrevendo Tag - A escrita do Tag falhou! - Escrita do Tag bem sucedida - A Tag não suporta NDEF! - A Tag tem %1$d bytes, mas nós precisamos de %2$d! - Eu não percebo a Tag! - Eu não percebo o que queres fazer! - NFC Disponivel! - Descrição (opcional) Endereço OpenAlias não disponivel. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index effbf624..7ea40515 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -298,15 +298,6 @@ %1$s atașat %1$s detașat - Se scrie Tag-ul - Scriere Tag eșuată! - Scriere Tag cu succes - Tag-ul nu are suport NDEF! - Tag-ul vine cu %1$d biți, dar avem nevoie de %2$d! - Nu înțeleg Tag-ul! - Nu știu ce vrei! - NFC disponibil! - Descriere (opțional) Adresă OpenAlias indisponibilă diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 3beb1288..dac96ec3 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -300,15 +300,6 @@ %1$s прикреплен %1$s откреплён - Запись метки - Ошибка записи метки! - Успешная запись метки - Метка не поддерживает NDEF! - Метка предоставляет %1$d байт, но нам нужно %2$d! - Я не понимаю эту метку! - Я не знаю, чего ты хочешь! - NFC доступен! - Описание (необязательно) Адрес OpenAlias недоступен diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index ca77542a..46a73d05 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -297,15 +297,6 @@ %1$s pripojený %1$s odpojený - Zapisujem Tag - Zapísanie Tagu zlyhalo! - Zapísanie Tagu úspešné - Tag nepodporuje NDEF! - Tag poskytol %1$d bytes, ale treba %2$d! - Neruzumiem Tagu! - Neviem čo tým básnik myslel! - NFC je dostupné! - Popis (voliteľné) OpenAlias adresa nie je dostupná diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 9a5d7fe6..6ad0e9ed 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -307,15 +307,6 @@ %1$s zakačeno %1$s otkačeno - Pisanje taga - Pisanje taga neuspelo! - Pisanje taga uspešno - Tag ne podržava NDEF! - Tag omogućava %1$d bajta, međutim nama treba %2$d! - Ne razumem tag! - Ne znam šta si mislio! - NFC dostupno! - Pokaži tajne! Ulični mod diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 66ffb58c..e379be5d 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -289,15 +289,6 @@ %1$s ansluten %1$s frånkopplad - Skriver tagg - Misslyckades att skriva till tagg! - Skrivning till tagg lyckades - Taggen stöder inte NDEF! - Taggen har %1$d bytes, men vi behöver %2$d! - Jag förstår inte taggen! - Jag vet inte vad du vill! - NFC tillgängligt! - Beskrivning (valfri) OpenAlias-adress ej tillgänglig diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 7f9d2457..692fd202 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -309,15 +309,6 @@ %1$s இணைக்கப்பட்டது %1$s பிரிக்கப்பட்டது - குறிச்சொல்லை எழுதுகிறது - குறிச்சொல் எழுதல் தோல்வியடைந்தது! - குறிச்சொல் எழுதல் வெற்றியடைந்தது - குறிச்சொலானது NDEF ஐ ஆதரிக்கவில்லை! - குறிச்சொல்லானது %1$d எண்ணுன்மிகளை அளிக்கிறது, ஆனால் நமக்கு %2$d தேவை! - இந்த குறிச்சொல் எனக்கு புரியவில்லை! - உனக்கு என்ன வேண்டும் என்று எனக்கு தெரியவில்லை! - NFC கிடைக்கிறது! - இரகசியங்களை காண்பி! வீதி பாங்கு diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 6d42337e..74fb8c66 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -300,15 +300,6 @@ %1$s підєднаний %1$s відєднаний - Запис мітки - Помилка запису мітки! - Успішний запис мітки - Мітка не підтримує NDEF! - Мітка надає %1$d байт, але нам потрібно %2$d! - Я не розумію цю мітку! - Я не знаю, що ти хочеш! - NFC доступний! - Опис (необов\'язково) Адреса OpenAlias недоступна diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index b64d0deb..39538288 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -235,14 +235,6 @@ 账户创建中 %1$s 已连接 %1$s 已断开连接 - NFC标签写入中 - NFC标签写入失败！ - NFC标签写入成功 - NFC标签不支持NDEF! - NFC标签提供%1$d字节，但我们需要%2$d! - 我不了解NFC标签！ - 我不知道你想要什么！ - NFC可用！ 显示私密信息 公共场合模式 Node-o-matiC已可用，点此了解更多. diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index cafc139c..d88897f4 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -296,15 +296,6 @@ %1$s 已連接 %1$s 已斷開連接 - 正在寫入 NFC 標籤 - NFC 標籤寫入失敗！ - NFC 標籤寫入成功 - 此 NFC 標籤不支援 NDEF 格式！ - 此 NFC 標籤可存放 %1$d 位元組，但需要 %2$d 位元組！ - 無法辨識此 NFC 標籤！ - 無法執行此 NFC 標籤的操作！ - 可使用 NFC 標籤 - 附註 (選填) 無法使用這個 OpenAlias diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5376523e..ec714e5b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -353,15 +353,6 @@ %1$s attached %1$s detached - Writing Tag - Writing Tag failed! - Writing Tag successful - Tag does not support NDEF! - Tag provides %1$d bytes, but we need %2$d! - I don\'t understand the Tag! - I don\'t know what you want! - NFC Available! - \?\?\? Show Secrets! From 3406f585f20f43b5c18623169cadbf3c32038b1d Mon Sep 17 00:00:00 2001 From: m2049r Date: Sun, 30 Apr 2023 17:46:32 +0200 Subject: [PATCH 12/15] organize all imports --- app/src/main/java/com/btchip/comm/BTChipTransport.java | 2 -- .../btchip/comm/android/BTChipTransportAndroidHID.java | 1 - .../main/java/com/m2049r/xmrwallet/GenerateFragment.java | 3 +-- .../main/java/com/m2049r/xmrwallet/LoginActivity.java | 1 - .../main/java/com/m2049r/xmrwallet/LoginFragment.java | 1 - app/src/main/java/com/m2049r/xmrwallet/MainActivity.java | 1 - .../main/java/com/m2049r/xmrwallet/ScannerFragment.java | 3 ++- .../main/java/com/m2049r/xmrwallet/SecureActivity.java | 4 ++-- app/src/main/java/com/m2049r/xmrwallet/TxFragment.java | 2 -- .../main/java/com/m2049r/xmrwallet/data/NodeInfo.java | 2 -- .../java/com/m2049r/xmrwallet/dialog/AboutFragment.java | 9 +++++---- .../fragment/send/SendConfirmWizardFragment.java | 4 ---- .../java/com/m2049r/xmrwallet/layout/SpendViewPager.java | 3 ++- .../m2049r/xmrwallet/layout/TransactionInfoAdapter.java | 3 --- .../java/com/m2049r/xmrwallet/model/WalletManager.java | 1 - .../m2049r/xmrwallet/onboarding/OnBoardingManager.java | 2 -- .../service/exchange/krakenEcb/ExchangeApiImpl.java | 1 - .../service/shift/sideshift/network/CreateOrderImpl.java | 1 - .../sideshift/network/QueryOrderParametersImpl.java | 3 +-- .../shift/sideshift/network/QueryOrderStatusImpl.java | 5 ++--- app/src/main/java/com/m2049r/xmrwallet/util/Helper.java | 1 - .../java/com/m2049r/xmrwallet/util/NightmodeHelper.java | 1 - .../com/m2049r/xmrwallet/widget/CTextInputLayout.java | 3 ++- .../com/m2049r/xmrwallet/widget/DropDownEditText.java | 3 ++- .../java/com/m2049r/xmrwallet/widget/ExchangeView.java | 2 +- app/src/main/java/com/theromus/sha/Keccak.java | 6 +++--- .../xmrwallet/service/exchange/ecb/ExchangeRateTest.java | 4 ++-- .../service/exchange/kraken/ExchangeRateTest.java | 4 ++-- .../shift/sideshift/SideShiftApiOrderParameterTest.java | 6 +++--- .../shift/sideshift/SideShiftApiRequestQuoteTest.java | 4 ++-- .../test/java/com/m2049r/xmrwallet/util/HelperTest.java | 6 ++---- .../com/m2049r/xmrwallet/util/OpenAliasHelperTest.java | 8 +++----- .../com/m2049r/xmrwallet/util/RestoreHeightTest.java | 4 ++-- .../java/com/m2049r/xmrwallet/util/UserNoteTest.java | 8 ++++---- .../com/m2049r/xmrwallet/util/ledger/MoneroTest.java | 6 +++--- .../util/validator/BitcoinAddressValidatorTest.java | 4 ++-- .../util/validator/EthAddressValidatorTest.java | 4 ++-- 37 files changed, 50 insertions(+), 76 deletions(-) diff --git a/app/src/main/java/com/btchip/comm/BTChipTransport.java b/app/src/main/java/com/btchip/comm/BTChipTransport.java index cc555737..217418e7 100644 --- a/app/src/main/java/com/btchip/comm/BTChipTransport.java +++ b/app/src/main/java/com/btchip/comm/BTChipTransport.java @@ -20,8 +20,6 @@ package com.btchip.comm; -import com.btchip.BTChipException; - public interface BTChipTransport { byte[] exchange(byte[] command); diff --git a/app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java b/app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java index 37c4f491..0580b6a7 100644 --- a/app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java +++ b/app/src/main/java/com/btchip/comm/android/BTChipTransportAndroidHID.java @@ -28,7 +28,6 @@ import android.hardware.usb.UsbInterface; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbRequest; -import com.btchip.BTChipException; import com.btchip.comm.BTChipTransport; import com.btchip.comm.LedgerHelper; import com.btchip.utils.Dump; diff --git a/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java b/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java index 6370e99d..46215829 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java @@ -16,8 +16,6 @@ package com.m2049r.xmrwallet; -import androidx.annotation.NonNull; - import android.app.Activity; import android.content.Context; import android.content.DialogInterface; @@ -37,6 +35,7 @@ import android.view.inputmethod.EditorInfo; import android.widget.Button; import android.widget.LinearLayout; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; diff --git a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java index 0cb29915..589eb4cc 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java +++ b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java @@ -49,7 +49,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.m2049r.xmrwallet.data.DefaultNodes; import com.m2049r.xmrwallet.data.Node; import com.m2049r.xmrwallet.data.NodeInfo; -import com.m2049r.xmrwallet.dialog.CreditsFragment; import com.m2049r.xmrwallet.dialog.HelpFragment; import com.m2049r.xmrwallet.ledger.Ledger; import com.m2049r.xmrwallet.ledger.LedgerProgressDialog; diff --git a/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java b/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java index 21b85bef..5eff646f 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/LoginFragment.java @@ -29,7 +29,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.animation.Animation; import android.view.animation.AnimationUtils; -import android.widget.FrameLayout; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.RelativeLayout; diff --git a/app/src/main/java/com/m2049r/xmrwallet/MainActivity.java b/app/src/main/java/com/m2049r/xmrwallet/MainActivity.java index 5c7cc754..b7cf609a 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/MainActivity.java +++ b/app/src/main/java/com/m2049r/xmrwallet/MainActivity.java @@ -20,7 +20,6 @@ import android.content.Intent; import android.os.Bundle; import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; import com.m2049r.xmrwallet.onboarding.OnBoardingActivity; import com.m2049r.xmrwallet.onboarding.OnBoardingManager; diff --git a/app/src/main/java/com/m2049r/xmrwallet/ScannerFragment.java b/app/src/main/java/com/m2049r/xmrwallet/ScannerFragment.java index 32512fdf..097d75df 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/ScannerFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/ScannerFragment.java @@ -19,12 +19,13 @@ package com.m2049r.xmrwallet; import android.content.Context; import android.os.Bundle; import android.os.Handler; -import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Toast; +import androidx.fragment.app.Fragment; + import com.google.zxing.BarcodeFormat; import com.google.zxing.Result; diff --git a/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java b/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java index 238aeea1..9dc36619 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java +++ b/app/src/main/java/com/m2049r/xmrwallet/SecureActivity.java @@ -16,6 +16,8 @@ package com.m2049r.xmrwallet; +import static android.view.WindowManager.LayoutParams; + import android.content.Context; import android.content.res.Configuration; import android.os.Build; @@ -29,8 +31,6 @@ import com.m2049r.xmrwallet.util.LocaleHelper; import java.util.Locale; -import static android.view.WindowManager.LayoutParams; - public abstract class SecureActivity extends AppCompatActivity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { diff --git a/app/src/main/java/com/m2049r/xmrwallet/TxFragment.java b/app/src/main/java/com/m2049r/xmrwallet/TxFragment.java index 283682ac..73556965 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/TxFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/TxFragment.java @@ -44,8 +44,6 @@ import com.m2049r.xmrwallet.data.UserNotes; import com.m2049r.xmrwallet.model.TransactionInfo; import com.m2049r.xmrwallet.model.Transfer; import com.m2049r.xmrwallet.model.Wallet; -import com.m2049r.xmrwallet.model.WalletManager; -import com.m2049r.xmrwallet.service.WalletService; import com.m2049r.xmrwallet.util.Helper; import com.m2049r.xmrwallet.util.ThemeHelper; import com.m2049r.xmrwallet.widget.Toolbar; diff --git a/app/src/main/java/com/m2049r/xmrwallet/data/NodeInfo.java b/app/src/main/java/com/m2049r/xmrwallet/data/NodeInfo.java index 351e7941..c77d3267 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/data/NodeInfo.java +++ b/app/src/main/java/com/m2049r/xmrwallet/data/NodeInfo.java @@ -21,8 +21,6 @@ import android.text.Html; import android.text.Spanned; import android.widget.TextView; -import androidx.core.content.ContextCompat; - import com.m2049r.levin.scanner.LevinPeer; import com.m2049r.xmrwallet.R; import com.m2049r.xmrwallet.util.NetCipherHelper; diff --git a/app/src/main/java/com/m2049r/xmrwallet/dialog/AboutFragment.java b/app/src/main/java/com/m2049r/xmrwallet/dialog/AboutFragment.java index dc1047ef..5c788d3b 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/dialog/AboutFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/dialog/AboutFragment.java @@ -19,15 +19,16 @@ package com.m2049r.xmrwallet.dialog; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; import android.text.Html; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; + import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.m2049r.xmrwallet.BuildConfig; import com.m2049r.xmrwallet.R; diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java index f4d334ee..99acd244 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendConfirmWizardFragment.java @@ -17,9 +17,6 @@ package com.m2049r.xmrwallet.fragment.send; import android.os.Bundle; -import android.text.Editable; -import android.text.TextWatcher; -import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -28,7 +25,6 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import com.google.android.material.textfield.TextInputLayout; import com.m2049r.xmrwallet.R; import com.m2049r.xmrwallet.data.TxData; import com.m2049r.xmrwallet.data.UserNotes; diff --git a/app/src/main/java/com/m2049r/xmrwallet/layout/SpendViewPager.java b/app/src/main/java/com/m2049r/xmrwallet/layout/SpendViewPager.java index 71b7e0cf..eafb82a3 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/layout/SpendViewPager.java +++ b/app/src/main/java/com/m2049r/xmrwallet/layout/SpendViewPager.java @@ -17,10 +17,11 @@ package com.m2049r.xmrwallet.layout; import android.content.Context; -import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; +import androidx.viewpager.widget.ViewPager; + import com.m2049r.xmrwallet.fragment.send.SendFragment; public class SpendViewPager extends ViewPager { diff --git a/app/src/main/java/com/m2049r/xmrwallet/layout/TransactionInfoAdapter.java b/app/src/main/java/com/m2049r/xmrwallet/layout/TransactionInfoAdapter.java index 41f4b31b..215d41b0 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/layout/TransactionInfoAdapter.java +++ b/app/src/main/java/com/m2049r/xmrwallet/layout/TransactionInfoAdapter.java @@ -26,7 +26,6 @@ import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.RecyclerView; @@ -35,8 +34,6 @@ import com.m2049r.xmrwallet.R; import com.m2049r.xmrwallet.data.Crypto; import com.m2049r.xmrwallet.data.UserNotes; import com.m2049r.xmrwallet.model.TransactionInfo; -import com.m2049r.xmrwallet.model.WalletManager; -import com.m2049r.xmrwallet.service.WalletService; import com.m2049r.xmrwallet.util.Helper; import com.m2049r.xmrwallet.util.ThemeHelper; diff --git a/app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java b/app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java index f5aa743c..97ed886b 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java +++ b/app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java @@ -25,7 +25,6 @@ import java.io.File; import java.io.FilenameFilter; import java.util.ArrayList; import java.util.Calendar; -import java.util.Date; import java.util.List; import lombok.Getter; diff --git a/app/src/main/java/com/m2049r/xmrwallet/onboarding/OnBoardingManager.java b/app/src/main/java/com/m2049r/xmrwallet/onboarding/OnBoardingManager.java index eb283310..b0c52d0d 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/onboarding/OnBoardingManager.java +++ b/app/src/main/java/com/m2049r/xmrwallet/onboarding/OnBoardingManager.java @@ -19,8 +19,6 @@ package com.m2049r.xmrwallet.onboarding; import android.content.Context; import android.content.SharedPreferences; -import com.m2049r.xmrwallet.util.KeyStoreHelper; - import java.util.Date; import timber.log.Timber; diff --git a/app/src/main/java/com/m2049r/xmrwallet/service/exchange/krakenEcb/ExchangeApiImpl.java b/app/src/main/java/com/m2049r/xmrwallet/service/exchange/krakenEcb/ExchangeApiImpl.java index b8021b9e..fcc7c678 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/service/exchange/krakenEcb/ExchangeApiImpl.java +++ b/app/src/main/java/com/m2049r/xmrwallet/service/exchange/krakenEcb/ExchangeApiImpl.java @@ -25,7 +25,6 @@ import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback; import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate; import com.m2049r.xmrwallet.util.Helper; -import okhttp3.OkHttpClient; import timber.log.Timber; /* diff --git a/app/src/main/java/com/m2049r/xmrwallet/service/shift/sideshift/network/CreateOrderImpl.java b/app/src/main/java/com/m2049r/xmrwallet/service/shift/sideshift/network/CreateOrderImpl.java index 258cf4d7..d04222fc 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/service/shift/sideshift/network/CreateOrderImpl.java +++ b/app/src/main/java/com/m2049r/xmrwallet/service/shift/sideshift/network/CreateOrderImpl.java @@ -23,7 +23,6 @@ import com.m2049r.xmrwallet.service.shift.NetworkCallback; import com.m2049r.xmrwallet.service.shift.ShiftApiCall; import com.m2049r.xmrwallet.service.shift.ShiftCallback; import com.m2049r.xmrwallet.service.shift.sideshift.api.CreateOrder; -import com.m2049r.xmrwallet.service.shift.sideshift.api.SideShiftApi; import com.m2049r.xmrwallet.util.DateHelper; import com.m2049r.xmrwallet.util.ServiceHelper; diff --git a/app/src/main/java/com/m2049r/xmrwallet/service/shift/sideshift/network/QueryOrderParametersImpl.java b/app/src/main/java/com/m2049r/xmrwallet/service/shift/sideshift/network/QueryOrderParametersImpl.java index afa5527c..98dfbf70 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/service/shift/sideshift/network/QueryOrderParametersImpl.java +++ b/app/src/main/java/com/m2049r/xmrwallet/service/shift/sideshift/network/QueryOrderParametersImpl.java @@ -20,9 +20,8 @@ import androidx.annotation.NonNull; import com.m2049r.xmrwallet.service.shift.NetworkCallback; import com.m2049r.xmrwallet.service.shift.ShiftApiCall; -import com.m2049r.xmrwallet.service.shift.sideshift.api.QueryOrderParameters; -import com.m2049r.xmrwallet.service.shift.sideshift.api.SideShiftApi; import com.m2049r.xmrwallet.service.shift.ShiftCallback; +import com.m2049r.xmrwallet.service.shift.sideshift.api.QueryOrderParameters; import com.m2049r.xmrwallet.util.ServiceHelper; import org.json.JSONException; diff --git a/app/src/main/java/com/m2049r/xmrwallet/service/shift/sideshift/network/QueryOrderStatusImpl.java b/app/src/main/java/com/m2049r/xmrwallet/service/shift/sideshift/network/QueryOrderStatusImpl.java index 439cb93f..c717cef3 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/service/shift/sideshift/network/QueryOrderStatusImpl.java +++ b/app/src/main/java/com/m2049r/xmrwallet/service/shift/sideshift/network/QueryOrderStatusImpl.java @@ -20,9 +20,9 @@ import androidx.annotation.NonNull; import com.m2049r.xmrwallet.service.shift.NetworkCallback; import com.m2049r.xmrwallet.service.shift.ShiftApiCall; -import com.m2049r.xmrwallet.util.DateHelper; -import com.m2049r.xmrwallet.service.shift.sideshift.api.QueryOrderStatus; import com.m2049r.xmrwallet.service.shift.ShiftCallback; +import com.m2049r.xmrwallet.service.shift.sideshift.api.QueryOrderStatus; +import com.m2049r.xmrwallet.util.DateHelper; import org.json.JSONArray; import org.json.JSONException; @@ -32,7 +32,6 @@ import java.text.ParseException; import java.util.Date; import lombok.Getter; -import timber.log.Timber; class QueryOrderStatusImpl implements QueryOrderStatus { diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/Helper.java b/app/src/main/java/com/m2049r/xmrwallet/util/Helper.java index 4cd90cfc..4f336119 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/util/Helper.java +++ b/app/src/main/java/com/m2049r/xmrwallet/util/Helper.java @@ -68,7 +68,6 @@ import java.math.BigInteger; import java.net.MalformedURLException; import java.net.SocketTimeoutException; import java.net.URL; -import java.util.Calendar; import java.util.Locale; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/app/src/main/java/com/m2049r/xmrwallet/util/NightmodeHelper.java b/app/src/main/java/com/m2049r/xmrwallet/util/NightmodeHelper.java index afe4ce4f..3cd622df 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/util/NightmodeHelper.java +++ b/app/src/main/java/com/m2049r/xmrwallet/util/NightmodeHelper.java @@ -18,7 +18,6 @@ package com.m2049r.xmrwallet.util; import android.annotation.SuppressLint; import android.content.Context; -import android.content.SharedPreferences; import android.preference.PreferenceManager; import androidx.appcompat.app.AppCompatDelegate; diff --git a/app/src/main/java/com/m2049r/xmrwallet/widget/CTextInputLayout.java b/app/src/main/java/com/m2049r/xmrwallet/widget/CTextInputLayout.java index 59b884dc..e427e3d8 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/widget/CTextInputLayout.java +++ b/app/src/main/java/com/m2049r/xmrwallet/widget/CTextInputLayout.java @@ -19,10 +19,11 @@ package com.m2049r.xmrwallet.widget; import android.content.Context; -import com.google.android.material.textfield.TextInputLayout; import android.util.AttributeSet; import android.widget.EditText; +import com.google.android.material.textfield.TextInputLayout; + public class CTextInputLayout extends TextInputLayout { public CTextInputLayout(Context context) { super(context); diff --git a/app/src/main/java/com/m2049r/xmrwallet/widget/DropDownEditText.java b/app/src/main/java/com/m2049r/xmrwallet/widget/DropDownEditText.java index 9a767f56..364cac91 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/widget/DropDownEditText.java +++ b/app/src/main/java/com/m2049r/xmrwallet/widget/DropDownEditText.java @@ -20,9 +20,10 @@ package com.m2049r.xmrwallet.widget; import android.content.Context; import android.graphics.Rect; -import androidx.appcompat.widget.AppCompatAutoCompleteTextView; import android.util.AttributeSet; +import androidx.appcompat.widget.AppCompatAutoCompleteTextView; + public class DropDownEditText extends AppCompatAutoCompleteTextView { public DropDownEditText(Context context) { diff --git a/app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeView.java b/app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeView.java index 3208f720..96a4923e 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeView.java +++ b/app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeView.java @@ -42,9 +42,9 @@ import com.m2049r.xmrwallet.model.Wallet; import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi; import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback; import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate; -import com.m2049r.xmrwallet.util.ThemeHelper; import com.m2049r.xmrwallet.util.Helper; import com.m2049r.xmrwallet.util.ServiceHelper; +import com.m2049r.xmrwallet.util.ThemeHelper; import java.util.ArrayList; import java.util.Arrays; diff --git a/app/src/main/java/com/theromus/sha/Keccak.java b/app/src/main/java/com/theromus/sha/Keccak.java index 0163a316..83849546 100644 --- a/app/src/main/java/com/theromus/sha/Keccak.java +++ b/app/src/main/java/com/theromus/sha/Keccak.java @@ -1,9 +1,9 @@ package com.theromus.sha; -import static com.theromus.utils.HexUtils.leftRotate64; -import static com.theromus.utils.HexUtils.convertToUint; -import static com.theromus.utils.HexUtils.convertFromLittleEndianTo64; import static com.theromus.utils.HexUtils.convertFrom64ToLittleEndian; +import static com.theromus.utils.HexUtils.convertFromLittleEndianTo64; +import static com.theromus.utils.HexUtils.convertToUint; +import static com.theromus.utils.HexUtils.leftRotate64; import static java.lang.Math.min; import static java.lang.System.arraycopy; import static java.util.Arrays.fill; diff --git a/app/src/test/java/com/m2049r/xmrwallet/service/exchange/ecb/ExchangeRateTest.java b/app/src/test/java/com/m2049r/xmrwallet/service/exchange/ecb/ExchangeRateTest.java index ef937247..df97ad04 100644 --- a/app/src/test/java/com/m2049r/xmrwallet/service/exchange/ecb/ExchangeRateTest.java +++ b/app/src/test/java/com/m2049r/xmrwallet/service/exchange/ecb/ExchangeRateTest.java @@ -16,6 +16,8 @@ package com.m2049r.xmrwallet.service.exchange.ecb; +import static org.junit.Assert.assertEquals; + import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi; import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback; import com.m2049r.xmrwallet.service.exchange.api.ExchangeException; @@ -38,8 +40,6 @@ import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; -import static org.junit.Assert.assertEquals; - public class ExchangeRateTest { diff --git a/app/src/test/java/com/m2049r/xmrwallet/service/exchange/kraken/ExchangeRateTest.java b/app/src/test/java/com/m2049r/xmrwallet/service/exchange/kraken/ExchangeRateTest.java index edb8be73..043eeb5d 100644 --- a/app/src/test/java/com/m2049r/xmrwallet/service/exchange/kraken/ExchangeRateTest.java +++ b/app/src/test/java/com/m2049r/xmrwallet/service/exchange/kraken/ExchangeRateTest.java @@ -16,6 +16,8 @@ package com.m2049r.xmrwallet.service.exchange.kraken; +import static org.junit.Assert.assertEquals; + import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi; import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback; import com.m2049r.xmrwallet.service.exchange.api.ExchangeException; @@ -38,8 +40,6 @@ import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; -import static org.junit.Assert.assertEquals; - public class ExchangeRateTest { diff --git a/app/src/test/java/com/m2049r/xmrwallet/service/shift/sideshift/SideShiftApiOrderParameterTest.java b/app/src/test/java/com/m2049r/xmrwallet/service/shift/sideshift/SideShiftApiOrderParameterTest.java index 5a2689fa..abad4409 100644 --- a/app/src/test/java/com/m2049r/xmrwallet/service/shift/sideshift/SideShiftApiOrderParameterTest.java +++ b/app/src/test/java/com/m2049r/xmrwallet/service/shift/sideshift/SideShiftApiOrderParameterTest.java @@ -16,10 +16,12 @@ package com.m2049r.xmrwallet.service.shift.sideshift; +import static org.junit.Assert.assertEquals; + +import com.m2049r.xmrwallet.service.shift.ShiftCallback; import com.m2049r.xmrwallet.service.shift.ShiftException; import com.m2049r.xmrwallet.service.shift.sideshift.api.QueryOrderParameters; import com.m2049r.xmrwallet.service.shift.sideshift.api.SideShiftApi; -import com.m2049r.xmrwallet.service.shift.ShiftCallback; import com.m2049r.xmrwallet.service.shift.sideshift.network.SideShiftApiImpl; import com.m2049r.xmrwallet.util.NetCipherHelper; @@ -38,8 +40,6 @@ import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; -import static org.junit.Assert.assertEquals; - public class SideShiftApiOrderParameterTest { private MockWebServer mockWebServer; diff --git a/app/src/test/java/com/m2049r/xmrwallet/service/shift/sideshift/SideShiftApiRequestQuoteTest.java b/app/src/test/java/com/m2049r/xmrwallet/service/shift/sideshift/SideShiftApiRequestQuoteTest.java index 7c651d3e..0031cc9b 100644 --- a/app/src/test/java/com/m2049r/xmrwallet/service/shift/sideshift/SideShiftApiRequestQuoteTest.java +++ b/app/src/test/java/com/m2049r/xmrwallet/service/shift/sideshift/SideShiftApiRequestQuoteTest.java @@ -16,6 +16,8 @@ package com.m2049r.xmrwallet.service.shift.sideshift; +import static org.junit.Assert.assertEquals; + import com.m2049r.xmrwallet.service.shift.ShiftCallback; import com.m2049r.xmrwallet.service.shift.ShiftError; import com.m2049r.xmrwallet.service.shift.ShiftException; @@ -40,8 +42,6 @@ import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; -import static org.junit.Assert.assertEquals; - public class SideShiftApiRequestQuoteTest { private MockWebServer mockWebServer; diff --git a/app/src/test/java/com/m2049r/xmrwallet/util/HelperTest.java b/app/src/test/java/com/m2049r/xmrwallet/util/HelperTest.java index d4c9ab77..87ebda81 100644 --- a/app/src/test/java/com/m2049r/xmrwallet/util/HelperTest.java +++ b/app/src/test/java/com/m2049r/xmrwallet/util/HelperTest.java @@ -16,12 +16,10 @@ package com.m2049r.xmrwallet.util; -import org.junit.Test; - -import java.math.BigDecimal; - import static org.junit.Assert.assertTrue; +import org.junit.Test; + public class HelperTest { @Test diff --git a/app/src/test/java/com/m2049r/xmrwallet/util/OpenAliasHelperTest.java b/app/src/test/java/com/m2049r/xmrwallet/util/OpenAliasHelperTest.java index b1062723..3e40c919 100644 --- a/app/src/test/java/com/m2049r/xmrwallet/util/OpenAliasHelperTest.java +++ b/app/src/test/java/com/m2049r/xmrwallet/util/OpenAliasHelperTest.java @@ -16,7 +16,9 @@ package com.m2049r.xmrwallet.util; -import com.m2049r.xmrwallet.data.BarcodeData; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import org.junit.Rule; import org.junit.Test; @@ -24,10 +26,6 @@ import org.junit.rules.ExpectedException; import java.util.Map; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - public class OpenAliasHelperTest { private final static String MONERUJO = "oa1:xmr recipient_address=4AdkPJoxn7JCvAby9szgnt93MSEwdnxdhaASxbTBm6x5dCwmsDep2UYN4FhStDn5i11nsJbpU7oj59ahg8gXb1Mg3viqCuk; recipient_name=Monerujo Development; tx_description=Donation to Monerujo Core Team;"; diff --git a/app/src/test/java/com/m2049r/xmrwallet/util/RestoreHeightTest.java b/app/src/test/java/com/m2049r/xmrwallet/util/RestoreHeightTest.java index 58ac8f54..c075c5d5 100644 --- a/app/src/test/java/com/m2049r/xmrwallet/util/RestoreHeightTest.java +++ b/app/src/test/java/com/m2049r/xmrwallet/util/RestoreHeightTest.java @@ -16,12 +16,12 @@ package com.m2049r.xmrwallet.util; +import static org.junit.Assert.assertTrue; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import static org.junit.Assert.assertTrue; - // all ranges go back 5 days public class RestoreHeightTest { diff --git a/app/src/test/java/com/m2049r/xmrwallet/util/UserNoteTest.java b/app/src/test/java/com/m2049r/xmrwallet/util/UserNoteTest.java index 126968e0..4b01b166 100644 --- a/app/src/test/java/com/m2049r/xmrwallet/util/UserNoteTest.java +++ b/app/src/test/java/com/m2049r/xmrwallet/util/UserNoteTest.java @@ -16,14 +16,14 @@ package com.m2049r.xmrwallet.util; -import com.m2049r.xmrwallet.data.UserNotes; - -import org.junit.Test; - import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import com.m2049r.xmrwallet.data.UserNotes; + +import org.junit.Test; + public class UserNoteTest { @Test diff --git a/app/src/test/java/com/m2049r/xmrwallet/util/ledger/MoneroTest.java b/app/src/test/java/com/m2049r/xmrwallet/util/ledger/MoneroTest.java index 5f32fa0b..0679c190 100644 --- a/app/src/test/java/com/m2049r/xmrwallet/util/ledger/MoneroTest.java +++ b/app/src/test/java/com/m2049r/xmrwallet/util/ledger/MoneroTest.java @@ -16,13 +16,13 @@ package com.m2049r.xmrwallet.util.ledger; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - public class MoneroTest { @Rule diff --git a/app/src/test/java/com/m2049r/xmrwallet/util/validator/BitcoinAddressValidatorTest.java b/app/src/test/java/com/m2049r/xmrwallet/util/validator/BitcoinAddressValidatorTest.java index 9696d83d..8402079f 100644 --- a/app/src/test/java/com/m2049r/xmrwallet/util/validator/BitcoinAddressValidatorTest.java +++ b/app/src/test/java/com/m2049r/xmrwallet/util/validator/BitcoinAddressValidatorTest.java @@ -16,11 +16,11 @@ package com.m2049r.xmrwallet.util.validator; -import org.junit.Test; - import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.junit.Test; + public class BitcoinAddressValidatorTest { diff --git a/app/src/test/java/com/m2049r/xmrwallet/util/validator/EthAddressValidatorTest.java b/app/src/test/java/com/m2049r/xmrwallet/util/validator/EthAddressValidatorTest.java index 4dfc2324..2be324b6 100644 --- a/app/src/test/java/com/m2049r/xmrwallet/util/validator/EthAddressValidatorTest.java +++ b/app/src/test/java/com/m2049r/xmrwallet/util/validator/EthAddressValidatorTest.java @@ -16,11 +16,11 @@ package com.m2049r.xmrwallet.util.validator; -import org.junit.Test; - import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.junit.Test; + public class EthAddressValidatorTest { From a42f750fc4f0c01f15e792c14d39d73945fee7da Mon Sep 17 00:00:00 2001 From: m2049r Date: Wed, 3 May 2023 08:22:23 +0200 Subject: [PATCH 13/15] center sync status --- app/build.gradle | 4 ++-- app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java | 2 +- app/src/main/res/layout/fragment_wallet.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6fb15637..d629e5d7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.m2049r.xmrwallet" minSdkVersion 21 targetSdkVersion 31 - versionCode 3110 - versionName "3.1.1 'Fluorine Fermi'" + versionCode 3120 + versionName "3.1.2 'Fluorine Fermi'" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java b/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java index e8066ff2..dc43045e 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java @@ -447,6 +447,7 @@ public class WalletFragment extends Fragment String sync; if (!activityCallback.hasBoundService()) throw new IllegalStateException("WalletService not bound."); + ivSynced.setVisibility(View.GONE); Wallet.ConnectionStatus daemonConnected = activityCallback.getConnectionStatus(); if (daemonConnected == Wallet.ConnectionStatus.ConnectionStatus_Connected) { if (!wallet.isSynchronized()) { @@ -460,7 +461,6 @@ public class WalletFragment extends Fragment int x = 100 - Math.round(100f * n / (1f * daemonHeight - firstBlock)); if (x == 0) x = 101; // indeterminate setProgress(x); - ivSynced.setVisibility(View.INVISIBLE); } else { sync = getString(R.string.status_synced) + " " + formatter.format(wallet.getBlockChainHeight()); ivSynced.setVisibility(View.VISIBLE); diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml index 9028ceaa..35bf9306 100644 --- a/app/src/main/res/layout/fragment_wallet.xml +++ b/app/src/main/res/layout/fragment_wallet.xml @@ -26,7 +26,7 @@ @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="8dp" android:src="@drawable/ic_done_all" - android:visibility="invisible" /> + android:visibility="gone" /> Date: Wed, 3 May 2023 22:43:42 +0200 Subject: [PATCH 14/15] new qr code logo --- app/build.gradle | 4 +-- .../com/m2049r/xmrwallet/ReceiveFragment.java | 2 +- app/src/main/res/drawable/ic_monerujo_qr.xml | 30 +++++++++++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/drawable/ic_monerujo_qr.xml diff --git a/app/build.gradle b/app/build.gradle index d629e5d7..fa8cb0c0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.m2049r.xmrwallet" minSdkVersion 21 targetSdkVersion 31 - versionCode 3120 - versionName "3.1.2 'Fluorine Fermi'" + versionCode 3130 + versionName "3.1.3 'Fluorine Fermi'" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { diff --git a/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java b/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java index b05662c4..071404d5 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java @@ -397,7 +397,7 @@ public class ReceiveFragment extends Fragment { private Bitmap getMoneroLogo() { if (logo == null) { - logo = Helper.getBitmap(getContext(), R.drawable.ic_monerujo); + logo = Helper.getBitmap(getContext(), R.drawable.ic_monerujo_qr); } return logo; } diff --git a/app/src/main/res/drawable/ic_monerujo_qr.xml b/app/src/main/res/drawable/ic_monerujo_qr.xml new file mode 100644 index 00000000..71277d0f --- /dev/null +++ b/app/src/main/res/drawable/ic_monerujo_qr.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + From 11b7e23ad27967d3dc3a9e1f795114a706b6db24 Mon Sep 17 00:00:00 2001 From: m2049r Date: Wed, 3 May 2023 22:49:18 +0200 Subject: [PATCH 15/15] remove RUB as currency as we don't get an exchange rate for it --- app/src/main/res/values/strings.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ec714e5b..0ea93487 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -311,7 +311,6 @@ PHP PLN RON - RUB SEK SGD THB