From 421d19f91f916e9c11f27ba71db04e780584129c Mon Sep 17 00:00:00 2001 From: Andreas Fahrecker Date: Fri, 15 Mar 2024 21:09:16 +0100 Subject: [PATCH] Fixed Remaining Problems --- lib/app.dart | 14 ++++++++------ lib/helper_functions.dart | 2 +- lib/middleware/store_middleware.dart | 3 --- lib/models/app_exceptions.dart | 6 +++--- lib/models/app_settings.dart | 12 ++++++------ lib/models/app_state.dart | 8 +++++--- lib/models/time_progress.dart | 11 ++++++----- lib/persistence/app_settings.dart | 6 +++--- lib/screens/progress_creation_screen.dart | 10 ++++++---- lib/screens/progress_detail_screen.dart | 10 +++++----- lib/selectors/time_progress_selectors.dart | 7 ++++--- lib/widgets/app_yes_no_dialog_widget.dart | 18 +++++++++--------- lib/widgets/buttons/color_picker_btn.dart | 17 +++++++++-------- lib/widgets/buttons/date_picker_btn.dart | 15 ++++++++------- lib/widgets/buttons/select_duration_btn.dart | 10 +++++----- .../detail_screen_floating_action_buttons.dart | 18 +++++++++--------- lib/widgets/home/home_bottom_navbar.dart | 6 +++--- .../tabs/settings/color_settings_widget.dart | 8 ++++---- .../settings/duration_settings_widget.dart | 4 ++-- lib/widgets/progress_editor_widget.dart | 14 ++++++++++---- .../progress_list_view/progress_list_tile.dart | 6 +++--- .../progress_list_view/progress_list_view.dart | 6 +++--- lib/widgets/progress_view_widget.dart | 6 +++--- .../settings_store_connector.dart | 2 +- .../time_progress_list_store_connector.dart | 2 +- .../time_progress_store_connector.dart | 9 ++------- test/material_tester_widget.dart | 2 +- 27 files changed, 120 insertions(+), 112 deletions(-) diff --git a/lib/app.dart b/lib/app.dart index e64dd55..a7e8198 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -12,9 +12,9 @@ class TimeProgressTrackerApp extends StatelessWidget { final Store store; const TimeProgressTrackerApp({ - Key key, - this.store, - }) : super(key: key); + super.key, + required this.store, + }); @override Widget build(BuildContext context) { @@ -24,14 +24,16 @@ class TimeProgressTrackerApp extends StatelessWidget { title: name, theme: ThemeData( primarySwatch: Colors.indigo, - accentColor: Colors.indigoAccent, + colorScheme: ColorScheme.fromSwatch( + primarySwatch: Colors.indigo, + accentColor: Colors.indigoAccent, + ), brightness: Brightness.light, visualDensity: VisualDensity.adaptivePlatformDensity, ), initialRoute: HomeScreen.routeName, routes: { - HomeScreen.routeName: (BuildContext context) => - const HomeScreen(), + HomeScreen.routeName: (BuildContext context) => const HomeScreen(), ProgressDetailScreen.routeName: (BuildContext context) => const ProgressDetailScreen(), ProgressCreationScreen.routeName: (BuildContext context) => diff --git a/lib/helper_functions.dart b/lib/helper_functions.dart index 7dc02a0..53bebc7 100644 --- a/lib/helper_functions.dart +++ b/lib/helper_functions.dart @@ -3,7 +3,7 @@ import 'dart:ui'; import 'package:time_progress_tracker/models/time_progress.dart'; TimeProgress selectProgressById(List tpList, String id) => - tpList.firstWhere((tp) => tp.id == id, orElse: null); + tpList.firstWhere((tp) => tp.id == id, orElse: () => TimeProgress.initialDefault()); List selectActiveProgresses(List tpList) => tpList.where((tp) => tp.hasStarted() && !tp.hasEnded()).toList(); diff --git a/lib/middleware/store_middleware.dart b/lib/middleware/store_middleware.dart index 079452a..16ff6e3 100644 --- a/lib/middleware/store_middleware.dart +++ b/lib/middleware/store_middleware.dart @@ -45,9 +45,6 @@ Middleware _createLoadTimeProgressList( repository.loadTimeProgressList().then((timeProgresses) { List timeProgressList = timeProgresses.map(TimeProgress.fromEntity).toList(); - if (timeProgressList == null) { - timeProgressList = []; - } store.dispatch(TimeProgressListLoadedAction( timeProgressList, )); diff --git a/lib/models/app_exceptions.dart b/lib/models/app_exceptions.dart index dedc93d..cc339e5 100644 --- a/lib/models/app_exceptions.dart +++ b/lib/models/app_exceptions.dart @@ -1,5 +1,5 @@ class TimeProgressInvalidNameException implements Exception { - final invalidName; + final String invalidName; TimeProgressInvalidNameException(this.invalidName); @@ -7,8 +7,8 @@ class TimeProgressInvalidNameException implements Exception { } class TimeProgressStartTimeIsNotBeforeEndTimeException implements Exception { - final startTime; - final endTime; + final DateTime startTime; + final DateTime endTime; TimeProgressStartTimeIsNotBeforeEndTimeException( this.startTime, this.endTime); diff --git a/lib/models/app_settings.dart b/lib/models/app_settings.dart index 886471b..0e39fc8 100644 --- a/lib/models/app_settings.dart +++ b/lib/models/app_settings.dart @@ -8,9 +8,9 @@ class AppSettings { final Duration duration; const AppSettings({ - this.doneColor, - this.leftColor, - this.duration, + required this.doneColor, + required this.leftColor, + required this.duration, }); factory AppSettings.defaults() => const AppSettings( @@ -20,9 +20,9 @@ class AppSettings { ); AppSettings copyWith({ - Color doneColor, - Color leftColor, - Duration duration, + Color? doneColor, + Color? leftColor, + Duration? duration, }) => AppSettings( doneColor: doneColor ?? this.doneColor, diff --git a/lib/models/app_state.dart b/lib/models/app_state.dart index 5b65c99..f589f6d 100644 --- a/lib/models/app_state.dart +++ b/lib/models/app_state.dart @@ -12,18 +12,20 @@ class AppState { {this.hasProgressesLoaded = false, this.hasSettingsLoaded = false, this.timeProgressList = const [], - this.appSettings}); + required this.appSettings}); factory AppState.initial() => AppState(hasProgressesLoaded: false, appSettings: AppSettings.defaults()); AppState copyWith({ - bool hasLoaded, - List timeProgressList, + bool? hasLoaded, + List? timeProgressList, + AppSettings? appSettings, }) { return AppState( hasProgressesLoaded: hasLoaded ?? hasProgressesLoaded, timeProgressList: timeProgressList ?? this.timeProgressList, + appSettings: appSettings ?? this.appSettings, ); } diff --git a/lib/models/time_progress.dart b/lib/models/time_progress.dart index 7a5d479..3f94703 100644 --- a/lib/models/time_progress.dart +++ b/lib/models/time_progress.dart @@ -10,7 +10,7 @@ class TimeProgress { final DateTime startTime; final DateTime endTime; - TimeProgress(this.name, this.startTime, this.endTime, {String id}) + TimeProgress(this.name, this.startTime, this.endTime, {String? id}) : id = id ?? Uuid().generateV4(); factory TimeProgress.initialDefault() { @@ -23,7 +23,7 @@ class TimeProgress { TimeProgress("", DateTime.now(), DateTime.now().add(duration)); TimeProgress copyWith( - {String id, String name, DateTime startTime, DateTime endTime}) => + {String? id, String? name, DateTime? startTime, DateTime? endTime}) => TimeProgress( name ?? this.name, startTime ?? this.startTime, @@ -83,21 +83,22 @@ class TimeProgress { throw TimeProgressInvalidNameException(name); } if (!TimeProgress.areTimesValid(startTime, endTime)) { - throw TimeProgressStartTimeIsNotBeforeEndTimeException(startTime, endTime); + throw TimeProgressStartTimeIsNotBeforeEndTimeException( + startTime, endTime); } return TimeProgressEntity(id, name, startTime, endTime); } static TimeProgress fromEntity(TimeProgressEntity entity) => TimeProgress(entity.name, entity.startTime, entity.endTime, - id: entity.id ?? Uuid().generateV4()); + id: entity.id); static bool isValid(TimeProgress tp) => TimeProgress.isNameValid(tp.name) && TimeProgress.areTimesValid(tp.startTime, tp.endTime); static bool isNameValid(String name) => - name != null && name != "" && name.length > 2 && name.length < 21; + name != "" && name.length > 2 && name.length < 21; static bool areTimesValid(DateTime startTime, DateTime endTime) => startTime.isBefore(endTime); diff --git a/lib/persistence/app_settings.dart b/lib/persistence/app_settings.dart index 8b6ce35..75924a8 100644 --- a/lib/persistence/app_settings.dart +++ b/lib/persistence/app_settings.dart @@ -53,8 +53,8 @@ class AppSettingsEntity { static AppSettingsEntity fromJson(Map json) => AppSettingsEntity( - json[_doneKey], - json[_leftKey], - json[_durationDaysKey], + json[_doneKey] as int, + json[_leftKey] as int, + json[_durationDaysKey] as int, ); } diff --git a/lib/screens/progress_creation_screen.dart b/lib/screens/progress_creation_screen.dart index 3a3b2ae..915fd72 100644 --- a/lib/screens/progress_creation_screen.dart +++ b/lib/screens/progress_creation_screen.dart @@ -54,7 +54,8 @@ class _ProgressCreationScreenState extends State { builder: (context, _ViewModel viewModel) { initTimeProgress(viewModel.defaultDurationProgress); return ProgressEditorWidget( - timeProgress: timeProgressToCreate, + timeProgress: + timeProgressToCreate ?? viewModel.defaultDurationProgress, onTimeProgressChanged: onTimeProgressChanged, ); }), @@ -70,7 +71,8 @@ class _ProgressCreationScreenState extends State { heroTag: "createTimeProgressBTN", onPressed: _isProgressValid ? () { - vm.onAddTimeProgress(timeProgressToCreate); + vm.onAddTimeProgress( + timeProgressToCreate ?? vm.defaultDurationProgress); Navigator.pop(context); } : null, @@ -98,8 +100,8 @@ class _ViewModel { final void Function(TimeProgress) onAddTimeProgress; _ViewModel({ - @required this.defaultDurationProgress, - @required this.onAddTimeProgress, + required this.defaultDurationProgress, + required this.onAddTimeProgress, }); factory _ViewModel.create(Store store) { diff --git a/lib/screens/progress_detail_screen.dart b/lib/screens/progress_detail_screen.dart index e5df6ea..0876ffc 100644 --- a/lib/screens/progress_detail_screen.dart +++ b/lib/screens/progress_detail_screen.dart @@ -62,7 +62,7 @@ class _ProgressDetailScreenState extends State { List columnChildren = [ Expanded( child: ProgressViewWidget( - timeProgress: _editMode ? _editedProgress : tpVm.tp, + timeProgress: _editMode ? _editedProgress ?? tpVm.tp : tpVm.tp, doneColor: settingsVm.appSettings.doneColor, leftColor: settingsVm.appSettings.leftColor, )) @@ -70,7 +70,7 @@ class _ProgressDetailScreenState extends State { if (_editMode) { columnChildren.add(Expanded( child: ProgressEditorWidget( - timeProgress: _editedProgress, + timeProgress: _editedProgress ?? tpVm.tp, onTimeProgressChanged: _onEditedProgressChanged, ))); } @@ -80,7 +80,7 @@ class _ProgressDetailScreenState extends State { @override Widget build(BuildContext context) { final ProgressDetailScreenArguments args = - ModalRoute.of(context).settings.arguments; + ModalRoute.of(context)?.settings.arguments as ProgressDetailScreenArguments; return Scaffold( appBar: AppBar( @@ -106,7 +106,7 @@ class _ProgressDetailScreenState extends State { timeProgressId: args.id, loadedBuilder: (context, tpVm) { void saveEditedProgress() { - tpVm.updateTimeProgress(_editedProgress); + tpVm.updateTimeProgress(_editedProgress ?? tpVm.tp); _switchEditMode(false); } @@ -119,7 +119,7 @@ class _ProgressDetailScreenState extends State { return DetailScreenFloatingActionButtons( editMode: _editMode, originalProgress: tpVm.tp, - editedProgress: _editedProgress, + editedProgress: _editedProgress ?? tpVm.tp, isEditedProgressValid: _isEditedProgressValid, onEditProgress: () => _switchEditMode(true), onSaveEditedProgress: saveEditedProgress, diff --git a/lib/selectors/time_progress_selectors.dart b/lib/selectors/time_progress_selectors.dart index d34e829..a241ae7 100644 --- a/lib/selectors/time_progress_selectors.dart +++ b/lib/selectors/time_progress_selectors.dart @@ -45,10 +45,11 @@ List pastTimeProgressesSelector(AppState state) => DateTime.now().millisecondsSinceEpoch) .toList(); -TimeProgress timeProgressByIdSelector(AppState state, String id) { +TimeProgress? timeProgressByIdSelector(AppState state, String id) { if (state.timeProgressList.isEmpty) return null; - return state.timeProgressList - .firstWhere((timeProgress) => timeProgress.id == id, orElse: () => null); + return state.timeProgressList.firstWhere( + (timeProgress) => timeProgress.id == id, + orElse: () => TimeProgress.initialDefault()); } AppSettings appSettingsSelector(AppState state) { diff --git a/lib/widgets/app_yes_no_dialog_widget.dart b/lib/widgets/app_yes_no_dialog_widget.dart index e578089..7f82f51 100644 --- a/lib/widgets/app_yes_no_dialog_widget.dart +++ b/lib/widgets/app_yes_no_dialog_widget.dart @@ -6,11 +6,11 @@ class AppYesNoDialog extends StatelessWidget { final void Function() onYesPressed; const AppYesNoDialog({ - Key key, - @required this.titleText, - @required this.contentText, - @required this.onYesPressed, - }) : super(key: key); + super.key, + required this.titleText, + required this.contentText, + required this.onYesPressed, + }); @override Widget build(BuildContext context) { @@ -18,15 +18,15 @@ class AppYesNoDialog extends StatelessWidget { title: Text(titleText), content: Text(contentText), actions: [ - FlatButton( - child: const Text("Yes"), + TextButton( onPressed: onYesPressed, + child: const Text("Yes"), ), - FlatButton( - child: const Text("No"), + TextButton( onPressed: () { Navigator.pop(context); }, + child: const Text("No"), ) ], ); diff --git a/lib/widgets/buttons/color_picker_btn.dart b/lib/widgets/buttons/color_picker_btn.dart index 7f6fe82..8b329bb 100644 --- a/lib/widgets/buttons/color_picker_btn.dart +++ b/lib/widgets/buttons/color_picker_btn.dart @@ -7,11 +7,12 @@ class ColorPickerButton extends StatelessWidget { final Color selectedColor; final void Function(Color) onColorPicked; - const ColorPickerButton({super.key, - @required this.title, - @required this.dialogTitle, - @required this.selectedColor, - @required this.onColorPicked, + const ColorPickerButton({ + super.key, + required this.title, + required this.dialogTitle, + required this.selectedColor, + required this.onColorPicked, }); @override @@ -35,9 +36,9 @@ class ColorPickerButton extends StatelessWidget { ); }, style: TextButton.styleFrom( - primary: useBrightBackground(selectedColor) - ? appTheme.primaryTextTheme.labelLarge.color - : appTheme.textTheme.labelLarge.color, + foregroundColor: useBrightBackground(selectedColor) + ? appTheme.primaryTextTheme.labelLarge?.color + : appTheme.textTheme.labelLarge?.color, backgroundColor: selectedColor, ), child: Text(title), diff --git a/lib/widgets/buttons/date_picker_btn.dart b/lib/widgets/buttons/date_picker_btn.dart index cb7d886..10cd5e8 100644 --- a/lib/widgets/buttons/date_picker_btn.dart +++ b/lib/widgets/buttons/date_picker_btn.dart @@ -3,12 +3,13 @@ import 'package:flutter/material.dart'; class DatePickerBtn extends StatelessWidget { final String leadingString; final DateTime pickedDate; - final void Function(DateTime) onDatePicked; + final void Function(DateTime?) onDatePicked; - const DatePickerBtn({super.key, - @required this.leadingString, - @required this.pickedDate, - @required this.onDatePicked, + const DatePickerBtn({ + super.key, + required this.leadingString, + required this.pickedDate, + required this.onDatePicked, }); void _onButtonPressed(BuildContext context) async { @@ -26,8 +27,8 @@ class DatePickerBtn extends StatelessWidget { return TextButton( onPressed: () => _onButtonPressed(context), style: TextButton.styleFrom( - primary: appTheme.primaryTextTheme.labelLarge.color, - backgroundColor: appTheme.accentColor, + foregroundColor: appTheme.primaryTextTheme.labelLarge?.color, + backgroundColor: appTheme.colorScheme.secondary, ), child: Text( "$leadingString ${pickedDate.toLocal().toString().split(" ")[0]}"), diff --git a/lib/widgets/buttons/select_duration_btn.dart b/lib/widgets/buttons/select_duration_btn.dart index 7c5020b..ca5ee1a 100644 --- a/lib/widgets/buttons/select_duration_btn.dart +++ b/lib/widgets/buttons/select_duration_btn.dart @@ -7,8 +7,8 @@ class SelectDurationBtn extends StatelessWidget { const SelectDurationBtn({ super.key, - @required this.duration, - @required this.updateDuration, + required this.duration, + required this.updateDuration, }); void _onPickerConfirm(Picker picker, List values) { @@ -26,7 +26,7 @@ class SelectDurationBtn extends StatelessWidget { ]), hideHeader: false, title: const Text("Default Duration"), - selectedTextStyle: TextStyle(color: appTheme.accentColor), + selectedTextStyle: TextStyle(color: appTheme.colorScheme.secondary), onConfirm: _onPickerConfirm) .showModal(context); @@ -40,8 +40,8 @@ class SelectDurationBtn extends StatelessWidget { return TextButton( onPressed: () => _onButtonPressed(context, appTheme), style: TextButton.styleFrom( - primary: appTheme.primaryTextTheme.labelLarge.color, - backgroundColor: appTheme.accentColor, + foregroundColor: appTheme.primaryTextTheme.labelLarge?.color, + backgroundColor: appTheme.colorScheme.secondary, ), child: Text("$years Years $months Months $days Days")); } diff --git a/lib/widgets/detail_screen_floating_action_buttons.dart b/lib/widgets/detail_screen_floating_action_buttons.dart index 70e5147..0305f9f 100644 --- a/lib/widgets/detail_screen_floating_action_buttons.dart +++ b/lib/widgets/detail_screen_floating_action_buttons.dart @@ -12,14 +12,14 @@ class DetailScreenFloatingActionButtons extends StatelessWidget { const DetailScreenFloatingActionButtons({ super.key, - @required this.editMode, - @required this.originalProgress, - @required this.editedProgress, - @required this.isEditedProgressValid, - @required this.onEditProgress, - @required this.onSaveEditedProgress, - @required this.onCancelEditProgress, - @required this.onDeleteProgress, + required this.editMode, + required this.originalProgress, + required this.editedProgress, + required this.isEditedProgressValid, + required this.onEditProgress, + required this.onSaveEditedProgress, + required this.onCancelEditProgress, + required this.onDeleteProgress, }); @override @@ -62,7 +62,7 @@ class DetailScreenFloatingActionButtons extends StatelessWidget { child: FloatingActionButton( heroTag: editMode ? "saveEditedTimeProgressBTN" : "editTimeProgressBTN", - backgroundColor: editMode ? Colors.green : appTheme.accentColor, + backgroundColor: editMode ? Colors.green : appTheme.colorScheme.secondary, onPressed: editMode ? isEditedProgressValid ? onSaveEditedProgress diff --git a/lib/widgets/home/home_bottom_navbar.dart b/lib/widgets/home/home_bottom_navbar.dart index 387ceb2..91d49a2 100644 --- a/lib/widgets/home/home_bottom_navbar.dart +++ b/lib/widgets/home/home_bottom_navbar.dart @@ -2,12 +2,12 @@ import 'package:flutter/material.dart'; class HomeBottomNavBar extends StatelessWidget { final int currentIndex; - final Function onTap; + final void Function(int)? onTap; const HomeBottomNavBar({ super.key, - @required this.currentIndex, - @required this.onTap, + required this.currentIndex, + required this.onTap, }); @override diff --git a/lib/widgets/home/tabs/settings/color_settings_widget.dart b/lib/widgets/home/tabs/settings/color_settings_widget.dart index 14acbeb..6db4fa8 100644 --- a/lib/widgets/home/tabs/settings/color_settings_widget.dart +++ b/lib/widgets/home/tabs/settings/color_settings_widget.dart @@ -7,10 +7,10 @@ class ColorSettingsWidget extends StatelessWidget { const ColorSettingsWidget({ super.key, - @required this.doneColor, - @required this.leftColor, - @required this.updateDoneColor, - @required this.updateLeftColor, + required this.doneColor, + required this.leftColor, + required this.updateDoneColor, + required this.updateLeftColor, }); @override diff --git a/lib/widgets/home/tabs/settings/duration_settings_widget.dart b/lib/widgets/home/tabs/settings/duration_settings_widget.dart index 0f583bb..ae8dcd7 100644 --- a/lib/widgets/home/tabs/settings/duration_settings_widget.dart +++ b/lib/widgets/home/tabs/settings/duration_settings_widget.dart @@ -7,8 +7,8 @@ class DurationSettingsWidget extends StatelessWidget { const DurationSettingsWidget({ super.key, - @required this.duration, - @required this.updateDuration, + required this.duration, + required this.updateDuration, }); @override diff --git a/lib/widgets/progress_editor_widget.dart b/lib/widgets/progress_editor_widget.dart index a66208c..bf66c54 100644 --- a/lib/widgets/progress_editor_widget.dart +++ b/lib/widgets/progress_editor_widget.dart @@ -8,8 +8,8 @@ class ProgressEditorWidget extends StatefulWidget { const ProgressEditorWidget({ super.key, - @required this.timeProgress, - @required this.onTimeProgressChanged, + required this.timeProgress, + required this.onTimeProgressChanged, }); @override @@ -32,7 +32,10 @@ class _ProgressEditorWidgetState extends State { }); } - void _onStartDateChanged(DateTime newStartDate) { + void _onStartDateChanged(DateTime? newStartDate) { + if (newStartDate == null) { + return; + } TimeProgress newProgress = widget.timeProgress.copyWith(startTime: newStartDate); widget.onTimeProgressChanged( @@ -43,7 +46,10 @@ class _ProgressEditorWidgetState extends State { }); } - void _onEndDateChanged(DateTime newEndDate) { + void _onEndDateChanged(DateTime? newEndDate) { + if (newEndDate == null) { + return; + } TimeProgress newProgress = widget.timeProgress.copyWith(endTime: newEndDate); widget.onTimeProgressChanged( diff --git a/lib/widgets/progress_list_view/progress_list_tile.dart b/lib/widgets/progress_list_view/progress_list_tile.dart index ce2d8b4..53080bc 100644 --- a/lib/widgets/progress_list_view/progress_list_tile.dart +++ b/lib/widgets/progress_list_view/progress_list_tile.dart @@ -19,9 +19,9 @@ class ProgressListTile extends StatelessWidget { final Color doneColor, leftColor; const ProgressListTile({super.key, - @required this.timeProgress, - @required this.doneColor, - @required this.leftColor, + required this.timeProgress, + required this.doneColor, + required this.leftColor, }); Widget _renderSubtitle(BuildContext context) { diff --git a/lib/widgets/progress_list_view/progress_list_view.dart b/lib/widgets/progress_list_view/progress_list_view.dart index 671a49e..31d6e3f 100644 --- a/lib/widgets/progress_list_view/progress_list_view.dart +++ b/lib/widgets/progress_list_view/progress_list_view.dart @@ -8,9 +8,9 @@ class ProgressListView extends StatelessWidget { const ProgressListView({ super.key, - @required this.timeProgressList, - @required this.doneColor, - @required this.leftColor, + required this.timeProgressList, + required this.doneColor, + required this.leftColor, }); List _renderListViewChildren() { diff --git a/lib/widgets/progress_view_widget.dart b/lib/widgets/progress_view_widget.dart index 38f830a..3fa8148 100644 --- a/lib/widgets/progress_view_widget.dart +++ b/lib/widgets/progress_view_widget.dart @@ -10,9 +10,9 @@ class ProgressViewWidget extends StatelessWidget { const ProgressViewWidget({ super.key, - @required this.timeProgress, - @required this.doneColor, - @required this.leftColor, + required this.timeProgress, + required this.doneColor, + required this.leftColor, }); @override diff --git a/lib/widgets/store_connectors/settings_store_connector.dart b/lib/widgets/store_connectors/settings_store_connector.dart index 649b502..43726c1 100644 --- a/lib/widgets/store_connectors/settings_store_connector.dart +++ b/lib/widgets/store_connectors/settings_store_connector.dart @@ -10,7 +10,7 @@ class SettingsStoreConnector extends StatelessWidget { const SettingsStoreConnector({ super.key, - @required this.loadedBuilder, + required this.loadedBuilder, }); @override diff --git a/lib/widgets/store_connectors/time_progress_list_store_connector.dart b/lib/widgets/store_connectors/time_progress_list_store_connector.dart index 5ccf3cb..dfbe279 100644 --- a/lib/widgets/store_connectors/time_progress_list_store_connector.dart +++ b/lib/widgets/store_connectors/time_progress_list_store_connector.dart @@ -10,7 +10,7 @@ class TimeProgressListStoreConnector extends StatelessWidget { const TimeProgressListStoreConnector({ super.key, - @required this.loadedBuilder, + required this.loadedBuilder, }); @override diff --git a/lib/widgets/store_connectors/time_progress_store_connector.dart b/lib/widgets/store_connectors/time_progress_store_connector.dart index 27f15ae..0387fc2 100644 --- a/lib/widgets/store_connectors/time_progress_store_connector.dart +++ b/lib/widgets/store_connectors/time_progress_store_connector.dart @@ -13,8 +13,8 @@ class TimeProgressStoreConnector extends StatelessWidget { const TimeProgressStoreConnector({ super.key, - @required this.timeProgressId, - @required this.loadedBuilder, + required this.timeProgressId, + required this.loadedBuilder, }); @override @@ -29,11 +29,6 @@ class TimeProgressStoreConnector extends StatelessWidget { child: CircularProgressIndicator(), ); } - if (vm.tp == null) { - return const Center( - child: Text("Error Invalid Time Progress"), - ); - } return loadedBuilder(context, vm); }, ); diff --git a/test/material_tester_widget.dart b/test/material_tester_widget.dart index a15f58d..e89d5fa 100644 --- a/test/material_tester_widget.dart +++ b/test/material_tester_widget.dart @@ -5,7 +5,7 @@ class MaterialTesterWidget extends StatelessWidget { const MaterialTesterWidget({ super.key, - @required this.widget, + required this.widget, }); @override