From 216ccda5035ea1dcd80c82c287859c0d5ef019b6 Mon Sep 17 00:00:00 2001 From: xylight <80978739+Xyphyn@users.noreply.github.com> Date: Thu, 16 Jul 2026 21:03:50 -0700 Subject: [PATCH] fix: android build alignment (#733) * fix: android build alignment * feat: make expandable image share button use navigator.share --- .github/workflows/build-android.yml | 17 +++++++------- android/app/build.gradle | 4 ++++ src/lib/ui/generic/ExpandableImage.svelte | 27 ++++++++++++++++++----- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index 12515987..2da76da0 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -49,18 +49,19 @@ jobs: KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }} KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }} run: | - bunx cap build android --androidreleasetype=APK \ - --keystorepath=app/release.keystore \ - --keystorepass="$KEYSTORE_PASSWORD" \ - --keystorealias="$KEY_ALIAS" \ - --keystorealiaspass="$KEY_PASSWORD" \ - --signing-type="apksigner" + cd android + chmod +x gradlew + ./gradlew assembleRelease \ + -Pandroid.injected.signing.store.file=$GITHUB_WORKSPACE/android/app/release.keystore \ + -Pandroid.injected.signing.store.password="$KEYSTORE_PASSWORD" \ + -Pandroid.injected.signing.key.alias="$KEY_ALIAS" \ + -Pandroid.injected.signing.key.password="$KEY_PASSWORD" - name: Upload APK Artifact uses: actions/upload-artifact@v7 with: name: android-release-apk - path: android/app/build/outputs/apk/release/app-release-signed.apk + path: android/app/build/outputs/apk/release/app-release.apk retention-days: 7 archive: false @@ -69,4 +70,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - gh release upload ${{ github.event.release.tag_name }} android/app/build/outputs/apk/release/app-release-signed.apk + gh release upload ${{ github.event.release.tag_name }} android/app/build/outputs/apk/release/app-release.apk diff --git a/android/app/build.gradle b/android/app/build.gradle index 906932d8..54fe11c5 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -21,6 +21,10 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + debug { + applicationIdSuffix ".dex" + versionNameSuffix "-dev" + } } } diff --git a/src/lib/ui/generic/ExpandableImage.svelte b/src/lib/ui/generic/ExpandableImage.svelte index 53528d56..898e0543 100644 --- a/src/lib/ui/generic/ExpandableImage.svelte +++ b/src/lib/ui/generic/ExpandableImage.svelte @@ -24,6 +24,24 @@ } let { alt = '' }: Props = $props() + + async function share() { + if (navigator.share != undefined && page.state.openImage != null) { + const url = page.state.openImage + const blob = await fetch(url).then((i) => i.blob()) + const file = new File([blob], url.substring(url.lastIndexOf('/') + 1), { + type: blob.type, + }) + navigator.share({ + files: [file], + }) + } else { + navigator.clipboard.writeText(page.state.openImage ?? '') + toast({ + content: $t('toast.copied'), + }) + } + } {#if page.state.openImage || '' != ''} @@ -57,16 +75,13 @@ onclick={(e) => e.stopPropagation()} > + /> + />