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/pre-commit.yml b/.github/workflows/pre-commit.yml index 0a3e08a..6ed9be9 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -60,7 +60,7 @@ jobs: - uses: kuhyx/utils/flutter-setup@flutter-setup-v1 if: matrix.group == 'flutter' with: - flutter-version: 3.47.9 + flutter-version: 3.50.0 working-directory: stronglift_replacement/workout_app # analyze needs resolved packages (.dart_tool); the hook runs analyze # only, so fetch deps here first. diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index b6ce175..3910a93 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -99,7 +99,7 @@ jobs: # cache cost ~38 s to restore even on a hit. - uses: kuhyx/utils/flutter-setup@flutter-setup-v1 with: - flutter-version: 3.47.9 + flutter-version: 3.50.0 working-directory: stronglift_replacement/workout_app - name: flutter test --coverage, bucket ${{ matrix.shard }} diff --git a/.github/workflows/release-apk.yml b/.github/workflows/release-apk.yml index 848d248..efb7dd5 100644 --- a/.github/workflows/release-apk.yml +++ b/.github/workflows/release-apk.yml @@ -60,7 +60,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/stronglift_replacement/workout_app/lib/main.dart b/stronglift_replacement/workout_app/lib/main.dart index 3c1a02c..7f98505 100644 --- a/stronglift_replacement/workout_app/lib/main.dart +++ b/stronglift_replacement/workout_app/lib/main.dart @@ -1,7 +1,14 @@ import 'dart:async'; import 'dart:io' show HttpOverrides, Platform; -import 'package:flutter/material.dart'; + +// Framework material, for its MaterialLocalizations delegate only: material_ui +// ships its own MaterialLocalizations type, so a package that still calls the +// framework `showDialog` (crdt_sync_flutter did) finds none and throws a null +// check. +// ignore: deprecated_member_use, the only source of the framework delegate. +import 'package:flutter/material.dart' as fw show DefaultMaterialLocalizations; import 'package:flutter_foreground_task/flutter_foreground_task.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/sandbox/sandbox.dart'; import 'package:workout_app/sandbox/sandbox_http.dart'; @@ -196,6 +203,10 @@ class _WorkoutAppState extends State with WidgetsBindingObserver { // the launcher icon and the manifest label (android:label) already. debugShowCheckedModeBanner: false, theme: buildAppTheme(), + localizationsDelegates: const >[ + fw.DefaultMaterialLocalizations.delegate, + DefaultWidgetsLocalizations.delegate, + ], home: const HomeScreen(), // The one thing that must never be mistaken for the daily build: a // ribbon on every screen, in the error colour, on the sandbox only. diff --git a/stronglift_replacement/workout_app/lib/screens/github_mirror_screen.dart b/stronglift_replacement/workout_app/lib/screens/github_mirror_screen.dart index ba0e27c..67b45c8 100644 --- a/stronglift_replacement/workout_app/lib/screens/github_mirror_screen.dart +++ b/stronglift_replacement/workout_app/lib/screens/github_mirror_screen.dart @@ -12,10 +12,11 @@ library; import 'dart:async'; + import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:http/http.dart' as http; +import 'package:material_ui/material_ui.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:workout_app/services/github_device_auth.dart'; import 'package:workout_app/services/sync_settings.dart'; diff --git a/stronglift_replacement/workout_app/lib/screens/history_screen.dart b/stronglift_replacement/workout_app/lib/screens/history_screen.dart index 9f17b47..1896834 100644 --- a/stronglift_replacement/workout_app/lib/screens/history_screen.dart +++ b/stronglift_replacement/workout_app/lib/screens/history_screen.dart @@ -8,9 +8,10 @@ import 'dart:async'; import 'dart:convert'; import 'dart:developer' as developer; import 'dart:math'; + import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/models/manual_workout.dart'; import 'package:workout_app/models/run_record.dart'; import 'package:workout_app/models/run_track.dart'; diff --git a/stronglift_replacement/workout_app/lib/screens/home_screen.dart b/stronglift_replacement/workout_app/lib/screens/home_screen.dart index b9e3de7..4312e03 100644 --- a/stronglift_replacement/workout_app/lib/screens/home_screen.dart +++ b/stronglift_replacement/workout_app/lib/screens/home_screen.dart @@ -3,7 +3,7 @@ library; import 'dart:async'; import 'dart:developer'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/models/exercise.dart'; import 'package:workout_app/sandbox/sandbox_log.dart'; import 'package:workout_app/screens/history_screen.dart'; diff --git a/stronglift_replacement/workout_app/lib/screens/manual_workout_screen.dart b/stronglift_replacement/workout_app/lib/screens/manual_workout_screen.dart index 902a298..76b251a 100644 --- a/stronglift_replacement/workout_app/lib/screens/manual_workout_screen.dart +++ b/stronglift_replacement/workout_app/lib/screens/manual_workout_screen.dart @@ -15,7 +15,7 @@ library; import 'dart:async'; import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/models/manual_workout.dart'; import 'package:workout_app/sandbox/sandbox_log.dart'; import 'package:workout_app/services/done_today.dart'; diff --git a/stronglift_replacement/workout_app/lib/screens/run_detail_screen.dart b/stronglift_replacement/workout_app/lib/screens/run_detail_screen.dart index c64c494..eba9a90 100644 --- a/stronglift_replacement/workout_app/lib/screens/run_detail_screen.dart +++ b/stronglift_replacement/workout_app/lib/screens/run_detail_screen.dart @@ -4,7 +4,7 @@ /// value. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/models/run_track.dart'; import 'package:workout_app/services/map_tile_cache.dart'; import 'package:workout_app/services/run_format.dart'; diff --git a/stronglift_replacement/workout_app/lib/screens/run_screen.dart b/stronglift_replacement/workout_app/lib/screens/run_screen.dart index 2283aff..441fb25 100644 --- a/stronglift_replacement/workout_app/lib/screens/run_screen.dart +++ b/stronglift_replacement/workout_app/lib/screens/run_screen.dart @@ -10,8 +10,8 @@ import 'dart:async'; import 'package:audioplayers/audioplayers.dart'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:latlong2/latlong.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:workout_app/models/run_track.dart'; import 'package:workout_app/sandbox/sandbox_log.dart'; diff --git a/stronglift_replacement/workout_app/lib/screens/settings_screen.dart b/stronglift_replacement/workout_app/lib/screens/settings_screen.dart index a0c6bda..292ac88 100644 --- a/stronglift_replacement/workout_app/lib/screens/settings_screen.dart +++ b/stronglift_replacement/workout_app/lib/screens/settings_screen.dart @@ -8,9 +8,10 @@ library; import 'dart:async'; import 'dart:developer'; + import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; +import 'package:material_ui/material_ui.dart'; import 'package:sync_settings_ui/sync_settings_ui.dart'; import 'package:workout_app/models/exercise.dart'; import 'package:workout_app/models/workout_plan.dart'; diff --git a/stronglift_replacement/workout_app/lib/screens/workout_screen.dart b/stronglift_replacement/workout_app/lib/screens/workout_screen.dart index 0a35544..9883e74 100644 --- a/stronglift_replacement/workout_app/lib/screens/workout_screen.dart +++ b/stronglift_replacement/workout_app/lib/screens/workout_screen.dart @@ -5,7 +5,7 @@ library; import 'dart:async'; import 'dart:developer'; import 'package:audioplayers/audioplayers.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:vibration/vibration.dart'; import 'package:workout_app/models/break_intent.dart'; import 'package:workout_app/models/break_snapshot.dart'; diff --git a/stronglift_replacement/workout_app/lib/screens/workout_screen_finish.dart b/stronglift_replacement/workout_app/lib/screens/workout_screen_finish.dart index 9469926..627c6df 100644 --- a/stronglift_replacement/workout_app/lib/screens/workout_screen_finish.dart +++ b/stronglift_replacement/workout_app/lib/screens/workout_screen_finish.dart @@ -146,20 +146,18 @@ extension _WorkoutScreenFinish on _WorkoutScreenState { // PB (it rewards the recording, not the number), then the summary arrives // on the dialog motion token instead of appearing. Both start together. unawaited(_cues.workoutFinished()); - unawaited( - showDialog( - context: context, - barrierDismissible: false, - animationStyle: AnimationStyle( - duration: motionDuration(context, AppDuration.slow), - curve: AppCurve.decelerate, - reverseCurve: AppCurve.accelerate, - ), - builder: (_) => WorkoutSummaryDialog( - session: session, - syncResult: syncResult, - pcPoke: pcPoke, - ), + showDialog( + context: context, + barrierDismissible: false, + animationStyle: AnimationStyle( + duration: motionDuration(context, AppDuration.slow), + curve: AppCurve.decelerate, + reverseCurve: AppCurve.accelerate, + ), + builder: (_) => WorkoutSummaryDialog( + session: session, + syncResult: syncResult, + pcPoke: pcPoke, ), ); } diff --git a/stronglift_replacement/workout_app/lib/ui/theme.dart b/stronglift_replacement/workout_app/lib/ui/theme.dart index 20c7127..00a56db 100644 --- a/stronglift_replacement/workout_app/lib/ui/theme.dart +++ b/stronglift_replacement/workout_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/stronglift_replacement/workout_app/lib/widgets/animated_counter.dart b/stronglift_replacement/workout_app/lib/widgets/animated_counter.dart index e79eef4..aa23f23 100644 --- a/stronglift_replacement/workout_app/lib/widgets/animated_counter.dart +++ b/stronglift_replacement/workout_app/lib/widgets/animated_counter.dart @@ -1,7 +1,7 @@ /// A whole number that counts to its true value instead of snapping to it. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/ui/theme.dart'; /// Rebuilds [builder] with a number that eases from 0 to [value] on arrival, diff --git a/stronglift_replacement/workout_app/lib/widgets/break_banner.dart b/stronglift_replacement/workout_app/lib/widgets/break_banner.dart index a3741cd..ec06bfe 100644 --- a/stronglift_replacement/workout_app/lib/widgets/break_banner.dart +++ b/stronglift_replacement/workout_app/lib/widgets/break_banner.dart @@ -1,7 +1,7 @@ /// Countdown strip permanently reserved at the top of the workout screen. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/ui/theme.dart'; /// Fixed-height strip: the rest countdown, Skip, and the workout's Reset and diff --git a/stronglift_replacement/workout_app/lib/widgets/calendar_widget.dart b/stronglift_replacement/workout_app/lib/widgets/calendar_widget.dart index 61f5e15..e16d2d9 100644 --- a/stronglift_replacement/workout_app/lib/widgets/calendar_widget.dart +++ b/stronglift_replacement/workout_app/lib/widgets/calendar_widget.dart @@ -1,7 +1,7 @@ /// Monthly calendar showing which days had workouts. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/ui/theme.dart'; /// Monthly calendar widget that highlights days with completed workouts. diff --git a/stronglift_replacement/workout_app/lib/widgets/data_transfer_buttons.dart b/stronglift_replacement/workout_app/lib/widgets/data_transfer_buttons.dart index f7fedce..27599cb 100644 --- a/stronglift_replacement/workout_app/lib/widgets/data_transfer_buttons.dart +++ b/stronglift_replacement/workout_app/lib/widgets/data_transfer_buttons.dart @@ -3,7 +3,7 @@ library; import 'dart:developer' show log; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/services/data_transfer.dart'; import 'package:workout_app/services/storage_service.dart'; diff --git a/stronglift_replacement/workout_app/lib/widgets/exercise_settings_sheet.dart b/stronglift_replacement/workout_app/lib/widgets/exercise_settings_sheet.dart index 2ca0124..9c53637 100644 --- a/stronglift_replacement/workout_app/lib/widgets/exercise_settings_sheet.dart +++ b/stronglift_replacement/workout_app/lib/widgets/exercise_settings_sheet.dart @@ -5,7 +5,7 @@ library; import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/models/exercise.dart'; import 'package:workout_app/models/exercise_state.dart'; import 'package:workout_app/models/progression.dart'; diff --git a/stronglift_replacement/workout_app/lib/widgets/exercise_tile.dart b/stronglift_replacement/workout_app/lib/widgets/exercise_tile.dart index eaf1799..06ce24a 100644 --- a/stronglift_replacement/workout_app/lib/widgets/exercise_tile.dart +++ b/stronglift_replacement/workout_app/lib/widgets/exercise_tile.dart @@ -2,7 +2,7 @@ /// one row of warmup + set circles, and the progress line. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/models/exercise.dart'; import 'package:workout_app/models/exercise_state.dart'; import 'package:workout_app/models/progression.dart'; diff --git a/stronglift_replacement/workout_app/lib/widgets/pc_poke_line.dart b/stronglift_replacement/workout_app/lib/widgets/pc_poke_line.dart index 251ca5c..b1911eb 100644 --- a/stronglift_replacement/workout_app/lib/widgets/pc_poke_line.dart +++ b/stronglift_replacement/workout_app/lib/widgets/pc_poke_line.dart @@ -1,7 +1,7 @@ /// The one-line PC status on the workout summary. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/services/pc_poke_result.dart'; import 'package:workout_app/ui/theme.dart'; diff --git a/stronglift_replacement/workout_app/lib/widgets/rep_circle.dart b/stronglift_replacement/workout_app/lib/widgets/rep_circle.dart index 339fecf..934b73a 100644 --- a/stronglift_replacement/workout_app/lib/widgets/rep_circle.dart +++ b/stronglift_replacement/workout_app/lib/widgets/rep_circle.dart @@ -12,7 +12,7 @@ /// long press → reset to neutral library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/ui/theme.dart'; /// Visual state of a [RepCircle]. diff --git a/stronglift_replacement/workout_app/lib/widgets/run_map.dart b/stronglift_replacement/workout_app/lib/widgets/run_map.dart index 313ee68..a91d499 100644 --- a/stronglift_replacement/workout_app/lib/widgets/run_map.dart +++ b/stronglift_replacement/workout_app/lib/widgets/run_map.dart @@ -29,9 +29,9 @@ library; import 'dart:async'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:latlong2/latlong.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/models/run_track.dart'; import 'package:workout_app/services/map_tile_cache.dart'; import 'package:workout_app/ui/theme.dart'; diff --git a/stronglift_replacement/workout_app/lib/widgets/run_map_layers.dart b/stronglift_replacement/workout_app/lib/widgets/run_map_layers.dart index f017052..7aac3e7 100644 --- a/stronglift_replacement/workout_app/lib/widgets/run_map_layers.dart +++ b/stronglift_replacement/workout_app/lib/widgets/run_map_layers.dart @@ -1,9 +1,9 @@ /// The route, endpoint markers and attribution button drawn by `RunMap`. library; -import 'package:flutter/material.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:latlong2/latlong.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/models/run_track.dart'; import 'package:workout_app/ui/theme.dart'; diff --git a/stronglift_replacement/workout_app/lib/widgets/run_map_slot.dart b/stronglift_replacement/workout_app/lib/widgets/run_map_slot.dart index a2a0111..99049a1 100644 --- a/stronglift_replacement/workout_app/lib/widgets/run_map_slot.dart +++ b/stronglift_replacement/workout_app/lib/widgets/run_map_slot.dart @@ -2,8 +2,8 @@ library; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; import 'package:latlong2/latlong.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/models/run_track.dart'; import 'package:workout_app/services/map_tile_cache.dart'; import 'package:workout_app/ui/theme.dart'; diff --git a/stronglift_replacement/workout_app/lib/widgets/run_pace_picker.dart b/stronglift_replacement/workout_app/lib/widgets/run_pace_picker.dart index 3714792..e95f133 100644 --- a/stronglift_replacement/workout_app/lib/widgets/run_pace_picker.dart +++ b/stronglift_replacement/workout_app/lib/widgets/run_pace_picker.dart @@ -8,7 +8,7 @@ library; import 'dart:async'; import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/services/pace_band.dart'; import 'package:workout_app/services/run_format.dart'; import 'package:workout_app/ui/theme.dart'; diff --git a/stronglift_replacement/workout_app/lib/widgets/run_upload_badge.dart b/stronglift_replacement/workout_app/lib/widgets/run_upload_badge.dart index d4a19d4..c8811f1 100644 --- a/stronglift_replacement/workout_app/lib/widgets/run_upload_badge.dart +++ b/stronglift_replacement/workout_app/lib/widgets/run_upload_badge.dart @@ -3,7 +3,7 @@ library; import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/services/run_uploader.dart'; import 'package:workout_app/ui/theme.dart'; diff --git a/stronglift_replacement/workout_app/lib/widgets/runnerup_import_badge.dart b/stronglift_replacement/workout_app/lib/widgets/runnerup_import_badge.dart index 59717ee..43fe8af 100644 --- a/stronglift_replacement/workout_app/lib/widgets/runnerup_import_badge.dart +++ b/stronglift_replacement/workout_app/lib/widgets/runnerup_import_badge.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/services/runnerup_importer.dart'; /// The RunnerUp history import's state as a glyph, never as words: a small diff --git a/stronglift_replacement/workout_app/lib/widgets/sync_setup_banner.dart b/stronglift_replacement/workout_app/lib/widgets/sync_setup_banner.dart index 5c5bc85..39b87f1 100644 --- a/stronglift_replacement/workout_app/lib/widgets/sync_setup_banner.dart +++ b/stronglift_replacement/workout_app/lib/widgets/sync_setup_banner.dart @@ -6,7 +6,7 @@ /// a workout gets logged into a void again. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/ui/theme.dart'; /// Tells the user this workout will not reach the PC until sync is set up. diff --git a/stronglift_replacement/workout_app/lib/widgets/sync_status_card.dart b/stronglift_replacement/workout_app/lib/widgets/sync_status_card.dart index 185a359..f2c8fd2 100644 --- a/stronglift_replacement/workout_app/lib/widgets/sync_status_card.dart +++ b/stronglift_replacement/workout_app/lib/widgets/sync_status_card.dart @@ -6,7 +6,7 @@ /// all offer the fix rather than just reporting the problem. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/services/sync_status.dart'; import 'package:workout_app/ui/theme.dart'; diff --git a/stronglift_replacement/workout_app/lib/widgets/workout_summary_dialog.dart b/stronglift_replacement/workout_app/lib/widgets/workout_summary_dialog.dart index 8f5b6ef..72683e8 100644 --- a/stronglift_replacement/workout_app/lib/widgets/workout_summary_dialog.dart +++ b/stronglift_replacement/workout_app/lib/widgets/workout_summary_dialog.dart @@ -1,7 +1,7 @@ /// Dialog shown after a workout is finished, summarising results. library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:workout_app/models/workout_session.dart'; import 'package:workout_app/services/pc_poke_result.dart'; import 'package:workout_app/services/sync_service.dart'; diff --git a/stronglift_replacement/workout_app/pubspec.lock b/stronglift_replacement/workout_app/pubspec.lock index 17ef574..b382d5c 100644 --- a/stronglift_replacement/workout_app/pubspec.lock +++ b/stronglift_replacement/workout_app/pubspec.lock @@ -125,10 +125,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: @@ -149,11 +149,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.14.1" + resolved-ref: edd0f7a7882cb1d3904932ba94faa282d08165df url: "https://github.com/kuhyx/utils" source: git - version: "0.12.1" + version: "0.14.1" cross_file: dependency: transitive description: @@ -170,6 +170,22 @@ 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_ui: + dependency: transitive + description: + name: cupertino_ui + sha256: "369e39a1c5c030a6212589c3da1809920b1c2cfade7b02aade7695bfa4b88c3a" + url: "https://pub.dev" + source: hosted + version: "1.1.6" dart_earcut: dependency: transitive description: @@ -456,6 +472,11 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.1" + flutter_localizations: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" flutter_map: dependency: "direct main" description: @@ -747,6 +768,14 @@ packages: url: "https://pub.dev" source: hosted version: "6.1.0" + listen: + dependency: transitive + description: + name: listen + sha256: "47501a08016a43fcad79252439d723f50f14f88fa7bfd8a177e0a417e5c9e1f2" + url: "https://pub.dev" + source: hosted + version: "1.0.1" logging: dependency: transitive description: @@ -771,6 +800,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: @@ -1148,10 +1185,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: @@ -1172,11 +1209,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.2" + resolved-ref: "3225af8365481677d61a8cabec0c0ad4d0407567" url: "https://github.com/kuhyx/utils" source: git - version: "0.7.0" + version: "0.8.2" synchronized: dependency: transitive description: @@ -1197,10 +1234,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" timezone: dependency: transitive description: @@ -1301,10 +1338,10 @@ packages: dependency: transitive description: name: vector_math - sha256: "1d774bbdf6b72a0b12122fc1560c9c2d2a67db5a4a4cc2bd8a5c990ab20e3188" + sha256: fa49e1674cb84acb900141714e6c6e1f9ae099827c24d141430ff6819db4e1bc url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.4.4" very_good_analysis: dependency: "direct dev" description: diff --git a/stronglift_replacement/workout_app/pubspec.yaml b/stronglift_replacement/workout_app/pubspec.yaml index c79d5a2..0b0a37f 100644 --- a/stronglift_replacement/workout_app/pubspec.yaml +++ b/stronglift_replacement/workout_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.14.1 path: crdt_sync_dart # HMAC-SHA256 for the signed phone->PC workout poke (pc_poke_wire.dart). crypto: 3.0.8 @@ -52,6 +52,7 @@ dependencies: http: 1.6.0 http_cache_file_store: 2.0.2 latlong2: 0.10.1 + material_ui: 1.11.0 path: 1.9.1 path_provider: 2.1.6 permission_handler: 13.0.2 @@ -63,7 +64,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.2 path: sync_settings_ui url_launcher: 6.3.3 uuid: 4.6.0 diff --git a/stronglift_replacement/workout_app/test/app_root_dialog_test.dart b/stronglift_replacement/workout_app/test/app_root_dialog_test.dart new file mode 100644 index 0000000..d42c08d --- /dev/null +++ b/stronglift_replacement/workout_app/test/app_root_dialog_test.dart @@ -0,0 +1,66 @@ +import 'dart:async' show unawaited; + +// Framework material, for `showDialog` only: material_ui ships its own +// MaterialLocalizations type, so a package that still calls the framework +// `showDialog` (crdt_sync_flutter did) finds none under WorkoutApp and throws +// a null check. This opens one through the real app root. +// ignore: deprecated_member_use, the only source of the framework dialog. +import 'package:flutter/material.dart' as fw show showDialog; +import 'package:flutter_test/flutter_test.dart'; +import 'package:material_ui/material_ui.dart'; +import 'package:sqflite_common_ffi/sqflite_ffi.dart'; +import 'package:workout_app/main.dart'; +import 'package:workout_app/screens/home_screen.dart'; +import 'package:workout_app/services/storage_service.dart'; + +import 'fake_secure_storage.dart'; + +void main() { + setUpAll(() { + sqfliteFfiInit(); + databaseFactory = databaseFactoryFfi; + }); + + setUp(() async { + installFakeSecureStorage(); + StorageService.resetForTesting(); + await StorageService.init(); + }); + + Future pumpApp(WidgetTester tester) async { + await tester.runAsync(() async { + await tester.pumpWidget(const WorkoutApp()); + await Future.delayed(const Duration(milliseconds: 300)); + }); + await tester.pump(); + return tester.element(find.byType(HomeScreen)); + } + + testWidgets('a material_ui dialog opens through the app root', ( + tester, + ) async { + final context = await pumpApp(tester); + unawaited( + showDialog( + context: context, + builder: (_) => const AlertDialog(key: Key('mui-dialog')), + ), + ); + await tester.pumpAndSettle(); + expect(find.byKey(const Key('mui-dialog')), findsOneWidget); + expect(tester.takeException(), isNull); + }); + + testWidgets('a framework dialog opens through the app root', (tester) async { + final context = await pumpApp(tester); + unawaited( + fw.showDialog( + context: context, + builder: (_) => const SizedBox(key: Key('fw-dialog')), + ), + ); + await tester.pumpAndSettle(); + expect(find.byKey(const Key('fw-dialog')), findsOneWidget); + expect(tester.takeException(), isNull); + }); +} diff --git a/stronglift_replacement/workout_app/test/icon_finders.dart b/stronglift_replacement/workout_app/test/icon_finders.dart index ce31f33..64c1fa2 100644 --- a/stronglift_replacement/workout_app/test/icon_finders.dart +++ b/stronglift_replacement/workout_app/test/icon_finders.dart @@ -2,7 +2,7 @@ /// the icon's spoken `semanticLabel`). library; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; /// The [Icon] whose spoken label is exactly [label]. diff --git a/stronglift_replacement/workout_app/test/main_lifecycle_test.dart b/stronglift_replacement/workout_app/test/main_lifecycle_test.dart index 2ba191a..e88ac09 100644 --- a/stronglift_replacement/workout_app/test/main_lifecycle_test.dart +++ b/stronglift_replacement/workout_app/test/main_lifecycle_test.dart @@ -2,7 +2,7 @@ // // Linux returns early because main() never starts the socket there, so a // resume must not start one behind the lock screen's back. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/main.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/_history_test_fixtures.dart b/stronglift_replacement/workout_app/test/screens/_history_test_fixtures.dart index 7076450..a8608db 100644 --- a/stronglift_replacement/workout_app/test/screens/_history_test_fixtures.dart +++ b/stronglift_replacement/workout_app/test/screens/_history_test_fixtures.dart @@ -7,7 +7,7 @@ import 'dart:convert'; import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:http/testing.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/_home_test_fixtures.dart b/stronglift_replacement/workout_app/test/screens/_home_test_fixtures.dart index 9297b28..d3918b8 100644 --- a/stronglift_replacement/workout_app/test/screens/_home_test_fixtures.dart +++ b/stronglift_replacement/workout_app/test/screens/_home_test_fixtures.dart @@ -5,7 +5,7 @@ // statically and a fake could not intercept one. import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/screens/home_screen.dart'; import 'package:workout_app/services/workout_sync_service.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/_manual_screen_fixtures.dart b/stronglift_replacement/workout_app/test/screens/_manual_screen_fixtures.dart index 288365a..49d5fc0 100644 --- a/stronglift_replacement/workout_app/test/screens/_manual_screen_fixtures.dart +++ b/stronglift_replacement/workout_app/test/screens/_manual_screen_fixtures.dart @@ -3,7 +3,7 @@ // Hoisted to top level so the split test files import one definition (see // _history_test_fixtures.dart for why local copies drift). import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/services/workout_sync_service.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/_run_screen_fixtures.dart b/stronglift_replacement/workout_app/test/screens/_run_screen_fixtures.dart index edcd6ab..531fe84 100644 --- a/stronglift_replacement/workout_app/test/screens/_run_screen_fixtures.dart +++ b/stronglift_replacement/workout_app/test/screens/_run_screen_fixtures.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:latlong2/latlong.dart'; import 'package:workout_app/models/run_track.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/_workout_screen_test_fixtures.dart b/stronglift_replacement/workout_app/test/screens/_workout_screen_test_fixtures.dart index 9af85a5..8472ce4 100644 --- a/stronglift_replacement/workout_app/test/screens/_workout_screen_test_fixtures.dart +++ b/stronglift_replacement/workout_app/test/screens/_workout_screen_test_fixtures.dart @@ -4,7 +4,7 @@ // the interaction in `runAsync`: the widget-test zone fakes async, so a // sqflite-ffi write started from a plain pump hangs and takes the isolate // down on shutdown. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/models/exercise.dart'; import 'package:workout_app/screens/workout_screen.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/github_mirror_screen_auth_test.dart b/stronglift_replacement/workout_app/test/screens/github_mirror_screen_auth_test.dart index 6da6cbb..864f423 100644 --- a/stronglift_replacement/workout_app/test/screens/github_mirror_screen_auth_test.dart +++ b/stronglift_replacement/workout_app/test/screens/github_mirror_screen_auth_test.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; diff --git a/stronglift_replacement/workout_app/test/screens/github_mirror_screen_flow_test.dart b/stronglift_replacement/workout_app/test/screens/github_mirror_screen_flow_test.dart index f80f25e..74b3984 100644 --- a/stronglift_replacement/workout_app/test/screens/github_mirror_screen_flow_test.dart +++ b/stronglift_replacement/workout_app/test/screens/github_mirror_screen_flow_test.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; diff --git a/stronglift_replacement/workout_app/test/screens/github_mirror_screen_push_test.dart b/stronglift_replacement/workout_app/test/screens/github_mirror_screen_push_test.dart index 1ddc005..29d35ae 100644 --- a/stronglift_replacement/workout_app/test/screens/github_mirror_screen_push_test.dart +++ b/stronglift_replacement/workout_app/test/screens/github_mirror_screen_push_test.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; diff --git a/stronglift_replacement/workout_app/test/screens/github_mirror_screen_test.dart b/stronglift_replacement/workout_app/test/screens/github_mirror_screen_test.dart index 8ccd1a0..53bb73a 100644 --- a/stronglift_replacement/workout_app/test/screens/github_mirror_screen_test.dart +++ b/stronglift_replacement/workout_app/test/screens/github_mirror_screen_test.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; diff --git a/stronglift_replacement/workout_app/test/screens/history_chart_test.dart b/stronglift_replacement/workout_app/test/screens/history_chart_test.dart index 7372dc5..0ef68d4 100644 --- a/stronglift_replacement/workout_app/test/screens/history_chart_test.dart +++ b/stronglift_replacement/workout_app/test/screens/history_chart_test.dart @@ -4,7 +4,7 @@ import 'dart:convert'; import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:http/testing.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/history_planned_test.dart b/stronglift_replacement/workout_app/test/screens/history_planned_test.dart index 634da9c..9b33889 100644 --- a/stronglift_replacement/workout_app/test/screens/history_planned_test.dart +++ b/stronglift_replacement/workout_app/test/screens/history_planned_test.dart @@ -4,7 +4,7 @@ import 'dart:convert'; import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:http/testing.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/history_runs_test.dart b/stronglift_replacement/workout_app/test/screens/history_runs_test.dart index 49bf5df..d77b935 100644 --- a/stronglift_replacement/workout_app/test/screens/history_runs_test.dart +++ b/stronglift_replacement/workout_app/test/screens/history_runs_test.dart @@ -1,6 +1,6 @@ // Runs in the history: the overview strip, the one-entry-per-run merge with // the PC's runnerup_verified rows, the calendar, and opening the detail. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/models/run_track.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/history_screen_test.dart b/stronglift_replacement/workout_app/test/screens/history_screen_test.dart index c136fba..dea6ffe 100644 --- a/stronglift_replacement/workout_app/test/screens/history_screen_test.dart +++ b/stronglift_replacement/workout_app/test/screens/history_screen_test.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:http/testing.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/history_streak_motion_test.dart b/stronglift_replacement/workout_app/test/screens/history_streak_motion_test.dart index ff38141..5379da3 100644 --- a/stronglift_replacement/workout_app/test/screens/history_streak_motion_test.dart +++ b/stronglift_replacement/workout_app/test/screens/history_streak_motion_test.dart @@ -2,7 +2,7 @@ // The numbers themselves are untouched: only the road to them is animated. import 'dart:convert'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/models/workout_plan.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/home_launch_test.dart b/stronglift_replacement/workout_app/test/screens/home_launch_test.dart index b690f9e..a5b6833 100644 --- a/stronglift_replacement/workout_app/test/screens/home_launch_test.dart +++ b/stronglift_replacement/workout_app/test/screens/home_launch_test.dart @@ -2,7 +2,7 @@ // home screen and lands on the workout, the way todo lands on the editor. import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/screens/home_screen.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/home_run_entry_test.dart b/stronglift_replacement/workout_app/test/screens/home_run_entry_test.dart index e9a19b1..8cecd9a 100644 --- a/stronglift_replacement/workout_app/test/screens/home_run_entry_test.dart +++ b/stronglift_replacement/workout_app/test/screens/home_run_entry_test.dart @@ -1,5 +1,5 @@ // The run icon on the home screen opens the run screen. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:geolocator/geolocator.dart'; import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/home_screen_test.dart b/stronglift_replacement/workout_app/test/screens/home_screen_test.dart index d4ff9cf..a04b8c6 100644 --- a/stronglift_replacement/workout_app/test/screens/home_screen_test.dart +++ b/stronglift_replacement/workout_app/test/screens/home_screen_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/models/workout_plan.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/home_sync_card_test.dart b/stronglift_replacement/workout_app/test/screens/home_sync_card_test.dart index bae16f5..0bc084f 100644 --- a/stronglift_replacement/workout_app/test/screens/home_sync_card_test.dart +++ b/stronglift_replacement/workout_app/test/screens/home_sync_card_test.dart @@ -4,7 +4,7 @@ // workout-start paths. import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/models/workout_plan.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/manual_workout_date_test.dart b/stronglift_replacement/workout_app/test/screens/manual_workout_date_test.dart index 171de6d..602f635 100644 --- a/stronglift_replacement/workout_app/test/screens/manual_workout_date_test.dart +++ b/stronglift_replacement/workout_app/test/screens/manual_workout_date_test.dart @@ -1,6 +1,6 @@ // The workout date on the manual form: today up to a week ahead, the budget // read as of that date, and the refusals around it. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/screens/manual_workout_screen.dart'; import 'package:workout_app/services/workout_sync_service.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/manual_workout_screen_test.dart b/stronglift_replacement/workout_app/test/screens/manual_workout_screen_test.dart index 96eb854..6505c9c 100644 --- a/stronglift_replacement/workout_app/test/screens/manual_workout_screen_test.dart +++ b/stronglift_replacement/workout_app/test/screens/manual_workout_screen_test.dart @@ -1,5 +1,5 @@ import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/models/manual_workout.dart'; import 'package:workout_app/screens/manual_workout_screen.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/run_detail_screen_test.dart b/stronglift_replacement/workout_app/test/screens/run_detail_screen_test.dart index e09c2c9..a7edd8b 100644 --- a/stronglift_replacement/workout_app/test/screens/run_detail_screen_test.dart +++ b/stronglift_replacement/workout_app/test/screens/run_detail_screen_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/models/run_track.dart'; import 'package:workout_app/screens/run_detail_screen.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/run_screen_denied_test.dart b/stronglift_replacement/workout_app/test/screens/run_screen_denied_test.dart index 173f0b2..ea049ec 100644 --- a/stronglift_replacement/workout_app/test/screens/run_screen_denied_test.dart +++ b/stronglift_replacement/workout_app/test/screens/run_screen_denied_test.dart @@ -1,6 +1,6 @@ // Location refused: no map, no start, only the red icon; a grant later (the // app coming back from settings) brings the screen back. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/services/position_source.dart'; import 'package:workout_app/widgets/run_map.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/run_screen_idle_map_test.dart b/stronglift_replacement/workout_app/test/screens/run_screen_idle_map_test.dart index 1c89180..3b3cc08 100644 --- a/stronglift_replacement/workout_app/test/screens/run_screen_idle_map_test.dart +++ b/stronglift_replacement/workout_app/test/screens/run_screen_idle_map_test.dart @@ -1,6 +1,6 @@ // Before a run the map shows and follows where the user is; those display-only // fixes never reach the recorded track. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/widgets/run_map.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/run_screen_insets_test.dart b/stronglift_replacement/workout_app/test/screens/run_screen_insets_test.dart index 56f81d5..75e28ae 100644 --- a/stronglift_replacement/workout_app/test/screens/run_screen_insets_test.dart +++ b/stronglift_replacement/workout_app/test/screens/run_screen_insets_test.dart @@ -1,6 +1,6 @@ // R7: the run screen fits one Pixel 6a screen with no scrolling, clear of the // status bar and the gesture bar, in every phase. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import '../fake_audio_platform.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/run_screen_one_mode_test.dart b/stronglift_replacement/workout_app/test/screens/run_screen_one_mode_test.dart index bac9f5e..3745a9f 100644 --- a/stronglift_replacement/workout_app/test/screens/run_screen_one_mode_test.dart +++ b/stronglift_replacement/workout_app/test/screens/run_screen_one_mode_test.dart @@ -1,6 +1,6 @@ // One mode: every GPS activity is recorded with the running filter and written // as a Running TCX. There is no run/walk switch left on the screen. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/models/run_track.dart'; import 'package:workout_app/services/tcx_codec.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/run_screen_pace_test.dart b/stronglift_replacement/workout_app/test/screens/run_screen_pace_test.dart index a8278d3..e8da305 100644 --- a/stronglift_replacement/workout_app/test/screens/run_screen_pace_test.dart +++ b/stronglift_replacement/workout_app/test/screens/run_screen_pace_test.dart @@ -1,6 +1,6 @@ // The optional pace target on the run screen: the picker before the start, the // coloured current pace while recording, the cues, the notification. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/services/pace_band.dart'; import 'package:workout_app/ui/theme.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/run_screen_problems_test.dart b/stronglift_replacement/workout_app/test/screens/run_screen_problems_test.dart index 609d1be..9cd03b4 100644 --- a/stronglift_replacement/workout_app/test/screens/run_screen_problems_test.dart +++ b/stronglift_replacement/workout_app/test/screens/run_screen_problems_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/models/run_track.dart'; import 'package:workout_app/services/position_source.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/run_screen_sandbox_idle_test.dart b/stronglift_replacement/workout_app/test/screens/run_screen_sandbox_idle_test.dart index 38c368e..a74e940 100644 --- a/stronglift_replacement/workout_app/test/screens/run_screen_sandbox_idle_test.dart +++ b/stronglift_replacement/workout_app/test/screens/run_screen_sandbox_idle_test.dart @@ -1,6 +1,6 @@ // In the sandbox flavor the idle map sits on the replay's first fix: one dot // at the loop's start, not the whole lap walked before the run. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/run_screen_sandbox_test.dart b/stronglift_replacement/workout_app/test/screens/run_screen_sandbox_test.dart index 1fe835c..baca559 100644 --- a/stronglift_replacement/workout_app/test/screens/run_screen_sandbox_test.dart +++ b/stronglift_replacement/workout_app/test/screens/run_screen_sandbox_test.dart @@ -2,7 +2,7 @@ // replayed GPS loop, the recorder, the database and the no-op uploader. import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart'; import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/run_screen_test.dart b/stronglift_replacement/workout_app/test/screens/run_screen_test.dart index cccd917..576b683 100644 --- a/stronglift_replacement/workout_app/test/screens/run_screen_test.dart +++ b/stronglift_replacement/workout_app/test/screens/run_screen_test.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/screens/run_screen.dart'; import 'package:workout_app/services/position_source.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/settings_screen_deload_test.dart b/stronglift_replacement/workout_app/test/screens/settings_screen_deload_test.dart index 1cbc92e..7e7f03f 100644 --- a/stronglift_replacement/workout_app/test/screens/settings_screen_deload_test.dart +++ b/stronglift_replacement/workout_app/test/screens/settings_screen_deload_test.dart @@ -1,7 +1,7 @@ // Manual deload from the Settings screen's exercise sheet: the stored and // shown weights move, a refusal is spoken, a pending stepper write cannot // undo it, and the progression push fires when the sheet closes. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/screens/settings_screen.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/settings_screen_exercises_test.dart b/stronglift_replacement/workout_app/test/screens/settings_screen_exercises_test.dart index 1a33484..0081c92 100644 --- a/stronglift_replacement/workout_app/test/screens/settings_screen_exercises_test.dart +++ b/stronglift_replacement/workout_app/test/screens/settings_screen_exercises_test.dart @@ -1,6 +1,6 @@ // The PER EXERCISE section: each row opens the workout tile's settings sheet, // edits persist as they happen, and closing the sheet pushes to Firebase. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/screens/settings_screen.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/settings_screen_pc_link_test.dart b/stronglift_replacement/workout_app/test/screens/settings_screen_pc_link_test.dart index 8386679..d123f60 100644 --- a/stronglift_replacement/workout_app/test/screens/settings_screen_pc_link_test.dart +++ b/stronglift_replacement/workout_app/test/screens/settings_screen_pc_link_test.dart @@ -1,5 +1,5 @@ // The PC LINK section: shows the pairing, validates and persists the host. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/sandbox/sandbox_http.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/settings_screen_reset_test.dart b/stronglift_replacement/workout_app/test/screens/settings_screen_reset_test.dart index 9711a4b..17974de 100644 --- a/stronglift_replacement/workout_app/test/screens/settings_screen_reset_test.dart +++ b/stronglift_replacement/workout_app/test/screens/settings_screen_reset_test.dart @@ -1,5 +1,5 @@ import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/settings_screen_sandbox_test.dart b/stronglift_replacement/workout_app/test/screens/settings_screen_sandbox_test.dart index 378d50e..b3dbf68 100644 --- a/stronglift_replacement/workout_app/test/screens/settings_screen_sandbox_test.dart +++ b/stronglift_replacement/workout_app/test/screens/settings_screen_sandbox_test.dart @@ -1,6 +1,6 @@ // The SANDBOX section: present only in the sandbox flavor, and each of its // three controls acts on the (sandbox's) database and reports back. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/sandbox/sandbox.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/settings_screen_sound_test.dart b/stronglift_replacement/workout_app/test/screens/settings_screen_sound_test.dart index ff73a79..41c4843 100644 --- a/stronglift_replacement/workout_app/test/screens/settings_screen_sound_test.dart +++ b/stronglift_replacement/workout_app/test/screens/settings_screen_sound_test.dart @@ -1,5 +1,5 @@ // The Settings sound switch: one switch for every cue, remembered. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/screens/settings_screen.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/settings_screen_sync_test.dart b/stronglift_replacement/workout_app/test/screens/settings_screen_sync_test.dart index 35f1614..d0455a3 100644 --- a/stronglift_replacement/workout_app/test/screens/settings_screen_sync_test.dart +++ b/stronglift_replacement/workout_app/test/screens/settings_screen_sync_test.dart @@ -1,5 +1,5 @@ import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/settings_screen_test.dart b/stronglift_replacement/workout_app/test/screens/settings_screen_test.dart index 62b509a..c6a5490 100644 --- a/stronglift_replacement/workout_app/test/screens/settings_screen_test.dart +++ b/stronglift_replacement/workout_app/test/screens/settings_screen_test.dart @@ -1,5 +1,5 @@ import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/settings_screen_thresholds_test.dart b/stronglift_replacement/workout_app/test/screens/settings_screen_thresholds_test.dart index df3b156..2c14e4e 100644 --- a/stronglift_replacement/workout_app/test/screens/settings_screen_thresholds_test.dart +++ b/stronglift_replacement/workout_app/test/screens/settings_screen_thresholds_test.dart @@ -1,5 +1,5 @@ import 'package:crdt_sync/crdt_sync.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:http/http.dart' as http; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/settings_screen_transfer_test.dart b/stronglift_replacement/workout_app/test/screens/settings_screen_transfer_test.dart index 6680fe8..e5421c9 100644 --- a/stronglift_replacement/workout_app/test/screens/settings_screen_transfer_test.dart +++ b/stronglift_replacement/workout_app/test/screens/settings_screen_transfer_test.dart @@ -1,5 +1,5 @@ // The export/import buttons in Settings reload the screen after an import. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/screens/settings_screen.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/workout_breaks_restore_test.dart b/stronglift_replacement/workout_app/test/screens/workout_breaks_restore_test.dart index e7910fa..04b0200 100644 --- a/stronglift_replacement/workout_app/test/screens/workout_breaks_restore_test.dart +++ b/stronglift_replacement/workout_app/test/screens/workout_breaks_restore_test.dart @@ -2,7 +2,7 @@ // while the app was not. // // Split out of workout_breaks_test.dart to stay under the repo's 250-line cap. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/services/storage_service.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/workout_breaks_test.dart b/stronglift_replacement/workout_app/test/screens/workout_breaks_test.dart index b847498..1bf9113 100644 --- a/stronglift_replacement/workout_app/test/screens/workout_breaks_test.dart +++ b/stronglift_replacement/workout_app/test/screens/workout_breaks_test.dart @@ -2,7 +2,7 @@ // // Split out of workout_screen_test.dart, which keeps the render and // restore-on-construction tests. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/models/exercise.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/workout_cues_test.dart b/stronglift_replacement/workout_app/test/screens/workout_cues_test.dart index 1aca7d4..12b666b 100644 --- a/stronglift_replacement/workout_app/test/screens/workout_cues_test.dart +++ b/stronglift_replacement/workout_app/test/screens/workout_cues_test.dart @@ -1,6 +1,6 @@ // The feedback cues: a haptic on recording a set, and a haptic, a chime and // an arriving dialog on finishing. Reward the RECORDING, never the number. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/workout_finish_stop_failure_test.dart b/stronglift_replacement/workout_app/test/screens/workout_finish_stop_failure_test.dart index e354730..6f169fc 100644 --- a/stronglift_replacement/workout_app/test/screens/workout_finish_stop_failure_test.dart +++ b/stronglift_replacement/workout_app/test/screens/workout_finish_stop_failure_test.dart @@ -1,6 +1,6 @@ // Finishing a workout whose break service will not stop: the summary still // appears (the stop no longer gates it) and the failure is logged, not thrown. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart'; import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/workout_layout_test.dart b/stronglift_replacement/workout_app/test/screens/workout_layout_test.dart index dcd17c5..fa95e14 100644 --- a/stronglift_replacement/workout_app/test/screens/workout_layout_test.dart +++ b/stronglift_replacement/workout_app/test/screens/workout_layout_test.dart @@ -7,7 +7,7 @@ import 'dart:io'; import 'dart:ui' as ui; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/workout_lazy_service_test.dart b/stronglift_replacement/workout_app/test/screens/workout_lazy_service_test.dart index 9cc5085..f49ccd5 100644 --- a/stronglift_replacement/workout_app/test/screens/workout_lazy_service_test.dart +++ b/stronglift_replacement/workout_app/test/screens/workout_lazy_service_test.dart @@ -1,7 +1,7 @@ // When the break service starts: on open for a restored session, on the // first tap for a fresh one -- the launch opens the workout by itself, and // just opening the app must not leave a notification behind. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart'; import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/workout_pause_test.dart b/stronglift_replacement/workout_app/test/screens/workout_pause_test.dart index 6fc6a42..cf217a1 100644 --- a/stronglift_replacement/workout_app/test/screens/workout_pause_test.dart +++ b/stronglift_replacement/workout_app/test/screens/workout_pause_test.dart @@ -1,6 +1,6 @@ // An exercise on an injury pause: no sets to tap, Finish does not wait for // it, the notification skips it, and it is recorded as FAILED. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart'; import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/workout_screen_deload_test.dart b/stronglift_replacement/workout_app/test/screens/workout_screen_deload_test.dart index 1492a2a..a6904a8 100644 --- a/stronglift_replacement/workout_app/test/screens/workout_screen_deload_test.dart +++ b/stronglift_replacement/workout_app/test/screens/workout_screen_deload_test.dart @@ -4,7 +4,7 @@ import 'dart:convert'; import 'dart:io'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart'; import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/workout_screen_intents_stale_test.dart b/stronglift_replacement/workout_app/test/screens/workout_screen_intents_stale_test.dart index b3bf4a9..15457f1 100644 --- a/stronglift_replacement/workout_app/test/screens/workout_screen_intents_stale_test.dart +++ b/stronglift_replacement/workout_app/test/screens/workout_screen_intents_stale_test.dart @@ -4,7 +4,7 @@ // Split out of workout_screen_intents_test.dart to stay under the repo's // 250-line cap; the shared setup is duplicated rather than exported because // each test file owns its own fakes. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart'; import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/workout_screen_intents_test.dart b/stronglift_replacement/workout_app/test/screens/workout_screen_intents_test.dart index 4c7666f..b57ed18 100644 --- a/stronglift_replacement/workout_app/test/screens/workout_screen_intents_test.dart +++ b/stronglift_replacement/workout_app/test/screens/workout_screen_intents_test.dart @@ -4,7 +4,7 @@ // The real client reports isSupported == false off Android, so these inject a // fake one -- otherwise the whole notification path is dead code on the test // host and none of these rules would ever be exercised. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart'; import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/workout_screen_test.dart b/stronglift_replacement/workout_app/test/screens/workout_screen_test.dart index a6d10d6..47510df 100644 --- a/stronglift_replacement/workout_app/test/screens/workout_screen_test.dart +++ b/stronglift_replacement/workout_app/test/screens/workout_screen_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/models/exercise.dart'; diff --git a/stronglift_replacement/workout_app/test/screens/workout_sound_switch_test.dart b/stronglift_replacement/workout_app/test/screens/workout_sound_switch_test.dart index bbe50ef..65fbf3d 100644 --- a/stronglift_replacement/workout_app/test/screens/workout_sound_switch_test.dart +++ b/stronglift_replacement/workout_app/test/screens/workout_sound_switch_test.dart @@ -1,6 +1,6 @@ // The sound switch reaches every sound: the break-end cue on screen, and the // foreground service that rings it when the screen is off. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart'; import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart'; diff --git a/stronglift_replacement/workout_app/test/text_free_guard_test.dart b/stronglift_replacement/workout_app/test/text_free_guard_test.dart index 3ce45b3..ca6083f 100644 --- a/stronglift_replacement/workout_app/test/text_free_guard_test.dart +++ b/stronglift_replacement/workout_app/test/text_free_guard_test.dart @@ -5,7 +5,7 @@ // besides exercise names and unit symbols after numbers. import 'dart:convert'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/models/exercise.dart'; diff --git a/stronglift_replacement/workout_app/test/text_free_widgets_guard_test.dart b/stronglift_replacement/workout_app/test/text_free_widgets_guard_test.dart index fa23a20..9548753 100644 --- a/stronglift_replacement/workout_app/test/text_free_widgets_guard_test.dart +++ b/stronglift_replacement/workout_app/test/text_free_widgets_guard_test.dart @@ -1,7 +1,7 @@ // textgate guard, widget states the screen-level guard does not reach: // every sync-card state, every PC poke outcome, the settings sheet in each // progression mode, and the GitHub mirror screen. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/models/exercise_state.dart'; diff --git a/stronglift_replacement/workout_app/test/ui/motion_test.dart b/stronglift_replacement/workout_app/test/ui/motion_test.dart index 3bba2a6..45577ea 100644 --- a/stronglift_replacement/workout_app/test/ui/motion_test.dart +++ b/stronglift_replacement/workout_app/test/ui/motion_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/ui/theme.dart'; diff --git a/stronglift_replacement/workout_app/test/ui/theme_test.dart b/stronglift_replacement/workout_app/test/ui/theme_test.dart index e59338e..6e503d4 100644 --- a/stronglift_replacement/workout_app/test/ui/theme_test.dart +++ b/stronglift_replacement/workout_app/test/ui/theme_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/ui/theme.dart'; diff --git a/stronglift_replacement/workout_app/test/widget_test.dart b/stronglift_replacement/workout_app/test/widget_test.dart index aac3b01..ae1be76 100644 --- a/stronglift_replacement/workout_app/test/widget_test.dart +++ b/stronglift_replacement/workout_app/test/widget_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:workout_app/main.dart'; diff --git a/stronglift_replacement/workout_app/test/widgets/_run_map_fixtures.dart b/stronglift_replacement/workout_app/test/widgets/_run_map_fixtures.dart index be89ed8..99ce167 100644 --- a/stronglift_replacement/workout_app/test/widgets/_run_map_fixtures.dart +++ b/stronglift_replacement/workout_app/test/widgets/_run_map_fixtures.dart @@ -7,7 +7,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter/services.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/stronglift_replacement/workout_app/test/widgets/animated_counter_test.dart b/stronglift_replacement/workout_app/test/widgets/animated_counter_test.dart index d6fa218..6663f68 100644 --- a/stronglift_replacement/workout_app/test/widgets/animated_counter_test.dart +++ b/stronglift_replacement/workout_app/test/widgets/animated_counter_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/ui/theme.dart'; import 'package:workout_app/widgets/animated_counter.dart'; diff --git a/stronglift_replacement/workout_app/test/widgets/break_banner_test.dart b/stronglift_replacement/workout_app/test/widgets/break_banner_test.dart index 1407409..e667539 100644 --- a/stronglift_replacement/workout_app/test/widgets/break_banner_test.dart +++ b/stronglift_replacement/workout_app/test/widgets/break_banner_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/ui/theme.dart'; import 'package:workout_app/widgets/break_banner.dart'; diff --git a/stronglift_replacement/workout_app/test/widgets/calendar_widget_test.dart b/stronglift_replacement/workout_app/test/widgets/calendar_widget_test.dart index 8c7a986..703dd46 100644 --- a/stronglift_replacement/workout_app/test/widgets/calendar_widget_test.dart +++ b/stronglift_replacement/workout_app/test/widgets/calendar_widget_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/ui/theme.dart'; import 'package:workout_app/widgets/calendar_widget.dart'; diff --git a/stronglift_replacement/workout_app/test/widgets/data_transfer_buttons_test.dart b/stronglift_replacement/workout_app/test/widgets/data_transfer_buttons_test.dart index 5bac90b..ce5592d 100644 --- a/stronglift_replacement/workout_app/test/widgets/data_transfer_buttons_test.dart +++ b/stronglift_replacement/workout_app/test/widgets/data_transfer_buttons_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/services/storage_service.dart'; import 'package:workout_app/ui/theme.dart'; diff --git a/stronglift_replacement/workout_app/test/widgets/exercise_settings_sheet_deload_test.dart b/stronglift_replacement/workout_app/test/widgets/exercise_settings_sheet_deload_test.dart index 290b1f8..b162060 100644 --- a/stronglift_replacement/workout_app/test/widgets/exercise_settings_sheet_deload_test.dart +++ b/stronglift_replacement/workout_app/test/widgets/exercise_settings_sheet_deload_test.dart @@ -1,5 +1,5 @@ // The "Deload now" row: confirm dialog, host hand-off, re-render. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/models/exercise_state.dart'; import 'package:workout_app/models/workout_plan.dart'; diff --git a/stronglift_replacement/workout_app/test/widgets/exercise_settings_sheet_test.dart b/stronglift_replacement/workout_app/test/widgets/exercise_settings_sheet_test.dart index 63c113a..15d7390 100644 --- a/stronglift_replacement/workout_app/test/widgets/exercise_settings_sheet_test.dart +++ b/stronglift_replacement/workout_app/test/widgets/exercise_settings_sheet_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/models/exercise_state.dart'; import 'package:workout_app/models/progression.dart'; diff --git a/stronglift_replacement/workout_app/test/widgets/exercise_tile_motion_test.dart b/stronglift_replacement/workout_app/test/widgets/exercise_tile_motion_test.dart index aa0903c..3983fe6 100644 --- a/stronglift_replacement/workout_app/test/widgets/exercise_tile_motion_test.dart +++ b/stronglift_replacement/workout_app/test/widgets/exercise_tile_motion_test.dart @@ -1,6 +1,6 @@ // The warmup circle's fill is the app's one implicit animation: its duration // is the motion token, and the OS "remove animations" setting zeroes it. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/models/exercise.dart'; import 'package:workout_app/models/exercise_state.dart'; diff --git a/stronglift_replacement/workout_app/test/widgets/exercise_tile_test.dart b/stronglift_replacement/workout_app/test/widgets/exercise_tile_test.dart index 91ca919..eeecf74 100644 --- a/stronglift_replacement/workout_app/test/widgets/exercise_tile_test.dart +++ b/stronglift_replacement/workout_app/test/widgets/exercise_tile_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/models/exercise.dart'; import 'package:workout_app/models/exercise_state.dart'; diff --git a/stronglift_replacement/workout_app/test/widgets/pc_poke_line_test.dart b/stronglift_replacement/workout_app/test/widgets/pc_poke_line_test.dart index 8cc95bc..6299431 100644 --- a/stronglift_replacement/workout_app/test/widgets/pc_poke_line_test.dart +++ b/stronglift_replacement/workout_app/test/widgets/pc_poke_line_test.dart @@ -1,7 +1,7 @@ // PcPokeLine: a spinner while the poke is in flight, then one coloured line. import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/services/pc_poke_result.dart'; import 'package:workout_app/ui/theme.dart'; diff --git a/stronglift_replacement/workout_app/test/widgets/rep_circle_test.dart b/stronglift_replacement/workout_app/test/widgets/rep_circle_test.dart index f8825f8..a3ee2e2 100644 --- a/stronglift_replacement/workout_app/test/widgets/rep_circle_test.dart +++ b/stronglift_replacement/workout_app/test/widgets/rep_circle_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/ui/theme.dart'; import 'package:workout_app/widgets/rep_circle.dart'; diff --git a/stronglift_replacement/workout_app/test/widgets/run_map_position_test.dart b/stronglift_replacement/workout_app/test/widgets/run_map_position_test.dart index cc2a2a8..ddedcd7 100644 --- a/stronglift_replacement/workout_app/test/widgets/run_map_position_test.dart +++ b/stronglift_replacement/workout_app/test/widgets/run_map_position_test.dart @@ -1,5 +1,5 @@ // RunMap.live with a current-position listenable: the idle map before a run. -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:latlong2/latlong.dart'; diff --git a/stronglift_replacement/workout_app/test/widgets/run_map_test.dart b/stronglift_replacement/workout_app/test/widgets/run_map_test.dart index dc1e0bf..f75f64f 100644 --- a/stronglift_replacement/workout_app/test/widgets/run_map_test.dart +++ b/stronglift_replacement/workout_app/test/widgets/run_map_test.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_map/flutter_map.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:latlong2/latlong.dart'; diff --git a/stronglift_replacement/workout_app/test/widgets/run_pace_picker_test.dart b/stronglift_replacement/workout_app/test/widgets/run_pace_picker_test.dart index 7d510f0..34ca937 100644 --- a/stronglift_replacement/workout_app/test/widgets/run_pace_picker_test.dart +++ b/stronglift_replacement/workout_app/test/widgets/run_pace_picker_test.dart @@ -1,7 +1,7 @@ // The pace picker: a pace icon, and when on, - m:ss + in 0:05 steps. No // Scrollable, so it fits the no-scroll run screen. import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/services/pace_band.dart'; import 'package:workout_app/ui/theme.dart'; diff --git a/stronglift_replacement/workout_app/test/widgets/runnerup_import_badge_test.dart b/stronglift_replacement/workout_app/test/widgets/runnerup_import_badge_test.dart index 3eabd79..1f4bca7 100644 --- a/stronglift_replacement/workout_app/test/widgets/runnerup_import_badge_test.dart +++ b/stronglift_replacement/workout_app/test/widgets/runnerup_import_badge_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/services/runnerup_importer.dart'; import 'package:workout_app/widgets/runnerup_import_badge.dart'; diff --git a/stronglift_replacement/workout_app/test/widgets/sync_status_card_test.dart b/stronglift_replacement/workout_app/test/widgets/sync_status_card_test.dart index 5830294..a1c7dac 100644 --- a/stronglift_replacement/workout_app/test/widgets/sync_status_card_test.dart +++ b/stronglift_replacement/workout_app/test/widgets/sync_status_card_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/services/sync_status.dart'; import 'package:workout_app/ui/theme.dart'; diff --git a/stronglift_replacement/workout_app/test/widgets/workout_summary_dialog_test.dart b/stronglift_replacement/workout_app/test/widgets/workout_summary_dialog_test.dart index b096011..ab8dd55 100644 --- a/stronglift_replacement/workout_app/test/widgets/workout_summary_dialog_test.dart +++ b/stronglift_replacement/workout_app/test/widgets/workout_summary_dialog_test.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:material_ui/material_ui.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:workout_app/models/exercise.dart'; import 'package:workout_app/models/exercise_result.dart';