From 2d2a7d2db0b426337290e2eb6269d77357011310 Mon Sep 17 00:00:00 2001 From: m2049r Date: Sun, 15 Sep 2024 20:46:00 +0200 Subject: [PATCH] show when sidekick is connected --- app/build.gradle | 8 ++++---- .../java/com/m2049r/xmrwallet/LoginActivity.java | 5 +++++ app/src/main/res/values-cat/strings.xml | 4 ++++ app/src/main/res/values-de/strings.xml | 4 ++++ app/src/main/res/values-el/strings.xml | 4 ++++ app/src/main/res/values-eo/strings.xml | 4 ++++ app/src/main/res/values-es/strings.xml | 4 ++++ app/src/main/res/values-et/strings.xml | 4 ++++ app/src/main/res/values-fa/strings.xml | 4 ++++ app/src/main/res/values-fr/strings.xml | 4 ++++ app/src/main/res/values-he/strings.xml | 4 ++++ app/src/main/res/values-hu/strings.xml | 4 ++++ app/src/main/res/values-it/strings.xml | 4 ++++ app/src/main/res/values-ja/strings.xml | 4 ++++ app/src/main/res/values-nb/strings.xml | 4 ++++ app/src/main/res/values-nl/strings.xml | 4 ++++ app/src/main/res/values-pt-rBR/strings.xml | 4 ++++ app/src/main/res/values-pt/strings.xml | 4 ++++ app/src/main/res/values-ro/strings.xml | 4 ++++ app/src/main/res/values-ru/strings.xml | 4 ++++ app/src/main/res/values-sk/strings.xml | 4 ++++ app/src/main/res/values-sr/strings.xml | 4 ++++ app/src/main/res/values-sv/strings.xml | 4 ++++ app/src/main/res/values-ta/strings.xml | 4 ++++ app/src/main/res/values-uk/strings.xml | 4 ++++ app/src/main/res/values-zh-rCN/strings.xml | 4 ++++ app/src/main/res/values-zh-rTW/strings.xml | 4 ++++ app/src/main/res/values/strings.xml | 16 +++------------- 28 files changed, 112 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 533145f3..550ea14f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,12 +4,12 @@ android { ndkVersion '17.2.4988734' defaultConfig { applicationId "com.m2049r.xmrwallet" - buildToolsVersion = '34.0.0' - compileSdk 34 + buildToolsVersion = '35.0.0' + compileSdk 35 minSdkVersion 21 targetSdkVersion 35 - versionCode 4005 - versionName "4.0.5 'Sidekick'" + versionCode 4006 + versionName "4.0.6 'Sidekick'" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { diff --git a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java index a167f3e6..465442d7 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java +++ b/app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java @@ -1413,6 +1413,11 @@ public class LoginActivity extends BaseActivity } catch (ClassCastException ex) { // ignore it } + if (connectedDeviceName != null) { + setSubtitle(getString(R.string.sidekick_connected)); + } else { + setSubtitle(null); + } } @Override diff --git a/app/src/main/res/values-cat/strings.xml b/app/src/main/res/values-cat/strings.xml index 804d592d..d5805e50 100644 --- a/app/src/main/res/values-cat/strings.xml +++ b/app/src/main/res/values-cat/strings.xml @@ -448,6 +448,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -460,4 +463,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 78a6fb0a..26e4af13 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -449,6 +449,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -461,4 +464,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 855b3477..8368f2d5 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -450,6 +450,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -462,4 +465,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index bd4b49a1..3df9c9d7 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -448,6 +448,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -460,4 +463,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8f8de438..58a52bc6 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -445,6 +445,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -457,4 +460,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 9100252f..18781ad0 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -448,6 +448,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -460,4 +463,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 96a5e719..f72b09cc 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -688,6 +688,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -700,4 +703,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 905b6c86..ffc8ec59 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -461,6 +461,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -473,4 +476,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 5bf905d9..7fd67c33 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -448,6 +448,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -460,4 +463,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 9fb4ac1d..df1378a8 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -452,6 +452,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -464,4 +467,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index f4b88c5f..4666a31f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -453,6 +453,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -465,4 +468,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c305f355..75460c7d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -453,6 +453,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -465,4 +468,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 80453eac..c3708547 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -448,6 +448,9 @@ APPLY + Connect Sidekick + Select Sidekick device + Lock Wallet in Background Bluetooth permissions are required to connect your Sidekick Wallet! @@ -462,4 +465,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 59f0449c..125de001 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -450,6 +450,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -462,4 +465,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 189354e1..2d129751 100755 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -443,6 +443,9 @@ aqui. Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -455,4 +458,5 @@ aqui. to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 31e58f05..e53a74dd 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -454,6 +454,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -466,4 +469,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index a98b2f61..f5231822 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -450,6 +450,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -462,4 +465,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index af38c4bf..996270f4 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -454,6 +454,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -466,4 +469,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index bac5fd26..8218e61d 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -451,6 +451,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -463,4 +466,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index e09c8291..bb33ca36 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -449,6 +449,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -461,4 +464,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 7fdb0e7b..9061d8c7 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -442,6 +442,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -454,4 +457,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 6a0abb25..14aa7b5c 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -448,6 +448,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -460,4 +463,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 64c482dd..55d6d358 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -454,6 +454,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -466,4 +469,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3fdae218..9ed83d19 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -375,6 +375,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -387,4 +390,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 37a6fa68..b9c57588 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -449,6 +449,9 @@ Lock Wallet in Background + Connect Sidekick + Select Sidekick device + Bluetooth permissions are required to connect your Sidekick Wallet! OK App Settings @@ -461,4 +464,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c31a5d72..d71e1615 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -503,20 +503,9 @@ Lock Wallet in Background - Sidekick Wallet - monerujo Sidekick Service - - Bluetooth not connected - Paired Devices - Other Devices - Scan - None paired - None found - Select Device Bluetooth - Connect Sidekick - Select Sidekick device - Scanning for devices + Connect Sidekick + Select Sidekick device Bluetooth permissions are required to connect your Sidekick Wallet! OK @@ -530,4 +519,5 @@ to turn on flight mode and restart the app with only Bluetooth enabled! Please connect Sidekick device Restore from Sidekick + Sidekick Connected