From aac434d7bf5bef14a16b4d44cc12e619cbcfe6bf Mon Sep 17 00:00:00 2001 From: dan-blank Date: Fri, 27 Jun 2025 13:08:00 +0200 Subject: [PATCH 1/5] Bump packages --- pubspec.lock | 90 ++++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index e2e507e..3da6e21 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,23 +5,23 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 + sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" url: "https://pub.dev" source: hosted - version: "72.0.0" + version: "76.0.0" _macros: dependency: transitive description: dart source: sdk - version: "0.3.2" + version: "0.3.3" analyzer: dependency: transitive description: name: analyzer - sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 + sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" url: "https://pub.dev" source: hosted - version: "6.7.0" + version: "6.11.0" args: dependency: transitive description: @@ -34,18 +34,18 @@ packages: dependency: transitive description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.13.0" boolean_selector: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" build: dependency: transitive description: @@ -114,10 +114,10 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" checked_yaml: dependency: transitive description: @@ -130,10 +130,10 @@ packages: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" code_builder: dependency: transitive description: @@ -146,10 +146,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.19.1" convert: dependency: transitive description: @@ -186,10 +186,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.3" ffi: dependency: transitive description: @@ -329,18 +329,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0" url: "https://pub.dev" source: hosted - version: "10.0.5" + version: "10.0.9" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -369,18 +369,18 @@ packages: dependency: transitive description: name: macros - sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" + sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" url: "https://pub.dev" source: hosted - version: "0.1.2-main.4" + version: "0.1.3-main.0" matcher: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -393,10 +393,10 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" mime: dependency: transitive description: @@ -417,10 +417,10 @@ packages: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" path_provider: dependency: transitive description: @@ -577,7 +577,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_gen: dependency: transitive description: @@ -598,26 +598,26 @@ packages: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" stack_trace: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" stream_transform: dependency: transitive description: @@ -630,26 +630,26 @@ packages: dependency: transitive description: name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.2" + version: "0.7.4" timing: dependency: transitive description: @@ -678,10 +678,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc + sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 url: "https://pub.dev" source: hosted - version: "14.2.4" + version: "15.0.0" watcher: dependency: transitive description: @@ -731,5 +731,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.5.0 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.22.0" From db7a300e3c8d672355cb034478c97095feec965b Mon Sep 17 00:00:00 2001 From: dan-blank Date: Fri, 27 Jun 2025 13:13:38 +0200 Subject: [PATCH 2/5] Add very_good_analysis linting --- analysis_options.yaml | 5 ++--- pubspec.lock | 26 +++++++++----------------- pubspec.yaml | 9 +-------- 3 files changed, 12 insertions(+), 28 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 0d29021..7db34b0 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -5,9 +5,7 @@ # IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be # invoked from the command line by running `flutter analyze`. -# The following line activates a set of recommended lints for Flutter apps, -# packages, and plugins designed to encourage good coding practices. -include: package:flutter_lints/flutter.yaml +include: package:very_good_analysis/analysis_options.yaml linter: # The lint rules applied to this project can be customized in the @@ -21,6 +19,7 @@ linter: # `// ignore_for_file: name_of_lint` syntax on the line or in the file # producing the lint. rules: + public_member_api_docs: false # avoid_print: false # Uncomment to disable the `avoid_print` rule # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule diff --git a/pubspec.lock b/pubspec.lock index 3da6e21..3615a06 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -219,14 +219,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_lints: - dependency: "direct dev" - description: - name: flutter_lints - sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" - url: "https://pub.dev" - source: hosted - version: "4.0.0" flutter_test: dependency: "direct dev" description: flutter @@ -349,14 +341,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" - lints: - dependency: transitive - description: - name: lints - sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" - url: "https://pub.dev" - source: hosted - version: "4.0.0" logging: dependency: transitive description: @@ -674,6 +658,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + very_good_analysis: + dependency: "direct dev" + description: + name: very_good_analysis + sha256: e479fbc0941009262343db308133e121bf8660c2c81d48dd8e952df7b7e1e382 + url: "https://pub.dev" + source: hosted + version: "9.0.0" vm_service: dependency: transitive description: @@ -731,5 +723,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.7.0-0 <4.0.0" + dart: ">=3.8.0 <4.0.0" flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index dd4d0be..669b290 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -43,15 +43,8 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - - # The "flutter_lints" package below contains a set of recommended lints to - # encourage good coding practices. The lint set provided by the package is - # activated in the `analysis_options.yaml` file located at the root of your - # package. See that file for information about deactivating specific lint - # rules and activating additional ones. - flutter_lints: ^4.0.0 hive_generator: ^2.0.1 - build_runner: ^2.4.12 + very_good_analysis: ^9.0.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec From c031f0733c5d65764ed9d2c2fd79f8868057321d Mon Sep 17 00:00:00 2001 From: dan-blank Date: Fri, 27 Jun 2025 13:25:23 +0200 Subject: [PATCH 3/5] Fix lint hints (mostly dart fix --apply) --- lib/alarm_actions_screen.dart | 4 ++-- lib/alarm_manager_screen.dart | 6 +++--- lib/hive/models/alarm_action.dart | 4 ++-- lib/hive/service/database_service.dart | 21 +++++++++++---------- lib/main.dart | 2 +- lib/utils/alarm_method_channel.dart | 16 +++++++--------- pubspec.yaml | 7 +++---- test/widget_test.dart | 3 +-- 8 files changed, 30 insertions(+), 33 deletions(-) diff --git a/lib/alarm_actions_screen.dart b/lib/alarm_actions_screen.dart index 1a18987..137c8be 100644 --- a/lib/alarm_actions_screen.dart +++ b/lib/alarm_actions_screen.dart @@ -18,7 +18,7 @@ class _AlarmActionsScreenState extends State { void initState() { super.initState(); _databaseService = DatabaseService.instance; - + final actions = _databaseService.getAllAlarmActions(); log(actions.length.toString()); } @@ -50,4 +50,4 @@ class _AlarmActionsScreenState extends State { ), ); } -} \ No newline at end of file +} diff --git a/lib/alarm_manager_screen.dart b/lib/alarm_manager_screen.dart index 195c3fc..912cda2 100644 --- a/lib/alarm_manager_screen.dart +++ b/lib/alarm_manager_screen.dart @@ -24,7 +24,7 @@ class AlarmManagerScreen extends StatelessWidget { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - title: const Text("Alarm Manager Screen"), + title: const Text('Alarm Manager Screen'), centerTitle: true, actions: [ IconButton( @@ -32,7 +32,7 @@ class AlarmManagerScreen extends StatelessWidget { onPressed: () { Navigator.push( context, - MaterialPageRoute( + MaterialPageRoute( builder: (_) => const AlarmActionsScreen())); }, ) @@ -43,7 +43,7 @@ class AlarmManagerScreen extends StatelessWidget { onPressed: () async { await _requestNotificationPermission(context); }, - child: const Text("Schedule Alarm")), + child: const Text('Schedule Alarm')), ), ); } diff --git a/lib/hive/models/alarm_action.dart b/lib/hive/models/alarm_action.dart index 77721c2..9d49629 100644 --- a/lib/hive/models/alarm_action.dart +++ b/lib/hive/models/alarm_action.dart @@ -4,10 +4,10 @@ part 'alarm_action.g.dart'; @HiveType(typeId: 0) //typeId should be unique for each model class AlarmAction { + AlarmAction(this.actionType, this.timestamp); + @HiveField(0) final String actionType; @HiveField(1) final DateTime timestamp; - - AlarmAction(this.actionType, this.timestamp); } diff --git a/lib/hive/service/database_service.dart b/lib/hive/service/database_service.dart index 2712047..10ef120 100644 --- a/lib/hive/service/database_service.dart +++ b/lib/hive/service/database_service.dart @@ -1,16 +1,17 @@ import 'dart:developer'; + import 'package:flutter/foundation.dart'; +import 'package:flutter_alarm_manager_poc/hive/models/alarm_action.dart'; import 'package:hive_flutter/hive_flutter.dart'; -import '../models/alarm_action.dart'; class DatabaseService { + // Private constructor + DatabaseService._(); + static const String alarmBoxName = 'alarm_actions'; static DatabaseService? _instance; late Box _alarmBox; - // Private constructor - DatabaseService._(); - // Singleton instance getter static DatabaseService get instance { _instance ??= DatabaseService._(); @@ -27,7 +28,7 @@ class DatabaseService { Hive.registerAdapter(AlarmActionAdapter()); _alarmBox = await Hive.openBox(alarmBoxName); log('Hive initialized and box opened successfully.'); - } catch (e) { + } on Exception catch (e) { log('Failed to initialize Hive or open box: $e'); } } @@ -40,9 +41,9 @@ class DatabaseService { ); log('Stored alarm action: $actionType'); - var actions = getAllAlarmActions(); + final actions = getAllAlarmActions(); log('Retrieved ${actions.length} alarm actions.'); - } catch (e) { + } on Exception catch (e) { log('Failed to store alarm action: $e'); } } @@ -50,10 +51,10 @@ class DatabaseService { // Retrieve all alarm actions from the Hive box List getAllAlarmActions() { try { - var actions = _alarmBox.values; + final actions = _alarmBox.values; log('Retrieved ${actions.length} alarm actions.'); return actions.toList(); - } catch (e) { + } on Exception catch (e) { log('Failed to retrieve alarm actions: $e'); return []; } @@ -64,7 +65,7 @@ class DatabaseService { try { await _alarmBox.clear(); log('All alarm actions cleared.'); - } catch (e) { + } on Exception catch (e) { log('Failed to clear alarm actions: $e'); } } diff --git a/lib/main.dart b/lib/main.dart index 7347d57..3836ab7 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_alarm_manager_poc/alarm_manager_screen.dart'; import 'package:flutter_alarm_manager_poc/hive/service/database_service.dart'; -import 'utils/alarm_method_channel.dart'; +import 'package:flutter_alarm_manager_poc/utils/alarm_method_channel.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/lib/utils/alarm_method_channel.dart b/lib/utils/alarm_method_channel.dart index 43cefa4..1c7ffe1 100644 --- a/lib/utils/alarm_method_channel.dart +++ b/lib/utils/alarm_method_channel.dart @@ -4,7 +4,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_alarm_manager_poc/hive/service/database_service.dart'; class AlarmMethodChannel { - static const name = "Flutter"; + static const name = 'Flutter'; static const platform = MethodChannel('com.example/alarm_manager'); static Future scheduleAlarm() async { @@ -27,20 +27,18 @@ class AlarmMethodChannel { log(name: name, 'Alarm was accepted'); // await alarmBox.add(AlarmAction('accept', DateTime.now())); - await DatabaseService.instance.storeAlarmAction("accept"); + await DatabaseService.instance.storeAlarmAction('accept'); - // Handle alarm accepted - // You can call a function or update state here - break; + // Handle alarm accepted + // You can call a function or update state here case 'alarmSnoozed': log(name: name, 'Alarm was snoozed'); // await alarmBox.add(AlarmAction('snooze', DateTime.now())); - await DatabaseService.instance.storeAlarmAction("snooze"); + await DatabaseService.instance.storeAlarmAction('snooze'); - // Handle alarm snoozed - // You can call a function or update state here - break; + // Handle alarm snoozed + // You can call a function or update state here default: log('Unrecognized method ${call.method}'); } diff --git a/pubspec.yaml b/pubspec.yaml index 669b290..f713d34 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -28,19 +28,18 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - flutter: - sdk: flutter - - # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.8 + flutter: + sdk: flutter hive: ^2.2.3 hive_flutter: ^1.1.0 permission_handler: ^11.3.1 dev_dependencies: + build_runner: ^2.4.12 flutter_test: sdk: flutter hive_generator: ^2.0.1 diff --git a/test/widget_test.dart b/test/widget_test.dart index f2c6c3b..e18cbef 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -6,9 +6,8 @@ // tree, read text, and verify that the values of widget properties are correct. import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; - import 'package:flutter_alarm_manager_poc/main.dart'; +import 'package:flutter_test/flutter_test.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { From 8127a23274c0a4bcdbd08bcc62b1435b73f3bf3a Mon Sep 17 00:00:00 2001 From: dan-blank Date: Fri, 27 Jun 2025 13:36:32 +0200 Subject: [PATCH 4/5] Fix lint hint "Static method should be a constructor" --- lib/hive/service/database_service.dart | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/hive/service/database_service.dart b/lib/hive/service/database_service.dart index 10ef120..b5b2671 100644 --- a/lib/hive/service/database_service.dart +++ b/lib/hive/service/database_service.dart @@ -8,16 +8,13 @@ class DatabaseService { // Private constructor DatabaseService._(); + static final DatabaseService _instance = DatabaseService._(); + + static DatabaseService get instance => _instance; + static const String alarmBoxName = 'alarm_actions'; - static DatabaseService? _instance; late Box _alarmBox; - // Singleton instance getter - static DatabaseService get instance { - _instance ??= DatabaseService._(); - return _instance!; - } - ValueListenable> get alarmBoxListenable => _alarmBox.listenable(); From 640e29d46b030844307c0d5bfbad1439b78456d9 Mon Sep 17 00:00:00 2001 From: dan-blank Date: Fri, 27 Jun 2025 14:38:29 +0200 Subject: [PATCH 5/5] Fix lint hint "Don't use 'BuildContext's across async gaps" --- lib/alarm_manager_screen.dart | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/alarm_manager_screen.dart b/lib/alarm_manager_screen.dart index 912cda2..15983eb 100644 --- a/lib/alarm_manager_screen.dart +++ b/lib/alarm_manager_screen.dart @@ -7,11 +7,14 @@ class AlarmManagerScreen extends StatelessWidget { const AlarmManagerScreen({super.key}); Future _requestNotificationPermission(BuildContext context) async { + // get a reference to the ScaffoldMessenger before calling async method + final scaffoldMessenger = ScaffoldMessenger.of(context); final status = await Permission.notification.request(); + if (status.isGranted) { await AlarmMethodChannel.scheduleAlarm(); } else { - ScaffoldMessenger.of(context).showSnackBar( + scaffoldMessenger.showSnackBar( const SnackBar( content: Text('Notification permission is required to schedule alarms.'),