Skip to content

Commit 897a82e

Browse files
committed
fix: version display bug in update dialog
1 parent 040eee1 commit 897a82e

27 files changed

Lines changed: 502 additions & 417 deletions

.github/workflows/release.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -891,12 +891,19 @@ jobs:
891891
steps:
892892
- name: Checkout repository
893893
uses: actions/checkout@v6
894+
with:
895+
fetch-depth: 0
894896

895897
- name: Download all artifacts
896898
uses: actions/download-artifact@v8
897899
with:
898900
merge-multiple: true
899901

902+
- name: Generate release notes HTML
903+
run: |
904+
./scripts/release/generate_changelog.sh --notes-only | \
905+
./scripts/generate_release_notes_html.sh > release-notes.html
906+
900907
- name: Generate appcast.xml
901908
env:
902909
TAG_NAME: ${{ github.ref_name }}
@@ -908,7 +915,8 @@ jobs:
908915
DATE=$(date -R)
909916
MACOS_URL="https://github.com/${{ github.repository }}/releases/download/${TAG_NAME}/Submersion-${TAG_NAME}-macOS.dmg"
910917
WINDOWS_URL="https://github.com/${{ github.repository }}/releases/download/${TAG_NAME}/Submersion-${TAG_NAME}-Windows-Setup.exe"
911-
./scripts/generate_appcast.sh "$VERSION" "$BUILD_NUMBER" "$DATE" "$MACOS_URL" "$WINDOWS_URL" > appcast.xml
918+
RELEASE_NOTES_URL="https://github.com/${{ github.repository }}/releases/download/${TAG_NAME}/release-notes.html"
919+
./scripts/generate_appcast.sh "$VERSION" "$BUILD_NUMBER" "$DATE" "$MACOS_URL" "$WINDOWS_URL" "$RELEASE_NOTES_URL" > appcast.xml
912920
913921
- name: Generate checksums
914922
run: sha256sum Submersion-* > checksums-sha256.txt
@@ -917,7 +925,9 @@ jobs:
917925
uses: actions/upload-artifact@v7
918926
with:
919927
name: appcast
920-
path: appcast.xml
928+
path: |
929+
appcast.xml
930+
release-notes.html
921931
retention-days: 5
922932

923933
- name: Upload checksums artifact
@@ -972,6 +982,7 @@ jobs:
972982
files: |
973983
Submersion-*
974984
appcast.xml
985+
release-notes.html
975986
checksums-sha256.txt
976987
prerelease: ${{ steps.prerelease.outputs.prerelease }}
977988
body_path: release-notes.md

lib/features/settings/presentation/pages/settings_page.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2320,8 +2320,12 @@ class _AboutSectionContentState extends ConsumerState<_AboutSectionContent> {
23202320
Widget build(BuildContext context) {
23212321
final packageInfoAsync = ref.watch(packageInfoProvider);
23222322
final versionString = packageInfoAsync.when(
2323-
data: (info) =>
2324-
context.l10n.settings_about_version(info.version, info.buildNumber),
2323+
data: (info) {
2324+
final version = info.version.endsWith('.${info.buildNumber}')
2325+
? info.version
2326+
: '${info.version}.${info.buildNumber}';
2327+
return context.l10n.settings_about_version(version);
2328+
},
23252329
loading: () => '',
23262330
error: (_, _) => '',
23272331
);

lib/l10n/arb/app_ar.arb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3024,7 +3024,7 @@
30243024
"settings_about_openSourceLicenses": "تراخيص المصادر المفتوحة",
30253025
"settings_about_reportIssue": "الإبلاغ عن مشكلة",
30263026
"settings_about_reportIssue_snackbar": "قم بزيارة github.com/submersion/submersion",
3027-
"settings_about_version": "الإصدار {version} ({buildNumber})",
3027+
"settings_about_version": "الإصدار {version}",
30283028
"settings_appBar_title": "الإعدادات",
30293029
"settings_appearance_appLanguage": "لغة التطبيق",
30303030
"settings_appearance_cardColorAttribute": "تلوين البطاقات حسب",

lib/l10n/arb/app_de.arb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3024,7 +3024,7 @@
30243024
"settings_about_openSourceLicenses": "Open-Source-Lizenzen",
30253025
"settings_about_reportIssue": "Problem melden",
30263026
"settings_about_reportIssue_snackbar": "Besuchen Sie github.com/submersion/submersion",
3027-
"settings_about_version": "Version {version} ({buildNumber})",
3027+
"settings_about_version": "Version {version}",
30283028
"settings_appBar_title": "Einstellungen",
30293029
"settings_appearance_appLanguage": "App-Sprache",
30303030
"settings_appearance_cardColorAttribute": "Karten faerben nach",

lib/l10n/arb/app_en.arb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5193,14 +5193,11 @@
51935193
"settings_about_openSourceLicenses": "Open Source Licenses",
51945194
"settings_about_reportIssue": "Report an Issue",
51955195
"settings_about_reportIssue_snackbar": "Visit github.com/submersion/submersion",
5196-
"settings_about_version": "Version {version} ({buildNumber})",
5196+
"settings_about_version": "Version {version}",
51975197
"@settings_about_version": {
51985198
"placeholders": {
51995199
"version": {
52005200
"type": "String"
5201-
},
5202-
"buildNumber": {
5203-
"type": "String"
52045201
}
52055202
}
52065203
},

lib/l10n/arb/app_es.arb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3024,7 +3024,7 @@
30243024
"settings_about_openSourceLicenses": "Licencias de codigo abierto",
30253025
"settings_about_reportIssue": "Reportar un problema",
30263026
"settings_about_reportIssue_snackbar": "Visita github.com/submersion/submersion",
3027-
"settings_about_version": "Version {version} ({buildNumber})",
3027+
"settings_about_version": "Version {version}",
30283028
"settings_appBar_title": "Ajustes",
30293029
"settings_appearance_appLanguage": "Idioma de la aplicacion",
30303030
"settings_appearance_cardColorAttribute": "Colorear tarjetas por",

lib/l10n/arb/app_fr.arb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2990,7 +2990,7 @@
29902990
"settings_about_openSourceLicenses": "Licences open source",
29912991
"settings_about_reportIssue": "Signaler un probleme",
29922992
"settings_about_reportIssue_snackbar": "Rendez-vous sur github.com/submersion/submersion",
2993-
"settings_about_version": "Version {version} ({buildNumber})",
2993+
"settings_about_version": "Version {version}",
29942994
"settings_appBar_title": "Reglages",
29952995
"settings_appearance_appLanguage": "Langue de l'application",
29962996
"settings_appearance_cardColorAttribute": "Colorer les cartes par",

lib/l10n/arb/app_he.arb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2990,7 +2990,7 @@
29902990
"settings_about_openSourceLicenses": "רישיונות קוד פתוח",
29912991
"settings_about_reportIssue": "דווח על בעיה",
29922992
"settings_about_reportIssue_snackbar": "בקר ב-github.com/submersion/submersion",
2993-
"settings_about_version": "גרסה {version} ({buildNumber})",
2993+
"settings_about_version": "גרסה {version}",
29942994
"settings_appBar_title": "הגדרות",
29952995
"settings_appearance_appLanguage": "שפת האפליקציה",
29962996
"settings_appearance_cardColorAttribute": "צבע כרטיסים לפי",

lib/l10n/arb/app_hu.arb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2990,7 +2990,7 @@
29902990
"settings_about_openSourceLicenses": "Nyilt forrasu licencek",
29912991
"settings_about_reportIssue": "Hiba bejelentese",
29922992
"settings_about_reportIssue_snackbar": "Latogasson el: github.com/submersion/submersion",
2993-
"settings_about_version": "Verzio {version} ({buildNumber})",
2993+
"settings_about_version": "Verzio {version}",
29942994
"settings_appBar_title": "Beallitasok",
29952995
"settings_appearance_appLanguage": "Alkalmazas nyelve",
29962996
"settings_appearance_cardColorAttribute": "Kartyak szinezese",

lib/l10n/arb/app_it.arb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2990,7 +2990,7 @@
29902990
"settings_about_openSourceLicenses": "Licenze open source",
29912991
"settings_about_reportIssue": "Segnala un problema",
29922992
"settings_about_reportIssue_snackbar": "Visita github.com/submersion/submersion",
2993-
"settings_about_version": "Versione {version} ({buildNumber})",
2993+
"settings_about_version": "Versione {version}",
29942994
"settings_appBar_title": "Impostazioni",
29952995
"settings_appearance_appLanguage": "Lingua dell'app",
29962996
"settings_appearance_cardColorAttribute": "Colora schede per",

0 commit comments

Comments
 (0)