Fixed Remaining Problems

lib/app.dart

@@ -12,9 +12,9 @@ class TimeProgressTrackerApp extends StatelessWidget {
   final Store<AppState> store;
 
   const TimeProgressTrackerApp({
-    Key key,
+    super.key,
-    this.store,
+    required this.store,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -23,15 +23,17 @@ class TimeProgressTrackerApp extends StatelessWidget {
       child: MaterialApp(
         title: name,
         theme: ThemeData(
+          primarySwatch: Colors.indigo,
+          colorScheme: ColorScheme.fromSwatch(
             primarySwatch: Colors.indigo,
             accentColor: Colors.indigoAccent,
+          ),
           brightness: Brightness.light,
           visualDensity: VisualDensity.adaptivePlatformDensity,
         ),
         initialRoute: HomeScreen.routeName,
         routes: {
-          HomeScreen.routeName: (BuildContext context) =>
+          HomeScreen.routeName: (BuildContext context) => const HomeScreen(),
-              const HomeScreen(),
           ProgressDetailScreen.routeName: (BuildContext context) =>
               const ProgressDetailScreen(),
           ProgressCreationScreen.routeName: (BuildContext context) =>

lib/helper_functions.dart

@@ -3,7 +3,7 @@ import 'dart:ui';
 import 'package:time_progress_tracker/models/time_progress.dart';
 
 TimeProgress selectProgressById(List<TimeProgress> tpList, String id) =>
-    tpList.firstWhere((tp) => tp.id == id, orElse: null);
+    tpList.firstWhere((tp) => tp.id == id, orElse: () => TimeProgress.initialDefault());
 
 List<TimeProgress> selectActiveProgresses(List<TimeProgress> tpList) =>
     tpList.where((tp) => tp.hasStarted() && !tp.hasEnded()).toList();

lib/middleware/store_middleware.dart

@@ -45,9 +45,6 @@ Middleware<AppState> _createLoadTimeProgressList(
     repository.loadTimeProgressList().then((timeProgresses) {
       List<TimeProgress> timeProgressList =
           timeProgresses.map<TimeProgress>(TimeProgress.fromEntity).toList();
-      if (timeProgressList == null) {
-        timeProgressList = [];
-      }
       store.dispatch(TimeProgressListLoadedAction(
         timeProgressList,
       ));

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 DateTime startTime;
-  final endTime;
+  final DateTime endTime;
 
   TimeProgressStartTimeIsNotBeforeEndTimeException(
       this.startTime, this.endTime);

lib/models/app_settings.dart

@@ -8,9 +8,9 @@ class AppSettings {
   final Duration duration;
 
   const AppSettings({
-    this.doneColor,
+    required this.doneColor,
-    this.leftColor,
+    required this.leftColor,
-    this.duration,
+    required this.duration,
   });
 
   factory AppSettings.defaults() => const AppSettings(
@@ -20,9 +20,9 @@ class AppSettings {
       );
 
   AppSettings copyWith({
-    Color doneColor,
+    Color? doneColor,
-    Color leftColor,
+    Color? leftColor,
-    Duration duration,
+    Duration? duration,
   }) =>
       AppSettings(
         doneColor: doneColor ?? this.doneColor,

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,
+    bool? hasLoaded,
-    List<TimeProgress> timeProgressList,
+    List<TimeProgress>? timeProgressList,
+    AppSettings? appSettings,
   }) {
     return AppState(
       hasProgressesLoaded: hasLoaded ?? hasProgressesLoaded,
       timeProgressList: timeProgressList ?? this.timeProgressList,
+      appSettings: appSettings ?? this.appSettings,
     );
   }
 

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);

lib/persistence/app_settings.dart

@@ -53,8 +53,8 @@ class AppSettingsEntity {
 
   static AppSettingsEntity fromJson(Map<String, Object> json) =>
       AppSettingsEntity(
-        json[_doneKey],
+        json[_doneKey] as int,
-        json[_leftKey],
+        json[_leftKey] as int,
-        json[_durationDaysKey],
+        json[_durationDaysKey] as int,
       );
 }

lib/screens/progress_creation_screen.dart

@@ -54,7 +54,8 @@ class _ProgressCreationScreenState extends State<ProgressCreationScreen> {
             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<ProgressCreationScreen> {
                 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.defaultDurationProgress,
-    @required this.onAddTimeProgress,
+    required this.onAddTimeProgress,
   });
 
   factory _ViewModel.create(Store<AppState> store) {

lib/screens/progress_detail_screen.dart

@@ -62,7 +62,7 @@ class _ProgressDetailScreenState extends State<ProgressDetailScreen> {
     List<Widget> 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<ProgressDetailScreen> {
     if (_editMode) {
       columnChildren.add(Expanded(
           child: ProgressEditorWidget(
-        timeProgress: _editedProgress,
+        timeProgress: _editedProgress ?? tpVm.tp,
         onTimeProgressChanged: _onEditedProgressChanged,
       )));
     }
@@ -80,7 +80,7 @@ class _ProgressDetailScreenState extends State<ProgressDetailScreen> {
   @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<ProgressDetailScreen> {
         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<ProgressDetailScreen> {
           return DetailScreenFloatingActionButtons(
               editMode: _editMode,
               originalProgress: tpVm.tp,
-              editedProgress: _editedProgress,
+              editedProgress: _editedProgress ?? tpVm.tp,
               isEditedProgressValid: _isEditedProgressValid,
               onEditProgress: () => _switchEditMode(true),
               onSaveEditedProgress: saveEditedProgress,

lib/selectors/time_progress_selectors.dart

@@ -45,10 +45,11 @@ List<TimeProgress> 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
+  return state.timeProgressList.firstWhere(
-      .firstWhere((timeProgress) => timeProgress.id == id, orElse: () => null);
+      (timeProgress) => timeProgress.id == id,
+      orElse: () => TimeProgress.initialDefault());
 }
 
 AppSettings appSettingsSelector(AppState state) {

lib/widgets/app_yes_no_dialog_widget.dart

@@ -6,11 +6,11 @@ class AppYesNoDialog extends StatelessWidget {
   final void Function() onYesPressed;
 
   const AppYesNoDialog({
-    Key key,
+    super.key,
-    @required this.titleText,
+    required this.titleText,
-    @required this.contentText,
+    required this.contentText,
-    @required this.onYesPressed,
+    required this.onYesPressed,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -18,15 +18,15 @@ class AppYesNoDialog extends StatelessWidget {
       title: Text(titleText),
       content: Text(contentText),
       actions: <Widget>[
-        FlatButton(
+        TextButton(
-          child: const Text("Yes"),
           onPressed: onYesPressed,
+          child: const Text("Yes"),
         ),
-        FlatButton(
+        TextButton(
-          child: const Text("No"),
           onPressed: () {
             Navigator.pop(context);
           },
+          child: const Text("No"),
         )
       ],
     );

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, 
+  const ColorPickerButton({
-    @required this.title,
+    super.key,
-    @required this.dialogTitle,
+    required this.title,
-    @required this.selectedColor,
+    required this.dialogTitle,
-    @required this.onColorPicked,
+    required this.selectedColor,
+    required this.onColorPicked,
   });
 
   @override
@@ -35,9 +36,9 @@ class ColorPickerButton extends StatelessWidget {
         );
       },
       style: TextButton.styleFrom(
-        primary: useBrightBackground(selectedColor)
+        foregroundColor: useBrightBackground(selectedColor)
-            ? appTheme.primaryTextTheme.labelLarge.color
+            ? appTheme.primaryTextTheme.labelLarge?.color
-            : appTheme.textTheme.labelLarge.color,
+            : appTheme.textTheme.labelLarge?.color,
         backgroundColor: selectedColor,
       ),
       child: Text(title),

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, 
+  const DatePickerBtn({
-    @required this.leadingString,
+    super.key,
-    @required this.pickedDate,
+    required this.leadingString,
-    @required this.onDatePicked,
+    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,
+        foregroundColor: appTheme.primaryTextTheme.labelLarge?.color,
-        backgroundColor: appTheme.accentColor,
+        backgroundColor: appTheme.colorScheme.secondary,
       ),
       child: Text(
           "$leadingString ${pickedDate.toLocal().toString().split(" ")[0]}"),

lib/widgets/buttons/select_duration_btn.dart

@@ -7,8 +7,8 @@ class SelectDurationBtn extends StatelessWidget {
 
   const SelectDurationBtn({
     super.key,
-    @required this.duration,
+    required this.duration,
-    @required this.updateDuration,
+    required this.updateDuration,
   });
 
   void _onPickerConfirm(Picker picker, List<int> 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,
+          foregroundColor: appTheme.primaryTextTheme.labelLarge?.color,
-          backgroundColor: appTheme.accentColor,
+          backgroundColor: appTheme.colorScheme.secondary,
         ),
         child: Text("$years Years $months Months $days Days"));
   }

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.editMode,
-    @required this.originalProgress,
+    required this.originalProgress,
-    @required this.editedProgress,
+    required this.editedProgress,
-    @required this.isEditedProgressValid,
+    required this.isEditedProgressValid,
-    @required this.onEditProgress,
+    required this.onEditProgress,
-    @required this.onSaveEditedProgress,
+    required this.onSaveEditedProgress,
-    @required this.onCancelEditProgress,
+    required this.onCancelEditProgress,
-    @required this.onDeleteProgress,
+    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

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.currentIndex,
-    @required this.onTap,
+    required this.onTap,
   });
 
   @override

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.doneColor,
-    @required this.leftColor,
+    required this.leftColor,
-    @required this.updateDoneColor,
+    required this.updateDoneColor,
-    @required this.updateLeftColor,
+    required this.updateLeftColor,
   });
 
   @override

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.duration,
-    @required this.updateDuration,
+    required this.updateDuration,
   });
 
   @override

lib/widgets/progress_editor_widget.dart

@@ -8,8 +8,8 @@ class ProgressEditorWidget extends StatefulWidget {
 
   const ProgressEditorWidget({
     super.key,
-    @required this.timeProgress,
+    required this.timeProgress,
-    @required this.onTimeProgressChanged,
+    required this.onTimeProgressChanged,
   });
 
   @override
@@ -32,7 +32,10 @@ class _ProgressEditorWidgetState extends State<ProgressEditorWidget> {
     });
   }
 
-  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<ProgressEditorWidget> {
     });
   }
 
-  void _onEndDateChanged(DateTime newEndDate) {
+  void _onEndDateChanged(DateTime? newEndDate) {
+    if (newEndDate == null) {
+      return;
+    }
     TimeProgress newProgress =
         widget.timeProgress.copyWith(endTime: newEndDate);
     widget.onTimeProgressChanged(

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.timeProgress,
-    @required this.doneColor,
+    required this.doneColor,
-    @required this.leftColor,
+    required this.leftColor,
   });
 
   Widget _renderSubtitle(BuildContext context) {

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.timeProgressList,
-    @required this.doneColor,
+    required this.doneColor,
-    @required this.leftColor,
+    required this.leftColor,
   });
 
   List<Widget> _renderListViewChildren() {

lib/widgets/progress_view_widget.dart

@@ -10,9 +10,9 @@ class ProgressViewWidget extends StatelessWidget {
 
   const ProgressViewWidget({
     super.key,
-    @required this.timeProgress,
+    required this.timeProgress,
-    @required this.doneColor,
+    required this.doneColor,
-    @required this.leftColor,
+    required this.leftColor,
   });
 
   @override

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

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

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.timeProgressId,
-    @required this.loadedBuilder,
+    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);
       },
     );

test/material_tester_widget.dart

@@ -5,7 +5,7 @@ class MaterialTesterWidget extends StatelessWidget {
 
   const MaterialTesterWidget({
     super.key,
-    @required this.widget,
+    required this.widget,
   });
 
   @override