Merge pull request #954 from m2049r/feature/show_connected

show when sidekick is connected

app/build.gradle

@@ -4,12 +4,12 @@ android {
     ndkVersion '17.2.4988734'
     defaultConfig {
         applicationId "com.m2049r.xmrwallet"
-        buildToolsVersion = '34.0.0'
+        buildToolsVersion = '35.0.0'
-        compileSdk 34
+        compileSdk 35
         minSdkVersion 21
         targetSdkVersion 35
-        versionCode 4005
+        versionCode 4006
-        versionName "4.0.5 'Sidekick'"
+        versionName "4.0.6 'Sidekick'"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

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

app/src/main/res/values-cat/strings.xml

@@ -448,6 +448,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -460,4 +463,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -449,6 +449,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -461,4 +464,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-el/strings.xml

@@ -450,6 +450,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -462,4 +465,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-eo/strings.xml

@@ -448,6 +448,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -460,4 +463,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-es/strings.xml

@@ -445,6 +445,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -457,4 +460,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-et/strings.xml

@@ -448,6 +448,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -460,4 +463,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-fa/strings.xml

@@ -688,6 +688,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -700,4 +703,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -461,6 +461,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -473,4 +476,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-he/strings.xml

@@ -448,6 +448,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -460,4 +463,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-hu/strings.xml

@@ -452,6 +452,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -464,4 +467,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -453,6 +453,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -465,4 +468,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-ja/strings.xml

@@ -453,6 +453,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -465,4 +468,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-nb/strings.xml

@@ -448,6 +448,9 @@
 
     <string name="label_apply">APPLY</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="setting_lock">Lock Wallet in Background</string>
 
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
@@ -462,4 +465,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-nl/strings.xml

@@ -450,6 +450,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -462,4 +465,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -443,6 +443,9 @@ aqui.</string>
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -455,4 +458,5 @@ aqui.</string>
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-pt/strings.xml

@@ -454,6 +454,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -466,4 +469,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-ro/strings.xml

@@ -450,6 +450,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -462,4 +465,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -454,6 +454,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -466,4 +469,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-sk/strings.xml

@@ -451,6 +451,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -463,4 +466,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-sr/strings.xml

@@ -449,6 +449,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -461,4 +464,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-sv/strings.xml

@@ -442,6 +442,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -454,4 +457,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-ta/strings.xml

@@ -448,6 +448,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -460,4 +463,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-uk/strings.xml

@@ -454,6 +454,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -466,4 +469,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -375,6 +375,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -387,4 +390,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -449,6 +449,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
+    <string name="menu_bluetooth">Connect Sidekick</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
+
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
     <string name="bluetooth_permissions_settings">App Settings</string>
@@ -461,4 +464,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -503,20 +503,9 @@
 
     <string name="setting_lock">Lock Wallet in Background</string>
 
-    <string name="sidekick_activity_name" translatable="false">Sidekick Wallet</string>
-    <string name="sidekick" translatable="false">monerujo Sidekick Service</string>
-
-    <string name="bt_not_connected" translatable="false">Bluetooth not connected</string>
-    <string name="title_paired_devices" translatable="false">Paired Devices</string>
-    <string name="title_other_devices" translatable="false">Other Devices</string>
-    <string name="button_scan" translatable="false">Scan</string>
-    <string name="none_paired" translatable="false">None paired</string>
-    <string name="none_found" translatable="false">None found</string>
-    <string name="select_device" translatable="false">Select Device</string>
     <string name="label_bluetooth" translatable="false">Bluetooth</string>
-    <string name="menu_bluetooth" translatable="false">Connect Sidekick</string>
+    <string name="menu_bluetooth">Connect Sidekick</string>
-    <string name="bluetooth_select_label" translatable="false">Select Sidekick device</string>
+    <string name="bluetooth_select_label">Select Sidekick device</string>
-    <string name="bluetooth_scanning" translatable="false">Scanning for devices</string>
 
     <string name="bluetooth_permissions">Bluetooth permissions are required to connect your Sidekick Wallet!</string>
     <string name="bluetooth_permissions_ok">OK</string>
@@ -530,4 +519,5 @@
         to turn on flight mode and restart the app with only Bluetooth enabled!</string>
     <string name="open_wallet_sidekick_missing">Please connect Sidekick device</string>
     <string name="fab_restore_sidekick">Restore from Sidekick</string>
+    <string name="sidekick_connected">Sidekick Connected</string>
 </resources>