diff --git a/.forgejo/workflows/android.yml b/.forgejo/workflows/android.yml index c66f999..72e3e8f 100644 --- a/.forgejo/workflows/android.yml +++ b/.forgejo/workflows/android.yml @@ -134,7 +134,7 @@ jobs: echo "code=$code" >> $GITHUB_OUTPUT if [ -n "${ANDROID_KEYSTORE_BASE64:-}" ]; then - printf '%s' "$ANDROID_KEYSTORE_BASE64" | base64 -d > /tmp/thoughtsync-release.jks + printf '%s' "$ANDROID_KEYSTORE_BASE64" | base64 -d > /tmp/inkwell-release.jks echo "variant=Release" >> $GITHUB_OUTPUT echo "label=release" >> $GITHUB_OUTPUT # DEBUG profile, in a release APK, deliberately — see the note above @@ -143,7 +143,7 @@ jobs: # outright (run 4077). Unpicking that is worth doing and is not worth # blocking signed builds on. echo "profile=debug" >> $GITHUB_OUTPUT - echo "keystore=/tmp/thoughtsync-release.jks" >> $GITHUB_OUTPUT + echo "keystore=/tmp/inkwell-release.jks" >> $GITHUB_OUTPUT echo "apk=android/app/build/outputs/apk/release/app-release.apk" >> $GITHUB_OUTPUT echo "Signed release build — $version (versionCode $code)" else @@ -167,7 +167,7 @@ jobs: # from the built .so. Run as its own step so a Rust failure is legible as a # Rust failure instead of arriving inside a Gradle stack trace. - name: Build the native library and bindings - run: ./gradlew generateUniffiBindings -PTHOUGHTSYNC_CARGO_PROFILE=${{ steps.build.outputs.profile }} + run: ./gradlew generateUniffiBindings -PINKWELL_CARGO_PROFILE=${{ steps.build.outputs.profile }} # The image's PINNED CLIs, not Gradle plugins. ci-rust-android carries both # (M12 step 3) precisely so this lane needs no second image, and going @@ -193,7 +193,7 @@ jobs: # not exist (run 4082). It costs one extra Kotlin compile and buys the # type-check on the debug variant, which is the one an emulator build # would use. - run: ./gradlew testDebugUnitTest -PTHOUGHTSYNC_CARGO_PROFILE=${{ steps.build.outputs.profile }} + run: ./gradlew testDebugUnitTest -PINKWELL_CARGO_PROFILE=${{ steps.build.outputs.profile }} - name: Assemble the APK env: @@ -203,9 +203,9 @@ jobs: ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }} run: | ./gradlew assemble${{ steps.build.outputs.variant }} \ - -PTHOUGHTSYNC_CARGO_PROFILE=${{ steps.build.outputs.profile }} \ - -PTHOUGHTSYNC_VERSION_NAME=${{ steps.build.outputs.name }} \ - -PTHOUGHTSYNC_VERSION_CODE=${{ steps.build.outputs.code }} + -PINKWELL_CARGO_PROFILE=${{ steps.build.outputs.profile }} \ + -PINKWELL_VERSION_NAME=${{ steps.build.outputs.name }} \ + -PINKWELL_VERSION_CODE=${{ steps.build.outputs.code }} # Prints the certificate the APK was actually signed with, so the operator # can compare it against the fingerprint recorded when the key was @@ -226,10 +226,10 @@ jobs: if: steps.build.outputs.keystore != '' run: | mkdir -p dist - cp "app/build/outputs/apk/release/app-release.apk" dist/thoughtsync.apk - size="$(wc -c < dist/thoughtsync.apk | tr -d ' ')" - sha="$(sha256sum dist/thoughtsync.apk | cut -d' ' -f1)" - cat > dist/thoughtsync-android.json < dist/inkwell-android.json < + colour is Inkwell" across the three surfaces. --> #F5C518 diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml index 5aa64e5..8a67a7e 100644 --- a/android/app/src/main/res/values/themes.xml +++ b/android/app/src/main/res/values/themes.xml @@ -6,5 +6,5 @@ truth in XML — the same reason the desktop reads its live theme rather than hardcoding a window colour. --> -