From a918f067f8ab579ecb95bcb29f5fa1006eeafaa8 Mon Sep 17 00:00:00 2001 From: Vadim <44135514+vodemn@users.noreply.github.com> Date: Sun, 17 Nov 2024 09:37:45 +0100 Subject: [PATCH] Merge branch 'main' of https://github.com/vodemn/m3_lightmeter into feature/ML-196 --- .github/workflows/run_integration_tests.yml | 2 +- assets/release_notes/release_notes_en_1.0.0.md | 2 ++ .../widget_dialog_release_notes.dart | 13 +------------ pubspec.yaml | 2 +- 4 files changed, 5 insertions(+), 14 deletions(-) create mode 100644 assets/release_notes/release_notes_en_1.0.0.md diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml index a246798..b49c3f8 100644 --- a/.github/workflows/run_integration_tests.yml +++ b/.github/workflows/run_integration_tests.yml @@ -12,7 +12,7 @@ on: jobs: run-integration-tests: name: Run integration tests - timeout-minutes: 60 + timeout-minutes: 90 runs-on: macos-13 steps: - uses: actions/checkout@v3 diff --git a/assets/release_notes/release_notes_en_1.0.0.md b/assets/release_notes/release_notes_en_1.0.0.md new file mode 100644 index 0000000..a165e58 --- /dev/null +++ b/assets/release_notes/release_notes_en_1.0.0.md @@ -0,0 +1,2 @@ +- [Pro] Added the ability to create custom films. +- [Pro] Added the ability to select equipment profiles in use. diff --git a/lib/screens/shared/release_notes_dialog/widget_dialog_release_notes.dart b/lib/screens/shared/release_notes_dialog/widget_dialog_release_notes.dart index 390399d..8323fa9 100644 --- a/lib/screens/shared/release_notes_dialog/widget_dialog_release_notes.dart +++ b/lib/screens/shared/release_notes_dialog/widget_dialog_release_notes.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart' show rootBundle; -import 'package:lightmeter/data/models/supported_locale.dart'; import 'package:lightmeter/generated/l10n.dart'; -import 'package:lightmeter/providers/user_preferences_provider.dart'; import 'package:lightmeter/res/dimens.dart'; class ReleaseNotesDialog extends StatelessWidget { @@ -40,17 +38,8 @@ class ReleaseNotesDialog extends StatelessWidget { } Future loadReleaseNotes(BuildContext context) async { - late final String localeName; - - switch (UserPreferencesProvider.localeOf(context)) { - case SupportedLocale.ru: - localeName = SupportedLocale.ru.name; - default: - localeName = SupportedLocale.en.name; - } - try { - return rootBundle.loadString('assets/release_notes/release_notes_${localeName}_$version.md'); + return rootBundle.loadString('assets/release_notes/release_notes_en_$version.md'); } catch (e) { return ''; } diff --git a/pubspec.yaml b/pubspec.yaml index 3d203bb..f65de8c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: lightmeter description: Lightmeter app inspired by Material 3 design system. publish_to: "none" -version: 0.21.0+53 +version: 1.0.0+54 environment: sdk: ">=3.0.0 <4.0.0"