Updated Flutter SDK for Null-Safety

Ported Progress Detail Screen to PlatformScaffold

Signed-off-by: Andreas Fahrecker <AndreasFahrecker@gmail.com>

lib/app.dart

@@ -13,8 +13,8 @@ class TimeProgressTrackerApp extends StatelessWidget {
   final Store<AppState> store;
 
   TimeProgressTrackerApp({
-    Key key,
+    Key? key,
-    this.store,
+    required this.store,
   }) : super(key: key);
 
   @override

lib/models/app_settings.dart

@@ -7,22 +7,16 @@ class AppSettings {
   final Color leftColor;
   final Duration duration;
 
-  AppSettings({
+  const AppSettings({
-    this.doneColor,
+    required this.doneColor,
-    this.leftColor,
+    required this.leftColor,
-    this.duration,
+    required this.duration,
   });
 
-  factory AppSettings.defaults() => AppSettings(
-        doneColor: Colors.green,
-        leftColor: Colors.red,
-        duration: Duration(days: 365),
-      );
-
   AppSettings copyWith({
-    Color doneColor,
+    Color? doneColor,
-    Color leftColor,
+    Color? leftColor,
-    Duration duration,
+    Duration? duration,
   }) =>
       AppSettings(
         doneColor: doneColor ?? this.doneColor,

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,
@@ -87,16 +87,19 @@ class TimeProgress {
     return TimeProgressEntity(id, name, startTime, endTime);
   }
 
-  static TimeProgress fromEntity(TimeProgressEntity entity) =>
+  static TimeProgress fromEntity(TimeProgressEntity entity) => TimeProgress(
-      TimeProgress(entity.name, entity.startTime, entity.endTime,
+        entity.name,
-          id: entity.id ?? Uuid().generateV4());
+        entity.startTime,
+        entity.endTime,
+        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

@@ -1,6 +1,7 @@
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:time_progress_tracker/models/app_settings.dart';
 import 'package:time_progress_tracker/persistence/repository.dart';
+import 'package:time_progress_tracker/utils/constants.dart';
 
 class AppSettingsRepository extends Repository<AppSettingsEntity> {
   static const String _key = "app_settings";
@@ -9,7 +10,7 @@ class AppSettingsRepository extends Repository<AppSettingsEntity> {
 
   @override
   Future<AppSettingsEntity> load() {
-    final String jsonString = this.prefs.getString(_key);
+    final String? jsonString = this.prefs.getString(_key);
     if (jsonString == null)
       return Future<AppSettingsEntity>.value(AppSettingsEntity.defaults());
     return Future<AppSettingsEntity>.value(
@@ -30,7 +31,7 @@ class AppSettingsEntity {
   AppSettingsEntity(
       this.doneColorValue, this.leftColorValue, this.durationDays);
 
-  factory AppSettingsEntity.defaults() => AppSettings.defaults().toEntity();
+  factory AppSettingsEntity.defaults() => defaultAppSettings.toEntity();
 
   @override
   int get hashCode => doneColorValue.hashCode ^ leftColorValue.hashCode;
@@ -51,8 +52,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/persistence/time_progress.dart

@@ -8,7 +8,7 @@ class TimeProgressRepository extends Repository<List<TimeProgressEntity>> {
 
   @override
   Future<List<TimeProgressEntity>> load() {
-    final String jsonString = this.prefs.getString(_key);
+    final String? jsonString = this.prefs.getString(_key);
     if (jsonString == null) {
       return Future<List<TimeProgressEntity>>.value([]);
     }

lib/redux/app_state.dart

@@ -1,6 +1,7 @@
 import 'package:meta/meta.dart';
 import 'package:time_progress_tracker/models/app_settings.dart';
 import 'package:time_progress_tracker/models/time_progress.dart';
+import 'package:time_progress_tracker/utils/constants.dart';
 
 @immutable
 class AppState {
@@ -12,14 +13,14 @@ class AppState {
       {this.hasProgressesLoaded = false,
       this.hasSettingsLoaded = false,
       this.timeProgressList = const [],
-      this.appSettings});
+      this.appSettings = defaultAppSettings});
 
   factory AppState.initial() =>
-      AppState(hasProgressesLoaded: false, appSettings: AppSettings.defaults());
+      AppState(hasProgressesLoaded: false, appSettings: defaultAppSettings);
 
   AppState copyWith({
-    bool hasLoaded,
+    bool? hasLoaded,
-    List<TimeProgress> timeProgressList,
+    List<TimeProgress>? timeProgressList,
   }) {
     return AppState(
       hasProgressesLoaded: hasLoaded ?? this.hasProgressesLoaded,

lib/redux/reducers/model_reducers.dart

@@ -4,6 +4,7 @@ import 'package:time_progress_tracker/models/time_progress.dart';
 import 'package:time_progress_tracker/redux/actions/app_settings_actions.dart';
 import 'package:time_progress_tracker/redux/actions/redux_actions.dart';
 import 'package:time_progress_tracker/redux/actions/time_progress_actions.dart';
+import 'package:time_progress_tracker/utils/constants.dart';
 
 final timeProgressListReducer = combineReducers<List<TimeProgress>>([
   TypedReducer<List<TimeProgress>, TimeProgressListLoadedAction>(
@@ -55,7 +56,7 @@ final appSettingsReducers = combineReducers<AppSettings>([
 
 AppSettings _setDefaultSettings(
         AppSettings appSettings, AppSettingsNotLoadedAction action) =>
-    AppSettings.defaults();
+    defaultAppSettings;
 
 AppSettings _updateAppSettings(
         AppSettings appSettings, AppSettingsAction action) =>

lib/redux/redux_selectors.dart

@@ -1,8 +1,8 @@
 import 'dart:ui';
 
 import 'package:time_progress_tracker/models/app_settings.dart';
-import 'package:time_progress_tracker/redux/app_state.dart';
 import 'package:time_progress_tracker/models/time_progress.dart';
+import 'package:time_progress_tracker/redux/app_state.dart';
 
 List<TimeProgress> timeProgressListSelector(AppState state) =>
     state.timeProgressList;
@@ -45,10 +45,12 @@ List<TimeProgress> pastTimeProgressesSelector(AppState state) =>
             DateTime.now().millisecondsSinceEpoch)
         .toList();
 
-TimeProgress timeProgressByIdSelector(AppState state, String id) {
+TimeProgress? timeProgressByIdSelector(AppState state, String id) {
   if (state.timeProgressList.length < 1) return null;
-  return state.timeProgressList
+  TimeProgress tp = state.timeProgressList.firstWhere(
-      .firstWhere((timeProgress) => timeProgress.id == id, orElse: () => null);
+      (timeProgress) => timeProgress.id == id,
+      orElse: () => TimeProgress.initialDefault());
+  return tp != TimeProgress.initialDefault() ? tp : null;
 }
 
 AppSettings appSettingsSelector(AppState state) {

lib/redux/store_connectors/create_time_progress_store_connector.dart

@@ -14,7 +14,7 @@ class CreateTimeProgressStoreConnector extends StatelessWidget {
       loadedBuilder;
 
   CreateTimeProgressStoreConnector({
-    @required this.loadedBuilder,
+    required this.loadedBuilder,
   });
 
   @override

lib/redux/store_connectors/settings_store_connector.dart

@@ -10,7 +10,7 @@ class SettingsStoreConnector extends StatelessWidget {
   final Widget Function(BuildContext, SettingsViewModel) loadedBuilder;
 
   SettingsStoreConnector({
-    @required this.loadedBuilder,
+    required this.loadedBuilder,
   });
 
   @override

lib/redux/store_connectors/time_progress_list_store_connector.dart

@@ -9,7 +9,7 @@ class TimeProgressListStoreConnector extends StatelessWidget {
   final Widget Function(BuildContext, TimeProgressListViewModel) loadedBuilder;
 
   TimeProgressListStoreConnector({
-    @required this.loadedBuilder,
+    required this.loadedBuilder,
   });
 
   @override

lib/redux/store_connectors/time_progress_store_connector.dart

@@ -4,16 +4,16 @@ import 'package:redux/redux.dart';
 import 'package:time_progress_tracker/redux/actions/time_progress_actions.dart';
 import 'package:time_progress_tracker/redux/app_state.dart';
 import 'package:time_progress_tracker/models/time_progress.dart';
+import 'package:time_progress_tracker/utils/helper_functions.dart';
 
-import '../../utils/helper_functions.dart';
 
 class TimeProgressStoreConnector extends StatelessWidget {
   final String timeProgressId;
   final Widget Function(BuildContext, TimeProgressViewModel) loadedBuilder;
 
   TimeProgressStoreConnector({
-    @required this.timeProgressId,
+    required this.timeProgressId,
-    @required this.loadedBuilder,
+    required this.loadedBuilder,
   });
 
   @override
@@ -38,7 +38,7 @@ class TimeProgressStoreConnector extends StatelessWidget {
 }
 
 class TimeProgressViewModel {
-  final TimeProgress tp;
+  final TimeProgress? tp;
   final bool hasTpListLoaded;
 
   final void Function(TimeProgress) updateTimeProgress;

lib/ui/app_yes_no_dialog_widget.dart

@@ -6,10 +6,10 @@ class AppYesNoDialog extends StatelessWidget {
   final void Function() onYesPressed;
 
   AppYesNoDialog({
-    Key key,
+    Key? key,
-    @required this.titleText,
+    required this.titleText,
-    @required this.contentText,
+    required this.contentText,
-    @required this.onYesPressed,
+    required this.onYesPressed,
   }) : super(key: key);
 
   @override

lib/ui/buttons/color_picker_btn.dart

@@ -8,10 +8,10 @@ class ColorPickerButton extends StatelessWidget {
   final void Function(Color) onColorPicked;
 
   ColorPickerButton({
-    @required this.title,
+    required this.title,
-    @required this.dialogTitle,
+    required this.dialogTitle,
-    @required this.selectedColor,
+    required this.selectedColor,
-    @required this.onColorPicked,
+    required this.onColorPicked,
   });
 
   @override
@@ -37,8 +37,8 @@ class ColorPickerButton extends StatelessWidget {
       child: Text(title),
       style: TextButton.styleFrom(
         primary: useBrightBackground(selectedColor)
-            ? appTheme.primaryTextTheme.button.color
+            ? appTheme.primaryTextTheme.button!.color
-            : appTheme.textTheme.button.color,
+            : appTheme.textTheme.button!.color,
         backgroundColor: selectedColor,
       ),
     );

lib/ui/buttons/create_progress_button.dart

@@ -8,7 +8,7 @@ class CreateProgressButton extends StatelessWidget {
 
   final void Function() createProgress;
 
-  const CreateProgressButton({Key key, @required this.createProgress})
+  const CreateProgressButton({Key? key, required this.createProgress})
       : super(key: key);
 
   @override

lib/ui/buttons/date_picker_btn.dart

@@ -6,18 +6,18 @@ class DatePickerBtn extends StatelessWidget {
   final void Function(DateTime) onDatePicked;
 
   DatePickerBtn({
-    @required this.leadingString,
+    required this.leadingString,
-    @required this.pickedDate,
+    required this.pickedDate,
-    @required this.onDatePicked,
+    required this.onDatePicked,
   }) : super();
 
   void _onButtonPressed(BuildContext context) async {
-    onDatePicked(await showDatePicker(
+    onDatePicked((await showDatePicker(
       context: context,
       initialDate: pickedDate,
       firstDate: DateTime(1900),
       lastDate: DateTime(2100),
-    ));
+    ))!);
   }
 
   @override
@@ -28,7 +28,7 @@ class DatePickerBtn extends StatelessWidget {
       child: Text(
           "$leadingString ${pickedDate.toLocal().toString().split(" ")[0]}"),
       style: TextButton.styleFrom(
-        primary: appTheme.primaryTextTheme.button.color,
+        primary: appTheme.primaryTextTheme.button!.color,
         backgroundColor: appTheme.accentColor,
       ),
     );

lib/ui/buttons/detail_screen_leading_button.dart

@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+import 'package:time_progress_tracker/ui/buttons/platform_action_button.dart';
+
+class DetailScreenLeadingButton extends StatelessWidget {
+  final bool isEditMode, isEditedTpValid;
+  final void Function() saveTp, editTp;
+
+  const DetailScreenLeadingButton({
+    Key? key,
+    required this.isEditMode,
+    required this.isEditedTpValid,
+    required this.saveTp,
+    required this.editTp,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    final ThemeData materialTheme = Theme.of(context);
+
+    if (isEditMode)
+      return PlatformActionButton(
+          heroTag: "saveEditedTimeProgressBTN",
+          icon: Icons.save,
+          materialBackground: Colors.green,
+          onBtnPressed: isEditedTpValid ? saveTp : null);
+    return PlatformActionButton(
+      heroTag: "editTimeProgressBTN",
+      icon: Icons.edit,
+      materialBackground: materialTheme.accentColor,
+      onBtnPressed: editTp,
+    );
+  }
+}

lib/ui/buttons/detail_screen_trailing_button.dart

@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+import 'package:time_progress_tracker/ui/buttons/platform_action_button.dart';
+
+class DetailScreenTrailingButton extends StatelessWidget {
+  final bool isEditMode;
+  final void Function() cancelEditTp, deleteTp;
+
+  const DetailScreenTrailingButton({
+    Key? key,
+    required this.isEditMode,
+    required this.cancelEditTp,
+    required this.deleteTp,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    if (isEditMode)
+      return PlatformActionButton(
+          heroTag: "cancelEditTimeProgressBTN",
+          icon: Icons.cancel,
+          materialBackground: Colors.red,
+          onBtnPressed: cancelEditTp);
+    return PlatformActionButton(
+      heroTag: "deleteTimeProgressBTN",
+      icon: Icons.delete,
+      materialBackground: Colors.red,
+      onBtnPressed: deleteTp,
+    );
+  }
+}

lib/ui/buttons/platform_action_button.dart

@@ -6,13 +6,15 @@ import 'package:time_progress_tracker/utils/helper_functions.dart';
 class PlatformActionButton extends StatelessWidget {
   final String heroTag;
   final IconData icon;
-  final void Function() onBtnPressed;
+  final Color? materialBackground;
+  final void Function()? onBtnPressed;
 
   const PlatformActionButton({
-    Key key,
+    Key? key,
-    @required this.heroTag,
+    required this.heroTag,
-    @required this.icon,
+    required this.icon,
-    @required this.onBtnPressed,
+    this.materialBackground,
+    required this.onBtnPressed,
   }) : super(key: key);
 
   @override
@@ -32,6 +34,7 @@ class PlatformActionButton extends StatelessWidget {
       return FloatingActionButton(
         heroTag: heroTag,
         child: Icon(icon),
+        backgroundColor: materialBackground,
         onPressed: onBtnPressed,
       );
     }

lib/ui/buttons/select_duration_btn.dart

@@ -6,8 +6,8 @@ class SelectDurationBtn extends StatelessWidget {
   final void Function(Duration) updateDuration;
 
   SelectDurationBtn({
-    @required this.duration,
+    required this.duration,
-    @required this.updateDuration,
+    required this.updateDuration,
   });
 
   void _onPickerConfirm(Picker picker, List<int> values) {
@@ -40,7 +40,7 @@ class SelectDurationBtn extends StatelessWidget {
         onPressed: () => _onButtonPressed(context, appTheme),
         child: Text("$years Years $months Months $days Days"),
         style: TextButton.styleFrom(
-          primary: appTheme.primaryTextTheme.button.color,
+          primary: appTheme.primaryTextTheme.button!.color,
           backgroundColor: appTheme.accentColor,
         ));
   }

lib/ui/detail_screen_floating_action_buttons.dart

@@ -11,14 +11,14 @@ class DetailScreenFloatingActionButtons extends StatelessWidget {
       onDeleteProgress;
 
   DetailScreenFloatingActionButtons({
-    @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

lib/ui/progress/progress_editor_widget.dart

@@ -8,8 +8,8 @@ class ProgressEditorWidget extends StatefulWidget {
   final Function(TimeProgress, bool) onTimeProgressChanged;
 
   ProgressEditorWidget({
-    @required this.timeProgress,
+    required this.timeProgress,
-    @required this.onTimeProgressChanged,
+    required this.onTimeProgressChanged,
   });
 
   @override

lib/ui/progress/progress_list_item.dart

@@ -24,9 +24,9 @@ class ProgressListItem extends StatelessWidget {
   final Color doneColor, leftColor;
 
   ProgressListItem({
-    @required this.timeProgress,
+    required this.timeProgress,
-    @required this.doneColor,
+    required this.doneColor,
-    @required this.leftColor,
+    required this.leftColor,
   });
 
   @override

lib/ui/progress/progress_list_view.dart

@@ -10,9 +10,9 @@ class ProgressListView extends StatelessWidget {
   final Color doneColor, leftColor;
 
   ProgressListView({
-    @required this.timeProgressList,
+    required this.timeProgressList,
-    @required this.doneColor,
+    required this.doneColor,
-    @required this.leftColor,
+    required this.leftColor,
   });
 
   Widget _renderListTile(TimeProgress tp) {

lib/ui/progress/progress_view_widget.dart

@@ -9,9 +9,9 @@ class ProgressViewWidget extends StatelessWidget {
   final Color leftColor;
 
   ProgressViewWidget({
-    @required this.timeProgress,
+    required this.timeProgress,
-    @required this.doneColor,
+    required this.doneColor,
-    @required this.leftColor,
+    required this.leftColor,
   });
 
   @override

lib/ui/screens/dashboard_screen.dart

@@ -44,7 +44,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
 
   @override
   Widget build(BuildContext context) {
-    Widget _renderCreateProgressBtn() => _tabSelectedIndex == 2
+    PlatformActionButton? _renderCreateProgressBtn() => _tabSelectedIndex == 2
         ? null
         : PlatformActionButton(
             heroTag: "goToCreateTimeProgressBTN",

lib/ui/screens/progress_creation_screen.dart

@@ -26,11 +26,11 @@ class ProgressCreationScreen extends StatefulWidget {
 }
 
 class _ProgressCreationScreenState extends State<ProgressCreationScreen> {
-  TimeProgress timeProgressToCreate;
+  TimeProgress timeProgressToCreate = TimeProgress.initialDefault();
   bool _isProgressValid = false;
 
   void initTimeProgress(TimeProgress timeProgress) {
-    if (timeProgressToCreate == null)
+    if (timeProgressToCreate == TimeProgress.initialDefault())
       setState(() {
         timeProgressToCreate = timeProgress;
       });
@@ -180,8 +180,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/ui/screens/progress_detail_screen.dart

@@ -1,18 +1,20 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
 import 'package:time_progress_tracker/models/time_progress.dart';
 import 'package:time_progress_tracker/redux/store_connectors/settings_store_connector.dart';
 import 'package:time_progress_tracker/redux/store_connectors/time_progress_store_connector.dart';
-import 'package:time_progress_tracker/ui/screens/dashboard_screen.dart';
+import 'package:time_progress_tracker/ui/buttons/detail_screen_leading_button.dart';
-import 'package:time_progress_tracker/ui/detail_screen_floating_action_buttons.dart';
+import 'package:time_progress_tracker/ui/buttons/detail_screen_trailing_button.dart';
 import 'package:time_progress_tracker/ui/progress/progress_editor_widget.dart';
 import 'package:time_progress_tracker/ui/progress/progress_view_widget.dart';
+import 'package:time_progress_tracker/utils/theme_utils.dart';
 
 class ProgressDetailScreen extends StatefulWidget {
   static const title = "Progress View";
 
   final String tpId;
 
-  const ProgressDetailScreen({Key key, @required this.tpId}) : super(key: key);
+  const ProgressDetailScreen({Key? key, required this.tpId}) : super(key: key);
 
   @override
   State<StatefulWidget> createState() {
@@ -22,10 +24,11 @@ class ProgressDetailScreen extends StatefulWidget {
 
 class _ProgressDetailScreenState extends State<ProgressDetailScreen> {
   bool _editMode = false, _isEditedProgressValid = false;
-  TimeProgress _editedProgress, _originalProgress;
+  TimeProgress _editedProgress = TimeProgress.initialDefault(),
+      _originalProgress = TimeProgress.initialDefault();
 
   void _initEditedProgress(TimeProgress tp) {
-    if (_editedProgress == null) {
+    if (_editedProgress == TimeProgress.initialDefault()) {
       _editedProgress = tp;
       _originalProgress = tp;
     }
@@ -54,10 +57,11 @@ class _ProgressDetailScreenState extends State<ProgressDetailScreen> {
 
   List<Widget> _renderColumnChildren(
       SettingsViewModel settingsVm, TimeProgressViewModel tpVm) {
+    TimeProgress tp = tpVm.tp ?? TimeProgress.initialDefault();
     List<Widget> columnChildren = [
       Expanded(
           child: ProgressViewWidget(
-        timeProgress: _editMode ? _editedProgress : tpVm.tp,
+        timeProgress: _editMode ? _editedProgress : tp,
         doneColor: settingsVm.appSettings.doneColor,
         leftColor: settingsVm.appSettings.leftColor,
       ))
@@ -73,16 +77,67 @@ class _ProgressDetailScreenState extends State<ProgressDetailScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    TimeProgressStoreConnector leadingActionButton = TimeProgressStoreConnector(
-      appBar: AppBar(
+      timeProgressId: widget.tpId,
-        title: Text(ProgressDetailScreen.title),
+      loadedBuilder: (context, tpVm) {
+        void _saveEditedTp() {
+          tpVm.updateTimeProgress(_editedProgress);
+          _switchEditMode(false);
+        }
+
+        return DetailScreenLeadingButton(
+          isEditMode: _editMode,
+          isEditedTpValid: _isEditedProgressValid,
+          saveTp: _saveEditedTp,
+          editTp: () => _switchEditMode(true),
+        );
+      },
+    );
+
+    TimeProgressStoreConnector trailingActionButton =
+        TimeProgressStoreConnector(
+      timeProgressId: widget.tpId,
+      loadedBuilder: (context, tpVm) {
+        void _deleteTp() {
+          tpVm.deleteTimeProgress();
+          Navigator.popUntil(context, (route) => route.isFirst);
+        }
+
+        return DetailScreenTrailingButton(
+          isEditMode: _editMode,
+          cancelEditTp: _cancelEditMode,
+          deleteTp: _deleteTp,
+        );
+      },
+    );
+
+    return PlatformScaffold(
+      appBar: PlatformAppBar(
+        title: Text(
+          ProgressDetailScreen.title,
+          style: toolbarTextStyle,
+        ),
+        cupertino: (_, __) => CupertinoNavigationBarData(
+          transitionBetweenRoutes: false,
+          leading: leadingActionButton,
+          trailing: trailingActionButton,
+        ),
+      ),
+      material: (_, __) => MaterialScaffoldData(
+        floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
+        floatingActionButton: Row(
+          children: [
+            Expanded(child: leadingActionButton),
+            Expanded(child: trailingActionButton),
+          ],
+        ),
       ),
       body: SettingsStoreConnector(
         loadedBuilder: (context, settingsVm) {
           return TimeProgressStoreConnector(
             timeProgressId: widget.tpId,
             loadedBuilder: (context, tpVm) {
-              _initEditedProgress(tpVm.tp);
+              _initEditedProgress(tpVm.tp!);
               return Container(
                   margin: EdgeInsets.all(8),
                   child: Column(
@@ -92,32 +147,6 @@ class _ProgressDetailScreenState extends State<ProgressDetailScreen> {
           );
         },
       ),
-      floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
-      floatingActionButton: TimeProgressStoreConnector(
-        timeProgressId: widget.tpId,
-        loadedBuilder: (context, tpVm) {
-          void _saveEditedProgress() {
-            tpVm.updateTimeProgress(_editedProgress);
-            _switchEditMode(false);
-          }
-
-          void _deleteTimeProgress() {
-            tpVm.deleteTimeProgress();
-            Navigator.popUntil(
-                context, ModalRoute.withName(DashboardScreen.routeName));
-          }
-
-          return DetailScreenFloatingActionButtons(
-              editMode: _editMode,
-              originalProgress: tpVm.tp,
-              editedProgress: _editedProgress,
-              isEditedProgressValid: _isEditedProgressValid,
-              onEditProgress: () => _switchEditMode(true),
-              onSaveEditedProgress: _saveEditedProgress,
-              onCancelEditProgress: _cancelEditMode,
-              onDeleteProgress: _deleteTimeProgress);
-        },
-      ),
     );
   }
 }

lib/ui/settings/color_settings_widget.dart

@@ -6,10 +6,10 @@ class ColorSettingsWidget extends StatelessWidget {
   final void Function(Color) updateDoneColor, updateLeftColor;
 
   ColorSettingsWidget({
-    @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/ui/settings/duration_settings_widget.dart

@@ -6,8 +6,8 @@ class DurationSettingsWidget extends StatelessWidget {
   final void Function(Duration) updateDuration;
 
   DurationSettingsWidget({
-    @required this.duration,
+    required this.duration,
-    @required this.updateDuration,
+    required this.updateDuration,
   });
 
   @override

lib/utils/constants.dart

@@ -1,3 +1,11 @@
+import 'package:flutter/material.dart';
+import 'package:time_progress_tracker/models/app_settings.dart';
+
 const txtActiveProgressesScreen = "Active Progresses";
 const txtInactiveProgressesScreen = "Inactive Progresses";
-const txtSettingsScreen = "Settings";
+const txtSettingsScreen = "Settings";
+const defaultAppSettings = AppSettings(
+  doneColor: Colors.green,
+  leftColor: Colors.red,
+  duration: Duration(days: 365),
+);

lib/utils/helper_functions.dart

@@ -17,7 +17,7 @@ void loadSettingsIfUnloaded(Store<AppState> store) {
   if (!store.state.hasSettingsLoaded) store.dispatch(LoadAppSettingsAction());
 }
 
-TimeProgress selectProgressById(List<TimeProgress> tpList, String id) =>
+TimeProgress? selectProgressById(List<TimeProgress> tpList, String id) =>
     tpList.firstWhere((tp) => tp.id == id, orElse: null);
 
 List<TimeProgress> selectActiveProgresses(List<TimeProgress> tpList) =>

pubspec.lock

@@ -381,5 +381,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.12.0-259.9.beta <3.0.0"
+  dart: ">=2.12.0 <3.0.0"
   flutter: ">=1.20.4"

pubspec.yaml

@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 0.0.19+19
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
   flutter: