diff --git a/.github/workflows/build_ipa.yml b/.github/workflows/build_ipa.yml index 7161eb0..610b98f 100644 --- a/.github/workflows/build_ipa.yml +++ b/.github/workflows/build_ipa.yml @@ -136,7 +136,7 @@ jobs: - name: Build .ipa run: | - flutter build ipa \ + flutter build ipa ${{ inputs.upload-artifact && '' || '--no-codesign' }} \ --release \ --flavor $FLAVOR \ --target lib/main_$FLAVOR.dart \ diff --git a/README.md b/README.md index f31669b..cfc5446 100644 --- a/README.md +++ b/README.md @@ -23,11 +23,11 @@ Without further delay behold my new Lightmeter app inspired by Material You (a.k # Screenshots

- - - - - + + + + +

# Development diff --git a/integration_test/mocks/paid_features_mock.dart b/integration_test/mocks/paid_features_mock.dart index b139ef1..d404a24 100644 --- a/integration_test/mocks/paid_features_mock.dart +++ b/integration_test/mocks/paid_features_mock.dart @@ -53,6 +53,7 @@ class _MockIAPProvidersState extends State { () => mockEquipmentProfilesStorageService.updateProfile( id: any(named: 'id'), name: any(named: 'name'), + isUsed: any(named: 'isUsed'), ), ).thenAnswer((_) async {}); when(() => mockEquipmentProfilesStorageService.deleteProfile(any())).thenAnswer((_) async {}); diff --git a/lib/screens/equipment_profile_edit/screen_equipment_profile_edit.dart b/lib/screens/equipment_profile_edit/screen_equipment_profile_edit.dart index 6d6ce2b..332bee6 100644 --- a/lib/screens/equipment_profile_edit/screen_equipment_profile_edit.dart +++ b/lib/screens/equipment_profile_edit/screen_equipment_profile_edit.dart @@ -138,7 +138,6 @@ class _NameFieldBuilder extends StatelessWidget { ), child: LightmeterTextField( initialValue: state.name, - autofocus: true, maxLength: 48, hintText: S.of(context).name, style: Theme.of(context).listTileTheme.titleTextStyle, diff --git a/pubspec.lock b/pubspec.lock index 76422dc..bc5b411 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -829,11 +829,11 @@ packages: dependency: "direct main" description: path: "." - ref: main - resolved-ref: "1070317079c42afa7d3f600747470c403408071f" + ref: "v2.1.3" + resolved-ref: "4575586ff6114b780ca651b7ac7c272a4a4801eb" url: "https://github.com/vodemn/m3_lightmeter_iap" source: git - version: "2.1.2+29" + version: "2.1.3+30" m3_lightmeter_resources: dependency: "direct main" description: @@ -1562,4 +1562,4 @@ packages: version: "3.1.3" sdks: dart: ">=3.5.0 <4.0.0" - flutter: ">=3.24.0" + flutter: ">=3.24.5" diff --git a/pubspec.yaml b/pubspec.yaml index 3791774..c2afdb4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,6 +5,7 @@ version: 1.0.3+58 environment: sdk: ">=3.0.0 <4.0.0" + flutter: "3.24.5" dependencies: app_settings: 5.1.1 diff --git a/screenshots/assets/content/screenshot_titles_en.json b/screenshots/assets/content/screenshot_titles_en.json index 13b14bf..886e423 100644 --- a/screenshots/assets/content/screenshot_titles_en.json +++ b/screenshots/assets/content/screenshot_titles_en.json @@ -30,11 +30,6 @@ "title": "Create multiple profiles", "subtitle": "to match your\ncamera & lens setups" }, - { - "screenshotName": "light_equipment-profiles-iso-picker", - "title": "Fine-tune results", - "subtitle": "by selecting the values\nthat you use the most" - }, { "screenshotName": "dark_metering-reflected", "title": "Match your style", diff --git a/screenshots/generate_screenshots.dart b/screenshots/generate_screenshots.dart index d80159c..dd77757 100644 --- a/screenshots/generate_screenshots.dart +++ b/screenshots/generate_screenshots.dart @@ -15,7 +15,6 @@ import 'package:lightmeter/data/shared_prefs_service.dart'; import 'package:lightmeter/generated/l10n.dart'; import 'package:lightmeter/res/dimens.dart'; import 'package:lightmeter/res/theme.dart'; -import 'package:lightmeter/screens/equipment_profiles/screen_equipment_profiles.dart'; import 'package:lightmeter/screens/metering/components/shared/exposure_pairs_list/widget_list_exposure_pairs.dart'; import 'package:lightmeter/screens/metering/components/shared/readings_container/components/iso_picker/widget_picker_iso.dart'; import 'package:lightmeter/screens/metering/screen_metering.dart'; @@ -118,13 +117,9 @@ void main() { await tester.tapDescendantTextOf(S.current.equipmentProfiles); await tester.pumpAndSettle(); - await tester.tapDescendantTextOf(mockEquipmentProfiles.first.name); + await tester.tap(find.byIcon(Icons.edit_outlined).first); await tester.pumpAndSettle(); await tester.takeScreenshotLight(binding, 'equipment-profiles'); - - await tester.tap(find.byIcon(Icons.iso_outlined).first); - await tester.pumpAndSettle(); - await tester.takeScreenshotLight(binding, 'equipment-profiles-iso-picker'); }); /// and the additionally the first one with the dark theme @@ -168,7 +163,7 @@ void main() { ev: 5, exposurePair: timerExposurePair, ); - await tester.tap(find.text(timerExposurePair.shutterSpeed.toString())); + await tester.tap(find.text(_mockFilm.reciprocityFailure(timerExposurePair.shutterSpeed).toString())); await tester.pumpAndSettle(); await tester.mockTimerResumedState(timerExposurePair.shutterSpeed); await tester.takeScreenshotLight(binding, 'timer'); diff --git a/screenshots/generated/android/android/dark_metering-reflected.png b/screenshots/generated/android/android/dark_metering-reflected.png index cc3dd89..d43d92c 100644 Binary files a/screenshots/generated/android/android/dark_metering-reflected.png and b/screenshots/generated/android/android/dark_metering-reflected.png differ diff --git a/screenshots/generated/android/android/light_equipment-profiles-iso-picker.png b/screenshots/generated/android/android/light_equipment-profiles-iso-picker.png deleted file mode 100644 index 743dc68..0000000 Binary files a/screenshots/generated/android/android/light_equipment-profiles-iso-picker.png and /dev/null differ diff --git a/screenshots/generated/android/android/light_equipment-profiles.png b/screenshots/generated/android/android/light_equipment-profiles.png index e4c7345..8d1f49e 100644 Binary files a/screenshots/generated/android/android/light_equipment-profiles.png and b/screenshots/generated/android/android/light_equipment-profiles.png differ diff --git a/screenshots/generated/android/android/light_metering-incident.png b/screenshots/generated/android/android/light_metering-incident.png index 61168b4..036cd5f 100644 Binary files a/screenshots/generated/android/android/light_metering-incident.png and b/screenshots/generated/android/android/light_metering-incident.png differ diff --git a/screenshots/generated/android/android/light_metering-iso-picker.png b/screenshots/generated/android/android/light_metering-iso-picker.png index 6ed2c57..cc201df 100644 Binary files a/screenshots/generated/android/android/light_metering-iso-picker.png and b/screenshots/generated/android/android/light_metering-iso-picker.png differ diff --git a/screenshots/generated/android/android/light_metering-reflected.png b/screenshots/generated/android/android/light_metering-reflected.png index 3efe588..35e666b 100644 Binary files a/screenshots/generated/android/android/light_metering-reflected.png and b/screenshots/generated/android/android/light_metering-reflected.png differ diff --git a/screenshots/generated/android/android/light_settings.png b/screenshots/generated/android/android/light_settings.png index 4205ca3..d5e9a52 100644 Binary files a/screenshots/generated/android/android/light_settings.png and b/screenshots/generated/android/android/light_settings.png differ diff --git a/screenshots/generated/android/android/light_timer.png b/screenshots/generated/android/android/light_timer.png index 262cc0b..5357128 100644 Binary files a/screenshots/generated/android/android/light_timer.png and b/screenshots/generated/android/android/light_timer.png differ diff --git a/screenshots/generated/ios/iphone55inch/dark_metering-reflected.png b/screenshots/generated/ios/iphone55inch/dark_metering-reflected.png index b47f725..8acf110 100644 Binary files a/screenshots/generated/ios/iphone55inch/dark_metering-reflected.png and b/screenshots/generated/ios/iphone55inch/dark_metering-reflected.png differ diff --git a/screenshots/generated/ios/iphone55inch/light_equipment-profiles-iso-picker.png b/screenshots/generated/ios/iphone55inch/light_equipment-profiles-iso-picker.png deleted file mode 100644 index 7c11358..0000000 Binary files a/screenshots/generated/ios/iphone55inch/light_equipment-profiles-iso-picker.png and /dev/null differ diff --git a/screenshots/generated/ios/iphone55inch/light_equipment-profiles.png b/screenshots/generated/ios/iphone55inch/light_equipment-profiles.png index 7d30267..06a05cf 100644 Binary files a/screenshots/generated/ios/iphone55inch/light_equipment-profiles.png and b/screenshots/generated/ios/iphone55inch/light_equipment-profiles.png differ diff --git a/screenshots/generated/ios/iphone55inch/light_metering-iso-picker.png b/screenshots/generated/ios/iphone55inch/light_metering-iso-picker.png index 53e869c..5b6c769 100644 Binary files a/screenshots/generated/ios/iphone55inch/light_metering-iso-picker.png and b/screenshots/generated/ios/iphone55inch/light_metering-iso-picker.png differ diff --git a/screenshots/generated/ios/iphone55inch/light_metering-reflected.png b/screenshots/generated/ios/iphone55inch/light_metering-reflected.png index b2aa51b..d1f1648 100644 Binary files a/screenshots/generated/ios/iphone55inch/light_metering-reflected.png and b/screenshots/generated/ios/iphone55inch/light_metering-reflected.png differ diff --git a/screenshots/generated/ios/iphone55inch/light_settings.png b/screenshots/generated/ios/iphone55inch/light_settings.png index b65508d..920d694 100644 Binary files a/screenshots/generated/ios/iphone55inch/light_settings.png and b/screenshots/generated/ios/iphone55inch/light_settings.png differ diff --git a/screenshots/generated/ios/iphone55inch/light_timer.png b/screenshots/generated/ios/iphone55inch/light_timer.png index ac8ff0e..4906114 100644 Binary files a/screenshots/generated/ios/iphone55inch/light_timer.png and b/screenshots/generated/ios/iphone55inch/light_timer.png differ diff --git a/screenshots/generated/ios/iphone65inch/dark_metering-reflected.png b/screenshots/generated/ios/iphone65inch/dark_metering-reflected.png index 60ad820..ef86fd8 100644 Binary files a/screenshots/generated/ios/iphone65inch/dark_metering-reflected.png and b/screenshots/generated/ios/iphone65inch/dark_metering-reflected.png differ diff --git a/screenshots/generated/ios/iphone65inch/light_equipment-profiles-iso-picker.png b/screenshots/generated/ios/iphone65inch/light_equipment-profiles-iso-picker.png deleted file mode 100644 index d137e16..0000000 Binary files a/screenshots/generated/ios/iphone65inch/light_equipment-profiles-iso-picker.png and /dev/null differ diff --git a/screenshots/generated/ios/iphone65inch/light_equipment-profiles.png b/screenshots/generated/ios/iphone65inch/light_equipment-profiles.png index a747ab5..2b45495 100644 Binary files a/screenshots/generated/ios/iphone65inch/light_equipment-profiles.png and b/screenshots/generated/ios/iphone65inch/light_equipment-profiles.png differ diff --git a/screenshots/generated/ios/iphone65inch/light_metering-iso-picker.png b/screenshots/generated/ios/iphone65inch/light_metering-iso-picker.png index 676c07c..d69ca3a 100644 Binary files a/screenshots/generated/ios/iphone65inch/light_metering-iso-picker.png and b/screenshots/generated/ios/iphone65inch/light_metering-iso-picker.png differ diff --git a/screenshots/generated/ios/iphone65inch/light_metering-reflected.png b/screenshots/generated/ios/iphone65inch/light_metering-reflected.png index 8fb5ffe..9d2936f 100644 Binary files a/screenshots/generated/ios/iphone65inch/light_metering-reflected.png and b/screenshots/generated/ios/iphone65inch/light_metering-reflected.png differ diff --git a/screenshots/generated/ios/iphone65inch/light_settings.png b/screenshots/generated/ios/iphone65inch/light_settings.png index 31be0c0..48f6014 100644 Binary files a/screenshots/generated/ios/iphone65inch/light_settings.png and b/screenshots/generated/ios/iphone65inch/light_settings.png differ diff --git a/screenshots/generated/ios/iphone65inch/light_timer.png b/screenshots/generated/ios/iphone65inch/light_timer.png index ad3d00a..c1b91a0 100644 Binary files a/screenshots/generated/ios/iphone65inch/light_timer.png and b/screenshots/generated/ios/iphone65inch/light_timer.png differ diff --git a/screenshots/scripts/convert_to_store_screenshots.sh b/screenshots/scripts/convert_to_store_screenshots.sh deleted file mode 100644 index 1688c5e..0000000 --- a/screenshots/scripts/convert_to_store_screenshots.sh +++ /dev/null @@ -1,4 +0,0 @@ -dart run screenshots/convert_to_store_screenshots.dart -p android -d pixel_6 -l android -dart run screenshots/convert_to_store_screenshots.dart -p ios -d iphone_13_pro -l iphone55inch -dart run screenshots/convert_to_store_screenshots.dart -p ios -d iphone_13_pro -l iphone65inch -#dart run screenshots/convert_to_store_screenshots.dart -p ios -d ipad_pro_12.9-inch_6th_generation -l ipad13inch diff --git a/screenshots/scripts/generate_android_screenshots.sh b/screenshots/scripts/generate_android_screenshots.sh index 7601ea2..e7c58cc 100644 --- a/screenshots/scripts/generate_android_screenshots.sh +++ b/screenshots/scripts/generate_android_screenshots.sh @@ -1 +1,3 @@ -sh screenshots/scripts/generate_screenshots.sh "Pixel 6" \ No newline at end of file +sh screenshots/scripts/generate_screenshots.sh "Pixel 6" + +dart run screenshots/convert_to_store_screenshots.dart -p android -d pixel_6 -l android \ No newline at end of file diff --git a/screenshots/scripts/generate_ios_screenshots.sh b/screenshots/scripts/generate_ios_screenshots.sh index f0cd882..2b7220b 100644 --- a/screenshots/scripts/generate_ios_screenshots.sh +++ b/screenshots/scripts/generate_ios_screenshots.sh @@ -6,3 +6,6 @@ for i in "${simulators_array[@]}"; do # https://www.baeldung.com/linux/shell-scr sh screenshots/scripts/generate_screenshots.sh "$i" done killall 'Simulator' + +dart run screenshots/convert_to_store_screenshots.dart -p ios -d iphone_13_pro -l iphone55inch +dart run screenshots/convert_to_store_screenshots.dart -p ios -d iphone_13_pro -l iphone65inch \ No newline at end of file