Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

frontend/android: create new android id for lnalpha #3078

Merged
merged 1 commit into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ jobs:
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
Expand Down
15 changes: 14 additions & 1 deletion frontends/android/BitBoxApp/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,27 @@ android {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
resValue "string", "app_name", "BitBoxApp"
manifestPlaceholders = [
appIcon: "@mipmap/ic_launcher",
appRoundIcon: "@mipmap/ic_launcher_round",
]
}
debug {
applicationIdSuffix ".debug"
resValue "string", "app_name", "BitBoxApp DEBUG"
manifestPlaceholders = [
appIcon: "@mipmap/ic_launcher",
appRoundIcon: "@mipmap/ic_launcher_round",
]
}
lnalpha {
applicationIdSuffix ".lnalpha"
resValue "string", "app_name", "BitBoxApp LN Alpha"
resValue "string", "app_name", "BBApp LN Alpha"
manifestPlaceholders = [
appIcon: "@mipmap/ic_launcher_lnalpha",
appRoundIcon: "@mipmap/ic_launcher_lnalpha_round",
]
signingConfig signingConfigs.debug // Use debug signing
}
}
namespace 'ch.shiftcrypto.bitboxapp'
Expand Down
4 changes: 2 additions & 2 deletions frontends/android/BitBoxApp/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:icon="${appIcon}"
android:roundIcon="${appRoundIcon}"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<!-- This tag might be required when interacting with Google Play Services, see https://developers.google.com/android/guides/setup. -->
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions frontends/android/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ include ../../android-env.mk.inc
apk-debug:
${MAKE} prepare-android
cd BitBoxApp && ./gradlew assemble
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:
Expand Down
Loading