diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index daf5b996ed..280fa9794a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,15 +57,15 @@ jobs: ~/.gradle/caches ~/.gradle/wrapper - name: Build Android - run: ./scripts/github-ci.sh android + run: ./scripts/github-ci.sh android-ln env: OS_NAME: linux - name: Upload APK id: upload uses: actions/upload-artifact@v4 with: - path: frontends/android/BitBoxApp/app/build/outputs/apk/debug/app-debug.apk - name: BitBoxApp-android-${{github.sha}}.apk + path: frontends/android/BitBoxApp/app/build/outputs/apk/lnalpha/app-lnalpha.apk + name: BitBoxApp-android-ln-${{github.sha}}.apk if-no-files-found: error qt-linux: runs-on: ubuntu-22.04 diff --git a/Makefile b/Makefile index 516dd19a65..a408743aeb 100644 --- a/Makefile +++ b/Makefile @@ -69,6 +69,9 @@ qt-windows: android: $(MAKE) buildweb cd frontends/android && ${MAKE} apk-debug +android-ln: + $(MAKE) buildweb + cd frontends/android && ${MAKE} apk-ln ios: cd frontends/ios && ${MAKE} build osx-sec-check: diff --git a/frontends/android/BitBoxApp/app/build.gradle b/frontends/android/BitBoxApp/app/build.gradle index 2e15eb33f8..b2c9316968 100644 --- a/frontends/android/BitBoxApp/app/build.gradle +++ b/frontends/android/BitBoxApp/app/build.gradle @@ -16,14 +16,30 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' resValue "string", "app_name", "BitBoxApp" + manifestPlaceholders = [ + appName: "BitBoxApp", + appIcon: "@mipmap/ic_launcher", + appRoundIcon: "@mipmap/ic_launcher_round", + ] } debug { applicationIdSuffix ".debug" resValue "string", "app_name", "BitBoxApp DEBUG" + manifestPlaceholders = [ + appName: "BitBoxApp DEBUG", + appIcon: "@mipmap/ic_launcher", + appRoundIcon: "@mipmap/ic_launcher_round", + ] } lnalpha { applicationIdSuffix ".lnalpha" resValue "string", "app_name", "BitBoxApp LN Alpha" + manifestPlaceholders = [ + appName: "BitBoxApp LN Alpha", + appIcon: "@mipmap/ic_launcher_lnalpha", + appRoundIcon: "@mipmap/ic_launcher_lnalpha_round", + ] + signingConfig signingConfigs.debug // Use debug signing } } namespace 'ch.shiftcrypto.bitboxapp' diff --git a/frontends/android/BitBoxApp/app/src/main/AndroidManifest.xml b/frontends/android/BitBoxApp/app/src/main/AndroidManifest.xml index 505566acaa..5cce5917c5 100644 --- a/frontends/android/BitBoxApp/app/src/main/AndroidManifest.xml +++ b/frontends/android/BitBoxApp/app/src/main/AndroidManifest.xml @@ -30,9 +30,9 @@ diff --git a/frontends/android/BitBoxApp/app/src/main/res/mipmap-hdpi/ic_launcher_lnalpha.png b/frontends/android/BitBoxApp/app/src/main/res/mipmap-hdpi/ic_launcher_lnalpha.png new file mode 100644 index 0000000000..73ee91c205 Binary files /dev/null and b/frontends/android/BitBoxApp/app/src/main/res/mipmap-hdpi/ic_launcher_lnalpha.png differ diff --git a/frontends/android/BitBoxApp/app/src/main/res/mipmap-hdpi/ic_launcher_lnalpha_round.png b/frontends/android/BitBoxApp/app/src/main/res/mipmap-hdpi/ic_launcher_lnalpha_round.png new file mode 100644 index 0000000000..9ca09b0ff9 Binary files /dev/null and b/frontends/android/BitBoxApp/app/src/main/res/mipmap-hdpi/ic_launcher_lnalpha_round.png differ diff --git a/frontends/android/BitBoxApp/app/src/main/res/mipmap-mdpi/ic_launcher_lnalpha.png b/frontends/android/BitBoxApp/app/src/main/res/mipmap-mdpi/ic_launcher_lnalpha.png new file mode 100644 index 0000000000..e4a7e9027e Binary files /dev/null and b/frontends/android/BitBoxApp/app/src/main/res/mipmap-mdpi/ic_launcher_lnalpha.png differ diff --git a/frontends/android/BitBoxApp/app/src/main/res/mipmap-mdpi/ic_launcher_lnalpha_round.png b/frontends/android/BitBoxApp/app/src/main/res/mipmap-mdpi/ic_launcher_lnalpha_round.png new file mode 100644 index 0000000000..6309d00cd3 Binary files /dev/null and b/frontends/android/BitBoxApp/app/src/main/res/mipmap-mdpi/ic_launcher_lnalpha_round.png differ diff --git a/frontends/android/BitBoxApp/app/src/main/res/mipmap-xhdpi/ic_launcher_lnalpha.png b/frontends/android/BitBoxApp/app/src/main/res/mipmap-xhdpi/ic_launcher_lnalpha.png new file mode 100644 index 0000000000..12e2d6bf8c Binary files /dev/null and b/frontends/android/BitBoxApp/app/src/main/res/mipmap-xhdpi/ic_launcher_lnalpha.png differ diff --git a/frontends/android/BitBoxApp/app/src/main/res/mipmap-xhdpi/ic_launcher_lnalpha_round.png b/frontends/android/BitBoxApp/app/src/main/res/mipmap-xhdpi/ic_launcher_lnalpha_round.png new file mode 100644 index 0000000000..53a9866342 Binary files /dev/null and b/frontends/android/BitBoxApp/app/src/main/res/mipmap-xhdpi/ic_launcher_lnalpha_round.png differ diff --git a/frontends/android/BitBoxApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_lnalpha.png b/frontends/android/BitBoxApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_lnalpha.png new file mode 100644 index 0000000000..65b0ed4c97 Binary files /dev/null and b/frontends/android/BitBoxApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_lnalpha.png differ diff --git a/frontends/android/BitBoxApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_lnalpha_round.png b/frontends/android/BitBoxApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_lnalpha_round.png new file mode 100644 index 0000000000..a7102b47d2 Binary files /dev/null and b/frontends/android/BitBoxApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_lnalpha_round.png differ diff --git a/frontends/android/BitBoxApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lnalpha.png b/frontends/android/BitBoxApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lnalpha.png new file mode 100644 index 0000000000..570ea0b354 Binary files /dev/null and b/frontends/android/BitBoxApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lnalpha.png differ diff --git a/frontends/android/BitBoxApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lnalpha_round.png b/frontends/android/BitBoxApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lnalpha_round.png new file mode 100644 index 0000000000..7df008db03 Binary files /dev/null and b/frontends/android/BitBoxApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_lnalpha_round.png differ diff --git a/frontends/android/Makefile b/frontends/android/Makefile index ba409b3ad4..a5caad5e80 100644 --- a/frontends/android/Makefile +++ b/frontends/android/Makefile @@ -3,8 +3,13 @@ include ../../android-env.mk.inc apk-debug: ${MAKE} prepare-android cd BitBoxApp && ./gradlew assemble +apk-ln: + ${MAKE} prepare-android + cd BitBoxApp && ./gradlew assembleLnalpha deploy-debug: adb install -r ./BitBoxApp/app/build/outputs/apk/debug/app-debug.apk +deploy-ln: + adb install -r ./BitBoxApp/app/build/outputs/apk/lnalpha/app-lnalpha.apk clean: cd BitBoxApp && ./gradlew clean prepare-android: