ML-70 Migrate to Dart 3 + stricter lints (#71)

* updated pub version * added lint * --code=always_use_package_imports * dart fixes * format * other lints
vodemn · May 11, 2023 · 5602b1e · 5602b1e
1 parent 19a788a
commit 5602b1e
Show file tree

Hide file tree

Showing 61 changed files with 259 additions and 260 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -1 +1,10 @@
-include: package:flutter_lints/flutter.yaml
+include: package:lint/strict.yaml
+
+
+linter:
+  rules:
+    use_setters_to_change_properties: false
+
+analyzer:
+  exclude:
+    - "**/generated/**"
diff --git a/lib/application.dart b/lib/application.dart
@@ -5,24 +5,23 @@ import 'package:flutter/services.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:lightmeter/data/caffeine_service.dart';
 import 'package:lightmeter/data/haptics_service.dart';
+import 'package:lightmeter/data/light_sensor_service.dart';
 import 'package:lightmeter/data/models/supported_locale.dart';
+import 'package:lightmeter/data/permissions_service.dart';
+import 'package:lightmeter/data/shared_prefs_service.dart';
+import 'package:lightmeter/environment.dart';
+import 'package:lightmeter/generated/l10n.dart';
+import 'package:lightmeter/providers/equipment_profile_provider.dart';
+import 'package:lightmeter/providers/ev_source_type_provider.dart';
+import 'package:lightmeter/providers/metering_screen_layout_provider.dart';
+import 'package:lightmeter/providers/stop_type_provider.dart';
 import 'package:lightmeter/providers/supported_locale_provider.dart';
+import 'package:lightmeter/providers/theme_provider.dart';
+import 'package:lightmeter/screens/metering/flow_metering.dart';
+import 'package:lightmeter/screens/settings/flow_settings.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-import 'data/light_sensor_service.dart';
-import 'data/permissions_service.dart';
-import 'data/shared_prefs_service.dart';
-import 'environment.dart';
-import 'generated/l10n.dart';
-import 'providers/equipment_profile_provider.dart';
-import 'providers/ev_source_type_provider.dart';
-import 'providers/metering_screen_layout_provider.dart';
-import 'providers/theme_provider.dart';
-import 'screens/metering/flow_metering.dart';
-import 'screens/settings/flow_settings.dart';
-import 'providers/stop_type_provider.dart';
-
 class Application extends StatelessWidget {
   final Environment env;
 
@@ -33,15 +32,16 @@ class Application extends StatelessWidget {
     return FutureBuilder(
       future: Future.wait([
         SharedPreferences.getInstance(),
-        Platform.isAndroid ? const LightSensorService().hasSensor() : Future.value(false),
+        if (Platform.isAndroid) const LightSensorService().hasSensor() else Future.value(false),
       ]),
       builder: (_, snapshot) {
         if (snapshot.data != null) {
           return MultiProvider(
             providers: [
               Provider.value(value: env.copyWith(hasLightSensor: snapshot.data![1] as bool)),
               Provider(
-                  create: (_) => UserPreferencesService(snapshot.data![0] as SharedPreferences)),
+                create: (_) => UserPreferencesService(snapshot.data![0] as SharedPreferences),
+              ),
               Provider(create: (_) => const CaffeineService()),
               Provider(create: (_) => const HapticsService()),
               Provider(create: (_) => PermissionsService()),

diff --git a/lib/data/caffeine_service.dart b/lib/data/caffeine_service.dart
@@ -6,7 +6,7 @@ class CaffeineService {
   const CaffeineService();
 
   Future<bool> isKeepScreenOn() async {
-    return await _methodChannel.invokeMethod<bool>("isKeepScreenOn").then((value) => value!);
+    return _methodChannel.invokeMethod<bool>("isKeepScreenOn").then((value) => value!);
   }
 
   Future<void> keepScreenOn(bool keep) async {

diff --git a/lib/data/models/exposure_pair.dart b/lib/data/models/exposure_pair.dart
@@ -7,5 +7,5 @@ class ExposurePair {
   const ExposurePair(this.aperture, this.shutterSpeed);
 
   @override
-  String toString() => '${aperture.toString()} - ${shutterSpeed.toString()}';
+  String toString() => '$aperture - $shutterSpeed';
 }
diff --git a/lib/data/models/metering_screen_layout_config.dart b/lib/data/models/metering_screen_layout_config.dart
@@ -4,7 +4,8 @@ typedef MeteringScreenLayoutConfig = Map<MeteringScreenLayoutFeature, bool>;
 
 extension MeteringScreenLayoutConfigJson on MeteringScreenLayoutConfig {
   static MeteringScreenLayoutConfig fromJson(Map<String, dynamic> data) => data.map(
-      (key, value) => MapEntry(MeteringScreenLayoutFeature.values[int.parse(key)], value as bool));
+        (key, value) => MapEntry(MeteringScreenLayoutFeature.values[int.parse(key)], value as bool),
+      );
 
   Map<String, dynamic> toJson() => map((key, value) => MapEntry(key.index.toString(), value));
 }
diff --git a/lib/data/models/supported_locale.dart b/lib/data/models/supported_locale.dart
@@ -29,4 +29,3 @@ extension SupportedLocaleExtension on SupportedLocale {
     }
   }
 }
-
diff --git a/lib/data/permissions_service.dart b/lib/data/permissions_service.dart
@@ -1,7 +1,7 @@
 import 'package:permission_handler/permission_handler.dart';
 
 class PermissionsService {
-  Future<PermissionStatus> checkCameraPermission() async => await Permission.camera.status;
+  Future<PermissionStatus> checkCameraPermission() async => Permission.camera.status;
 
   Future<PermissionStatus> requestCameraPermission() async => Permission.camera.request();
 }
diff --git a/lib/data/shared_prefs_service.dart b/lib/data/shared_prefs_service.dart
@@ -1,15 +1,14 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
+import 'package:lightmeter/data/models/ev_source_type.dart';
+import 'package:lightmeter/data/models/film.dart';
+import 'package:lightmeter/data/models/metering_screen_layout_config.dart';
 import 'package:lightmeter/data/models/supported_locale.dart';
+import 'package:lightmeter/data/models/theme_type.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-import 'models/ev_source_type.dart';
-import 'models/film.dart';
-import 'models/metering_screen_layout_config.dart';
-import 'models/theme_type.dart';
-
 class UserPreferencesService {
   static const _isoKey = "iso";
   static const _ndFilterKey = "ndFilter";
@@ -87,7 +86,9 @@ class UserPreferencesService {
   MeteringScreenLayoutConfig get meteringScreenLayout {
     final configJson = _sharedPreferences.getString(_meteringScreenLayoutKey);
     if (configJson != null) {
-      return MeteringScreenLayoutConfigJson.fromJson(json.decode(configJson));
+      return MeteringScreenLayoutConfigJson.fromJson(
+        json.decode(configJson) as Map<String, dynamic>,
+      );
     } else {
       return {
         MeteringScreenLayoutFeature.extremeExposurePairs: true,

diff --git a/lib/firebase.dart b/lib/firebase.dart
@@ -2,7 +2,7 @@ import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:flutter/foundation.dart';
 
-import 'firebase_options.dart';
+import 'package:lightmeter/firebase_options.dart';
 
 Future<void> initializeFirebase() async {
   await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);

diff --git a/lib/interactors/metering_interactor.dart b/lib/interactors/metering_interactor.dart
@@ -58,8 +58,6 @@ class MeteringInteractor {
     AppSettings.openAppSettings();
   }
 
-  void enableHaptics(bool enable) => _userPreferencesService.haptics = enable;
-
   Future<bool> hasAmbientLightSensor() async {
     if (Platform.isAndroid) {
       return _lightSensorService.hasSensor();

diff --git a/lib/main_dev.dart b/lib/main_dev.dart
@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:lightmeter/application.dart';
 import 'package:lightmeter/environment.dart';
 
-import 'application.dart';
-
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
   runApp(const Application(Environment.dev()));

diff --git a/lib/main_prod.dart b/lib/main_prod.dart
@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:lightmeter/application.dart';
 import 'package:lightmeter/environment.dart';
-
-import 'application.dart';
-import 'firebase.dart';
+import 'package:lightmeter/firebase.dart';
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();

diff --git a/lib/platform_config.dart b/lib/platform_config.dart
@@ -1,4 +1,6 @@
 class PlatformConfig {
+  const PlatformConfig._();
+
   static double get cameraPreviewAspectRatio {
     final rational = const String.fromEnvironment('cameraPreviewAspectRatio').split('/');
     return int.parse(rational[0]) / int.parse(rational[1]);

diff --git a/lib/providers/equipment_profile_provider.dart b/lib/providers/equipment_profile_provider.dart
@@ -65,14 +65,16 @@ class EquipmentProfileProviderState extends State<EquipmentProfileProvider> {
 
   /// Creates a default equipment profile
   void addProfile(String name) {
-    _customProfiles.add(EquipmentProfileData(
-      id: const Uuid().v1(),
-      name: name,
-      apertureValues: ApertureValue.values,
-      ndValues: NdValue.values,
-      shutterSpeedValues: ShutterSpeedValue.values,
-      isoValues: IsoValue.values,
-    ));
+    _customProfiles.add(
+      EquipmentProfileData(
+        id: const Uuid().v1(),
+        name: name,
+        apertureValues: ApertureValue.values,
+        ndValues: NdValue.values,
+        shutterSpeedValues: ShutterSpeedValue.values,
+        isoValues: IsoValue.values,
+      ),
+    );
     _refreshSavedProfiles();
   }
 

diff --git a/lib/screens/metering/bloc_metering.dart b/lib/screens/metering/bloc_metering.dart
@@ -6,16 +6,15 @@ import 'package:lightmeter/data/models/exposure_pair.dart';
 import 'package:lightmeter/data/models/film.dart';
 import 'package:lightmeter/data/shared_prefs_service.dart';
 import 'package:lightmeter/interactors/metering_interactor.dart';
+import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart';
 import 'package:lightmeter/screens/metering/communication/event_communication_metering.dart'
     as communication_events;
 import 'package:lightmeter/screens/metering/communication/state_communication_metering.dart'
     as communication_states;
+import 'package:lightmeter/screens/metering/event_metering.dart';
+import 'package:lightmeter/screens/metering/state_metering.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 
-import 'communication/bloc_communication_metering.dart';
-import 'event_metering.dart';
-import 'state_metering.dart';
-
 class MeteringBloc extends Bloc<MeteringEvent, MeteringState> {
   final MeteringCommunicationBloc _communicationBloc;
   final UserPreferencesService _userPreferencesService;
@@ -145,26 +144,28 @@ class MeteringBloc extends Bloc<MeteringEvent, MeteringState> {
 
   void _emitMeasuredState(Emitter emit) {
     final ev = _ev100 + log2(_iso.value / 100) - _nd.stopReduction;
-    emit(_isMeteringInProgress
-        ? MeteringInProgressState(
-            ev: ev,
-            film: _film,
-            iso: _iso,
-            nd: _nd,
-            exposurePairs: _buildExposureValues(ev),
-          )
-        : MeteringEndedState(
-            ev: ev,
-            film: _film,
-            iso: _iso,
-            nd: _nd,
-            exposurePairs: _buildExposureValues(ev),
-          ));
+    emit(
+      _isMeteringInProgress
+          ? MeteringInProgressState(
+              ev: ev,
+              film: _film,
+              iso: _iso,
+              nd: _nd,
+              exposurePairs: _buildExposureValues(ev),
+            )
+          : MeteringEndedState(
+              ev: ev,
+              film: _film,
+              iso: _iso,
+              nd: _nd,
+              exposurePairs: _buildExposureValues(ev),
+            ),
+    );
   }
 
   List<ExposurePair> _buildExposureValues(double ev) {
     if (ev.isNaN || ev.isInfinite) {
-      return List.empty(growable: false);
+      return List.empty();
     }
 
     /// Depending on the `stopType` the exposure pairs list length is multiplied by 1,2 or 3
@@ -200,12 +201,14 @@ class MeteringBloc extends Bloc<MeteringEvent, MeteringState> {
       shutterSpeedOffset = 0;
     }
 
-    final int itemsCount = min(_apertureValues.length + shutterSpeedOffset,
-            _shutterSpeedValues.length + apertureOffset) -
+    final int itemsCount = min(
+          _apertureValues.length + shutterSpeedOffset,
+          _shutterSpeedValues.length + apertureOffset,
+        ) -
         max(apertureOffset, shutterSpeedOffset);
 
     if (itemsCount < 0) {
-      return List.empty(growable: false);
+      return List.empty();
     }
     return List.generate(
       itemsCount,

diff --git a/lib/screens/metering/communication/bloc_communication_metering.dart b/lib/screens/metering/communication/bloc_communication_metering.dart
@@ -1,7 +1,7 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 
-import 'event_communication_metering.dart';
-import 'state_communication_metering.dart';
+import 'package:lightmeter/screens/metering/communication/event_communication_metering.dart';
+import 'package:lightmeter/screens/metering/communication/state_communication_metering.dart';
 
 class MeteringCommunicationBloc
     extends Bloc<MeteringCommunicationEvent, MeteringCommunicationState> {

diff --git a/.../metering/components/bottom_controls/components/measure_button/widget_button_measure.dart b/.../metering/components/bottom_controls/components/measure_button/widget_button_measure.dart
@@ -73,7 +73,6 @@ class _MeteringMeasureButtonState extends State<MeteringMeasureButton> {
                   /// This key is needed to make indicator start from the same point every time
                   key: ValueKey(widget.isMetering),
                   color: Theme.of(context).colorScheme.onSurface,
-                  strokeWidth: Dimens.grid4,
                   value: widget.isMetering ? null : 1,
                 ),
               ),

diff --git a/lib/screens/metering/components/bottom_controls/provider_bottom_controls.dart b/lib/screens/metering/components/bottom_controls/provider_bottom_controls.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/res/dimens.dart';
 
-import 'widget_bottom_controls.dart';
+import 'package:lightmeter/screens/metering/components/bottom_controls/widget_bottom_controls.dart';
 
 class MeteringBottomControlsProvider extends StatelessWidget {
   final double? ev;

diff --git a/lib/screens/metering/components/bottom_controls/widget_bottom_controls.dart b/lib/screens/metering/components/bottom_controls/widget_bottom_controls.dart
@@ -1,10 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:lightmeter/data/models/ev_source_type.dart';
 import 'package:lightmeter/res/dimens.dart';
+import 'package:lightmeter/screens/metering/components/bottom_controls/components/measure_button/widget_button_measure.dart';
 import 'package:provider/provider.dart';
 
-import 'components/measure_button/widget_button_measure.dart';
-
 class MeteringBottomControls extends StatelessWidget {
   final double? ev;
   final bool isMetering;
@@ -42,9 +41,11 @@ class MeteringBottomControls extends StatelessWidget {
                     child: Center(
                       child: IconButton(
                         onPressed: onSwitchEvSourceType,
-                        icon: Icon(context.watch<EvSourceType>() != EvSourceType.camera
-                            ? Icons.camera_rear
-                            : Icons.wb_incandescent),
+                        icon: Icon(
+                          context.watch<EvSourceType>() != EvSourceType.camera
+                              ? Icons.camera_rear
+                              : Icons.wb_incandescent,
+                        ),
                       ),
                     ),
                   )