diff --git a/lib/actions/actions.dart b/lib/actions/actions.dart index 708dcfd..17ebbdf 100644 --- a/lib/actions/actions.dart +++ b/lib/actions/actions.dart @@ -49,8 +49,9 @@ class DeleteTimeProgressAction { } void loadTimeProgressListIfUnloaded(Store store) { - if (!store.state.hasProgressesLoaded) + if (!store.state.hasProgressesLoaded) { store.dispatch(LoadTimeProgressListAction()); + } } void loadSettingsIfUnloaded(Store store) { diff --git a/lib/app.dart b/lib/app.dart index 6cd350a..e64dd55 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -11,7 +11,7 @@ class TimeProgressTrackerApp extends StatelessWidget { final Store store; - TimeProgressTrackerApp({ + const TimeProgressTrackerApp({ Key key, this.store, }) : super(key: key); @@ -31,11 +31,11 @@ class TimeProgressTrackerApp extends StatelessWidget { initialRoute: HomeScreen.routeName, routes: { HomeScreen.routeName: (BuildContext context) => - HomeScreen(), + const HomeScreen(), ProgressDetailScreen.routeName: (BuildContext context) => - ProgressDetailScreen(), + const ProgressDetailScreen(), ProgressCreationScreen.routeName: (BuildContext context) => - ProgressCreationScreen(), + const ProgressCreationScreen(), }, ), ); diff --git a/lib/middleware/store_middleware.dart b/lib/middleware/store_middleware.dart index b79ddaf..079452a 100644 --- a/lib/middleware/store_middleware.dart +++ b/lib/middleware/store_middleware.dart @@ -17,12 +17,12 @@ List> createStoreMiddleware( final loadSettings = _createLoadAppSettings(settingsRepo); return [ - TypedMiddleware(loadTimeProgressList), - TypedMiddleware(saveTimeProgressList), - TypedMiddleware(saveTimeProgressList), - TypedMiddleware(saveTimeProgressList), - TypedMiddleware(loadSettings), - TypedMiddleware(saveSettings) + TypedMiddleware(loadTimeProgressList).call, + TypedMiddleware(saveTimeProgressList).call, + TypedMiddleware(saveTimeProgressList).call, + TypedMiddleware(saveTimeProgressList).call, + TypedMiddleware(loadSettings).call, + TypedMiddleware(saveSettings).call ]; } diff --git a/lib/models/app_settings.dart b/lib/models/app_settings.dart index 120da4e..886471b 100644 --- a/lib/models/app_settings.dart +++ b/lib/models/app_settings.dart @@ -7,13 +7,13 @@ class AppSettings { final Color leftColor; final Duration duration; - AppSettings({ + const AppSettings({ this.doneColor, this.leftColor, this.duration, }); - factory AppSettings.defaults() => AppSettings( + factory AppSettings.defaults() => const AppSettings( doneColor: Colors.green, leftColor: Colors.red, duration: Duration(days: 365), diff --git a/lib/models/app_state.dart b/lib/models/app_state.dart index 350aa42..5b65c99 100644 --- a/lib/models/app_state.dart +++ b/lib/models/app_state.dart @@ -8,7 +8,7 @@ class AppState { final List timeProgressList; final AppSettings appSettings; - AppState( + const AppState( {this.hasProgressesLoaded = false, this.hasSettingsLoaded = false, this.timeProgressList = const [], @@ -22,7 +22,7 @@ class AppState { List timeProgressList, }) { return AppState( - hasProgressesLoaded: hasLoaded ?? this.hasProgressesLoaded, + hasProgressesLoaded: hasLoaded ?? hasProgressesLoaded, timeProgressList: timeProgressList ?? this.timeProgressList, ); } diff --git a/lib/models/time_progress.dart b/lib/models/time_progress.dart index dde845d..7a5d479 100644 --- a/lib/models/time_progress.dart +++ b/lib/models/time_progress.dart @@ -38,7 +38,7 @@ class TimeProgress { int allDays() => endTime.difference(startTime).inDays; double percentDone() { - double percent = this.daysBehind() / (this.allDays() / 100) / 100; + double percent = daysBehind() / (allDays() / 100) / 100; if (percent < 0) percent = 0; if (percent > 1) percent = 1; return percent; @@ -48,7 +48,7 @@ class TimeProgress { DateTime.now().millisecondsSinceEpoch > startTime.millisecondsSinceEpoch; int daysTillStart() { - if (hasStarted()) throw new TimeProgressHasStartedException(); + if (hasStarted()) throw TimeProgressHasStartedException(); return startTime.difference(DateTime.now()).inDays; } @@ -56,7 +56,7 @@ class TimeProgress { DateTime.now().millisecondsSinceEpoch > endTime.millisecondsSinceEpoch; int daysSinceEnd() { - if (!hasEnded()) throw new TimeProgressHasNotEndedException(); + if (!hasEnded()) throw TimeProgressHasNotEndedException(); return DateTime.now().difference(endTime).inDays; } @@ -79,11 +79,12 @@ class TimeProgress { "TimeProgress{id: $id, name: $name, startTime: $startTime, endTime: $endTime}"; TimeProgressEntity toEntity() { - if (!TimeProgress.isNameValid(name)) - throw new TimeProgressInvalidNameException(name); - if (!TimeProgress.areTimesValid(startTime, endTime)) - throw new TimeProgressStartTimeIsNotBeforeEndTimeException( - startTime, endTime); + if (!TimeProgress.isNameValid(name)) { + throw TimeProgressInvalidNameException(name); + } + if (!TimeProgress.areTimesValid(startTime, endTime)) { + throw TimeProgressStartTimeIsNotBeforeEndTimeException(startTime, endTime); + } return TimeProgressEntity(id, name, startTime, endTime); } diff --git a/lib/persistence/app_settings.dart b/lib/persistence/app_settings.dart index f83a2fe..8b6ce35 100644 --- a/lib/persistence/app_settings.dart +++ b/lib/persistence/app_settings.dart @@ -11,15 +11,16 @@ class AppSettingsRepository { AppSettingsRepository(this.prefs, {this.codec = json}); Future loadAppSettings() { - final String jsonString = this.prefs.getString(_key); - if (jsonString == null) + final String? jsonString = prefs.getString(_key); + if (jsonString == null) { return Future.value(AppSettingsEntity.defaults()); + } return Future.value( AppSettingsEntity.fromJson(codec.decode(jsonString))); } Future saveAppSettings(AppSettingsEntity appSettings) => - this.prefs.setString(_key, codec.encode(appSettings)); + prefs.setString(_key, codec.encode(appSettings)); } class AppSettingsEntity { diff --git a/lib/persistence/time_progress_repository.dart b/lib/persistence/time_progress_repository.dart index 0b87123..84b4064 100644 --- a/lib/persistence/time_progress_repository.dart +++ b/lib/persistence/time_progress_repository.dart @@ -10,7 +10,7 @@ class TimeProgressRepository { TimeProgressRepository(this.prefs, {this.codec = json}); Future> loadTimeProgressList() { - final String jsonString = this.prefs.getString(_key); + final String? jsonString = prefs.getString(_key); if (jsonString == null) { return Future>.value([]); } @@ -24,6 +24,6 @@ class TimeProgressRepository { Future saveTimeProgressList(List timeProgressList) { final String jsonString = codec.encode( {"timers": timeProgressList.map((timer) => timer.toJson()).toList()}); - return this.prefs.setString(_key, jsonString); + return prefs.setString(_key, jsonString); } } diff --git a/lib/reducers/app_state_reducer.dart b/lib/reducers/app_state_reducer.dart index ad684a8..0db4370 100644 --- a/lib/reducers/app_state_reducer.dart +++ b/lib/reducers/app_state_reducer.dart @@ -17,9 +17,9 @@ AppState appStateReducer(AppState state, dynamic action) { } final appSettingsReducers = combineReducers([ - TypedReducer(_loadAppSettings), - TypedReducer(_updateAppSettings), - TypedReducer(_setDefaultSettings) + TypedReducer(_loadAppSettings).call, + TypedReducer(_updateAppSettings).call, + TypedReducer(_setDefaultSettings).call ]); AppSettings _loadAppSettings( diff --git a/lib/reducers/has_loaded_reducer.dart b/lib/reducers/has_loaded_reducer.dart index 603b3fb..ad5009b 100644 --- a/lib/reducers/has_loaded_reducer.dart +++ b/lib/reducers/has_loaded_reducer.dart @@ -2,8 +2,8 @@ import 'package:redux/redux.dart'; import 'package:time_progress_tracker/actions/actions.dart'; final hasProgressesLoadedReducer = combineReducers([ - TypedReducer(_setProgressesLoaded), - TypedReducer(_setProgressesUnloaded) + TypedReducer(_setProgressesLoaded).call, + TypedReducer(_setProgressesUnloaded).call ]); bool _setProgressesLoaded(bool hasLoaded, TimeProgressListLoadedAction action) { @@ -15,8 +15,8 @@ bool _setProgressesUnloaded(bool hasLoaded, TimeProgressListNotLoadedAction acti } final hasSettingsLoadedReducer = combineReducers([ - TypedReducer(_setSettingsLoaded), - TypedReducer(_setSettingsUnloaded) + TypedReducer(_setSettingsLoaded).call, + TypedReducer(_setSettingsUnloaded).call ]); bool _setSettingsLoaded(bool hasLoaded, AppSettingsLoadedActions action) { diff --git a/lib/reducers/time_progress_list_reducer.dart b/lib/reducers/time_progress_list_reducer.dart index 7e643a4..1a2ea1d 100644 --- a/lib/reducers/time_progress_list_reducer.dart +++ b/lib/reducers/time_progress_list_reducer.dart @@ -4,13 +4,13 @@ import 'package:time_progress_tracker/models/time_progress.dart'; final timeProgressListReducer = combineReducers>([ TypedReducer, TimeProgressListLoadedAction>( - _setLoadedTimeProgressList), + _setLoadedTimeProgressList).call, TypedReducer, TimeProgressListNotLoadedAction>( - _setEmptyTimeProgressList), - TypedReducer, AddTimeProgressAction>(_addTimeProgress), + _setEmptyTimeProgressList).call, + TypedReducer, AddTimeProgressAction>(_addTimeProgress).call, TypedReducer, UpdateTimeProgressAction>( - _updateTimeProgress), - TypedReducer, DeleteTimeProgressAction>(_deleteTimeProgress), + _updateTimeProgress).call, + TypedReducer, DeleteTimeProgressAction>(_deleteTimeProgress).call, ]); List _setLoadedTimeProgressList( diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart index 9b5d2d9..86ba3e3 100644 --- a/lib/screens/home_screen.dart +++ b/lib/screens/home_screen.dart @@ -9,6 +9,8 @@ class HomeScreen extends StatefulWidget { static const routeName = "/home"; static const title = "Time Progress Tracker"; + const HomeScreen({super.key}); + @override State createState() { return _HomeScreenState(); @@ -18,9 +20,9 @@ class HomeScreen extends StatefulWidget { class _HomeScreenState extends State { int _currentIndex = 0; final List _children = [ - HomeActiveProgressesTab(), - HomeInactiveProgressesTab(), - HomeSettingsTab(), + const HomeActiveProgressesTab(), + const HomeInactiveProgressesTab(), + const HomeSettingsTab(), ]; void onBottomTabTapped(int index) { @@ -33,11 +35,11 @@ class _HomeScreenState extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - title: Text(HomeScreen.title), + title: const Text(HomeScreen.title), ), body: _children[_currentIndex], floatingActionButtonLocation: FloatingActionButtonLocation.endFloat, - floatingActionButton: _currentIndex != 2 ? CreateProgressButton() : null, + floatingActionButton: _currentIndex != 2 ? const CreateProgressButton() : null, bottomNavigationBar: HomeBottomNavBar( currentIndex: _currentIndex, onTap: onBottomTabTapped, diff --git a/lib/screens/progress_creation_screen.dart b/lib/screens/progress_creation_screen.dart index 22acb22..3a3b2ae 100644 --- a/lib/screens/progress_creation_screen.dart +++ b/lib/screens/progress_creation_screen.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:redux/redux.dart'; import 'package:time_progress_tracker/actions/actions.dart'; @@ -13,6 +12,8 @@ class ProgressCreationScreen extends StatefulWidget { static const routeName = "/create-progress"; static const title = "Create Time Progress"; + const ProgressCreationScreen({super.key}); + @override State createState() { return _ProgressCreationScreenState(); @@ -20,14 +21,15 @@ class ProgressCreationScreen extends StatefulWidget { } class _ProgressCreationScreenState extends State { - TimeProgress timeProgressToCreate; + TimeProgress? timeProgressToCreate; bool _isProgressValid = false; void initTimeProgress(TimeProgress timeProgress) { - if (timeProgressToCreate == null) + if (timeProgressToCreate == null) { setState(() { timeProgressToCreate = timeProgress; }); + } } void onTimeProgressChanged( @@ -42,10 +44,10 @@ class _ProgressCreationScreenState extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - title: Text(ProgressCreationScreen.title), + title: const Text(ProgressCreationScreen.title), ), body: Container( - padding: EdgeInsets.all(12), + padding: const EdgeInsets.all(12), child: StoreConnector( onInit: loadSettingsIfUnloaded, converter: (store) => _ViewModel.create(store), @@ -66,23 +68,23 @@ class _ProgressCreationScreenState extends State { converter: (store) => _ViewModel.create(store), builder: (context, _ViewModel vm) => FloatingActionButton( heroTag: "createTimeProgressBTN", - child: Icon(Icons.save), onPressed: _isProgressValid ? () { vm.onAddTimeProgress(timeProgressToCreate); Navigator.pop(context); } : null, + child: const Icon(Icons.save), ), ), ), Expanded( child: FloatingActionButton( heroTag: "cancelTimeProgressCreationBTN", - child: Icon(Icons.cancel), onPressed: () { Navigator.pop(context); }, + child: const Icon(Icons.cancel), ), ) ], @@ -103,14 +105,14 @@ class _ViewModel { factory _ViewModel.create(Store store) { AppSettings settings = appSettingsSelector(store.state); - _onAddTimeProgress(TimeProgress tp) { + onAddTimeProgress(TimeProgress tp) { if (TimeProgress.isValid(tp)) store.dispatch(AddTimeProgressAction(tp)); } return _ViewModel( defaultDurationProgress: TimeProgress.defaultFromDuration(settings.duration), - onAddTimeProgress: _onAddTimeProgress, + onAddTimeProgress: onAddTimeProgress, ); } } diff --git a/lib/screens/progress_detail_screen.dart b/lib/screens/progress_detail_screen.dart index be4c7b9..e5df6ea 100644 --- a/lib/screens/progress_detail_screen.dart +++ b/lib/screens/progress_detail_screen.dart @@ -17,6 +17,8 @@ class ProgressDetailScreen extends StatefulWidget { static const routeName = "/progress"; static const title = "Progress View"; + const ProgressDetailScreen({super.key}); + @override State createState() { return _ProgressDetailScreenState(); @@ -25,7 +27,7 @@ class ProgressDetailScreen extends StatefulWidget { class _ProgressDetailScreenState extends State { bool _editMode = false, _isEditedProgressValid = false; - TimeProgress _editedProgress, _originalProgress; + TimeProgress? _editedProgress, _originalProgress; void _initEditedProgress(TimeProgress tp) { if (_editedProgress == null) { @@ -65,12 +67,13 @@ class _ProgressDetailScreenState extends State { leftColor: settingsVm.appSettings.leftColor, )) ]; - if (_editMode) + if (_editMode) { columnChildren.add(Expanded( child: ProgressEditorWidget( timeProgress: _editedProgress, onTimeProgressChanged: _onEditedProgressChanged, ))); + } return columnChildren; } @@ -81,7 +84,7 @@ class _ProgressDetailScreenState extends State { return Scaffold( appBar: AppBar( - title: Text(ProgressDetailScreen.title), + title: const Text(ProgressDetailScreen.title), ), body: SettingsStoreConnector( loadedBuilder: (context, settingsVm) { @@ -90,7 +93,7 @@ class _ProgressDetailScreenState extends State { loadedBuilder: (context, tpVm) { _initEditedProgress(tpVm.tp); return Container( - margin: EdgeInsets.all(8), + margin: const EdgeInsets.all(8), child: Column( children: _renderColumnChildren(settingsVm, tpVm), )); @@ -102,12 +105,12 @@ class _ProgressDetailScreenState extends State { floatingActionButton: TimeProgressStoreConnector( timeProgressId: args.id, loadedBuilder: (context, tpVm) { - void _saveEditedProgress() { + void saveEditedProgress() { tpVm.updateTimeProgress(_editedProgress); _switchEditMode(false); } - void _deleteTimeProgress() { + void deleteTimeProgress() { tpVm.deleteTimeProgress(); Navigator.popUntil( context, ModalRoute.withName(HomeScreen.routeName)); @@ -119,9 +122,9 @@ class _ProgressDetailScreenState extends State { editedProgress: _editedProgress, isEditedProgressValid: _isEditedProgressValid, onEditProgress: () => _switchEditMode(true), - onSaveEditedProgress: _saveEditedProgress, + onSaveEditedProgress: saveEditedProgress, onCancelEditProgress: _cancelEditMode, - onDeleteProgress: _deleteTimeProgress); + onDeleteProgress: deleteTimeProgress); }, ), ); diff --git a/lib/selectors/time_progress_selectors.dart b/lib/selectors/time_progress_selectors.dart index cf77f79..d34e829 100644 --- a/lib/selectors/time_progress_selectors.dart +++ b/lib/selectors/time_progress_selectors.dart @@ -46,7 +46,7 @@ List pastTimeProgressesSelector(AppState state) => .toList(); TimeProgress timeProgressByIdSelector(AppState state, String id) { - if (state.timeProgressList.length < 1) return null; + if (state.timeProgressList.isEmpty) return null; return state.timeProgressList .firstWhere((timeProgress) => timeProgress.id == id, orElse: () => null); } diff --git a/lib/widgets/app_yes_no_dialog_widget.dart b/lib/widgets/app_yes_no_dialog_widget.dart index 270752b..e578089 100644 --- a/lib/widgets/app_yes_no_dialog_widget.dart +++ b/lib/widgets/app_yes_no_dialog_widget.dart @@ -5,7 +5,7 @@ class AppYesNoDialog extends StatelessWidget { final String contentText; final void Function() onYesPressed; - AppYesNoDialog({ + const AppYesNoDialog({ Key key, @required this.titleText, @required this.contentText, @@ -19,11 +19,11 @@ class AppYesNoDialog extends StatelessWidget { content: Text(contentText), actions: [ FlatButton( - child: Text("Yes"), + child: const Text("Yes"), onPressed: onYesPressed, ), FlatButton( - child: Text("No"), + child: const Text("No"), onPressed: () { Navigator.pop(context); }, diff --git a/lib/widgets/buttons/color_picker_btn.dart b/lib/widgets/buttons/color_picker_btn.dart index 96e1bc5..7f6fe82 100644 --- a/lib/widgets/buttons/color_picker_btn.dart +++ b/lib/widgets/buttons/color_picker_btn.dart @@ -7,7 +7,7 @@ class ColorPickerButton extends StatelessWidget { final Color selectedColor; final void Function(Color) onColorPicked; - ColorPickerButton({ + const ColorPickerButton({super.key, @required this.title, @required this.dialogTitle, @required this.selectedColor, @@ -34,13 +34,13 @@ class ColorPickerButton extends StatelessWidget { }, ); }, - child: Text(title), style: TextButton.styleFrom( primary: useBrightBackground(selectedColor) - ? appTheme.primaryTextTheme.button.color - : appTheme.textTheme.button.color, + ? appTheme.primaryTextTheme.labelLarge.color + : appTheme.textTheme.labelLarge.color, backgroundColor: selectedColor, ), + child: Text(title), ); } } diff --git a/lib/widgets/buttons/create_progress_button.dart b/lib/widgets/buttons/create_progress_button.dart index 5d125f3..e7ac1fe 100644 --- a/lib/widgets/buttons/create_progress_button.dart +++ b/lib/widgets/buttons/create_progress_button.dart @@ -4,15 +4,17 @@ import 'package:time_progress_tracker/screens/progress_creation_screen.dart'; class CreateProgressButton extends StatelessWidget { final String _heroTag = "createProgressBTN"; + const CreateProgressButton({super.key}); + @override Widget build(BuildContext context) { - void _onButtonPressed() => + void onButtonPressed() => Navigator.pushNamed(context, ProgressCreationScreen.routeName); return FloatingActionButton( heroTag: _heroTag, - child: Icon(Icons.add), - onPressed: _onButtonPressed, + onPressed: onButtonPressed, + child: const Icon(Icons.add), ); } } diff --git a/lib/widgets/buttons/date_picker_btn.dart b/lib/widgets/buttons/date_picker_btn.dart index 908dbfd..cb7d886 100644 --- a/lib/widgets/buttons/date_picker_btn.dart +++ b/lib/widgets/buttons/date_picker_btn.dart @@ -5,11 +5,11 @@ class DatePickerBtn extends StatelessWidget { final DateTime pickedDate; final void Function(DateTime) onDatePicked; - DatePickerBtn({ + const DatePickerBtn({super.key, @required this.leadingString, @required this.pickedDate, @required this.onDatePicked, - }) : super(); + }); void _onButtonPressed(BuildContext context) async { onDatePicked(await showDatePicker( @@ -25,12 +25,12 @@ class DatePickerBtn extends StatelessWidget { ThemeData appTheme = Theme.of(context); return TextButton( onPressed: () => _onButtonPressed(context), - child: Text( - "$leadingString ${pickedDate.toLocal().toString().split(" ")[0]}"), style: TextButton.styleFrom( - primary: appTheme.primaryTextTheme.button.color, + primary: appTheme.primaryTextTheme.labelLarge.color, backgroundColor: appTheme.accentColor, ), + 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 5490000..7c5020b 100644 --- a/lib/widgets/buttons/select_duration_btn.dart +++ b/lib/widgets/buttons/select_duration_btn.dart @@ -5,7 +5,8 @@ class SelectDurationBtn extends StatelessWidget { final Duration duration; final void Function(Duration) updateDuration; - SelectDurationBtn({ + const SelectDurationBtn({ + super.key, @required this.duration, @required this.updateDuration, }); @@ -38,10 +39,10 @@ class SelectDurationBtn extends StatelessWidget { int days = duration.inDays - (365 * years) - (30 * months); return TextButton( onPressed: () => _onButtonPressed(context, appTheme), - child: Text("$years Years $months Months $days Days"), style: TextButton.styleFrom( - primary: appTheme.primaryTextTheme.button.color, + primary: appTheme.primaryTextTheme.labelLarge.color, backgroundColor: appTheme.accentColor, - )); + ), + 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 00dc4e7..70e5147 100644 --- a/lib/widgets/detail_screen_floating_action_buttons.dart +++ b/lib/widgets/detail_screen_floating_action_buttons.dart @@ -10,7 +10,8 @@ class DetailScreenFloatingActionButtons extends StatelessWidget { onCancelEditProgress, onDeleteProgress; - DetailScreenFloatingActionButtons({ + const DetailScreenFloatingActionButtons({ + super.key, @required this.editMode, @required this.originalProgress, @required this.editedProgress, @@ -25,10 +26,10 @@ class DetailScreenFloatingActionButtons extends StatelessWidget { Widget build(BuildContext context) { final ThemeData appTheme = Theme.of(context); - void _onCancelEditTimeProgressBTN() { - if (originalProgress == editedProgress) + void onCancelEditTimeProgressBTN() { + if (originalProgress == editedProgress) { onCancelEditProgress(); - else { + } else { showDialog( context: context, builder: (_) => AppYesNoDialog( @@ -44,7 +45,7 @@ class DetailScreenFloatingActionButtons extends StatelessWidget { } } - void _onDeleteTimeProgressBTN() { + void onDeleteTimeProgressBTN() { showDialog( context: context, builder: (_) => AppYesNoDialog( @@ -61,13 +62,13 @@ class DetailScreenFloatingActionButtons extends StatelessWidget { child: FloatingActionButton( heroTag: editMode ? "saveEditedTimeProgressBTN" : "editTimeProgressBTN", - child: editMode ? Icon(Icons.save) : Icon(Icons.edit), backgroundColor: editMode ? Colors.green : appTheme.accentColor, onPressed: editMode ? isEditedProgressValid ? onSaveEditedProgress : null : onEditProgress, + child: editMode ? const Icon(Icons.save) : const Icon(Icons.edit), ), ), Expanded( @@ -75,11 +76,11 @@ class DetailScreenFloatingActionButtons extends StatelessWidget { heroTag: editMode ? "cancelEditTimeProgressBTN" : "deleteTimeProgressBTN", - child: editMode ? Icon(Icons.cancel) : Icon(Icons.delete), backgroundColor: Colors.red, onPressed: editMode - ? _onCancelEditTimeProgressBTN - : _onDeleteTimeProgressBTN, + ? onCancelEditTimeProgressBTN + : onDeleteTimeProgressBTN, + child: editMode ? const Icon(Icons.cancel) : const Icon(Icons.delete), ), ), ], diff --git a/lib/widgets/home/home_bottom_navbar.dart b/lib/widgets/home/home_bottom_navbar.dart index 3dd666b..387ceb2 100644 --- a/lib/widgets/home/home_bottom_navbar.dart +++ b/lib/widgets/home/home_bottom_navbar.dart @@ -4,11 +4,11 @@ class HomeBottomNavBar extends StatelessWidget { final int currentIndex; final Function onTap; - HomeBottomNavBar({ - Key key, + const HomeBottomNavBar({ + super.key, @required this.currentIndex, @required this.onTap, - }) : super(key: key); + }); @override Widget build(BuildContext context) { @@ -19,21 +19,21 @@ class HomeBottomNavBar extends StatelessWidget { currentIndex: currentIndex, items: [ BottomNavigationBarItem( - icon: new Icon( + icon: Icon( Icons.alarm, color: appTheme.primaryColor, ), label: "Active Progresses", ), BottomNavigationBarItem( - icon: new Icon( + icon: Icon( Icons.alarm_off, color: appTheme.primaryColor, ), label: "Inactive Progresses", ), BottomNavigationBarItem( - icon: new Icon( + icon: Icon( Icons.settings, color: appTheme.primaryColor, ), diff --git a/lib/widgets/home/tabs/home_active_progresses_tab.dart b/lib/widgets/home/tabs/home_active_progresses_tab.dart index 9b7a975..e49d749 100644 --- a/lib/widgets/home/tabs/home_active_progresses_tab.dart +++ b/lib/widgets/home/tabs/home_active_progresses_tab.dart @@ -6,6 +6,8 @@ import 'package:time_progress_tracker/widgets/store_connectors/settings_store_co import 'package:time_progress_tracker/widgets/store_connectors/time_progress_list_store_connector.dart'; class HomeActiveProgressesTab extends StatelessWidget { + const HomeActiveProgressesTab({super.key}); + @override Widget build(BuildContext context) { return SettingsStoreConnector( @@ -14,14 +16,15 @@ class HomeActiveProgressesTab extends StatelessWidget { loadedBuilder: (context, tpListVm) { List activeTpList = selectActiveProgresses(tpListVm.tpList); - if (activeTpList.length < 1) + if (activeTpList.isEmpty) { return Container( - padding: EdgeInsets.all(16), - child: Center( + padding: const EdgeInsets.all(16), + child: const Center( child: Text( "You don't have any active time progress, that are tracked."), ), ); + } return ProgressListView( timeProgressList: activeTpList, diff --git a/lib/widgets/home/tabs/home_inactive_progresses_tab.dart b/lib/widgets/home/tabs/home_inactive_progresses_tab.dart index 9eb0312..cb4b147 100644 --- a/lib/widgets/home/tabs/home_inactive_progresses_tab.dart +++ b/lib/widgets/home/tabs/home_inactive_progresses_tab.dart @@ -6,6 +6,8 @@ import 'package:time_progress_tracker/widgets/store_connectors/settings_store_co import 'package:time_progress_tracker/widgets/store_connectors/time_progress_list_store_connector.dart'; class HomeInactiveProgressesTab extends StatelessWidget { + const HomeInactiveProgressesTab({super.key}); + @override Widget build(BuildContext context) { return SettingsStoreConnector( @@ -14,14 +16,15 @@ class HomeInactiveProgressesTab extends StatelessWidget { loadedBuilder: (context, tpListVm) { List inactiveTpList = selectInactiveProgresses(tpListVm.tpList); - if (inactiveTpList.length < 1) + if (inactiveTpList.isEmpty) { return Container( - padding: EdgeInsets.all(16), - child: Center( + padding: const EdgeInsets.all(16), + child: const Center( child: Text( "You don't have any currently inactive time progresses, that are tracked."), ), ); + } return ProgressListView( timeProgressList: inactiveTpList, diff --git a/lib/widgets/home/tabs/home_settings_tab.dart b/lib/widgets/home/tabs/home_settings_tab.dart index a4a62e0..9a6c929 100644 --- a/lib/widgets/home/tabs/home_settings_tab.dart +++ b/lib/widgets/home/tabs/home_settings_tab.dart @@ -5,12 +5,14 @@ import 'package:time_progress_tracker/widgets/home/tabs/settings/duration_settin import 'package:time_progress_tracker/widgets/store_connectors/settings_store_connector.dart'; class HomeSettingsTab extends StatelessWidget { + const HomeSettingsTab({super.key}); + @override Widget build(BuildContext context) { return SettingsStoreConnector( loadedBuilder: (context, settingsVm) { return Container( - padding: EdgeInsets.all(16), + padding: const EdgeInsets.all(16), child: Center( child: Column( children: [ @@ -28,7 +30,7 @@ class HomeSettingsTab extends StatelessWidget { updateDuration: settingsVm.updateDuration, ), ), - Spacer(), + const Spacer(), Expanded( child: TextButton( onPressed: () { @@ -39,7 +41,7 @@ class HomeSettingsTab extends StatelessWidget { applicationLegalese: '\u00a9Andreas Fahrecker 2020-2021'); }, - child: Text("About"), + child: const Text("About"), ), ), ], diff --git a/lib/widgets/home/tabs/settings/color_settings_widget.dart b/lib/widgets/home/tabs/settings/color_settings_widget.dart index b088f62..14acbeb 100644 --- a/lib/widgets/home/tabs/settings/color_settings_widget.dart +++ b/lib/widgets/home/tabs/settings/color_settings_widget.dart @@ -5,7 +5,8 @@ class ColorSettingsWidget extends StatelessWidget { final Color doneColor, leftColor; final void Function(Color) updateDoneColor, updateLeftColor; - ColorSettingsWidget({ + const ColorSettingsWidget({ + super.key, @required this.doneColor, @required this.leftColor, @required this.updateDoneColor, @@ -21,14 +22,14 @@ class ColorSettingsWidget extends StatelessWidget { Expanded( child: Text( "Color Settings", - style: appTheme.textTheme.headline6, + style: appTheme.textTheme.titleLarge, ), ), Row( children: [ Expanded( child: Padding( - padding: EdgeInsets.only(right: 5), + padding: const EdgeInsets.only(right: 5), child: ColorPickerButton( title: "Done Color", dialogTitle: "Select Done Color", @@ -39,7 +40,7 @@ class ColorSettingsWidget extends StatelessWidget { ), Expanded( child: Padding( - padding: EdgeInsets.only(left: 5), + padding: const EdgeInsets.only(left: 5), child: ColorPickerButton( title: "Left Color", dialogTitle: "Select Left Color", diff --git a/lib/widgets/home/tabs/settings/duration_settings_widget.dart b/lib/widgets/home/tabs/settings/duration_settings_widget.dart index 0d80458..0f583bb 100644 --- a/lib/widgets/home/tabs/settings/duration_settings_widget.dart +++ b/lib/widgets/home/tabs/settings/duration_settings_widget.dart @@ -5,7 +5,8 @@ class DurationSettingsWidget extends StatelessWidget { final Duration duration; final void Function(Duration) updateDuration; - DurationSettingsWidget({ + const DurationSettingsWidget({ + super.key, @required this.duration, @required this.updateDuration, }); @@ -14,15 +15,15 @@ class DurationSettingsWidget extends StatelessWidget { Widget build(BuildContext context) { ThemeData appTheme = Theme.of(context); - int years = duration.inDays ~/ 365; - int months = (duration.inDays - (365 * years)) ~/ 30; - int days = duration.inDays - (365 * years) - (30 * months); + //int years = duration.inDays ~/ 365; + //int months = (duration.inDays - (365 * years)) ~/ 30; + //int days = duration.inDays - (365 * years) - (30 * months); return Column( children: [ Expanded( child: Text( "Duration Settings", - style: appTheme.textTheme.headline6, + style: appTheme.textTheme.titleLarge, ), ), Row( diff --git a/lib/widgets/progress_editor_widget.dart b/lib/widgets/progress_editor_widget.dart index 71f9aaa..a66208c 100644 --- a/lib/widgets/progress_editor_widget.dart +++ b/lib/widgets/progress_editor_widget.dart @@ -6,7 +6,8 @@ class ProgressEditorWidget extends StatefulWidget { final TimeProgress timeProgress; final Function(TimeProgress, bool) onTimeProgressChanged; - ProgressEditorWidget({ + const ProgressEditorWidget({ + super.key, @required this.timeProgress, @required this.onTimeProgressChanged, }); @@ -67,7 +68,7 @@ class _ProgressEditorWidgetState extends State { child: TextField( controller: _nameTextController, decoration: InputDecoration( - border: OutlineInputBorder(), + border: const OutlineInputBorder(), labelText: "Progress Name", errorText: _validName ? null @@ -80,7 +81,7 @@ class _ProgressEditorWidgetState extends State { children: [ Expanded( child: Padding( - padding: EdgeInsets.only(right: 5), + padding: const EdgeInsets.only(right: 5), child: DatePickerBtn( leadingString: "Start Date:", pickedDate: widget.timeProgress.startTime, @@ -90,7 +91,7 @@ class _ProgressEditorWidgetState extends State { ), Expanded( child: Padding( - padding: EdgeInsets.only(left: 5), + padding: const EdgeInsets.only(left: 5), child: DatePickerBtn( leadingString: "End Date:", pickedDate: widget.timeProgress.endTime, @@ -103,9 +104,9 @@ class _ProgressEditorWidgetState extends State { ) ]; - if (!_validDate) + if (!_validDate) { columnChildren.add( - Expanded( + const Expanded( child: Center( child: Text( "Invalid Dates. The Start Date has to be before the End Date", @@ -114,11 +115,10 @@ class _ProgressEditorWidgetState extends State { ), ), ); + } - return Container( - child: Column( - children: columnChildren, - ), + return Column( + children: columnChildren, ); } } diff --git a/lib/widgets/progress_list_view/progress_list_tile.dart b/lib/widgets/progress_list_view/progress_list_tile.dart index 7cdf0a6..ce2d8b4 100644 --- a/lib/widgets/progress_list_view/progress_list_tile.dart +++ b/lib/widgets/progress_list_view/progress_list_tile.dart @@ -18,17 +18,19 @@ class ProgressListTile extends StatelessWidget { final TimeProgress timeProgress; final Color doneColor, leftColor; - ProgressListTile({ + const ProgressListTile({super.key, @required this.timeProgress, @required this.doneColor, @required this.leftColor, }); Widget _renderSubtitle(BuildContext context) { - if (!timeProgress.hasStarted()) + if (!timeProgress.hasStarted()) { return Text(ProgressListTileStrings.startsInDaysString(timeProgress)); - if (timeProgress.hasEnded()) + } + if (timeProgress.hasEnded()) { return Text(ProgressListTileStrings.endedDaysAgoString(timeProgress)); + } return LinearPercentIndicator( center: Text(ProgressListTileStrings.percentString(timeProgress)), percent: timeProgress.percentDone(), @@ -40,14 +42,14 @@ class ProgressListTile extends StatelessWidget { @override Widget build(BuildContext context) { - void _onTileTap() => + void onTileTap() => Navigator.pushNamed(context, ProgressDetailScreen.routeName, arguments: ProgressDetailScreenArguments(timeProgress.id)); return ListTile( title: Text(timeProgress.name), subtitle: _renderSubtitle(context), - onTap: _onTileTap, + onTap: onTileTap, ); } } diff --git a/lib/widgets/progress_list_view/progress_list_view.dart b/lib/widgets/progress_list_view/progress_list_view.dart index 896b36e..671a49e 100644 --- a/lib/widgets/progress_list_view/progress_list_view.dart +++ b/lib/widgets/progress_list_view/progress_list_view.dart @@ -6,7 +6,8 @@ class ProgressListView extends StatelessWidget { final List timeProgressList; final Color doneColor, leftColor; - ProgressListView({ + const ProgressListView({ + super.key, @required this.timeProgressList, @required this.doneColor, @required this.leftColor, @@ -27,7 +28,7 @@ class ProgressListView extends StatelessWidget { @override Widget build(BuildContext context) { return ListView( - padding: EdgeInsets.all(8), + padding: const EdgeInsets.all(8), children: _renderListViewChildren(), ); } diff --git a/lib/widgets/progress_view_widget.dart b/lib/widgets/progress_view_widget.dart index ca5b205..38f830a 100644 --- a/lib/widgets/progress_view_widget.dart +++ b/lib/widgets/progress_view_widget.dart @@ -8,7 +8,8 @@ class ProgressViewWidget extends StatelessWidget { final Color doneColor; final Color leftColor; - ProgressViewWidget({ + const ProgressViewWidget({ + super.key, @required this.timeProgress, @required this.doneColor, @required this.leftColor, @@ -16,49 +17,47 @@ class ProgressViewWidget extends StatelessWidget { @override Widget build(BuildContext context) { - return Container( - child: Column( - children: [ - Expanded( - child: FittedBox( - fit: BoxFit.fitWidth, - child: Text( - timeProgress.name, - textAlign: TextAlign.center, - style: TextStyle( - fontWeight: FontWeight.bold, - color: Colors.black87, - ), + return Column( + children: [ + Expanded( + child: FittedBox( + fit: BoxFit.fitWidth, + child: Text( + timeProgress.name, + textAlign: TextAlign.center, + style: const TextStyle( + fontWeight: FontWeight.bold, + color: Colors.black87, ), ), ), - Expanded( - child: CircularPercentIndicator( - radius: 100, - lineWidth: 10, - percent: timeProgress.percentDone(), - progressColor: doneColor, - backgroundColor: leftColor, - center: Text("${(timeProgress.percentDone() * 100).floor()} %"), - ), + ), + Expanded( + child: CircularPercentIndicator( + radius: 100, + lineWidth: 10, + percent: timeProgress.percentDone(), + progressColor: doneColor, + backgroundColor: leftColor, + center: Text("${(timeProgress.percentDone() * 100).floor()} %"), ), - Expanded( - child: LinearPercentIndicator( - padding: EdgeInsets.symmetric(horizontal: 15), - percent: timeProgress.percentDone(), - leading: Text("${timeProgress.daysBehind()} Days"), - center: Text( - "${(timeProgress.percentDone() * 100).floor()} %", - style: TextStyle(color: Colors.white), - ), - trailing: Text("${timeProgress.daysLeft()} Days"), - progressColor: doneColor, - backgroundColor: leftColor, - lineHeight: 25, + ), + Expanded( + child: LinearPercentIndicator( + padding: const EdgeInsets.symmetric(horizontal: 15), + percent: timeProgress.percentDone(), + leading: Text("${timeProgress.daysBehind()} Days"), + center: Text( + "${(timeProgress.percentDone() * 100).floor()} %", + style: const TextStyle(color: Colors.white), ), + trailing: Text("${timeProgress.daysLeft()} Days"), + progressColor: doneColor, + backgroundColor: leftColor, + lineHeight: 25, ), - ], - ), + ), + ], ); } } diff --git a/lib/widgets/store_connectors/settings_store_connector.dart b/lib/widgets/store_connectors/settings_store_connector.dart index 8ebc876..649b502 100644 --- a/lib/widgets/store_connectors/settings_store_connector.dart +++ b/lib/widgets/store_connectors/settings_store_connector.dart @@ -8,7 +8,8 @@ import 'package:time_progress_tracker/models/app_state.dart'; class SettingsStoreConnector extends StatelessWidget { final Widget Function(BuildContext, SettingsViewModel) loadedBuilder; - SettingsStoreConnector({ + const SettingsStoreConnector({ + super.key, @required this.loadedBuilder, }); @@ -18,10 +19,11 @@ class SettingsStoreConnector extends StatelessWidget { onInit: loadSettingsIfUnloaded, converter: (store) => SettingsViewModel._create(store), builder: (context, SettingsViewModel vm) { - if (!vm.hasSettingsLoaded) - return Center( + if (!vm.hasSettingsLoaded) { + return const Center( child: CircularProgressIndicator(), ); + } return loadedBuilder(context, vm); }, ); @@ -44,17 +46,17 @@ class SettingsViewModel { ); factory SettingsViewModel._create(Store store) { - AppSettings _appSettings = store.state.appSettings; + AppSettings appSettings = store.state.appSettings; - void _updateDoneColor(Color dC) => store.dispatch( - UpdateAppSettingsActions(_appSettings.copyWith(doneColor: dC))); - void _updateLeftColor(Color lC) => store.dispatch( - UpdateAppSettingsActions(_appSettings.copyWith(leftColor: lC))); + void updateDoneColor(Color dC) => store.dispatch( + UpdateAppSettingsActions(appSettings.copyWith(doneColor: dC))); + void updateLeftColor(Color lC) => store.dispatch( + UpdateAppSettingsActions(appSettings.copyWith(leftColor: lC))); - void _updateDuration(Duration d) => store - .dispatch(UpdateAppSettingsActions(_appSettings.copyWith(duration: d))); + void updateDuration(Duration d) => store + .dispatch(UpdateAppSettingsActions(appSettings.copyWith(duration: d))); - return SettingsViewModel(_appSettings, store.state.hasSettingsLoaded, - _updateDoneColor, _updateLeftColor, _updateDuration); + return SettingsViewModel(appSettings, store.state.hasSettingsLoaded, + updateDoneColor, updateLeftColor, updateDuration); } } 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 6929281..5ccf3cb 100644 --- a/lib/widgets/store_connectors/time_progress_list_store_connector.dart +++ b/lib/widgets/store_connectors/time_progress_list_store_connector.dart @@ -8,7 +8,8 @@ import 'package:time_progress_tracker/models/time_progress.dart'; class TimeProgressListStoreConnector extends StatelessWidget { final Widget Function(BuildContext, TimeProgressListViewModel) loadedBuilder; - TimeProgressListStoreConnector({ + const TimeProgressListStoreConnector({ + super.key, @required this.loadedBuilder, }); @@ -18,10 +19,11 @@ class TimeProgressListStoreConnector extends StatelessWidget { onInit: loadTimeProgressListIfUnloaded, converter: (store) => TimeProgressListViewModel._create(store), builder: (context, TimeProgressListViewModel vm) { - if (!vm.hasTpListLoaded) - return Center( + if (!vm.hasTpListLoaded) { + return const Center( child: CircularProgressIndicator(), ); + } return loadedBuilder(context, vm); }, ); diff --git a/lib/widgets/store_connectors/time_progress_store_connector.dart b/lib/widgets/store_connectors/time_progress_store_connector.dart index 9237623..27f15ae 100644 --- a/lib/widgets/store_connectors/time_progress_store_connector.dart +++ b/lib/widgets/store_connectors/time_progress_store_connector.dart @@ -11,7 +11,8 @@ class TimeProgressStoreConnector extends StatelessWidget { final String timeProgressId; final Widget Function(BuildContext, TimeProgressViewModel) loadedBuilder; - TimeProgressStoreConnector({ + const TimeProgressStoreConnector({ + super.key, @required this.timeProgressId, @required this.loadedBuilder, }); @@ -23,14 +24,16 @@ class TimeProgressStoreConnector extends StatelessWidget { converter: (store) => TimeProgressViewModel._create(store, timeProgressId), builder: (context, TimeProgressViewModel vm) { - if (!vm.hasTpListLoaded) - return Center( + if (!vm.hasTpListLoaded) { + return const Center( child: CircularProgressIndicator(), ); - if (vm.tp == null) - return Center( + } + if (vm.tp == null) { + return const Center( child: Text("Error Invalid Time Progress"), ); + } return loadedBuilder(context, vm); }, ); @@ -52,15 +55,15 @@ class TimeProgressViewModel { ); factory TimeProgressViewModel._create(Store store, String id) { - void _updateTimeProgress(TimeProgress tp) => + void updateTimeProgress(TimeProgress tp) => store.dispatch(UpdateTimeProgressAction(id, tp)); - void _deleteTimeProgress() => store.dispatch(DeleteTimeProgressAction(id)); + void deleteTimeProgress() => store.dispatch(DeleteTimeProgressAction(id)); return TimeProgressViewModel( selectProgressById(store.state.timeProgressList, id), store.state.hasProgressesLoaded, - _updateTimeProgress, - _deleteTimeProgress, + updateTimeProgress, + deleteTimeProgress, ); } } diff --git a/test/MaterialTesterWidget.dart b/test/material_tester_widget.dart similarity index 86% rename from test/MaterialTesterWidget.dart rename to test/material_tester_widget.dart index 7fc20fc..a15f58d 100644 --- a/test/MaterialTesterWidget.dart +++ b/test/material_tester_widget.dart @@ -3,7 +3,8 @@ import 'package:flutter/material.dart'; class MaterialTesterWidget extends StatelessWidget { final Widget widget; - MaterialTesterWidget({ + const MaterialTesterWidget({ + super.key, @required this.widget, }); diff --git a/test/widget_test.dart b/test/widget_test.dart index e95f9a7..d24b6bc 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -13,34 +13,34 @@ import 'package:time_progress_tracker/models/time_progress.dart'; import 'package:time_progress_tracker/widgets/progress_list_view/progress_list_tile.dart'; import 'package:time_progress_tracker/widgets/progress_list_view/progress_list_view.dart'; -import 'MaterialTesterWidget.dart'; +import 'material_tester_widget.dart'; void main() { - final AppSettings _defaultAppSettings = AppSettings.defaults(); - final int _thisYear = DateTime.now().year; - final TimeProgress _activeProgress = TimeProgress( - "TestProgress", DateTime(_thisYear - 2), DateTime(_thisYear + 2)); + final AppSettings defaultAppSettings = AppSettings.defaults(); + final int thisYear = DateTime.now().year; + final TimeProgress activeProgress = TimeProgress( + "TestProgress", DateTime(thisYear - 2), DateTime(thisYear + 2)); - void _findStringOnce(String str) => expect(find.text(str), findsOneWidget); + void findStringOnce(String str) => expect(find.text(str), findsOneWidget); testWidgets("Progress List Tile with currently active progress works", (WidgetTester tester) async { await tester.pumpWidget(MaterialTesterWidget( widget: ProgressListTile( - timeProgress: _activeProgress, - doneColor: _defaultAppSettings.doneColor, - leftColor: _defaultAppSettings.leftColor, + timeProgress: activeProgress, + doneColor: defaultAppSettings.doneColor, + leftColor: defaultAppSettings.leftColor, ), )); - _findStringOnce(_activeProgress.name); - _findStringOnce(ProgressListTileStrings.percentString(_activeProgress)); + findStringOnce(activeProgress.name); + findStringOnce(ProgressListTileStrings.percentString(activeProgress)); - WidgetPredicate linearPercentPredicate = (Widget widget) => + linearPercentPredicate(Widget widget) => widget is LinearPercentIndicator && - widget.percent == _activeProgress.percentDone() && - widget.progressColor == _defaultAppSettings.doneColor && - widget.backgroundColor == _defaultAppSettings.leftColor; + widget.percent == activeProgress.percentDone() && + widget.progressColor == defaultAppSettings.doneColor && + widget.backgroundColor == defaultAppSettings.leftColor; expect(find.byWidgetPredicate(linearPercentPredicate), findsOneWidget); }); @@ -48,40 +48,40 @@ void main() { (WidgetTester tester) async { TimeProgress futureProgress = TimeProgress( "Test Progress", - DateTime(_thisYear + 1), - DateTime(_thisYear + 2), + DateTime(thisYear + 1), + DateTime(thisYear + 2), ); await tester.pumpWidget(MaterialTesterWidget( widget: ProgressListTile( timeProgress: futureProgress, - doneColor: _defaultAppSettings.doneColor, - leftColor: _defaultAppSettings.leftColor, + doneColor: defaultAppSettings.doneColor, + leftColor: defaultAppSettings.leftColor, ), )); - _findStringOnce(futureProgress.name); - _findStringOnce(ProgressListTileStrings.startsInDaysString(futureProgress)); + findStringOnce(futureProgress.name); + findStringOnce(ProgressListTileStrings.startsInDaysString(futureProgress)); }); testWidgets("Progress List Tile with past progress works", (WidgetTester tester) async { TimeProgress pastProgress = TimeProgress( "Test Progress", - DateTime(_thisYear - 2), - DateTime(_thisYear - 1), + DateTime(thisYear - 2), + DateTime(thisYear - 1), ); await tester.pumpWidget(MaterialTesterWidget( widget: ProgressListTile( timeProgress: pastProgress, - doneColor: _defaultAppSettings.doneColor, - leftColor: _defaultAppSettings.leftColor, + doneColor: defaultAppSettings.doneColor, + leftColor: defaultAppSettings.leftColor, ), )); - _findStringOnce(pastProgress.name); - _findStringOnce(ProgressListTileStrings.endedDaysAgoString(pastProgress)); + findStringOnce(pastProgress.name); + findStringOnce(ProgressListTileStrings.endedDaysAgoString(pastProgress)); }); WidgetPredicate getProgressListTilePredicate( @@ -96,35 +96,37 @@ void main() { (WidgetTester tester) async { await tester.pumpWidget(MaterialTesterWidget( widget: ProgressListView( - timeProgressList: [_activeProgress], - doneColor: _defaultAppSettings.doneColor, - leftColor: _defaultAppSettings.leftColor, + timeProgressList: [activeProgress], + doneColor: defaultAppSettings.doneColor, + leftColor: defaultAppSettings.leftColor, ), )); - _findStringOnce(_activeProgress.name); + findStringOnce(activeProgress.name); expect( find.byWidgetPredicate( - getProgressListTilePredicate(_activeProgress, _defaultAppSettings)), + getProgressListTilePredicate(activeProgress, defaultAppSettings)), findsOneWidget); }); testWidgets("Progress List View displays file tiles", (WidgetTester tester) async { List tpList = []; - for (int i = 0; i < 5; i++) tpList.add(_activeProgress); + for (int i = 0; i < 5; i++) { + tpList.add(activeProgress); + } await tester.pumpWidget(MaterialTesterWidget( widget: ProgressListView( timeProgressList: tpList, - doneColor: _defaultAppSettings.doneColor, - leftColor: _defaultAppSettings.leftColor, + doneColor: defaultAppSettings.doneColor, + leftColor: defaultAppSettings.leftColor, ), )); - expect(find.text(_activeProgress.name), findsNWidgets(5)); + expect(find.text(activeProgress.name), findsNWidgets(5)); expect( find.byWidgetPredicate( - getProgressListTilePredicate(_activeProgress, _defaultAppSettings)), + getProgressListTilePredicate(activeProgress, defaultAppSettings)), findsNWidgets(5)); }); }