Merge pull request #3951 from kiwix/Fixes#3933

Introduced new standalone apk for website and nightly.
This commit is contained in:
Kelson 2024-07-22 18:47:17 +02:00 committed by GitHub
commit 974c7d4832
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 3 deletions

View File

@ -32,10 +32,10 @@ jobs:
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
UNIVERSAL_RELEASE_APK: app/build/outputs/apk/release/*universal*.apk
UNIVERSAL_RELEASE_APK: app/build/outputs/apk/standalone/*universal*.apk
ARCHIVE_NAME: kiwix-${{ github.event.release.tag_name }}.apk
run: |
./gradlew assembleRelease
./gradlew assembleStandalone
cp ${UNIVERSAL_RELEASE_APK} ${ARCHIVE_NAME}
scp -P 30022 -vrp -i ssh_key -o StrictHostKeyChecking=no "$ARCHIVE_NAME" ci@master.download.kiwix.org:/data/download/release/kiwix-android/

View File

@ -47,11 +47,18 @@ android {
buildConfigField("boolean", "IS_PLAYSTORE", "true")
manifestPlaceholders["permission"] = "android.permission.placeholder"
}
create("standalone") {
initWith(getByName("release"))
matchingFallbacks += "release"
signingConfig = signingConfigs.getByName("releaseSigningConfig")
applicationIdSuffix = ".standalone" // Bug Fix #3933
}
create("nightly") {
initWith(getByName("debug"))
matchingFallbacks += "debug"
// Build the nightly APK with the released keyStore to make the APK updatable. See #3838
signingConfig = signingConfigs.getByName("releaseSigningConfig")
applicationIdSuffix = ".standalone" // Bug Fix #3933
}
}
bundle {

View File

@ -34,7 +34,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:defaultNavHost="true"
app:layout_behavior=".nav.helper.ScrollingViewWithBottomNavigationBehavior"
app:layout_behavior="org.kiwix.kiwixmobile.nav.helper.ScrollingViewWithBottomNavigationBehavior"
app:navGraph="@navigation/kiwix_nav_graph" />
<com.google.android.material.bottomnavigation.BottomNavigationView