Merge remote-tracking branch 'benma/android-rename'

.dockerignore

@@ -1,4 +1,4 @@
 /frontends/qt/build
-/frontends/android/BitBox/app/build
-/frontends/android/BitBox/app/captures
-/frontends/android/BitBox/app/.idea
+/frontends/android/BitBoxApp/app/build
+/frontends/android/BitBoxApp/app/captures
+/frontends/android/BitBoxApp/app/.idea

docs/BUILD.md

@@ -70,7 +70,7 @@ To update the app icon, execute `frontends/android/mkicon.sh`.
 The script isn't run during `make android` build.
 
 Build artifacts:
-* `frontends/android/BitBox/app/build/outputs/apk/*`
+* `frontends/android/BitBoxApp/app/build/outputs/apk/*`
 
 ## Cross compile from GNU/Linux to Windows
 It is not currently possible to cross compile the BitBox wallet for Windows.

frontends/android/BitBox/app/build.gradle → frontends/android/BitBoxApp/app/build.gradle

@@ -4,7 +4,7 @@ android {
     buildToolsVersion "29.0.0"
     compileSdkVersion 29
     defaultConfig {
-        applicationId "com.shiftcryptosecurity.bitbox"
+        applicationId "ch.shiftcrypto.bitboxapp"
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 1

frontends/android/BitBox/app/src/main/AndroidManifest.xml → frontends/android/BitBoxApp/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.shiftcryptosecurity.bitbox">
+    package="ch.shiftcrypto.bitboxapp">
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-feature android:name="android.hardware.usb.host" />
 
@@ -34,4 +34,4 @@
                 android:resource="@xml/device_filter" />
         </activity>
     </application>
-</manifest>
+</manifest>

frontends/android/BitBox/app/src/main/java/com/shiftcryptosecurity/bitbox/GoViewModel.java → frontends/android/BitBoxApp/app/src/main/java/ch/shiftcrypto/bitboxapp/GoViewModel.java

@@ -1,4 +1,4 @@
-package com.shiftcryptosecurity.bitbox;
+package ch.shiftcrypto.bitboxapp;
 
 import goserver.GoDeviceInfoInterface;
 import goserver.GoEnvironmentInterface;
@@ -18,11 +18,9 @@
 import android.hardware.usb.UsbEndpoint;
 import android.hardware.usb.UsbInterface;
 import android.hardware.usb.UsbManager;
-import android.util.Log;
 
 import androidx.lifecycle.AndroidViewModel;
 
-import java.util.AbstractMap;
 import java.util.HashMap;
 import java.util.Iterator;
 

frontends/android/BitBox/app/src/main/java/com/shiftcryptosecurity/bitbox/MainActivity.java → frontends/android/BitBoxApp/app/src/main/java/ch/shiftcrypto/bitboxapp/MainActivity.java

@@ -1,4 +1,4 @@
-package com.shiftcryptosecurity.bitbox;
+package ch.shiftcrypto.bitboxapp;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -179,7 +179,7 @@ public void onPermissionRequest(PermissionRequest request) {
     }
 
     private void log(String msg) {
-        Log.d("com.shiftcryptosecurity.bitbox", "XYZ: " + msg);
+        Log.d("ch.shiftcrypto.bitboxapp", "XYZ: " + msg);
     }
 
     @Override

frontends/android/BitBox/app/src/main/res/layout/activity_main.xml → frontends/android/BitBoxApp/app/src/main/res/layout/activity_main.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context="ch.shiftcrypto.bitboxapp.MainActivity">
 
     <WebView
         android:id="@+id/vw"

frontends/android/BitBoxApp/app/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">BitBoxApp</string>
+</resources>

frontends/android/Makefile

@@ -1,13 +1,13 @@
 export ANDROID_SDK_ROOT := /opt/android-sdk
 apk-debug:
 	${MAKE} prepare-android
-	cd BitBox && ./gradlew assemble
+	cd BitBoxApp && ./gradlew assemble
 deploy-debug:
-	adb install -r ./BitBox/app/build/outputs/apk/debug/app-debug.apk
+	adb install -r ./BitBoxApp/app/build/outputs/apk/debug/app-debug.apk
 clean:
 	cd goserver && ${MAKE} clean
-	cd BitBox && ./gradlew clean
+	cd BitBoxApp && ./gradlew clean
 prepare-android:
-	mkdir -p BitBox/app/src/main/assets/web && cp -aR ../web/build/* BitBox/app/src/main/assets/web/
+	mkdir -p BitBoxApp/app/src/main/assets/web && cp -aR ../web/build/* BitBoxApp/app/src/main/assets/web/
 	cd goserver && ${MAKE} build
-	cp goserver/goserver.aar BitBox/goserver/
+	cp goserver/goserver.aar BitBoxApp/goserver/

frontends/android/mkicon.sh

@@ -5,7 +5,7 @@ set -e
 
 thisdir=$(dirname ${0})
 source=${thisdir}/../qt/resources/app_icon_source.png
-res=${thisdir}/BitBox/app/src/main/res
+res=${thisdir}/BitBoxApp/app/src/main/res
 
 convert -resize 48x48 ${source} ${res}/mipmap-mdpi/ic_launcher.png
 convert -resize 72x72 ${source} ${res}/mipmap-hdpi/ic_launcher.png