diff --git a/.gitea/workflows/build-apk.yml b/.gitea/workflows/build-apk.yml index cb093ff..d6862d9 100644 --- a/.gitea/workflows/build-apk.yml +++ b/.gitea/workflows/build-apk.yml @@ -33,18 +33,15 @@ jobs: - name: Extract release notes run: | - echo "No release notes" > release_notes.md -# VERSION="${{ gitea.ref_name }}" -# VERSION="${VERSION#v}" -# -# awk -v ver="$VERSION" ' -# BEGIN { found=0 } -# /^## \[/ { -# if (found) exit -# if ($0 ~ "\\[" ver "\\]") { found=1; next } -# } -# found { print } -# ' CHANGELOG.md > release_notes.md + VERSION_CODE=$(grep 'versionCode = ' app/build.gradle.kts | sed 's/.*versionCode = \([0-9]*\).*/\1/') + CHANGELOG="fastlane/metadata/android/en-US/changelogs/${VERSION_CODE}.txt" + + if [ -f "$CHANGELOG" ]; then + cp "$CHANGELOG" release_notes.md + else + echo "No changelog found at $CHANGELOG" + echo "No release notes" > release_notes.md + fi - name: Create Gitea Release env: @@ -104,9 +101,9 @@ jobs: APP_NAME="${APP_NAME//\//-}" TAG="${{ gitea.ref_name }}" ASSET_PATH=".build/release/release/${APP_NAME}-${TAG}.apk" - CAPTION="${APP_NAME} ${TAG}" + CAPTION="$(printf '%s\n\n%s' "${APP_NAME} ${TAG}" "$(cat release_notes.md)" | head -c 1024)" curl -s -X POST "https://api.telegram.org/bot${TG_BOT_TOKEN}/sendDocument" \ -F "chat_id=${TG_CHAT_ID}" \ -F "document=@${ASSET_PATH}" \ - -F "caption=${CAPTION}" + --form-string "caption=${CAPTION}" diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6e8164d..f098a76 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -21,8 +21,8 @@ android { applicationId = "sh.sar.basedbank" minSdk = 26 targetSdk = 36 - versionCode = 27 - versionName = "1.0.26" + versionCode = 28 + versionName = "1.0.27" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/fastlane/metadata/android/en-US/changelogs/28.txt b/fastlane/metadata/android/en-US/changelogs/28.txt new file mode 100644 index 0000000..0e9d50c --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/28.txt @@ -0,0 +1,5 @@ +- Redesigned OTP page: codes turn red in the last 5 seconds and there are copy buttons, and you can tap a card to copy its code +- OTP page and login setup now also show the next code +- Redesigned contacts list: tap a contact to open a details sheet, which now holds the edit and delete buttons +- Contact details show the account number, account name, bank and currency +- Copy or share a contact's account details, or show a PayMV QR code for them