Compare commits

..

No commits in common. "6df706ecc57c23a264c27e04bab3ec45ac175f9d" and "495d7a9cd1c3e93ee6ef301a54a1e07a0e7384c0" have entirely different histories.

6 changed files with 19 additions and 39 deletions

View file

@ -27,14 +27,6 @@ on:
required: true required: true
type: boolean type: boolean
default: true default: true
release-track:
description: "Release track"
type: choice
required: true
options:
- production
- beta
default: production
env: env:
RELEASE_NOTES_ARTIFACT_NAME: release_notes_en_${{ inputs.version }} RELEASE_NOTES_ARTIFACT_NAME: release_notes_en_${{ inputs.version }}
@ -136,7 +128,6 @@ jobs:
with: with:
artifacts: "m3_lightmeter.apk" artifacts: "m3_lightmeter.apk"
skipIfReleaseExists: true skipIfReleaseExists: true
prerelease: ${{ inputs.release-track == 'beta' }}
tag: "v${{ github.event.inputs.version }}" tag: "v${{ github.event.inputs.version }}"
bodyFile: "${{ env.RELEASE_NOTES_PATH }}/${{ env.RELEASE_NOTES_FILE }}" bodyFile: "${{ env.RELEASE_NOTES_PATH }}/${{ env.RELEASE_NOTES_FILE }}"
@ -187,7 +178,7 @@ jobs:
packageName: com.vodemn.lightmeter packageName: com.vodemn.lightmeter
releaseFiles: app-prod-release.aab releaseFiles: app-prod-release.aab
releaseName: ${{ env.release_name }} releaseName: ${{ env.release_name }}
track: ${{ inputs.release-track }} track: production
status: completed status: completed
debugSymbols: merged_native_libs.zip debugSymbols: merged_native_libs.zip
whatsNewDirectory: whatsnew whatsNewDirectory: whatsnew

View file

@ -12,7 +12,7 @@ on:
jobs: jobs:
run-integration-tests: run-integration-tests:
name: Run integration tests name: Run integration tests
timeout-minutes: 90 timeout-minutes: 60
runs-on: macos-13 runs-on: macos-13
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

View file

@ -1,2 +0,0 @@
- [Pro] Added the ability to create custom films.
- [Pro] Added the ability to select equipment profiles in use.

View file

@ -83,42 +83,22 @@ class EquipmentProfileEditBloc extends Bloc<EquipmentProfileEditEvent, Equipment
Future<void> _onApertureValuesChanged(EquipmentProfileApertureValuesChangedEvent event, Emitter emit) async { Future<void> _onApertureValuesChanged(EquipmentProfileApertureValuesChangedEvent event, Emitter emit) async {
_newEquipmentProfile = _newEquipmentProfile.copyWith(apertureValues: event.apertureValues); _newEquipmentProfile = _newEquipmentProfile.copyWith(apertureValues: event.apertureValues);
emit( emit(state.copyWith(apertureValues: event.apertureValues));
state.copyWith(
apertureValues: event.apertureValues,
canSave: _canSave(state.name, state.lensZoom),
),
);
} }
Future<void> _onShutterSpeedValuesChanged(EquipmentProfileShutterSpeedValuesChangedEvent event, Emitter emit) async { Future<void> _onShutterSpeedValuesChanged(EquipmentProfileShutterSpeedValuesChangedEvent event, Emitter emit) async {
_newEquipmentProfile = _newEquipmentProfile.copyWith(shutterSpeedValues: event.shutterSpeedValues); _newEquipmentProfile = _newEquipmentProfile.copyWith(shutterSpeedValues: event.shutterSpeedValues);
emit( emit(state.copyWith(shutterSpeedValues: event.shutterSpeedValues));
state.copyWith(
shutterSpeedValues: event.shutterSpeedValues,
canSave: _canSave(state.name, state.lensZoom),
),
);
} }
Future<void> _onIsoValuesChanged(EquipmentProfileIsoValuesChangedEvent event, Emitter emit) async { Future<void> _onIsoValuesChanged(EquipmentProfileIsoValuesChangedEvent event, Emitter emit) async {
_newEquipmentProfile = _newEquipmentProfile.copyWith(isoValues: event.isoValues); _newEquipmentProfile = _newEquipmentProfile.copyWith(isoValues: event.isoValues);
emit( emit(state.copyWith(isoValues: event.isoValues));
state.copyWith(
isoValues: event.isoValues,
canSave: _canSave(state.name, state.lensZoom),
),
);
} }
Future<void> _onNdValuesChanged(EquipmentProfileNdValuesChangedEvent event, Emitter emit) async { Future<void> _onNdValuesChanged(EquipmentProfileNdValuesChangedEvent event, Emitter emit) async {
_newEquipmentProfile = _newEquipmentProfile.copyWith(ndValues: event.ndValues); _newEquipmentProfile = _newEquipmentProfile.copyWith(ndValues: event.ndValues);
emit( emit(state.copyWith(ndValues: event.ndValues));
state.copyWith(
ndValues: event.ndValues,
canSave: _canSave(state.name, state.lensZoom),
),
);
} }
Future<void> _onLensZoomChanged(EquipmentProfileLensZoomChangedEvent event, Emitter emit) async { Future<void> _onLensZoomChanged(EquipmentProfileLensZoomChangedEvent event, Emitter emit) async {

View file

@ -1,6 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart' show rootBundle; import 'package:flutter/services.dart' show rootBundle;
import 'package:lightmeter/data/models/supported_locale.dart';
import 'package:lightmeter/generated/l10n.dart'; import 'package:lightmeter/generated/l10n.dart';
import 'package:lightmeter/providers/user_preferences_provider.dart';
import 'package:lightmeter/res/dimens.dart'; import 'package:lightmeter/res/dimens.dart';
class ReleaseNotesDialog extends StatelessWidget { class ReleaseNotesDialog extends StatelessWidget {
@ -38,8 +40,17 @@ class ReleaseNotesDialog extends StatelessWidget {
} }
Future<String> loadReleaseNotes(BuildContext context) async { Future<String> 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 { try {
return rootBundle.loadString('assets/release_notes/release_notes_en_$version.md'); return rootBundle.loadString('assets/release_notes/release_notes_${localeName}_$version.md');
} catch (e) { } catch (e) {
return ''; return '';
} }

View file

@ -1,7 +1,7 @@
name: lightmeter name: lightmeter
description: Lightmeter app inspired by Material 3 design system. description: Lightmeter app inspired by Material 3 design system.
publish_to: "none" publish_to: "none"
version: 1.0.0+54 version: 0.21.0+53
environment: environment:
sdk: ">=3.0.0 <4.0.0" sdk: ">=3.0.0 <4.0.0"