From 8e6fa90c80921e515d61fb2c16a516da7e7baa79 Mon Sep 17 00:00:00 2001 From: Krzysztof kuhy Rudnicki Date: Thu, 12 Nov 2026 09:06:16 +0100 Subject: [PATCH] Bump Flutter to 3.50.0 via material_ui Flutter 3.50 deprecates package:flutter/material.dart, so the app moves to material_ui 1.11.0 together with sync_settings_ui 0.8.0 and github_device_auth 0.5.0 (crdt_sync 0.13.1 rides along). Co-Authored-By: Claude Opus 5.5 --- .fvmrc | 2 +- .github/workflows/python-tests.yml | 2 +- .github/workflows/release-apk.yml | 2 +- phone_app/lib/main.dart | 2 +- phone_app/lib/main_arm_probe.dart | 2 +- phone_app/lib/main_ring_probe.dart | 2 +- phone_app/lib/main_session_probe.dart | 2 +- phone_app/lib/main_tag_probe.dart | 2 +- .../lib/probe/file_driven_scheduler.dart | 2 +- phone_app/lib/screens/day_calendar.dart | 2 +- phone_app/lib/screens/day_cell.dart | 2 +- phone_app/lib/screens/energy_picker.dart | 2 +- phone_app/lib/screens/escape_dialog.dart | 2 +- phone_app/lib/screens/free_days_body.dart | 2 +- phone_app/lib/screens/free_days_screen.dart | 2 +- .../lib/screens/github_mirror_screen.dart | 2 +- phone_app/lib/screens/home_body.dart | 7 +- phone_app/lib/screens/home_history_card.dart | 2 +- .../lib/screens/home_location_screen.dart | 2 +- phone_app/lib/screens/home_presence_line.dart | 2 +- phone_app/lib/screens/home_screen.dart | 2 +- phone_app/lib/screens/home_tiles.dart | 2 +- phone_app/lib/screens/ring_body.dart | 2 +- phone_app/lib/screens/ring_challenge.dart | 2 +- phone_app/lib/screens/ring_checklist.dart | 2 +- phone_app/lib/screens/ring_screen.dart | 2 +- phone_app/lib/screens/ring_stakes_line.dart | 2 +- phone_app/lib/screens/room_proof_screen.dart | 4 +- phone_app/lib/screens/session_body.dart | 2 +- phone_app/lib/screens/session_checkin.dart | 2 +- phone_app/lib/screens/session_checklist.dart | 2 +- phone_app/lib/screens/session_screen.dart | 2 +- .../lib/screens/session_tags_screen.dart | 7 +- phone_app/lib/screens/settings_screen.dart | 8 +- phone_app/lib/screens/sick_day_sheet.dart | 2 +- phone_app/lib/screens/sick_days_body.dart | 8 +- phone_app/lib/screens/sick_days_screen.dart | 2 +- phone_app/lib/screens/stakes_card.dart | 2 +- phone_app/lib/screens/stakes_marks.dart | 2 +- phone_app/lib/services/home_presence.dart | 5 +- phone_app/lib/services/ring_startup.dart | 6 +- phone_app/lib/ui/cues.dart | 43 +++++++--- phone_app/lib/ui/dashed_slot.dart | 2 +- phone_app/lib/ui/spoken_label.dart | 2 +- phone_app/lib/ui/theme.dart | 2 +- phone_app/pubspec.lock | 79 +++++++++++++++---- phone_app/pubspec.yaml | 7 +- phone_app/test/free_days_screen_test.dart | 2 +- .../test/free_days_sick_conflict_test.dart | 2 +- phone_app/test/home_fit_test.dart | 2 +- phone_app/test/home_history_card_test.dart | 2 +- phone_app/test/home_location_screen_test.dart | 2 +- phone_app/test/ring_away_test.dart | 2 +- phone_app/test/ring_bypass_test.dart | 2 +- phone_app/test/ring_route_test.dart | 2 +- phone_app/test/ring_session_handoff_test.dart | 2 +- phone_app/test/ring_stakes_test.dart | 2 +- phone_app/test/room_proof_screen_test.dart | 2 +- .../services/alarm_sync_service_test.dart | 5 +- phone_app/test/services/challenge_test.dart | 3 +- .../test/services/home_presence_test.dart | 3 +- .../test/session_screen_catch_up_test.dart | 2 +- .../test/session_screen_checkin_test.dart | 2 +- .../test/session_screen_relaunch_test.dart | 2 +- phone_app/test/session_screen_test.dart | 2 +- phone_app/test/session_tags_screen_test.dart | 2 +- phone_app/test/settings_screen_test.dart | 6 +- phone_app/test/sick_day_sheet_test.dart | 2 +- phone_app/test/sick_days_screen_test.dart | 2 +- phone_app/test/stakes_card_test.dart | 2 +- phone_app/test/text_free_days_test.dart | 2 +- phone_app/test/text_free_ring_test.dart | 6 +- phone_app/test/text_free_support.dart | 2 +- phone_app/test/text_free_sync_test.dart | 2 +- phone_app/test/text_free_test.dart | 2 +- phone_app/test/ui/cues_haptics_test.dart | 2 +- phone_app/test/ui/cues_test.dart | 2 +- 77 files changed, 187 insertions(+), 134 deletions(-) diff --git a/.fvmrc b/.fvmrc index a059027..14bb2a9 100644 --- a/.fvmrc +++ b/.fvmrc @@ -1,3 +1,3 @@ { - "flutter": "3.47.9" + "flutter": "3.50.0" } diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index 1edee74..6e19875 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -71,7 +71,7 @@ jobs: - uses: kuhyx/utils/flutter-setup@flutter-setup-v1 with: - flutter-version: 3.47.9 + flutter-version: 3.50.0 working-directory: phone_app - name: Dart writes, Python replays, both must agree diff --git a/.github/workflows/release-apk.yml b/.github/workflows/release-apk.yml index 0fb6dc1..cccefb8 100644 --- a/.github/workflows/release-apk.yml +++ b/.github/workflows/release-apk.yml @@ -87,7 +87,7 @@ jobs: - uses: subosito/flutter-action@v2 with: - flutter-version: 3.47.9 + flutter-version: 3.50.0 channel: stable cache: true diff --git a/phone_app/lib/main.dart b/phone_app/lib/main.dart index c4b9361..a518782 100644 --- a/phone_app/lib/main.dart +++ b/phone_app/lib/main.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/home_screen.dart'; import 'package:wake_alarm_sync/screens/ring_screen.dart'; diff --git a/phone_app/lib/main_arm_probe.dart b/phone_app/lib/main_arm_probe.dart index 819dc35..f6133e9 100644 --- a/phone_app/lib/main_arm_probe.dart +++ b/phone_app/lib/main_arm_probe.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/main.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; diff --git a/phone_app/lib/main_ring_probe.dart b/phone_app/lib/main_ring_probe.dart index edf0db4..37bd493 100644 --- a/phone_app/lib/main_ring_probe.dart +++ b/phone_app/lib/main_ring_probe.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/main.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; diff --git a/phone_app/lib/main_session_probe.dart b/phone_app/lib/main_session_probe.dart index 322ffc5..a7464f7 100644 --- a/phone_app/lib/main_session_probe.dart +++ b/phone_app/lib/main_session_probe.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/main.dart'; import 'package:wake_alarm_sync/probe/file_driven_scheduler.dart'; diff --git a/phone_app/lib/main_tag_probe.dart b/phone_app/lib/main_tag_probe.dart index a9141dd..33d892b 100644 --- a/phone_app/lib/main_tag_probe.dart +++ b/phone_app/lib/main_tag_probe.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/room_proof_screen.dart'; diff --git a/phone_app/lib/probe/file_driven_scheduler.dart b/phone_app/lib/probe/file_driven_scheduler.dart index 252fd1d..6e50963 100644 --- a/phone_app/lib/probe/file_driven_scheduler.dart +++ b/phone_app/lib/probe/file_driven_scheduler.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:path/path.dart' as p; import 'package:path_provider/path_provider.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; diff --git a/phone_app/lib/screens/day_calendar.dart b/phone_app/lib/screens/day_calendar.dart index 2ef787b..0b0c581 100644 --- a/phone_app/lib/screens/day_calendar.dart +++ b/phone_app/lib/screens/day_calendar.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/day_cell.dart'; import 'package:wake_alarm_sync/services/alarm_ramp.dart'; import 'package:wake_alarm_sync/services/free_day_pool.dart'; diff --git a/phone_app/lib/screens/day_cell.dart b/phone_app/lib/screens/day_cell.dart index f35dda3..605dda0 100644 --- a/phone_app/lib/screens/day_cell.dart +++ b/phone_app/lib/screens/day_cell.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; Widget _dot(Color color) => Container( key: const ValueKey('day-badge'), diff --git a/phone_app/lib/screens/energy_picker.dart b/phone_app/lib/screens/energy_picker.dart index 1d95b12..71104ec 100644 --- a/phone_app/lib/screens/energy_picker.dart +++ b/phone_app/lib/screens/energy_picker.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/services/weight_entry.dart'; /// Five chips, 1 to 5: the morning's energy, tapped next to the weigh-in. diff --git a/phone_app/lib/screens/escape_dialog.dart b/phone_app/lib/screens/escape_dialog.dart index 456f135..7c6cfa1 100644 --- a/phone_app/lib/screens/escape_dialog.dart +++ b/phone_app/lib/screens/escape_dialog.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/services/stakes.dart'; /// Asks why this morning should be excused; the reason, or null if diff --git a/phone_app/lib/screens/free_days_body.dart b/phone_app/lib/screens/free_days_body.dart index 30a416d..c2e27db 100644 --- a/phone_app/lib/screens/free_days_body.dart +++ b/phone_app/lib/screens/free_days_body.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/day_calendar.dart'; import 'package:wake_alarm_sync/services/free_day_pool.dart'; import 'package:wake_alarm_sync/ui/cues.dart'; diff --git a/phone_app/lib/screens/free_days_screen.dart b/phone_app/lib/screens/free_days_screen.dart index 9d1597c..793a807 100644 --- a/phone_app/lib/screens/free_days_screen.dart +++ b/phone_app/lib/screens/free_days_screen.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/day_calendar.dart'; import 'package:wake_alarm_sync/screens/free_days_body.dart'; import 'package:wake_alarm_sync/services/free_day_pool.dart'; diff --git a/phone_app/lib/screens/github_mirror_screen.dart b/phone_app/lib/screens/github_mirror_screen.dart index ecf2c1a..a730e5b 100644 --- a/phone_app/lib/screens/github_mirror_screen.dart +++ b/phone_app/lib/screens/github_mirror_screen.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:github_device_auth/github_device_auth.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/services/sync_settings.dart'; import 'package:wake_alarm_sync/ui/cues.dart'; diff --git a/phone_app/lib/screens/home_body.dart b/phone_app/lib/screens/home_body.dart index 1954be7..acb935f 100644 --- a/phone_app/lib/screens/home_body.dart +++ b/phone_app/lib/screens/home_body.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/home_presence_line.dart'; import 'package:wake_alarm_sync/screens/home_tiles.dart'; import 'package:wake_alarm_sync/ui/cues.dart'; @@ -129,10 +129,7 @@ class HomeBody extends StatelessWidget { ), const SizedBox(height: 24), if (status.isNotEmpty) ...[ - StatusCue( - semanticLabel: status, - icon: _statusIcon(status), - ), + StatusCue(semanticLabel: status, icon: _statusIcon(status)), const SizedBox(height: 24), ], HomeTiles( diff --git a/phone_app/lib/screens/home_history_card.dart b/phone_app/lib/screens/home_history_card.dart index 4199c1c..0150698 100644 --- a/phone_app/lib/screens/home_history_card.dart +++ b/phone_app/lib/screens/home_history_card.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/services/morning_session.dart'; import 'package:wake_alarm_sync/services/session_store.dart'; import 'package:wake_alarm_sync/services/weight_entry.dart'; diff --git a/phone_app/lib/screens/home_location_screen.dart b/phone_app/lib/screens/home_location_screen.dart index 89e880b..c761228 100644 --- a/phone_app/lib/screens/home_location_screen.dart +++ b/phone_app/lib/screens/home_location_screen.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; import 'package:wake_alarm_sync/services/home_location_settings.dart'; import 'package:wake_alarm_sync/ui/cues.dart'; diff --git a/phone_app/lib/screens/home_presence_line.dart b/phone_app/lib/screens/home_presence_line.dart index d32e7d1..efd6a8d 100644 --- a/phone_app/lib/screens/home_presence_line.dart +++ b/phone_app/lib/screens/home_presence_line.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/services/home_presence.dart'; import 'package:wake_alarm_sync/ui/cues.dart'; diff --git a/phone_app/lib/screens/home_screen.dart b/phone_app/lib/screens/home_screen.dart index 66f7e70..d2ae6cb 100644 --- a/phone_app/lib/screens/home_screen.dart +++ b/phone_app/lib/screens/home_screen.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:developer' as developer; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/free_days_screen.dart'; import 'package:wake_alarm_sync/screens/home_body.dart'; diff --git a/phone_app/lib/screens/home_tiles.dart b/phone_app/lib/screens/home_tiles.dart index 707e145..eb06207 100644 --- a/phone_app/lib/screens/home_tiles.dart +++ b/phone_app/lib/screens/home_tiles.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/home_history_card.dart'; import 'package:wake_alarm_sync/screens/stakes_card.dart'; diff --git a/phone_app/lib/screens/ring_body.dart b/phone_app/lib/screens/ring_body.dart index 78dc517..9e74f43 100644 --- a/phone_app/lib/screens/ring_body.dart +++ b/phone_app/lib/screens/ring_body.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/ring_challenge.dart'; import 'package:wake_alarm_sync/screens/ring_checklist.dart'; import 'package:wake_alarm_sync/screens/ring_stakes_line.dart'; diff --git a/phone_app/lib/screens/ring_challenge.dart b/phone_app/lib/screens/ring_challenge.dart index a0432e0..99b5441 100644 --- a/phone_app/lib/screens/ring_challenge.dart +++ b/phone_app/lib/screens/ring_challenge.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/services/challenge.dart'; import 'package:wake_alarm_sync/services/dismiss_gate.dart'; import 'package:wake_alarm_sync/ui/spoken_label.dart'; diff --git a/phone_app/lib/screens/ring_checklist.dart b/phone_app/lib/screens/ring_checklist.dart index fa26efe..dfd06b4 100644 --- a/phone_app/lib/screens/ring_checklist.dart +++ b/phone_app/lib/screens/ring_checklist.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/services/dismiss_gate.dart'; import 'package:wake_alarm_sync/services/room_proof.dart'; import 'package:wake_alarm_sync/ui/spoken_label.dart'; diff --git a/phone_app/lib/screens/ring_screen.dart b/phone_app/lib/screens/ring_screen.dart index d42c362..750d919 100644 --- a/phone_app/lib/screens/ring_screen.dart +++ b/phone_app/lib/screens/ring_screen.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:developer' as developer; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/ring_body.dart'; import 'package:wake_alarm_sync/screens/ring_challenge.dart'; import 'package:wake_alarm_sync/services/alarm_policy.dart'; diff --git a/phone_app/lib/screens/ring_stakes_line.dart b/phone_app/lib/screens/ring_stakes_line.dart index e070d88..1c8bd30 100644 --- a/phone_app/lib/screens/ring_stakes_line.dart +++ b/phone_app/lib/screens/ring_stakes_line.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/services/enforcement_bridge.dart'; import 'package:wake_alarm_sync/services/today_stakes.dart'; import 'package:wake_alarm_sync/ui/cues.dart'; diff --git a/phone_app/lib/screens/room_proof_screen.dart b/phone_app/lib/screens/room_proof_screen.dart index 2fedb46..da693f9 100644 --- a/phone_app/lib/screens/room_proof_screen.dart +++ b/phone_app/lib/screens/room_proof_screen.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; import 'package:wake_alarm_sync/services/room_proof_settings.dart'; import 'package:wake_alarm_sync/ui/cues.dart'; @@ -102,7 +102,7 @@ class _RoomProofScreenState extends State { return Padding( padding: const EdgeInsets.only(bottom: 24), child: Row( - children: [ + children: [ CircleAvatar(radius: 14, child: Text('${slot + 1}')), const SizedBox(width: 12), Expanded( diff --git a/phone_app/lib/screens/session_body.dart b/phone_app/lib/screens/session_body.dart index 8945b37..40cfd15 100644 --- a/phone_app/lib/screens/session_body.dart +++ b/phone_app/lib/screens/session_body.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/energy_picker.dart'; import 'package:wake_alarm_sync/screens/session_checklist.dart'; import 'package:wake_alarm_sync/services/morning_session.dart'; diff --git a/phone_app/lib/screens/session_checkin.dart b/phone_app/lib/screens/session_checkin.dart index f37bd9a..f50cc51 100644 --- a/phone_app/lib/screens/session_checkin.dart +++ b/phone_app/lib/screens/session_checkin.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/services/morning_session.dart'; import 'package:wake_alarm_sync/services/session_rules.dart'; import 'package:wake_alarm_sync/services/weight_entry.dart'; diff --git a/phone_app/lib/screens/session_checklist.dart b/phone_app/lib/screens/session_checklist.dart index 8ecb4de..9eb977f 100644 --- a/phone_app/lib/screens/session_checklist.dart +++ b/phone_app/lib/screens/session_checklist.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/services/morning_session.dart'; import 'package:wake_alarm_sync/services/weight_entry.dart'; import 'package:wake_alarm_sync/ui/spoken_label.dart'; diff --git a/phone_app/lib/screens/session_screen.dart b/phone_app/lib/screens/session_screen.dart index b83d9f9..d28d8fb 100644 --- a/phone_app/lib/screens/session_screen.dart +++ b/phone_app/lib/screens/session_screen.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/main.dart'; import 'package:wake_alarm_sync/screens/session_body.dart'; import 'package:wake_alarm_sync/screens/session_checkin.dart'; diff --git a/phone_app/lib/screens/session_tags_screen.dart b/phone_app/lib/screens/session_tags_screen.dart index 9d77964..85e292b 100644 --- a/phone_app/lib/screens/session_tags_screen.dart +++ b/phone_app/lib/screens/session_tags_screen.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; import 'package:wake_alarm_sync/services/session_tag_settings.dart'; import 'package:wake_alarm_sync/ui/cues.dart'; @@ -102,10 +102,7 @@ class _SessionTagsScreenState extends State { padding: const EdgeInsets.only(bottom: 24), child: Row( children: [ - Icon( - _iconForSlot(slot), - semanticLabel: _semanticLabelForSlot(slot), - ), + Icon(_iconForSlot(slot), semanticLabel: _semanticLabelForSlot(slot)), const SizedBox(width: 12), Expanded( child: id != null diff --git a/phone_app/lib/screens/settings_screen.dart b/phone_app/lib/screens/settings_screen.dart index b1f8207..fb7a2ef 100644 --- a/phone_app/lib/screens/settings_screen.dart +++ b/phone_app/lib/screens/settings_screen.dart @@ -1,6 +1,6 @@ import 'dart:developer' as developer; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sync_settings_ui/sync_settings_ui.dart'; import 'package:wake_alarm_sync/screens/github_mirror_screen.dart'; @@ -103,8 +103,10 @@ class SettingsScreen extends StatelessWidget { ListTile( key: const Key('settings-sync'), contentPadding: EdgeInsets.zero, - leading: const Icon(Icons.cloud_sync_outlined, - semanticLabel: 'Sync settings'), + leading: const Icon( + Icons.cloud_sync_outlined, + semanticLabel: 'Sync settings', + ), trailing: const Icon(Icons.chevron_right), onTap: () => Navigator.of(context).push( MaterialPageRoute( diff --git a/phone_app/lib/screens/sick_day_sheet.dart b/phone_app/lib/screens/sick_day_sheet.dart index d0928da..901cb90 100644 --- a/phone_app/lib/screens/sick_day_sheet.dart +++ b/phone_app/lib/screens/sick_day_sheet.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/services/free_day_pool.dart'; import 'package:wake_alarm_sync/services/sick_day_keep.dart'; import 'package:wake_alarm_sync/services/sick_day_pool.dart'; diff --git a/phone_app/lib/screens/sick_days_body.dart b/phone_app/lib/screens/sick_days_body.dart index 3193a9a..19538cc 100644 --- a/phone_app/lib/screens/sick_days_body.dart +++ b/phone_app/lib/screens/sick_days_body.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/day_calendar.dart'; import 'package:wake_alarm_sync/screens/sick_day_sheet.dart'; import 'package:wake_alarm_sync/services/sick_day_keep.dart'; @@ -37,7 +37,7 @@ class SickDaysBody extends StatelessWidget { final String status; /// The native ring-path cache, read back (list of ISO -/// dates or null for unreadable). + /// dates or null for unreadable). final List? cache; /// Whether the cache has been read at least once. @@ -85,9 +85,7 @@ class SickDaysBody extends StatelessWidget { calendar, const SizedBox(height: 24), const Row( - children: [ - Icon(Icons.sick_outlined, semanticLabel: 'Marked sick'), - ], + children: [Icon(Icons.sick_outlined, semanticLabel: 'Marked sick')], ), const SizedBox(height: 8), if (upcoming.isEmpty) diff --git a/phone_app/lib/screens/sick_days_screen.dart b/phone_app/lib/screens/sick_days_screen.dart index 8877043..0351322 100644 --- a/phone_app/lib/screens/sick_days_screen.dart +++ b/phone_app/lib/screens/sick_days_screen.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/day_calendar.dart'; import 'package:wake_alarm_sync/screens/sick_day_sheet.dart'; import 'package:wake_alarm_sync/screens/sick_days_body.dart'; diff --git a/phone_app/lib/screens/stakes_card.dart b/phone_app/lib/screens/stakes_card.dart index 6593dbf..5d5f80d 100644 --- a/phone_app/lib/screens/stakes_card.dart +++ b/phone_app/lib/screens/stakes_card.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/escape_dialog.dart'; import 'package:wake_alarm_sync/screens/stakes_marks.dart'; import 'package:wake_alarm_sync/services/alarm_policy.dart'; diff --git a/phone_app/lib/screens/stakes_marks.dart b/phone_app/lib/screens/stakes_marks.dart index d746ec4..498c227 100644 --- a/phone_app/lib/screens/stakes_marks.dart +++ b/phone_app/lib/screens/stakes_marks.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/services/today_stakes.dart'; import 'package:wake_alarm_sync/ui/spoken_label.dart'; import 'package:wake_alarm_sync/ui/theme.dart'; diff --git a/phone_app/lib/services/home_presence.dart b/phone_app/lib/services/home_presence.dart index c6ce6fd..01ef3de 100644 --- a/phone_app/lib/services/home_presence.dart +++ b/phone_app/lib/services/home_presence.dart @@ -115,9 +115,8 @@ class HomePresence { ); } - static String _readableDistance(double metres) => metres >= 1000 - ? '${(metres / 1000).round()} km' - : '${metres.round()} m'; + static String _readableDistance(double metres) => + metres >= 1000 ? '${(metres / 1000).round()} km' : '${metres.round()} m'; static String _reasonText(String? reason) => switch (reason) { 'no-permission' => 'location permission denied', diff --git a/phone_app/lib/services/ring_startup.dart b/phone_app/lib/services/ring_startup.dart index 1878619..e92ab40 100644 --- a/phone_app/lib/services/ring_startup.dart +++ b/phone_app/lib/services/ring_startup.dart @@ -76,9 +76,5 @@ Future resolveRingStartup({ : 'NFC is off or unavailable.', ); } - return RingStartup( - settings: settings, - skip: RingSkip.none, - status: '', - ); + return RingStartup(settings: settings, skip: RingSkip.none, status: ''); } diff --git a/phone_app/lib/ui/cues.dart b/phone_app/lib/ui/cues.dart index 9d8f4ed..37195ff 100644 --- a/phone_app/lib/ui/cues.dart +++ b/phone_app/lib/ui/cues.dart @@ -5,9 +5,8 @@ library; import 'dart:async' show unawaited; import 'dart:math' show pi, sin; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; - +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/ui/theme.dart' show AppStatusColors; export 'package:wake_alarm_sync/ui/spoken_label.dart'; @@ -16,12 +15,16 @@ export 'package:wake_alarm_sync/ui/spoken_label.dart'; enum CueKind { /// Busy/loading state. busy, + /// Success/connected state. ok, + /// Error/failed state. error, + /// Warning/caution state. warning, + /// Informational state (default). info, } @@ -35,16 +38,34 @@ CueKind? cueKindOf(String status) { if (status.endsWith('…') || status.endsWith('...')) return CueKind.busy; const errorKeywords = [ - 'Error', 'Could not', 'unavailable', 'refused', 'Not ', 'Unknown', - 'Too early', 'not earlier', 'Wrong', 'Failed', 'too short', + 'Error', + 'Could not', + 'unavailable', + 'refused', + 'Not ', + 'Unknown', + 'Too early', + 'not earlier', + 'Wrong', + 'Failed', + 'too short', ]; for (final kw in errorKeywords) { if (status.contains(kw)) return CueKind.error; } const okKeywords = [ - '✓', 'Connected', 'registered', 'matched', 'Captured', 'Synced', - 'Armed', 'Done', 'Correct', 'Dismissed', 'Excused', + '✓', + 'Connected', + 'registered', + 'matched', + 'Captured', + 'Synced', + 'Armed', + 'Done', + 'Correct', + 'Dismissed', + 'Excused', ]; for (final kw in okKeywords) { if (status.contains(kw)) return CueKind.ok; @@ -109,9 +130,10 @@ class _StatusCueState extends State duration: const Duration(milliseconds: 300), vsync: this, ); - _shakeAnim = Tween(begin: 0, end: 1).animate( - CurvedAnimation(parent: _shakeCtrl, curve: Curves.easeOut), - ); + _shakeAnim = Tween( + begin: 0, + end: 1, + ).animate(CurvedAnimation(parent: _shakeCtrl, curve: Curves.easeOut)); _prevKind = widget.resolvedKind; } @@ -173,7 +195,8 @@ class _StatusCueState extends State final statusColors = theme.extension(); final colorScheme = theme.colorScheme; - final iconData = widget.icon ?? + final iconData = + widget.icon ?? switch (kind) { CueKind.ok => Icons.check_circle, CueKind.error => Icons.error_outline, diff --git a/phone_app/lib/ui/dashed_slot.dart b/phone_app/lib/ui/dashed_slot.dart index b5b7efd..a7ad4b1 100644 --- a/phone_app/lib/ui/dashed_slot.dart +++ b/phone_app/lib/ui/dashed_slot.dart @@ -1,6 +1,6 @@ import 'dart:math' show pi; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/ui/spoken_label.dart'; /// A dashed outline slot for an empty/unregistered value. diff --git a/phone_app/lib/ui/spoken_label.dart b/phone_app/lib/ui/spoken_label.dart index 9bd5e95..c850409 100644 --- a/phone_app/lib/ui/spoken_label.dart +++ b/phone_app/lib/ui/spoken_label.dart @@ -4,7 +4,7 @@ /// Use for icon-only controls whose wording must remain only for TalkBack. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// A wrapper that provides a spoken label for accessibility without any /// visible text (no Tooltip). diff --git a/phone_app/lib/ui/theme.dart b/phone_app/lib/ui/theme.dart index 08b50e0..24b018e 100644 --- a/phone_app/lib/ui/theme.dart +++ b/phone_app/lib/ui/theme.dart @@ -6,7 +6,7 @@ /// hand-picked, not algorithmically derived from one seed color. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; /// Builds the app's single dark `ThemeData` from the shared token set. ThemeData buildAppTheme() { diff --git a/phone_app/pubspec.lock b/phone_app/pubspec.lock index bfbd908..f829dbe 100644 --- a/phone_app/pubspec.lock +++ b/phone_app/pubspec.lock @@ -77,10 +77,10 @@ packages: dependency: transitive description: name: clock - sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + sha256: e51d50bca3217c9a9fa2b41a30e4a38971133f5f9ec7a3d57bae095007f1d28e url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.3" code_assets: dependency: transitive description: @@ -101,11 +101,11 @@ packages: dependency: "direct main" description: path: crdt_sync_dart - ref: "crdt_sync_dart-v0.12.1" - resolved-ref: "6641d85f0550ca60433fc8e0d13a3dafdbb664d6" + ref: "crdt_sync_dart-v0.13.1" + resolved-ref: eebeb0b51053f160f163140141aba10a447ba1e8 url: "https://github.com/kuhyx/utils" source: git - version: "0.12.1" + version: "0.13.1" cross_file: dependency: transitive description: @@ -122,6 +122,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.8" + cryptography: + dependency: transitive + description: + name: cryptography + sha256: "3eda3029d34ec9095a27a198ac9785630fe525c0eb6a49f3d575272f8e792ef0" + url: "https://pub.dev" + source: hosted + version: "2.9.0" cupertino_icons: dependency: "direct main" description: @@ -130,6 +138,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.0" + cupertino_ui: + dependency: transitive + description: + name: cupertino_ui + sha256: "369e39a1c5c030a6212589c3da1809920b1c2cfade7b02aade7695bfa4b88c3a" + url: "https://pub.dev" + source: hosted + version: "1.1.6" data_transfer_flutter: dependency: "direct main" description: @@ -304,6 +320,11 @@ packages: url: "https://pub.dev" source: hosted version: "0.14.4" + flutter_localizations: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" flutter_secure_storage: dependency: "direct main" description: @@ -366,11 +387,11 @@ packages: dependency: "direct main" description: path: github_device_auth - ref: "github_device_auth-v0.4.0" - resolved-ref: "3084080d744c348a217727e26a6be838e7d5a4ff" + ref: "github_device_auth-v0.5.0" + resolved-ref: "0ef5461805e8f574de5174c940775e5245d675b3" url: "https://github.com/kuhyx/utils" source: git - version: "0.4.0" + version: "0.5.0" google_account_token: dependency: "direct main" description: @@ -412,6 +433,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.9.1" + intl: + dependency: transitive + description: + name: intl + sha256: "1ca20c894b1717686a2319b8548763d812bc0aabdac580420a44c5178c57a867" + url: "https://pub.dev" + source: hosted + version: "0.20.3" jni: dependency: transitive description: @@ -460,6 +489,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" + listen: + dependency: transitive + description: + name: listen + sha256: "47501a08016a43fcad79252439d723f50f14f88fa7bfd8a177e0a417e5c9e1f2" + url: "https://pub.dev" + source: hosted + version: "1.0.1" logging: dependency: transitive description: @@ -484,6 +521,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.13.0" + material_ui: + dependency: "direct main" + description: + name: material_ui + sha256: "474c135fd46b56ff1d35ca982155e8863d28fbc6464d1192acf4ee53a738680e" + url: "https://pub.dev" + source: hosted + version: "1.11.0" meta: dependency: transitive description: @@ -709,10 +754,10 @@ packages: dependency: transitive description: name: stack_trace - sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + sha256: "277654b3034d17ac6f9f1cb5595db011b1d5d41e8806866db28e0abaa101c490" url: "https://pub.dev" source: hosted - version: "1.12.1" + version: "1.12.2" stream_channel: dependency: transitive description: @@ -733,11 +778,11 @@ packages: dependency: "direct main" description: path: sync_settings_ui - ref: "sync_settings_ui-v0.7.0" - resolved-ref: "3084080d744c348a217727e26a6be838e7d5a4ff" + ref: "sync_settings_ui-v0.8.0" + resolved-ref: "0ef5461805e8f574de5174c940775e5245d675b3" url: "https://github.com/kuhyx/utils" source: git - version: "0.7.0" + version: "0.8.0" term_glyph: dependency: transitive description: @@ -750,10 +795,10 @@ packages: dependency: transitive description: name: test_api - sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11" + sha256: "0a10344e901e5b2e63819567951cb6a06673ed6b84f40462188ff5a0c41f371f" url: "https://pub.dev" source: hosted - version: "0.7.12" + version: "0.7.14" typed_data: dependency: transitive description: @@ -838,10 +883,10 @@ packages: dependency: transitive description: name: vector_math - sha256: f36f9f3be64c6198714492bb455c11056e33e2f85d9a0b676a48301e44fdcf47 + sha256: fa49e1674cb84acb900141714e6c6e1f9ae099827c24d141430ff6819db4e1bc url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.4.4" very_good_analysis: dependency: "direct dev" description: diff --git a/phone_app/pubspec.yaml b/phone_app/pubspec.yaml index c6255e7..e3b8f85 100644 --- a/phone_app/pubspec.yaml +++ b/phone_app/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: crdt_sync: git: url: https://github.com/kuhyx/utils - ref: crdt_sync_dart-v0.12.1 + ref: crdt_sync_dart-v0.13.1 path: crdt_sync_dart cupertino_icons: 2.0.0 @@ -31,7 +31,7 @@ dependencies: github_device_auth: git: url: https://github.com/kuhyx/utils - ref: github_device_auth-v0.4.0 + ref: github_device_auth-v0.5.0 path: github_device_auth google_account_token: git: @@ -39,6 +39,7 @@ dependencies: ref: google_account_token-v0.1.0 path: google_account_token http: 1.6.0 + material_ui: 1.11.0 path: 1.9.1 path_provider: 2.1.6 shared_preferences: 2.5.6 @@ -49,7 +50,7 @@ dependencies: sync_settings_ui: git: url: https://github.com/kuhyx/utils - ref: sync_settings_ui-v0.7.0 + ref: sync_settings_ui-v0.8.0 path: sync_settings_ui url_launcher: 6.3.3 uuid: 4.6.0 diff --git a/phone_app/test/free_days_screen_test.dart b/phone_app/test/free_days_screen_test.dart index 98c8b7d..d9c9707 100644 --- a/phone_app/test/free_days_screen_test.dart +++ b/phone_app/test/free_days_screen_test.dart @@ -1,8 +1,8 @@ import 'dart:io'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/free_days_screen.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; import 'package:wake_alarm_sync/services/free_day_pool.dart'; diff --git a/phone_app/test/free_days_sick_conflict_test.dart b/phone_app/test/free_days_sick_conflict_test.dart index c006ab4..59ea8e1 100644 --- a/phone_app/test/free_days_sick_conflict_test.dart +++ b/phone_app/test/free_days_sick_conflict_test.dart @@ -1,8 +1,8 @@ import 'dart:io'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/free_days_screen.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; import 'package:wake_alarm_sync/services/free_day_pool.dart'; diff --git a/phone_app/test/home_fit_test.dart b/phone_app/test/home_fit_test.dart index df9afcd..6cb1859 100644 --- a/phone_app/test/home_fit_test.dart +++ b/phone_app/test/home_fit_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:wake_alarm_sync/screens/home_body.dart'; import 'package:wake_alarm_sync/screens/home_history_card.dart'; diff --git a/phone_app/test/home_history_card_test.dart b/phone_app/test/home_history_card_test.dart index 323484e..2be2eb1 100644 --- a/phone_app/test/home_history_card_test.dart +++ b/phone_app/test/home_history_card_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:wake_alarm_sync/screens/home_history_card.dart'; import 'package:wake_alarm_sync/services/morning_session.dart'; diff --git a/phone_app/test/home_location_screen_test.dart b/phone_app/test/home_location_screen_test.dart index 9ce1b00..a12bd77 100644 --- a/phone_app/test/home_location_screen_test.dart +++ b/phone_app/test/home_location_screen_test.dart @@ -1,6 +1,6 @@ -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:wake_alarm_sync/screens/home_location_screen.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; diff --git a/phone_app/test/ring_away_test.dart b/phone_app/test/ring_away_test.dart index a4b7710..c638f9d 100644 --- a/phone_app/test/ring_away_test.dart +++ b/phone_app/test/ring_away_test.dart @@ -1,8 +1,8 @@ import 'dart:math'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:wake_alarm_sync/screens/ring_screen.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; diff --git a/phone_app/test/ring_bypass_test.dart b/phone_app/test/ring_bypass_test.dart index f93e9e0..5a8fac1 100644 --- a/phone_app/test/ring_bypass_test.dart +++ b/phone_app/test/ring_bypass_test.dart @@ -1,8 +1,8 @@ import 'dart:math'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:wake_alarm_sync/screens/ring_screen.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; diff --git a/phone_app/test/ring_route_test.dart b/phone_app/test/ring_route_test.dart index 28a7f02..5723811 100644 --- a/phone_app/test/ring_route_test.dart +++ b/phone_app/test/ring_route_test.dart @@ -1,8 +1,8 @@ import 'dart:math'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:wake_alarm_sync/main.dart'; import 'package:wake_alarm_sync/screens/ring_screen.dart'; diff --git a/phone_app/test/ring_session_handoff_test.dart b/phone_app/test/ring_session_handoff_test.dart index 9120b87..be37972 100644 --- a/phone_app/test/ring_session_handoff_test.dart +++ b/phone_app/test/ring_session_handoff_test.dart @@ -1,8 +1,8 @@ import 'dart:math'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:wake_alarm_sync/screens/ring_screen.dart'; import 'package:wake_alarm_sync/screens/session_screen.dart'; diff --git a/phone_app/test/ring_stakes_test.dart b/phone_app/test/ring_stakes_test.dart index d552b56..86d3e05 100644 --- a/phone_app/test/ring_stakes_test.dart +++ b/phone_app/test/ring_stakes_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:wake_alarm_sync/screens/ring_screen.dart'; import 'package:wake_alarm_sync/screens/ring_stakes_line.dart'; diff --git a/phone_app/test/room_proof_screen_test.dart b/phone_app/test/room_proof_screen_test.dart index 28f15a7..8e07a9d 100644 --- a/phone_app/test/room_proof_screen_test.dart +++ b/phone_app/test/room_proof_screen_test.dart @@ -1,6 +1,6 @@ -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:wake_alarm_sync/screens/room_proof_screen.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; diff --git a/phone_app/test/services/alarm_sync_service_test.dart b/phone_app/test/services/alarm_sync_service_test.dart index da08a3a..124a172 100644 --- a/phone_app/test/services/alarm_sync_service_test.dart +++ b/phone_app/test/services/alarm_sync_service_test.dart @@ -96,8 +96,9 @@ void main() { expect(putCalls, hasLength(1)); expect(putCalls.single.path, _alarmPath); final pushed = _decodePush(putCalls.single); - final fields = (pushed['alarm'] as Map)['fields'] - as Map; + final fields = + (pushed['alarm'] as Map)['fields'] + as Map; expect((fields['alarm_hour'] as List).first, 7); expect((fields['alarm_minute'] as List).first, 15); }); diff --git a/phone_app/test/services/challenge_test.dart b/phone_app/test/services/challenge_test.dart index 5ce8207..c702d39 100644 --- a/phone_app/test/services/challenge_test.dart +++ b/phone_app/test/services/challenge_test.dart @@ -72,8 +72,7 @@ void main() { final c = ChallengeGenerator(random: _FixedRandom([2, 3, 4])).math(); expect(c.display, contains('*')); final parts = RegExp(r'(\d+) \* (\d+)').firstMatch(c.display)!; - final product = - int.parse(parts.group(1)!) * int.parse(parts.group(2)!); + final product = int.parse(parts.group(1)!) * int.parse(parts.group(2)!); expect(c.answer, '$product'); }); diff --git a/phone_app/test/services/home_presence_test.dart b/phone_app/test/services/home_presence_test.dart index aade105..612b1f1 100644 --- a/phone_app/test/services/home_presence_test.dart +++ b/phone_app/test/services/home_presence_test.dart @@ -122,8 +122,7 @@ void main() { TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger .setMockMethodCallHandler( const MethodChannel(AlarmScheduler.channelName), - (call) async => - call.method == 'readPresence' ? reading() : null, + (call) async => call.method == 'readPresence' ? reading() : null, ); } diff --git a/phone_app/test/session_screen_catch_up_test.dart b/phone_app/test/session_screen_catch_up_test.dart index f5834fa..50c0ec6 100644 --- a/phone_app/test/session_screen_catch_up_test.dart +++ b/phone_app/test/session_screen_catch_up_test.dart @@ -1,6 +1,6 @@ -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:wake_alarm_sync/screens/session_screen.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; diff --git a/phone_app/test/session_screen_checkin_test.dart b/phone_app/test/session_screen_checkin_test.dart index 5a241b5..ab9fabe 100644 --- a/phone_app/test/session_screen_checkin_test.dart +++ b/phone_app/test/session_screen_checkin_test.dart @@ -1,8 +1,8 @@ import 'dart:async'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:wake_alarm_sync/screens/session_screen.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; diff --git a/phone_app/test/session_screen_relaunch_test.dart b/phone_app/test/session_screen_relaunch_test.dart index c42fa8f..71e4260 100644 --- a/phone_app/test/session_screen_relaunch_test.dart +++ b/phone_app/test/session_screen_relaunch_test.dart @@ -1,6 +1,6 @@ -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:wake_alarm_sync/screens/session_screen.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; diff --git a/phone_app/test/session_screen_test.dart b/phone_app/test/session_screen_test.dart index 37275b9..fa9b44a 100644 --- a/phone_app/test/session_screen_test.dart +++ b/phone_app/test/session_screen_test.dart @@ -1,6 +1,6 @@ -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:wake_alarm_sync/screens/session_screen.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; diff --git a/phone_app/test/session_tags_screen_test.dart b/phone_app/test/session_tags_screen_test.dart index 2d926e6..4be1176 100644 --- a/phone_app/test/session_tags_screen_test.dart +++ b/phone_app/test/session_tags_screen_test.dart @@ -1,6 +1,6 @@ -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:wake_alarm_sync/screens/session_tags_screen.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; diff --git a/phone_app/test/settings_screen_test.dart b/phone_app/test/settings_screen_test.dart index 0546ce9..6ce519d 100644 --- a/phone_app/test/settings_screen_test.dart +++ b/phone_app/test/settings_screen_test.dart @@ -1,13 +1,11 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/github_mirror_screen.dart'; import 'package:wake_alarm_sync/screens/settings_screen.dart'; import 'package:wake_alarm_sync/ui/theme.dart'; void main() { - testWidgets('shows the two sync links and navigates to each', ( - tester, - ) async { + testWidgets('shows the two sync links and navigates to each', (tester) async { await tester.pumpWidget( MaterialApp(theme: buildAppTheme(), home: const SettingsScreen()), ); diff --git a/phone_app/test/sick_day_sheet_test.dart b/phone_app/test/sick_day_sheet_test.dart index ce5a0b2..ce7cd9b 100644 --- a/phone_app/test/sick_day_sheet_test.dart +++ b/phone_app/test/sick_day_sheet_test.dart @@ -1,7 +1,7 @@ import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/day_calendar.dart'; import 'package:wake_alarm_sync/screens/sick_days_screen.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; diff --git a/phone_app/test/sick_days_screen_test.dart b/phone_app/test/sick_days_screen_test.dart index 59eed72..d94acc4 100644 --- a/phone_app/test/sick_days_screen_test.dart +++ b/phone_app/test/sick_days_screen_test.dart @@ -1,8 +1,8 @@ import 'dart:io'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/day_calendar.dart'; import 'package:wake_alarm_sync/screens/sick_days_screen.dart'; import 'package:wake_alarm_sync/services/alarm_scheduler.dart'; diff --git a/phone_app/test/stakes_card_test.dart b/phone_app/test/stakes_card_test.dart index 13132cd..0f13ebe 100644 --- a/phone_app/test/stakes_card_test.dart +++ b/phone_app/test/stakes_card_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:wake_alarm_sync/screens/home_body.dart'; import 'package:wake_alarm_sync/screens/stakes_card.dart'; diff --git a/phone_app/test/text_free_days_test.dart b/phone_app/test/text_free_days_test.dart index 34946bf..cb6abb4 100644 --- a/phone_app/test/text_free_days_test.dart +++ b/phone_app/test/text_free_days_test.dart @@ -1,7 +1,7 @@ import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/screens/free_days_screen.dart'; import 'package:wake_alarm_sync/screens/sick_day_sheet.dart'; import 'package:wake_alarm_sync/screens/sick_days_screen.dart'; diff --git a/phone_app/test/text_free_ring_test.dart b/phone_app/test/text_free_ring_test.dart index 7b6a4f9..4ea2abb 100644 --- a/phone_app/test/text_free_ring_test.dart +++ b/phone_app/test/text_free_ring_test.dart @@ -1,8 +1,8 @@ import 'dart:math'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:wake_alarm_sync/screens/ring_screen.dart'; import 'package:wake_alarm_sync/screens/session_screen.dart'; @@ -100,9 +100,7 @@ void main() { expectNoWords(tester, 'RingScreen-challenge-bypass'); }); - testWidgets('challenge after tag path — no words', ( - tester, - ) async { + testWidgets('challenge after tag path — no words', (tester) async { phoneView(tester); await pumpRing(tester); // Simulate tag 1 tap diff --git a/phone_app/test/text_free_support.dart b/phone_app/test/text_free_support.dart index 2b6bb81..dfb8f70 100644 --- a/phone_app/test/text_free_support.dart +++ b/phone_app/test/text_free_support.dart @@ -1,6 +1,6 @@ -import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; /// Every word painted on screen: text of each RenderParagraph (covers Text, /// Text.rich, button/chip labels and InputDecoration labels/hints), minus diff --git a/phone_app/test/text_free_sync_test.dart b/phone_app/test/text_free_sync_test.dart index cc18afc..adabdd6 100644 --- a/phone_app/test/text_free_sync_test.dart +++ b/phone_app/test/text_free_sync_test.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sync_settings_ui/sync_settings_ui.dart'; import 'package:wake_alarm_sync/ui/theme.dart'; diff --git a/phone_app/test/text_free_test.dart b/phone_app/test/text_free_test.dart index f363db7..61205da 100644 --- a/phone_app/test/text_free_test.dart +++ b/phone_app/test/text_free_test.dart @@ -1,6 +1,6 @@ -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:wake_alarm_sync/screens/escape_dialog.dart'; import 'package:wake_alarm_sync/screens/github_mirror_screen.dart'; diff --git a/phone_app/test/ui/cues_haptics_test.dart b/phone_app/test/ui/cues_haptics_test.dart index 42cedba..80ae81e 100644 --- a/phone_app/test/ui/cues_haptics_test.dart +++ b/phone_app/test/ui/cues_haptics_test.dart @@ -1,9 +1,9 @@ /// Tests for cues.dart: haptic feedback and semantics behavior. library; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/ui/cues.dart'; void main() { diff --git a/phone_app/test/ui/cues_test.dart b/phone_app/test/ui/cues_test.dart index 75d5c83..333f87c 100644 --- a/phone_app/test/ui/cues_test.dart +++ b/phone_app/test/ui/cues_test.dart @@ -1,8 +1,8 @@ /// Tests for cues.dart: CueKind classifier and StatusCue rendering. library; -import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:wake_alarm_sync/ui/cues.dart'; void main() {