README.md

@@ -1,28 +1,8 @@
-# Time Progress Tracker
+# time_progress_tracker
 
 A Flutter Application to create Timers with a percentage indicator.
-The Idea for this Application came to me while, I was doing my civil service.
-It is a really simple app at this state. You can enter Time Progresses, which are made up of
-a name, a start date, and a end date.
-Then you can see a list of all currently active and a list of all currently inactive progresses,
-including their current percentages.
 
-## Current State of the repo.
+## Getting Started
-
-Now the repo is mostly cleaned up.
-
-My own model classes are located in lib/models.
-The logic for converting the models to json format and saving them is in lib/persistence.
-All redux logic, including store connector widgets are in lib/redux.
-The Flutter UI widgets are located in lib/ui.
-Other stuff is in lib/utils or directly in lib.
-
-- [Google Play](https://play.google.com/store/apps/details?id=com.fahrecker.time_progress_calculator)
-
-
-## Original Readme
-
-### Getting Started
 
 This project is a starting point for a Flutter application.
 

lib/actions/actions.dart

@@ -0,0 +1,58 @@
+import 'package:redux/redux.dart';
+import 'package:time_progress_tracker/models/app_settings.dart';
+import 'package:time_progress_tracker/models/app_state.dart';
+import 'package:time_progress_tracker/models/time_progress.dart';
+
+class LoadSettingsAction {}
+
+class AppSettingsLoadedActions {
+  final AppSettings appSettings;
+
+  AppSettingsLoadedActions(this.appSettings);
+}
+
+class UpdateAppSettingsActions {
+  final AppSettings appSettings;
+
+  UpdateAppSettingsActions(this.appSettings);
+}
+
+class AppSettingsNotLoadedAction {}
+
+class LoadTimeProgressListAction {}
+
+class TimeProgressListLoadedAction {
+  final List<TimeProgress> timeProgressList;
+
+  TimeProgressListLoadedAction(this.timeProgressList);
+}
+
+class TimeProgressListNotLoadedAction {}
+
+class AddTimeProgressAction {
+  final TimeProgress timeProgress;
+
+  AddTimeProgressAction(this.timeProgress);
+}
+
+class UpdateTimeProgressAction {
+  final String id;
+  final TimeProgress updatedTimeProgress;
+
+  UpdateTimeProgressAction(this.id, this.updatedTimeProgress);
+}
+
+class DeleteTimeProgressAction {
+  final String id;
+
+  DeleteTimeProgressAction(this.id);
+}
+
+void loadTimeProgressListIfUnloaded(Store<AppState> store) {
+  if (!store.state.hasProgressesLoaded)
+    store.dispatch(LoadTimeProgressListAction());
+}
+
+void loadSettingsIfUnloaded(Store<AppState> store) {
+  if (!store.state.hasSettingsLoaded) store.dispatch(LoadSettingsAction());
+}

lib/app.dart

@@ -3,9 +3,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:redux/redux.dart';
-import 'package:time_progress_tracker/redux/app_state.dart';
+import 'package:time_progress_tracker/models/app_state.dart';
-import 'package:time_progress_tracker/ui/screens/dashboard_screen.dart';
+import 'package:time_progress_tracker/screens/dashboard_screen.dart';
-import 'package:time_progress_tracker/utils/theme_utils.dart';
+import 'package:time_progress_tracker/utils/color_utils.dart';
 
 class TimeProgressTrackerApp extends StatelessWidget {
   static const String name = "Time Progress Tracker";
@@ -13,8 +13,8 @@ class TimeProgressTrackerApp extends StatelessWidget {
   final Store<AppState> store;
 
   TimeProgressTrackerApp({
-    Key? key,
+    Key key,
-    required this.store,
+    this.store,
   }) : super(key: key);
 
   @override

lib/helper_functions.dart

@@ -0,0 +1,17 @@
+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);
+
+List<TimeProgress> selectActiveProgresses(List<TimeProgress> tpList) =>
+    tpList.where((tp) => tp.hasStarted() && !tp.hasEnded()).toList();
+
+List<TimeProgress> selectInactiveProgresses(List<TimeProgress> tpList) =>
+    tpList.where((tp) => !tp.hasStarted() || tp.hasEnded()).toList();
+
+bool useBrightBackground(Color bC) {
+  double yiq = ((bC.red * 299) + (bC.green * 587) + (bC.blue * 114)) / 1000;
+  return yiq >= 186 || (bC.red == 0 && bC.green == 0 && bC.blue == 0);
+}

lib/main.dart

@@ -2,11 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:redux/redux.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:time_progress_tracker/app.dart';
-import 'package:time_progress_tracker/redux/app_state.dart';
+import 'package:time_progress_tracker/middleware/store_middleware.dart';
+import 'package:time_progress_tracker/models/app_state.dart';
 import 'package:time_progress_tracker/persistence/app_settings.dart';
-import 'package:time_progress_tracker/persistence/time_progress.dart';
+import 'package:time_progress_tracker/persistence/time_progress_repository.dart';
-import 'package:time_progress_tracker/redux/reducers/app_state_reducer.dart';
+import 'package:time_progress_tracker/reducers/app_state_reducer.dart';
-import 'package:time_progress_tracker/redux/store_middleware.dart';
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();

lib/middleware/store_middleware.dart

@@ -1,12 +1,12 @@
 import 'package:redux/redux.dart';
+import 'package:time_progress_tracker/actions/actions.dart';
 import 'package:time_progress_tracker/models/app_settings.dart';
+import 'package:time_progress_tracker/models/app_state.dart';
 import 'package:time_progress_tracker/models/time_progress.dart';
 import 'package:time_progress_tracker/persistence/app_settings.dart';
-import 'package:time_progress_tracker/persistence/time_progress.dart';
+import 'package:time_progress_tracker/persistence/time_progress_entity.dart';
-import 'package:time_progress_tracker/redux/actions/app_settings_actions.dart';
+import 'package:time_progress_tracker/persistence/time_progress_repository.dart';
-import 'package:time_progress_tracker/redux/actions/time_progress_actions.dart';
+import 'package:time_progress_tracker/selectors/time_progress_selectors.dart';
-import 'package:time_progress_tracker/redux/app_state.dart';
-import 'package:time_progress_tracker/redux/redux_selectors.dart';
 
 List<Middleware<AppState>> createStoreMiddleware(
     TimeProgressRepository progressRepo, AppSettingsRepository settingsRepo) {
@@ -21,7 +21,7 @@ List<Middleware<AppState>> createStoreMiddleware(
     TypedMiddleware<AppState, AddTimeProgressAction>(saveTimeProgressList),
     TypedMiddleware<AppState, UpdateTimeProgressAction>(saveTimeProgressList),
     TypedMiddleware<AppState, DeleteTimeProgressAction>(saveTimeProgressList),
-    TypedMiddleware<AppState, LoadAppSettingsAction>(loadSettings),
+    TypedMiddleware<AppState, LoadSettingsAction>(loadSettings),
     TypedMiddleware<AppState, UpdateAppSettingsActions>(saveSettings)
   ];
 }
@@ -31,7 +31,7 @@ Middleware<AppState> _createSaveTimeProgressList(
   return (Store<AppState> store, dynamic action, NextDispatcher next) {
     next(action);
 
-    repository.save(
+    repository.saveTimeProgressList(
       timeProgressListSelector(store.state)
           .map<TimeProgressEntity>((timeProgress) => timeProgress.toEntity())
           .toList(growable: false),
@@ -42,7 +42,7 @@ Middleware<AppState> _createSaveTimeProgressList(
 Middleware<AppState> _createLoadTimeProgressList(
     TimeProgressRepository repository) {
   return (Store<AppState> store, dynamic action, NextDispatcher next) {
-    repository.load().then((timeProgresses) {
+    repository.loadTimeProgressList().then((timeProgresses) {
       List<TimeProgress> timeProgressList =
           timeProgresses.map<TimeProgress>(TimeProgress.fromEntity).toList();
       if (timeProgressList == null) {
@@ -58,12 +58,12 @@ Middleware<AppState> _createLoadTimeProgressList(
 Middleware<AppState> _createSaveAppSettings(AppSettingsRepository repo) =>
     (Store<AppState> store, dynamic action, NextDispatcher next) {
       next(action);
-      repo.save(store.state.appSettings.toEntity());
+      repo.saveAppSettings(store.state.appSettings.toEntity());
     };
 
 Middleware<AppState> _createLoadAppSettings(AppSettingsRepository repo) =>
     (Store<AppState> store, dynamic action, NextDispatcher next) {
-      repo.load().then((appSettings) {
+      repo.loadAppSettings().then((appSettings) {
         store.dispatch(
             AppSettingsLoadedActions(AppSettings.fromEntity(appSettings)));
       });

lib/models/app_settings.dart

@@ -7,16 +7,22 @@ class AppSettings {
   final Color leftColor;
   final Duration duration;
 
-  const AppSettings({
+  AppSettings({
-    required this.doneColor,
+    this.doneColor,
-    required this.leftColor,
+    this.leftColor,
-    required this.duration,
+    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/app_state.dart

@@ -1,7 +1,6 @@
 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 {
@@ -13,14 +12,14 @@ class AppState {
       {this.hasProgressesLoaded = false,
       this.hasSettingsLoaded = false,
       this.timeProgressList = const [],
-      this.appSettings = defaultAppSettings});
+      this.appSettings});
 
   factory AppState.initial() =>
-      AppState(hasProgressesLoaded: false, appSettings: defaultAppSettings);
+      AppState(hasProgressesLoaded: false, appSettings: AppSettings.defaults());
 
   AppState copyWith({
-    bool? hasLoaded,
+    bool hasLoaded,
-    List<TimeProgress>? timeProgressList,
+    List<TimeProgress> timeProgressList,
   }) {
     return AppState(
       hasProgressesLoaded: hasLoaded ?? this.hasProgressesLoaded,

lib/models/time_progress.dart

@@ -1,6 +1,6 @@
 import 'package:meta/meta.dart';
 import 'package:time_progress_tracker/models/app_exceptions.dart';
-import 'package:time_progress_tracker/persistence/time_progress.dart';
+import 'package:time_progress_tracker/persistence/time_progress_entity.dart';
 import 'package:time_progress_tracker/uuid.dart';
 
 @immutable
@@ -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,19 +87,16 @@ class TimeProgress {
     return TimeProgressEntity(id, name, startTime, endTime);
   }
 
-  static TimeProgress fromEntity(TimeProgressEntity entity) => TimeProgress(
+  static TimeProgress fromEntity(TimeProgressEntity entity) =>
-        entity.name,
+      TimeProgress(entity.name, entity.startTime, entity.endTime,
-        entity.startTime,
+          id: entity.id ?? Uuid().generateV4());
-        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 != "" && name.length > 2 && name.length < 21;
+      name != null && name != "" && name.length > 2 && name.length < 21;
 
   static bool areTimesValid(DateTime startTime, DateTime endTime) =>
       startTime.isBefore(endTime);

lib/persistence/app_settings.dart

@@ -1,24 +1,24 @@
+import 'dart:convert';
+
 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> {
+class AppSettingsRepository {
   static const String _key = "app_settings";
+  final SharedPreferences prefs;
+  final JsonCodec codec;
 
-  AppSettingsRepository(SharedPreferences prefs) : super(prefs);
+  AppSettingsRepository(this.prefs, {this.codec = json});
 
-  @override
+  Future<AppSettingsEntity> loadAppSettings() {
-  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(
         AppSettingsEntity.fromJson(codec.decode(jsonString)));
   }
 
-  @override
+  Future<bool> saveAppSettings(AppSettingsEntity appSettings) =>
-  Future<bool> save(AppSettingsEntity appSettings) =>
       this.prefs.setString(_key, codec.encode(appSettings));
 }
 
@@ -31,7 +31,7 @@ class AppSettingsEntity {
   AppSettingsEntity(
       this.doneColorValue, this.leftColorValue, this.durationDays);
 
-  factory AppSettingsEntity.defaults() => defaultAppSettings.toEntity();
+  factory AppSettingsEntity.defaults() => AppSettings.defaults().toEntity();
 
   @override
   int get hashCode => doneColorValue.hashCode ^ leftColorValue.hashCode;
@@ -52,8 +52,8 @@ class AppSettingsEntity {
 
   static AppSettingsEntity fromJson(Map<String, Object> json) =>
       AppSettingsEntity(
-        json[_doneKey] as int,
+        json[_doneKey],
-        json[_leftKey] as int,
+        json[_leftKey],
-        json[_durationDaysKey] as int,
+        json[_durationDaysKey],
       );
 }

lib/persistence/repository.dart

@@ -1,14 +0,0 @@
-import 'dart:convert';
-
-import 'package:shared_preferences/shared_preferences.dart';
-
-abstract class Repository<T> {
-  final SharedPreferences prefs;
-  final JsonCodec codec;
-
-  Repository(this.prefs, {this.codec = json});
-
-  Future<T> load();
-
-  Future<bool> save(T e);
-}

lib/persistence/time_progress.dart

@@ -1,74 +0,0 @@
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:time_progress_tracker/persistence/repository.dart';
-
-class TimeProgressRepository extends Repository<List<TimeProgressEntity>> {
-  static const String _key = "time_progress_repo";
-
-  TimeProgressRepository(SharedPreferences prefs) : super(prefs);
-
-  @override
-  Future<List<TimeProgressEntity>> load() {
-    final String? jsonString = this.prefs.getString(_key);
-    if (jsonString == null) {
-      return Future<List<TimeProgressEntity>>.value([]);
-    }
-    return Future<List<TimeProgressEntity>>.value(codec
-        .decode(jsonString)["timers"]
-        .cast<Map<String, Object>>()
-        .map<TimeProgressEntity>(TimeProgressEntity.fromJson)
-        .toList(growable: false));
-  }
-
-  @override
-  Future<bool> save(List<TimeProgressEntity> timeProgressList) {
-    final String jsonString = codec.encode(
-        {"timers": timeProgressList.map((timer) => timer.toJson()).toList()});
-    return this.prefs.setString(_key, jsonString);
-  }
-}
-
-class TimeProgressEntity {
-  static const String _idKey = "id",
-      _nameKey = "name",
-      _startTimeKey = "startTime",
-      _endTimeKey = "endTime";
-  final String id;
-  final String name;
-  final DateTime startTime;
-  final DateTime endTime;
-
-  TimeProgressEntity(this.id, this.name, this.startTime, this.endTime);
-
-  @override
-  int get hashCode =>
-      id.hashCode ^ name.hashCode ^ startTime.hashCode ^ endTime.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is TimeProgressEntity &&
-          runtimeType == other.runtimeType &&
-          id == other.id &&
-          name == other.name &&
-          startTime == other.startTime &&
-          endTime == other.endTime;
-
-  Map<String, Object> toJson() {
-    return {
-      _idKey: id,
-      _nameKey: name,
-      _startTimeKey: startTime.millisecondsSinceEpoch,
-      _endTimeKey: endTime.millisecondsSinceEpoch
-    };
-  }
-
-  static TimeProgressEntity fromJson(Map<String, Object> json) {
-    final String id = json[_idKey] as String;
-    final String name = json[_nameKey] as String;
-    final DateTime startTime =
-        DateTime.fromMillisecondsSinceEpoch(json[_startTimeKey] as int);
-    final DateTime endTime =
-        DateTime.fromMillisecondsSinceEpoch(json[_endTimeKey] as int);
-    return TimeProgressEntity(id, name, startTime, endTime);
-  }
-}

lib/persistence/time_progress_entity.dart

@@ -0,0 +1,41 @@
+class TimeProgressEntity {
+  final String id;
+  final String name;
+  final DateTime startTime;
+  final DateTime endTime;
+
+  TimeProgressEntity(this.id, this.name, this.startTime, this.endTime);
+
+  @override
+  int get hashCode =>
+      id.hashCode ^ name.hashCode ^ startTime.hashCode ^ endTime.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is TimeProgressEntity &&
+          runtimeType == other.runtimeType &&
+          id == other.id &&
+          name == other.name &&
+          startTime == other.startTime &&
+          endTime == other.endTime;
+
+  Map<String, Object> toJson() {
+    return {
+      "id": id,
+      "name": name,
+      "startTime": startTime.millisecondsSinceEpoch,
+      "endTime": endTime.millisecondsSinceEpoch
+    };
+  }
+
+  static TimeProgressEntity fromJson(Map<String, Object> json) {
+    final String id = json["id"] as String;
+    final String name = json["name"] as String;
+    final DateTime startTime =
+        DateTime.fromMillisecondsSinceEpoch(json["startTime"] as int);
+    final DateTime endTime =
+        DateTime.fromMillisecondsSinceEpoch(json["endTime"] as int);
+    return TimeProgressEntity(id, name, startTime, endTime);
+  }
+}

lib/persistence/time_progress_repository.dart

@@ -0,0 +1,29 @@
+import 'dart:convert';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:time_progress_tracker/persistence/time_progress_entity.dart';
+
+class TimeProgressRepository {
+  static const String _key = "time_progress_repo";
+  final SharedPreferences prefs;
+  final JsonCodec codec;
+
+  TimeProgressRepository(this.prefs, {this.codec = json});
+
+  Future<List<TimeProgressEntity>> loadTimeProgressList() {
+    final String jsonString = this.prefs.getString(_key);
+    if (jsonString == null) {
+      return Future<List<TimeProgressEntity>>.value([]);
+    }
+    return Future<List<TimeProgressEntity>>.value(codec
+        .decode(jsonString)["timers"]
+        .cast<Map<String, Object>>()
+        .map<TimeProgressEntity>(TimeProgressEntity.fromJson)
+        .toList(growable: false));
+  }
+
+  Future<bool> saveTimeProgressList(List<TimeProgressEntity> timeProgressList) {
+    final String jsonString = codec.encode(
+        {"timers": timeProgressList.map((timer) => timer.toJson()).toList()});
+    return this.prefs.setString(_key, jsonString);
+  }
+}

lib/reducers/app_state_reducer.dart

@@ -0,0 +1,35 @@
+import 'package:redux/redux.dart';
+import 'package:time_progress_tracker/actions/actions.dart';
+import 'package:time_progress_tracker/models/app_settings.dart';
+import 'package:time_progress_tracker/models/app_state.dart';
+import 'package:time_progress_tracker/reducers/has_loaded_reducer.dart';
+import 'package:time_progress_tracker/reducers/time_progress_list_reducer.dart';
+
+AppState appStateReducer(AppState state, dynamic action) {
+  return AppState(
+    hasSettingsLoaded:
+        hasSettingsLoadedReducer(state.hasSettingsLoaded, action),
+    hasProgressesLoaded:
+        hasProgressesLoadedReducer(state.hasProgressesLoaded, action),
+    timeProgressList: timeProgressListReducer(state.timeProgressList, action),
+    appSettings: appSettingsReducers(state.appSettings, action),
+  );
+}
+
+final appSettingsReducers = combineReducers<AppSettings>([
+  TypedReducer<AppSettings, AppSettingsLoadedActions>(_loadAppSettings),
+  TypedReducer<AppSettings, UpdateAppSettingsActions>(_updateAppSettings),
+  TypedReducer<AppSettings, AppSettingsNotLoadedAction>(_setDefaultSettings)
+]);
+
+AppSettings _loadAppSettings(
+        AppSettings appSettings, AppSettingsLoadedActions nS) =>
+    nS.appSettings;
+
+AppSettings _setDefaultSettings(
+        AppSettings appSettings, AppSettingsNotLoadedAction action) =>
+    AppSettings.defaults();
+
+AppSettings _updateAppSettings(
+        AppSettings appSettings, UpdateAppSettingsActions nS) =>
+    nS.appSettings;

lib/reducers/has_loaded_reducer.dart

@@ -0,0 +1,28 @@
+import 'package:redux/redux.dart';
+import 'package:time_progress_tracker/actions/actions.dart';
+
+final hasProgressesLoadedReducer = combineReducers<bool>([
+  TypedReducer<bool, TimeProgressListLoadedAction>(_setProgressesLoaded),
+  TypedReducer<bool, TimeProgressListNotLoadedAction>(_setProgressesUnloaded)
+]);
+
+bool _setProgressesLoaded(bool hasLoaded, TimeProgressListLoadedAction action) {
+  return true;
+}
+
+bool _setProgressesUnloaded(bool hasLoaded, TimeProgressListNotLoadedAction action) {
+  return false;
+}
+
+final hasSettingsLoadedReducer = combineReducers<bool>([
+  TypedReducer<bool, AppSettingsLoadedActions>(_setSettingsLoaded),
+  TypedReducer<bool, AppSettingsNotLoadedAction>(_setSettingsUnloaded)
+]);
+
+bool _setSettingsLoaded(bool hasLoaded, AppSettingsLoadedActions action) {
+  return true;
+}
+
+bool _setSettingsUnloaded(bool hasLoaded, AppSettingsNotLoadedAction action) {
+  return false;
+}

lib/reducers/time_progress_list_reducer.dart

@@ -0,0 +1,45 @@
+import 'package:redux/redux.dart';
+import 'package:time_progress_tracker/actions/actions.dart';
+import 'package:time_progress_tracker/models/time_progress.dart';
+
+final timeProgressListReducer = combineReducers<List<TimeProgress>>([
+  TypedReducer<List<TimeProgress>, TimeProgressListLoadedAction>(
+      _setLoadedTimeProgressList),
+  TypedReducer<List<TimeProgress>, TimeProgressListNotLoadedAction>(
+      _setEmptyTimeProgressList),
+  TypedReducer<List<TimeProgress>, AddTimeProgressAction>(_addTimeProgress),
+  TypedReducer<List<TimeProgress>, UpdateTimeProgressAction>(
+      _updateTimeProgress),
+  TypedReducer<List<TimeProgress>, DeleteTimeProgressAction>(_deleteTimeProgress),
+]);
+
+List<TimeProgress> _setLoadedTimeProgressList(
+    List<TimeProgress> timeProgressList, TimeProgressListLoadedAction action) {
+  return action.timeProgressList;
+}
+
+List<TimeProgress> _setEmptyTimeProgressList(
+    List<TimeProgress> timeProgressList, TimeProgressListNotLoadedAction action) {
+  return [];
+}
+
+List<TimeProgress> _addTimeProgress(
+    List<TimeProgress> timeProgressList, AddTimeProgressAction action) {
+  return List.from(timeProgressList)
+    ..add(action.timeProgress)
+    ..toList(growable: false);
+}
+
+List<TimeProgress> _updateTimeProgress(
+    List<TimeProgress> timeProgressList, UpdateTimeProgressAction action) {
+  return timeProgressList
+      .map((timeProgress) => timeProgress.id == action.id
+          ? action.updatedTimeProgress
+          : timeProgress)
+      .toList(growable: false);
+}
+
+List<TimeProgress> _deleteTimeProgress(
+    List<TimeProgress> timeProgressList, DeleteTimeProgressAction action) {
+  return timeProgressList.where((timeProgress) => timeProgress.id != action.id).toList(growable: false);
+}

lib/redux/actions/app_settings_actions.dart

@@ -1,14 +0,0 @@
-import 'package:time_progress_tracker/models/app_settings.dart';
-import 'package:time_progress_tracker/redux/actions/redux_actions.dart';
-
-class LoadAppSettingsAction {}
-
-class AppSettingsLoadedActions extends AppSettingsAction with BoolAction {
-  AppSettingsLoadedActions(AppSettings appSettings) : super(appSettings);
-}
-
-class UpdateAppSettingsActions extends AppSettingsAction {
-  UpdateAppSettingsActions(AppSettings appSettings) : super(appSettings);
-}
-
-class AppSettingsNotLoadedAction extends BoolAction {}

lib/redux/actions/redux_actions.dart

@@ -1,16 +0,0 @@
-import 'package:time_progress_tracker/models/app_settings.dart';
-import 'package:time_progress_tracker/models/time_progress.dart';
-
-abstract class BoolAction {}
-
-abstract class AppSettingsAction {
-  final AppSettings appSettings;
-
-  AppSettingsAction(this.appSettings);
-}
-
-abstract class TimeProgressAction {
-  final TimeProgress timeProgress;
-
-  TimeProgressAction(this.timeProgress);
-}

lib/redux/actions/time_progress_actions.dart

@@ -1,29 +0,0 @@
-import 'package:time_progress_tracker/models/time_progress.dart';
-import 'package:time_progress_tracker/redux/actions/redux_actions.dart';
-
-class LoadTimeProgressListAction {}
-
-class TimeProgressListLoadedAction extends BoolAction {
-  final List<TimeProgress> timeProgressList;
-
-  TimeProgressListLoadedAction(this.timeProgressList);
-}
-
-class TimeProgressListNotLoadedAction extends BoolAction {}
-
-class AddTimeProgressAction extends TimeProgressAction {
-  AddTimeProgressAction(TimeProgress timeProgress) : super(timeProgress);
-}
-
-class UpdateTimeProgressAction extends TimeProgressAction {
-  final String id;
-
-  UpdateTimeProgressAction(this.id, TimeProgress timeProgress)
-      : super(timeProgress);
-}
-
-class DeleteTimeProgressAction {
-  final String id;
-
-  DeleteTimeProgressAction(this.id);
-}

lib/redux/reducers/app_state_reducer.dart

@@ -1,14 +0,0 @@
-import 'package:time_progress_tracker/redux/app_state.dart';
-import 'package:time_progress_tracker/redux/reducers/bool_reducers.dart';
-import 'package:time_progress_tracker/redux/reducers/model_reducers.dart';
-
-AppState appStateReducer(AppState state, dynamic action) {
-  return AppState(
-    hasSettingsLoaded:
-        hasSettingsLoadedReducer(state.hasSettingsLoaded, action),
-    hasProgressesLoaded:
-        hasProgressesLoadedReducer(state.hasProgressesLoaded, action),
-    timeProgressList: timeProgressListReducer(state.timeProgressList, action),
-    appSettings: appSettingsReducers(state.appSettings, action),
-  );
-}

lib/redux/reducers/bool_reducers.dart

@@ -1,22 +0,0 @@
-import 'package:redux/redux.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';
-
-final hasProgressesLoadedReducer = combineReducers<bool>([
-  TypedReducer<bool, TimeProgressListLoadedAction>(_setTrue),
-  TypedReducer<bool, TimeProgressListNotLoadedAction>(_setFalse)
-]);
-
-final hasSettingsLoadedReducer = combineReducers<bool>([
-  TypedReducer<bool, AppSettingsLoadedActions>(_setTrue),
-  TypedReducer<bool, AppSettingsNotLoadedAction>(_setFalse)
-]);
-
-bool _setTrue(bool value, BoolAction action) {
-  return true;
-}
-
-bool _setFalse(bool value, BoolAction action) {
-  return false;
-}

lib/redux/reducers/model_reducers.dart

@@ -1,63 +0,0 @@
-import 'package:redux/redux.dart';
-import 'package:time_progress_tracker/models/app_settings.dart';
-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>(
-      _setLoadedTimeProgressList),
-  TypedReducer<List<TimeProgress>, TimeProgressListNotLoadedAction>(
-      _setEmptyTimeProgressList),
-  TypedReducer<List<TimeProgress>, AddTimeProgressAction>(_addTimeProgress),
-  TypedReducer<List<TimeProgress>, UpdateTimeProgressAction>(
-      _updateTimeProgress),
-  TypedReducer<List<TimeProgress>, DeleteTimeProgressAction>(
-      _deleteTimeProgress),
-]);
-
-List<TimeProgress> _setEmptyTimeProgressList(
-    List<TimeProgress> timeProgressList,
-    TimeProgressListNotLoadedAction action) {
-  return [];
-}
-
-List<TimeProgress> _setLoadedTimeProgressList(
-    List<TimeProgress> timeProgressList, TimeProgressListLoadedAction action) {
-  return action.timeProgressList;
-}
-
-List<TimeProgress> _addTimeProgress(
-        List<TimeProgress> timeProgressList, AddTimeProgressAction action) =>
-    List.from(timeProgressList)
-      ..add(action.timeProgress)
-      ..toList(growable: false);
-
-List<TimeProgress> _updateTimeProgress(
-        List<TimeProgress> timeProgressList, UpdateTimeProgressAction action) =>
-    timeProgressList
-        .map((timeProgress) =>
-            timeProgress.id == action.id ? action.timeProgress : timeProgress)
-        .toList(growable: false);
-
-List<TimeProgress> _deleteTimeProgress(
-        List<TimeProgress> timeProgressList, DeleteTimeProgressAction action) =>
-    timeProgressList
-        .where((timeProgress) => timeProgress.id != action.id)
-        .toList(growable: false);
-
-final appSettingsReducers = combineReducers<AppSettings>([
-  TypedReducer<AppSettings, AppSettingsLoadedActions>(_updateAppSettings),
-  TypedReducer<AppSettings, UpdateAppSettingsActions>(_updateAppSettings),
-  TypedReducer<AppSettings, AppSettingsNotLoadedAction>(_setDefaultSettings)
-]);
-
-AppSettings _setDefaultSettings(
-        AppSettings appSettings, AppSettingsNotLoadedAction action) =>
-    defaultAppSettings;
-
-AppSettings _updateAppSettings(
-        AppSettings appSettings, AppSettingsAction action) =>
-    action.appSettings;

lib/redux/store_connectors/create_time_progress_store_connector.dart

@@ -1,53 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_redux/flutter_redux.dart';
-import 'package:redux/redux.dart';
-import 'package:time_progress_tracker/models/app_settings.dart';
-import 'package:time_progress_tracker/models/time_progress.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/redux/redux_selectors.dart';
-
-import '../../utils/helper_functions.dart';
-
-class CreateTimeProgressStoreConnector extends StatelessWidget {
-  final Widget Function(BuildContext, CreateTimeProgressViewModel)
-      loadedBuilder;
-
-  CreateTimeProgressStoreConnector({
-    required this.loadedBuilder,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return StoreConnector<AppState, CreateTimeProgressViewModel>(
-      onInit: loadTimeProgressListIfUnloaded,
-      converter: (store) => CreateTimeProgressViewModel._create(store),
-      builder: (context, CreateTimeProgressViewModel vm) {
-        return loadedBuilder(context, vm);
-      },
-    );
-  }
-}
-
-class CreateTimeProgressViewModel {
-  final TimeProgress defaultProgress;
-
-  final void Function(TimeProgress) addTimeProgress;
-
-  CreateTimeProgressViewModel(
-    this.defaultProgress,
-    this.addTimeProgress,
-  );
-
-  factory CreateTimeProgressViewModel._create(Store<AppState> store) {
-    AppSettings settings = appSettingsSelector(store.state);
-    void _addTimeProgress(TimeProgress tp) {
-      if (TimeProgress.isValid(tp)) store.dispatch(AddTimeProgressAction(tp));
-    }
-
-    return CreateTimeProgressViewModel(
-      TimeProgress.defaultFromDuration(settings.duration),
-      _addTimeProgress,
-    );
-  }
-}

lib/screens/active_time_progresses_screen.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
-import 'package:time_progress_tracker/redux/store_connectors/settings_store_connector.dart';
+import 'package:time_progress_tracker/helper_functions.dart';
-import 'package:time_progress_tracker/redux/store_connectors/time_progress_list_store_connector.dart';
-import 'package:time_progress_tracker/utils/helper_functions.dart';
 import 'package:time_progress_tracker/models/time_progress.dart';
-import 'package:time_progress_tracker/ui/progress/progress_list_view.dart';
+import 'package:time_progress_tracker/widgets/progress_list_view/progress_list_view.dart';
+import 'package:time_progress_tracker/widgets/store_connectors/settings_store_connector.dart';
+import 'package:time_progress_tracker/widgets/store_connectors/time_progress_list_store_connector.dart';
 
 class ActiveTimeProgressesScreen extends StatelessWidget {
   @override

lib/screens/dashboard_screen.dart

@@ -1,17 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
-import 'package:time_progress_tracker/ui/buttons/platform_action_button.dart';
+import 'package:time_progress_tracker/screens/active_time_progresses_screen.dart';
-import 'package:time_progress_tracker/ui/screens/active_time_progresses_screen.dart';
+import 'package:time_progress_tracker/screens/inactive_time_progresses_screen.dart';
-import 'package:time_progress_tracker/ui/screens/inactive_time_progresses_screen.dart';
+import 'package:time_progress_tracker/screens/settings_screen.dart';
-import 'package:time_progress_tracker/ui/screens/progress_creation_screen.dart';
+import 'package:time_progress_tracker/utils/color_utils.dart';
-import 'package:time_progress_tracker/ui/screens/settings_screen.dart';
-import 'package:time_progress_tracker/utils/theme_utils.dart';
 import 'package:time_progress_tracker/utils/constants.dart';
 
 class DashboardScreen extends StatefulWidget {
-  static const routeName = "/dashboard";
-
   @override
   State<StatefulWidget> createState() => _DashboardScreenState();
 }
@@ -44,20 +40,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
 
   @override
   Widget build(BuildContext context) {
-    PlatformActionButton? _renderCreateProgressBtn() => _tabSelectedIndex == 2
-        ? null
-        : PlatformActionButton(
-            heroTag: "goToCreateTimeProgressBTN",
-            icon: Icons.add,
-            onBtnPressed: () => Navigator.push(
-              context,
-              platformPageRoute(
-                context: context,
-                builder: (context) => ProgressCreationScreen(),
-              ),
-            ),
-          );
-
     return PlatformScaffold(
       appBar: PlatformAppBar(
         title: Text(
@@ -66,12 +48,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
         ),
         cupertino: (_, __) => CupertinoNavigationBarData(
           transitionBetweenRoutes: false,
-          leading: _renderCreateProgressBtn(),
         ),
       ),
-      material: (_, __) => MaterialScaffoldData(
+      material: (_, __) => MaterialScaffoldData(),
-        floatingActionButton: _renderCreateProgressBtn(),
-      ),
       body: _renderTabScreen(_tabSelectedIndex),
       bottomNavBar: PlatformNavBar(
           currentIndex: _tabSelectedIndex,

lib/screens/home_screen.dart

@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+import 'package:time_progress_tracker/widgets/buttons/create_progress_button.dart';
+import 'package:time_progress_tracker/widgets/home/home_bottom_navbar.dart';
+import 'package:time_progress_tracker/widgets/home/tabs/home_active_progresses_tab.dart';
+import 'package:time_progress_tracker/widgets/home/tabs/home_inactive_progresses_tab.dart';
+import 'package:time_progress_tracker/widgets/home/tabs/home_settings_tab.dart';
+
+class HomeScreen extends StatefulWidget {
+  static const routeName = "/home";
+  static const title = "Time Progress Tracker";
+
+  @override
+  State<StatefulWidget> createState() {
+    return _HomeScreenState();
+  }
+}
+
+class _HomeScreenState extends State<HomeScreen> {
+  int _currentIndex = 0;
+  final List<Widget> _children = [
+    HomeActiveProgressesTab(),
+    HomeInactiveProgressesTab(),
+    HomeSettingsTab(),
+  ];
+
+  void onBottomTabTapped(int index) {
+    setState(() {
+      _currentIndex = index;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(HomeScreen.title),
+      ),
+      body: _children[_currentIndex],
+      floatingActionButtonLocation: FloatingActionButtonLocation.endFloat,
+      floatingActionButton: _currentIndex != 2 ? CreateProgressButton() : null,
+      bottomNavigationBar: HomeBottomNavBar(
+        currentIndex: _currentIndex,
+        onTap: onBottomTabTapped,
+      ),
+    );
+  }
+}

lib/screens/inactive_time_progresses_screen.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
-import 'package:time_progress_tracker/redux/store_connectors/settings_store_connector.dart';
+import 'package:time_progress_tracker/helper_functions.dart';
-import 'package:time_progress_tracker/redux/store_connectors/time_progress_list_store_connector.dart';
-import 'package:time_progress_tracker/utils/helper_functions.dart';
 import 'package:time_progress_tracker/models/time_progress.dart';
-import 'package:time_progress_tracker/ui/progress/progress_list_view.dart';
+import 'package:time_progress_tracker/widgets/progress_list_view/progress_list_view.dart';
+import 'package:time_progress_tracker/widgets/store_connectors/settings_store_connector.dart';
+import 'package:time_progress_tracker/widgets/store_connectors/time_progress_list_store_connector.dart';
 
 class InactiveTimeProgressesScreen extends StatelessWidget {
   @override

lib/screens/progress_creation_screen.dart

@@ -0,0 +1,116 @@
+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';
+import 'package:time_progress_tracker/models/app_settings.dart';
+import 'package:time_progress_tracker/models/app_state.dart';
+import 'package:time_progress_tracker/models/time_progress.dart';
+import 'package:time_progress_tracker/selectors/time_progress_selectors.dart';
+import 'package:time_progress_tracker/widgets/progress_editor_widget.dart';
+
+class ProgressCreationScreen extends StatefulWidget {
+  static const routeName = "/create-progress";
+  static const title = "Create Time Progress";
+
+  @override
+  State<StatefulWidget> createState() {
+    return _ProgressCreationScreenState();
+  }
+}
+
+class _ProgressCreationScreenState extends State<ProgressCreationScreen> {
+  TimeProgress timeProgressToCreate;
+  bool _isProgressValid = false;
+
+  void initTimeProgress(TimeProgress timeProgress) {
+    if (timeProgressToCreate == null)
+      setState(() {
+        timeProgressToCreate = timeProgress;
+      });
+  }
+
+  void onTimeProgressChanged(
+      TimeProgress newTimeProgress, bool isNewProgressValid) {
+    setState(() {
+      timeProgressToCreate = newTimeProgress;
+      _isProgressValid = isNewProgressValid;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(ProgressCreationScreen.title),
+      ),
+      body: Container(
+        padding: EdgeInsets.all(12),
+        child: StoreConnector<AppState, _ViewModel>(
+            onInit: loadSettingsIfUnloaded,
+            converter: (store) => _ViewModel.create(store),
+            builder: (context, _ViewModel viewModel) {
+              initTimeProgress(viewModel.defaultDurationProgress);
+              return ProgressEditorWidget(
+                timeProgress: timeProgressToCreate,
+                onTimeProgressChanged: onTimeProgressChanged,
+              );
+            }),
+      ),
+      floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
+      floatingActionButton: Row(
+        children: <Widget>[
+          Expanded(
+            child: StoreConnector<AppState, _ViewModel>(
+              onInit: loadSettingsIfUnloaded,
+              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,
+              ),
+            ),
+          ),
+          Expanded(
+            child: FloatingActionButton(
+              heroTag: "cancelTimeProgressCreationBTN",
+              child: Icon(Icons.cancel),
+              onPressed: () {
+                Navigator.pop(context);
+              },
+            ),
+          )
+        ],
+      ),
+    );
+  }
+}
+
+class _ViewModel {
+  final TimeProgress defaultDurationProgress;
+  final void Function(TimeProgress) onAddTimeProgress;
+
+  _ViewModel({
+    @required this.defaultDurationProgress,
+    @required this.onAddTimeProgress,
+  });
+
+  factory _ViewModel.create(Store<AppState> store) {
+    AppSettings settings = appSettingsSelector(store.state);
+
+    _onAddTimeProgress(TimeProgress tp) {
+      if (TimeProgress.isValid(tp)) store.dispatch(AddTimeProgressAction(tp));
+    }
+
+    return _ViewModel(
+      defaultDurationProgress:
+          TimeProgress.defaultFromDuration(settings.duration),
+      onAddTimeProgress: _onAddTimeProgress,
+    );
+  }
+}

lib/screens/progress_detail_screen.dart

@@ -0,0 +1,129 @@
+import 'package:flutter/material.dart';
+import 'package:time_progress_tracker/models/time_progress.dart';
+import 'package:time_progress_tracker/screens/home_screen.dart';
+import 'package:time_progress_tracker/widgets/detail_screen_floating_action_buttons.dart';
+import 'package:time_progress_tracker/widgets/progress_editor_widget.dart';
+import 'package:time_progress_tracker/widgets/progress_view_widget.dart';
+import 'package:time_progress_tracker/widgets/store_connectors/settings_store_connector.dart';
+import 'package:time_progress_tracker/widgets/store_connectors/time_progress_store_connector.dart';
+
+class ProgressDetailScreenArguments {
+  final String id;
+
+  ProgressDetailScreenArguments(this.id);
+}
+
+class ProgressDetailScreen extends StatefulWidget {
+  static const routeName = "/progress";
+  static const title = "Progress View";
+
+  @override
+  State<StatefulWidget> createState() {
+    return _ProgressDetailScreenState();
+  }
+}
+
+class _ProgressDetailScreenState extends State<ProgressDetailScreen> {
+  bool _editMode = false, _isEditedProgressValid = false;
+  TimeProgress _editedProgress, _originalProgress;
+
+  void _initEditedProgress(TimeProgress tp) {
+    if (_editedProgress == null) {
+      _editedProgress = tp;
+      _originalProgress = tp;
+    }
+  }
+
+  void _onEditedProgressChanged(
+      TimeProgress newProgress, bool isNewProgressValid) {
+    setState(() {
+      _editedProgress = newProgress;
+      _isEditedProgressValid = isNewProgressValid;
+    });
+  }
+
+  void _switchEditMode(bool newMode) {
+    setState(() {
+      _editMode = newMode;
+    });
+  }
+
+  void _cancelEditMode() {
+    setState(() {
+      _editMode = false;
+      _editedProgress = _originalProgress;
+    });
+  }
+
+  List<Widget> _renderColumnChildren(
+      SettingsViewModel settingsVm, TimeProgressViewModel tpVm) {
+    List<Widget> columnChildren = [
+      Expanded(
+          child: ProgressViewWidget(
+        timeProgress: _editMode ? _editedProgress : tpVm.tp,
+        doneColor: settingsVm.appSettings.doneColor,
+        leftColor: settingsVm.appSettings.leftColor,
+      ))
+    ];
+    if (_editMode)
+      columnChildren.add(Expanded(
+          child: ProgressEditorWidget(
+        timeProgress: _editedProgress,
+        onTimeProgressChanged: _onEditedProgressChanged,
+      )));
+    return columnChildren;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final ProgressDetailScreenArguments args =
+        ModalRoute.of(context).settings.arguments;
+
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(ProgressDetailScreen.title),
+      ),
+      body: SettingsStoreConnector(
+        loadedBuilder: (context, settingsVm) {
+          return TimeProgressStoreConnector(
+            timeProgressId: args.id,
+            loadedBuilder: (context, tpVm) {
+              _initEditedProgress(tpVm.tp);
+              return Container(
+                  margin: EdgeInsets.all(8),
+                  child: Column(
+                    children: _renderColumnChildren(settingsVm, tpVm),
+                  ));
+            },
+          );
+        },
+      ),
+      floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
+      floatingActionButton: TimeProgressStoreConnector(
+        timeProgressId: args.id,
+        loadedBuilder: (context, tpVm) {
+          void _saveEditedProgress() {
+            tpVm.updateTimeProgress(_editedProgress);
+            _switchEditMode(false);
+          }
+
+          void _deleteTimeProgress() {
+            tpVm.deleteTimeProgress();
+            Navigator.popUntil(
+                context, ModalRoute.withName(HomeScreen.routeName));
+          }
+
+          return DetailScreenFloatingActionButtons(
+              editMode: _editMode,
+              originalProgress: tpVm.tp,
+              editedProgress: _editedProgress,
+              isEditedProgressValid: _isEditedProgressValid,
+              onEditProgress: () => _switchEditMode(true),
+              onSaveEditedProgress: _saveEditedProgress,
+              onCancelEditProgress: _cancelEditMode,
+              onDeleteProgress: _deleteTimeProgress);
+        },
+      ),
+    );
+  }
+}

lib/screens/settings_screen.dart

@@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
 import 'package:time_progress_tracker/app.dart';
-import 'package:time_progress_tracker/redux/store_connectors/settings_store_connector.dart';
+import 'package:time_progress_tracker/widgets/buttons/color_picker_btn.dart';
-import 'package:time_progress_tracker/ui/buttons/color_picker_btn.dart';
+import 'package:time_progress_tracker/widgets/home/tabs/settings/duration_settings_widget.dart';
-import 'package:time_progress_tracker/ui/settings/duration_settings_widget.dart';
+import 'package:time_progress_tracker/widgets/store_connectors/settings_store_connector.dart';
 
 class SettingsScreen extends StatelessWidget {
   Widget _renderColorSettings(

lib/selectors/time_progress_selectors.dart

@@ -1,8 +1,8 @@
 import 'dart:ui';
 
 import 'package:time_progress_tracker/models/app_settings.dart';
+import 'package:time_progress_tracker/models/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,12 +45,10 @@ 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;
-  TimeProgress tp = state.timeProgressList.firstWhere(
+  return state.timeProgressList
-      (timeProgress) => timeProgress.id == id,
+      .firstWhere((timeProgress) => timeProgress.id == id, orElse: () => null);
-      orElse: () => TimeProgress.initialDefault());
-  return tp != TimeProgress.initialDefault() ? tp : null;
 }
 
 AppSettings appSettingsSelector(AppState state) {

lib/ui/buttons/create_progress_button.dart

@@ -1,37 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
-import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
-import 'package:time_progress_tracker/utils/helper_functions.dart';
-
-class CreateProgressButton extends StatelessWidget {
-  final String _heroTag = "createTimeProgressBTN";
-
-  final void Function() createProgress;
-
-  const CreateProgressButton({Key? key, required this.createProgress})
-      : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    Widget _renderCupertino() {
-      return PlatformButton(
-        padding: EdgeInsets.all(4),
-        child: Icon(
-          Icons.save,
-          color: Colors.white,
-        ),
-        onPressed: () => createProgress(),
-      );
-    }
-
-    Widget _renderMaterial() {
-      return FloatingActionButton(
-        heroTag: _heroTag,
-        child: Icon(Icons.save),
-        onPressed: () => createProgress(),
-      );
-    }
-
-    return useCupertino() ? _renderCupertino() : _renderMaterial();
-  }
-}

lib/ui/buttons/detail_screen_leading_button.dart

@@ -1,34 +0,0 @@
-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

@@ -1,31 +0,0 @@
-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

@@ -1,44 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
-import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
-import 'package:time_progress_tracker/utils/helper_functions.dart';
-
-class PlatformActionButton extends StatelessWidget {
-  final String heroTag;
-  final IconData icon;
-  final Color? materialBackground;
-  final void Function()? onBtnPressed;
-
-  const PlatformActionButton({
-    Key? key,
-    required this.heroTag,
-    required this.icon,
-    this.materialBackground,
-    required this.onBtnPressed,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    Widget _renderCupertino() {
-      return PlatformButton(
-        padding: EdgeInsets.all(4),
-        child: Icon(
-          icon,
-          color: Colors.white,
-        ),
-        onPressed: onBtnPressed,
-      );
-    }
-
-    Widget _renderMaterial() {
-      return FloatingActionButton(
-        heroTag: heroTag,
-        child: Icon(icon),
-        backgroundColor: materialBackground,
-        onPressed: onBtnPressed,
-      );
-    }
-
-    return useCupertino() ? _renderCupertino() : _renderMaterial();
-  }
-}

lib/ui/progress/progress_list_item.dart

@@ -1,122 +0,0 @@
-import 'dart:io' show Platform;
-
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
-import 'package:percent_indicator/linear_percent_indicator.dart';
-import 'package:time_progress_tracker/models/time_progress.dart';
-import 'package:time_progress_tracker/ui/screens/progress_detail_screen.dart';
-import 'package:time_progress_tracker/utils/theme_utils.dart';
-
-class ProgressListTileStrings {
-  static String percentString(TimeProgress tp) =>
-      "${(tp.percentDone() * 100).floorToDouble()} %";
-
-  static String startsInDaysString(TimeProgress tp) =>
-      "Starts in ${tp.daysTillStart()} Days.";
-
-  static String endedDaysAgoString(TimeProgress tp) =>
-      "Ended ${tp.daysSinceEnd()} Days ago.";
-}
-
-class ProgressListItem extends StatelessWidget {
-  final TimeProgress timeProgress;
-  final Color doneColor, leftColor;
-
-  ProgressListItem({
-    required this.timeProgress,
-    required this.doneColor,
-    required this.leftColor,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    void _onTileTap() => Navigator.push(
-          context,
-          platformPageRoute(
-              context: context,
-              builder: (context) => ProgressDetailScreen(
-                    tpId: timeProgress.id,
-                  )),
-        );
-
-    Widget _renderTitle(bool material) {
-      Text name = Text(
-        timeProgress.name,
-        style: material ? null : cupertinoCardTitleStyle,
-        textAlign: material ? null : TextAlign.left,
-      );
-      Text duration = Text(
-        "${timeProgress.allDays()} Days",
-        style: material ? null : cupertinoCardSubtitleStyle,
-        textAlign: material ? null : TextAlign.left,
-      );
-      Row title = Row(
-        children: [name, Spacer(), duration],
-      );
-      if (!material)
-        return Padding(
-          padding: EdgeInsets.only(bottom: 16, right: 5),
-          child: title,
-        );
-      return title;
-    }
-
-    Widget _renderSubtitle(bool material) {
-      if (!timeProgress.hasStarted())
-        return PlatformText(
-            ProgressListTileStrings.startsInDaysString(timeProgress));
-      if (timeProgress.hasEnded())
-        return PlatformText(
-            ProgressListTileStrings.endedDaysAgoString(timeProgress));
-      LinearPercentIndicator percentIndicator = LinearPercentIndicator(
-        center:
-            PlatformText(ProgressListTileStrings.percentString(timeProgress)),
-        percent: timeProgress.percentDone(),
-        progressColor: doneColor,
-        backgroundColor: leftColor,
-        lineHeight: 20,
-      );
-      if (!material)
-        return Padding(
-          padding: EdgeInsets.only(
-            bottom: 5,
-            right: 5,
-          ),
-          child: percentIndicator,
-        );
-      return percentIndicator;
-    }
-
-    Widget _renderCupertino() {
-      CupertinoThemeData theme = CupertinoTheme.of(context);
-      return CupertinoButton(
-          child: Container(
-            decoration: BoxDecoration(
-              color: theme.primaryColor,
-              borderRadius: BorderRadius.circular(12),
-            ),
-            padding: EdgeInsets.fromLTRB(15, 15, 5, 5),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                _renderTitle(false),
-                _renderSubtitle(false),
-              ],
-            ),
-          ),
-          onPressed: _onTileTap);
-    }
-
-    Widget _renderMaterial() {
-      return ListTile(
-        title: _renderTitle(true),
-        subtitle: _renderSubtitle(true),
-        onTap: _onTileTap,
-      );
-    }
-
-    if (Platform.isIOS) return _renderCupertino();
-    return _renderMaterial();
-  }
-}

lib/ui/screens/progress_creation_screen.dart

@@ -1,200 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
-import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
-import 'package:flutter_redux/flutter_redux.dart';
-import 'package:redux/redux.dart';
-import 'package:time_progress_tracker/models/app_settings.dart';
-import 'package:time_progress_tracker/models/time_progress.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/redux/redux_selectors.dart';
-import 'package:time_progress_tracker/redux/store_connectors/create_time_progress_store_connector.dart';
-import 'package:time_progress_tracker/ui/buttons/create_progress_button.dart';
-import 'package:time_progress_tracker/ui/buttons/platform_action_button.dart';
-import 'package:time_progress_tracker/ui/progress/progress_editor_widget.dart';
-import 'package:time_progress_tracker/utils/theme_utils.dart';
-import 'package:time_progress_tracker/utils/helper_functions.dart';
-
-class ProgressCreationScreen extends StatefulWidget {
-  static const routeName = "/create-progress";
-  static const title = "Create Time Progress";
-
-  @override
-  State<StatefulWidget> createState() {
-    return _ProgressCreationScreenState();
-  }
-}
-
-class _ProgressCreationScreenState extends State<ProgressCreationScreen> {
-  TimeProgress timeProgressToCreate = TimeProgress.initialDefault();
-  bool _isProgressValid = false;
-
-  void initTimeProgress(TimeProgress timeProgress) {
-    if (timeProgressToCreate == TimeProgress.initialDefault())
-      setState(() {
-        timeProgressToCreate = timeProgress;
-      });
-  }
-
-  void onTimeProgressChanged(
-      TimeProgress newTimeProgress, bool isNewProgressValid) {
-    setState(() {
-      timeProgressToCreate = newTimeProgress;
-      _isProgressValid = isNewProgressValid;
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    void _onCreateTimeProgress(CreateTimeProgressViewModel vm) {
-      if (!_isProgressValid) return null;
-      vm.addTimeProgress(timeProgressToCreate);
-      Navigator.pop(context);
-    }
-
-    initTimeProgress(TimeProgress.defaultFromDuration(
-        StoreProvider.of<AppState>(context).state.appSettings.duration));
-
-    Widget _createActionButton = CreateTimeProgressStoreConnector(
-      loadedBuilder: (context, CreateTimeProgressViewModel vm) =>
-          PlatformActionButton(
-              heroTag: "createTimeProgressBTN",
-              icon: Icons.save,
-              onBtnPressed: () => _onCreateTimeProgress(vm)),
-    );
-
-    return PlatformScaffold(
-      appBar: PlatformAppBar(
-        title: Text(
-          ProgressCreationScreen.title,
-          style: toolbarTextStyle,
-        ),
-        cupertino: (_, __) => CupertinoNavigationBarData(
-          transitionBetweenRoutes: false,
-          trailing: _createActionButton,
-        ),
-      ),
-      material: (_, __) => MaterialScaffoldData(
-        floatingActionButton: Row(
-          children: [
-            Expanded(
-              child: _createActionButton,
-            )
-          ],
-        ),
-      ),
-      body: ProgressEditorWidget(
-        timeProgress: timeProgressToCreate,
-        onTimeProgressChanged: onTimeProgressChanged,
-      ),
-    );
-
-    return CreateTimeProgressStoreConnector(
-      loadedBuilder: (context, CreateTimeProgressViewModel vm) {
-        initTimeProgress(vm.defaultProgress);
-        return PlatformScaffold(
-          appBar: PlatformAppBar(
-            title: Text(
-              ProgressCreationScreen.title,
-              style: toolbarTextStyle,
-            ),
-            cupertino: (_, __) => CupertinoNavigationBarData(
-              transitionBetweenRoutes: false,
-              trailing: CreateProgressButton(
-                createProgress: () => _onCreateTimeProgress(vm),
-              ),
-            ),
-          ),
-          material: (_, __) => MaterialScaffoldData(
-            floatingActionButton: Row(
-              children: [
-                Expanded(
-                  child: CreateProgressButton(
-                    createProgress: () => _onCreateTimeProgress(vm),
-                  ),
-                )
-              ],
-            ),
-          ),
-          body: ProgressEditorWidget(
-            timeProgress: timeProgressToCreate,
-            onTimeProgressChanged: onTimeProgressChanged,
-          ),
-        );
-      },
-    );
-
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(ProgressCreationScreen.title),
-      ),
-      body: Container(
-        padding: EdgeInsets.all(12),
-        child: StoreConnector<AppState, _ViewModel>(
-            onInit: loadSettingsIfUnloaded,
-            converter: (store) => _ViewModel.create(store),
-            builder: (context, _ViewModel viewModel) {
-              initTimeProgress(viewModel.defaultDurationProgress);
-              return ProgressEditorWidget(
-                timeProgress: timeProgressToCreate,
-                onTimeProgressChanged: onTimeProgressChanged,
-              );
-            }),
-      ),
-      floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
-      floatingActionButton: Row(
-        children: <Widget>[
-          Expanded(
-            child: StoreConnector<AppState, _ViewModel>(
-              onInit: loadSettingsIfUnloaded,
-              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,
-              ),
-            ),
-          ),
-          Expanded(
-            child: FloatingActionButton(
-              heroTag: "cancelTimeProgressCreationBTN",
-              child: Icon(Icons.cancel),
-              onPressed: () {
-                Navigator.pop(context);
-              },
-            ),
-          )
-        ],
-      ),
-    );
-  }
-}
-
-class _ViewModel {
-  final TimeProgress defaultDurationProgress;
-  final void Function(TimeProgress) onAddTimeProgress;
-
-  _ViewModel({
-    required this.defaultDurationProgress,
-    required this.onAddTimeProgress,
-  });
-
-  factory _ViewModel.create(Store<AppState> store) {
-    AppSettings settings = appSettingsSelector(store.state);
-
-    _onAddTimeProgress(TimeProgress tp) {
-      if (TimeProgress.isValid(tp)) store.dispatch(AddTimeProgressAction(tp));
-    }
-
-    return _ViewModel(
-      defaultDurationProgress:
-          TimeProgress.defaultFromDuration(settings.duration),
-      onAddTimeProgress: _onAddTimeProgress,
-    );
-  }
-}

lib/ui/screens/progress_detail_screen.dart

@@ -1,152 +0,0 @@
-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/buttons/detail_screen_leading_button.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);
-
-  @override
-  State<StatefulWidget> createState() {
-    return _ProgressDetailScreenState();
-  }
-}
-
-class _ProgressDetailScreenState extends State<ProgressDetailScreen> {
-  bool _editMode = false, _isEditedProgressValid = false;
-  TimeProgress _editedProgress = TimeProgress.initialDefault(),
-      _originalProgress = TimeProgress.initialDefault();
-
-  void _initEditedProgress(TimeProgress tp) {
-    if (_editedProgress == TimeProgress.initialDefault()) {
-      _editedProgress = tp;
-      _originalProgress = tp;
-    }
-  }
-
-  void _onEditedProgressChanged(
-      TimeProgress newProgress, bool isNewProgressValid) {
-    setState(() {
-      _editedProgress = newProgress;
-      _isEditedProgressValid = isNewProgressValid;
-    });
-  }
-
-  void _switchEditMode(bool newMode) {
-    setState(() {
-      _editMode = newMode;
-    });
-  }
-
-  void _cancelEditMode() {
-    setState(() {
-      _editMode = false;
-      _editedProgress = _originalProgress;
-    });
-  }
-
-  List<Widget> _renderColumnChildren(
-      SettingsViewModel settingsVm, TimeProgressViewModel tpVm) {
-    TimeProgress tp = tpVm.tp ?? TimeProgress.initialDefault();
-    List<Widget> columnChildren = [
-      Expanded(
-          child: ProgressViewWidget(
-        timeProgress: _editMode ? _editedProgress : tp,
-        doneColor: settingsVm.appSettings.doneColor,
-        leftColor: settingsVm.appSettings.leftColor,
-      ))
-    ];
-    if (_editMode)
-      columnChildren.add(Expanded(
-          child: ProgressEditorWidget(
-        timeProgress: _editedProgress,
-        onTimeProgressChanged: _onEditedProgressChanged,
-      )));
-    return columnChildren;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    TimeProgressStoreConnector leadingActionButton = TimeProgressStoreConnector(
-      timeProgressId: widget.tpId,
-      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!);
-              return Container(
-                  margin: EdgeInsets.all(8),
-                  child: Column(
-                    children: _renderColumnChildren(settingsVm, tpVm),
-                  ));
-            },
-          );
-        },
-      ),
-    );
-  }
-}

lib/utils/color_utils.dart

@@ -17,8 +17,4 @@ final CupertinoThemeData cupertinoThemeData = CupertinoThemeData(
   scaffoldBackgroundColor: Colors.white,
 );
 final toolbarTextStyle = TextStyle(color: Colors.white, fontSize: 16);
-final cupertinoCardTitleStyle =
-    TextStyle(color: Colors.white, fontSize: 20, fontWeight: FontWeight.w600);
-final cupertinoCardSubtitleStyle =
-    TextStyle(color: Colors.grey, fontSize: 18, fontWeight: FontWeight.w400);
 final bottomTabsBackground = Colors.indigoAccent;

lib/utils/constants.dart

@@ -1,11 +1,3 @@
-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 defaultAppSettings = AppSettings(
-  doneColor: Colors.green,
-  leftColor: Colors.red,
-  duration: Duration(days: 365),
-);

lib/utils/helper_functions.dart

@@ -1,37 +0,0 @@
-import 'dart:io' show Platform;
-import 'dart:ui';
-
-import 'package:flutter/foundation.dart';
-import 'package:redux/redux.dart';
-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/time_progress_actions.dart';
-import 'package:time_progress_tracker/redux/app_state.dart';
-
-void loadTimeProgressListIfUnloaded(Store<AppState> store) {
-  if (!store.state.hasProgressesLoaded)
-    store.dispatch(LoadTimeProgressListAction());
-}
-
-void loadSettingsIfUnloaded(Store<AppState> store) {
-  if (!store.state.hasSettingsLoaded) store.dispatch(LoadAppSettingsAction());
-}
-
-TimeProgress? selectProgressById(List<TimeProgress> tpList, String id) =>
-    tpList.firstWhere((tp) => tp.id == id, orElse: null);
-
-List<TimeProgress> selectActiveProgresses(List<TimeProgress> tpList) =>
-    tpList.where((tp) => tp.hasStarted() && !tp.hasEnded()).toList();
-
-List<TimeProgress> selectInactiveProgresses(List<TimeProgress> tpList) =>
-    tpList.where((tp) => !tp.hasStarted() || tp.hasEnded()).toList();
-
-bool useBrightBackground(Color bC) {
-  double yiq = ((bC.red * 299) + (bC.green * 587) + (bC.blue * 114)) / 1000;
-  return yiq >= 186 || (bC.red == 0 && bC.green == 0 && bC.blue == 0);
-}
-
-bool useCupertino() {
-  if (kIsWeb) return false;
-  return Platform.isIOS;
-}

lib/widgets/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/widgets/buttons/color_picker_btn.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_colorpicker/flutter_colorpicker.dart';
-import 'package:time_progress_tracker/utils/helper_functions.dart';
+import 'package:time_progress_tracker/helper_functions.dart';
 
 class ColorPickerButton extends StatelessWidget {
   final String title, dialogTitle;
@@ -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/widgets/buttons/create_progress_button.dart

@@ -0,0 +1,18 @@
+import 'package:flutter/material.dart';
+import 'package:time_progress_tracker/screens/progress_creation_screen.dart';
+
+class CreateProgressButton extends StatelessWidget {
+  final String _heroTag = "createProgressBTN";
+
+  @override
+  Widget build(BuildContext context) {
+    void _onButtonPressed() =>
+        Navigator.pushNamed(context, ProgressCreationScreen.routeName);
+
+    return FloatingActionButton(
+      heroTag: _heroTag,
+      child: Icon(Icons.add),
+      onPressed: _onButtonPressed,
+    );
+  }
+}

lib/widgets/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/widgets/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/widgets/detail_screen_floating_action_buttons.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:time_progress_tracker/models/time_progress.dart';
-import 'package:time_progress_tracker/ui/app_yes_no_dialog_widget.dart';
+import 'package:time_progress_tracker/widgets/app_yes_no_dialog_widget.dart';
 
 class DetailScreenFloatingActionButtons extends StatelessWidget {
   final bool editMode, isEditedProgressValid;
@@ -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/widgets/home/home_bottom_navbar.dart

@@ -0,0 +1,45 @@
+import 'package:flutter/material.dart';
+
+class HomeBottomNavBar extends StatelessWidget {
+  final int currentIndex;
+  final Function onTap;
+
+  HomeBottomNavBar({
+    Key key,
+    @required this.currentIndex,
+    @required this.onTap,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    ThemeData appTheme = Theme.of(context);
+
+    return BottomNavigationBar(
+      onTap: onTap,
+      currentIndex: currentIndex,
+      items: [
+        BottomNavigationBarItem(
+          icon: new Icon(
+            Icons.alarm,
+            color: appTheme.primaryColor,
+          ),
+          label: "Active Progresses",
+        ),
+        BottomNavigationBarItem(
+          icon: new Icon(
+            Icons.alarm_off,
+            color: appTheme.primaryColor,
+          ),
+          label: "Inactive Progresses",
+        ),
+        BottomNavigationBarItem(
+          icon: new Icon(
+            Icons.settings,
+            color: appTheme.primaryColor,
+          ),
+          label: "Settings",
+        )
+      ],
+    );
+  }
+}

lib/widgets/home/tabs/home_active_progresses_tab.dart

@@ -0,0 +1,36 @@
+import 'package:flutter/material.dart';
+import 'package:time_progress_tracker/helper_functions.dart';
+import 'package:time_progress_tracker/models/time_progress.dart';
+import 'package:time_progress_tracker/widgets/progress_list_view/progress_list_view.dart';
+import 'package:time_progress_tracker/widgets/store_connectors/settings_store_connector.dart';
+import 'package:time_progress_tracker/widgets/store_connectors/time_progress_list_store_connector.dart';
+
+class HomeActiveProgressesTab extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return SettingsStoreConnector(
+      loadedBuilder: (context, settingsVm) {
+        return TimeProgressListStoreConnector(
+          loadedBuilder: (context, tpListVm) {
+            List<TimeProgress> activeTpList =
+                selectActiveProgresses(tpListVm.tpList);
+            if (activeTpList.length < 1)
+              return Container(
+                padding: EdgeInsets.all(16),
+                child: Center(
+                  child: Text(
+                      "You don't have any active time progress, that are tracked."),
+                ),
+              );
+
+            return ProgressListView(
+              timeProgressList: activeTpList,
+              doneColor: settingsVm.appSettings.doneColor,
+              leftColor: settingsVm.appSettings.leftColor,
+            );
+          },
+        );
+      },
+    );
+  }
+}

lib/widgets/home/tabs/home_inactive_progresses_tab.dart

@@ -0,0 +1,36 @@
+import 'package:flutter/material.dart';
+import 'package:time_progress_tracker/helper_functions.dart';
+import 'package:time_progress_tracker/models/time_progress.dart';
+import 'package:time_progress_tracker/widgets/progress_list_view/progress_list_view.dart';
+import 'package:time_progress_tracker/widgets/store_connectors/settings_store_connector.dart';
+import 'package:time_progress_tracker/widgets/store_connectors/time_progress_list_store_connector.dart';
+
+class HomeInactiveProgressesTab extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return SettingsStoreConnector(
+      loadedBuilder: (context, settingsVm) {
+        return TimeProgressListStoreConnector(
+          loadedBuilder: (context, tpListVm) {
+            List<TimeProgress> inactiveTpList =
+                selectInactiveProgresses(tpListVm.tpList);
+            if (inactiveTpList.length < 1)
+              return Container(
+                padding: EdgeInsets.all(16),
+                child: Center(
+                  child: Text(
+                      "You don't have any currently inactive time progresses, that are tracked."),
+                ),
+              );
+
+            return ProgressListView(
+              timeProgressList: inactiveTpList,
+              doneColor: settingsVm.appSettings.doneColor,
+              leftColor: settingsVm.appSettings.leftColor,
+            );
+          },
+        );
+      },
+    );
+  }
+}

lib/widgets/home/tabs/home_settings_tab.dart

@@ -0,0 +1,52 @@
+import 'package:flutter/material.dart';
+import 'package:time_progress_tracker/app.dart';
+import 'package:time_progress_tracker/widgets/home/tabs/settings/color_settings_widget.dart';
+import 'package:time_progress_tracker/widgets/home/tabs/settings/duration_settings_widget.dart';
+import 'package:time_progress_tracker/widgets/store_connectors/settings_store_connector.dart';
+
+class HomeSettingsTab extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return SettingsStoreConnector(
+      loadedBuilder: (context, settingsVm) {
+        return Container(
+          padding: EdgeInsets.all(16),
+          child: Center(
+            child: Column(
+              children: [
+                Expanded(
+                  child: ColorSettingsWidget(
+                    doneColor: settingsVm.appSettings.doneColor,
+                    leftColor: settingsVm.appSettings.leftColor,
+                    updateDoneColor: settingsVm.updateDoneColor,
+                    updateLeftColor: settingsVm.updateLeftColor,
+                  ),
+                ),
+                Expanded(
+                  child: DurationSettingsWidget(
+                    duration: settingsVm.appSettings.duration,
+                    updateDuration: settingsVm.updateDuration,
+                  ),
+                ),
+                Spacer(),
+                Expanded(
+                  child: TextButton(
+                    onPressed: () {
+                      showAboutDialog(
+                          context: context,
+                          applicationName: TimeProgressTrackerApp.name,
+                          applicationVersion: "Beta",
+                          applicationLegalese:
+                              '\u00a9Andreas Fahrecker 2020-2021');
+                    },
+                    child: Text("About"),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+}

lib/widgets/home/tabs/settings/color_settings_widget.dart

@@ -1,15 +1,15 @@
 import 'package:flutter/material.dart';
-import 'package:time_progress_tracker/ui/buttons/color_picker_btn.dart';
+import 'package:time_progress_tracker/widgets/buttons/color_picker_btn.dart';
 
 class ColorSettingsWidget extends StatelessWidget {
   final Color doneColor, leftColor;
   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/widgets/home/tabs/settings/duration_settings_widget.dart

@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
-import 'package:time_progress_tracker/ui/buttons/select_duration_btn.dart';
+import 'package:time_progress_tracker/widgets/buttons/select_duration_btn.dart';
 
 class DurationSettingsWidget extends StatelessWidget {
   final Duration duration;
   final void Function(Duration) updateDuration;
 
   DurationSettingsWidget({
-    required this.duration,
+    @required this.duration,
-    required this.updateDuration,
+    @required this.updateDuration,
   });
 
   @override

lib/widgets/progress_editor_widget.dart

@@ -1,15 +1,14 @@
 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/ui/buttons/date_picker_btn.dart';
+import 'package:time_progress_tracker/widgets/buttons/date_picker_btn.dart';
 
 class ProgressEditorWidget extends StatefulWidget {
   final TimeProgress timeProgress;
   final Function(TimeProgress, bool) onTimeProgressChanged;
 
   ProgressEditorWidget({
-    required this.timeProgress,
+    @required this.timeProgress,
-    required this.onTimeProgressChanged,
+    @required this.onTimeProgressChanged,
   });
 
   @override
@@ -65,25 +64,14 @@ class _ProgressEditorWidgetState extends State<ProgressEditorWidget> {
   Widget build(BuildContext context) {
     List<Widget> columnChildren = [
       Expanded(
-        child: Center(
+        child: TextField(
-          child: PlatformTextField(
+          controller: _nameTextController,
-            controller: _nameTextController,
+          decoration: InputDecoration(
-            material: (context, platform) => MaterialTextFieldData(
+            border: OutlineInputBorder(),
-              decoration: InputDecoration(
+            labelText: "Progress Name",
-                border: OutlineInputBorder(),
+            errorText: _validName
-                labelText: "Progress Name",
+                ? null
-                errorText: _validName
+                : "The Name need to have at least 3 and at max 20 symbols.",
-                    ? null
-                    : "The Name need to have at least 3 and at max 20 symbols.",
-              ),
-            ),
-            cupertino: (context, platform) => CupertinoTextFieldData(
-              placeholder: "Progress Name",
-              decoration: BoxDecoration(
-                border: Border.all(width: 2, color: Colors.grey),
-                borderRadius: BorderRadius.circular(32),
-              )
-            ),
           ),
         ),
       ),

lib/widgets/progress_list_view/progress_list_item.dart

@@ -0,0 +1,74 @@
+import 'dart:io' show Platform;
+
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
+import 'package:percent_indicator/linear_percent_indicator.dart';
+import 'package:time_progress_tracker/models/time_progress.dart';
+import 'package:time_progress_tracker/screens/progress_detail_screen.dart';
+
+class ProgressListTileStrings {
+  static String percentString(TimeProgress tp) =>
+      "${(tp.percentDone() * 100).floorToDouble()} %";
+
+  static String startsInDaysString(TimeProgress tp) =>
+      "Starts in ${tp.daysTillStart()} Days.";
+
+  static String endedDaysAgoString(TimeProgress tp) =>
+      "Ended ${tp.daysSinceEnd()} Days ago.";
+}
+
+class ProgressListItem extends StatelessWidget {
+  final TimeProgress timeProgress;
+  final Color doneColor, leftColor;
+
+  ProgressListItem({
+    @required this.timeProgress,
+    @required this.doneColor,
+    @required this.leftColor,
+  });
+
+  Widget _renderSubtitle(BuildContext context) {
+    if (!timeProgress.hasStarted())
+      return PlatformText(ProgressListTileStrings.startsInDaysString(timeProgress));
+    if (timeProgress.hasEnded())
+      return PlatformText(ProgressListTileStrings.endedDaysAgoString(timeProgress));
+    return LinearPercentIndicator(
+      center: PlatformText(ProgressListTileStrings.percentString(timeProgress)),
+      percent: timeProgress.percentDone(),
+      progressColor: doneColor,
+      backgroundColor: leftColor,
+      lineHeight: 20,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    void _onTileTap() =>
+        Navigator.pushNamed(context, ProgressDetailScreen.routeName,
+            arguments: ProgressDetailScreenArguments(timeProgress.id));
+    Text titleText = Text(timeProgress.name);
+
+    if (Platform.isIOS)
+      return CupertinoButton(
+          child: Container(
+            decoration: BoxDecoration(
+              color: Colors.grey,
+              borderRadius: BorderRadius.circular(12),
+            ),
+            padding: EdgeInsets.fromLTRB(15, 15, 5, 5),
+            child: Column(
+              children: [
+                titleText,
+                _renderSubtitle(context),
+              ],
+            ),
+          ),
+          onPressed: _onTileTap);
+    return ListTile(
+      title: titleText,
+      subtitle: _renderSubtitle(context),
+      onTap: _onTileTap,
+    );
+  }
+}

lib/widgets/progress_list_view/progress_list_view.dart

@@ -3,16 +3,16 @@ import 'dart:io' show Platform;
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:time_progress_tracker/models/time_progress.dart';
-import 'package:time_progress_tracker/ui/progress/progress_list_item.dart';
+import 'package:time_progress_tracker/widgets/progress_list_view/progress_list_item.dart';
 
 class ProgressListView extends StatelessWidget {
   final List<TimeProgress> timeProgressList;
   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/widgets/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/widgets/store_connectors/settings_store_connector.dart

@@ -1,16 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:redux/redux.dart';
+import 'package:time_progress_tracker/actions/actions.dart';
 import 'package:time_progress_tracker/models/app_settings.dart';
-import 'package:time_progress_tracker/redux/actions/app_settings_actions.dart';
+import 'package:time_progress_tracker/models/app_state.dart';
-import 'package:time_progress_tracker/redux/app_state.dart';
-import 'package:time_progress_tracker/utils/helper_functions.dart';
 
 class SettingsStoreConnector extends StatelessWidget {
   final Widget Function(BuildContext, SettingsViewModel) loadedBuilder;
 
   SettingsStoreConnector({
-    required this.loadedBuilder,
+    @required this.loadedBuilder,
   });
 
   @override

lib/widgets/store_connectors/time_progress_list_store_connector.dart

@@ -1,15 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:redux/redux.dart';
-import 'package:time_progress_tracker/redux/app_state.dart';
+import 'package:time_progress_tracker/actions/actions.dart';
+import 'package:time_progress_tracker/models/app_state.dart';
 import 'package:time_progress_tracker/models/time_progress.dart';
-import 'package:time_progress_tracker/utils/helper_functions.dart';
 
 class TimeProgressListStoreConnector extends StatelessWidget {
   final Widget Function(BuildContext, TimeProgressListViewModel) loadedBuilder;
 
   TimeProgressListStoreConnector({
-    required this.loadedBuilder,
+    @required this.loadedBuilder,
   });
 
   @override

lib/widgets/store_connectors/time_progress_store_connector.dart

@@ -1,19 +1,19 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:redux/redux.dart';
-import 'package:time_progress_tracker/redux/actions/time_progress_actions.dart';
+import 'package:time_progress_tracker/actions/actions.dart';
-import 'package:time_progress_tracker/redux/app_state.dart';
+import 'package:time_progress_tracker/models/app_state.dart';
 import 'package:time_progress_tracker/models/time_progress.dart';
-import 'package:time_progress_tracker/utils/helper_functions.dart';
 
+import '../../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;

pubspec.lock

@@ -381,5 +381,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.12.0-259.9.beta <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.12.0 <3.0.0"
+  sdk: ">=2.7.0 <3.0.0"
 
 dependencies:
   flutter:

test/widget_test.dart

@@ -10,8 +10,8 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:percent_indicator/linear_percent_indicator.dart';
 import 'package:time_progress_tracker/models/app_settings.dart';
 import 'package:time_progress_tracker/models/time_progress.dart';
-import 'package:time_progress_tracker/ui/progress/progress_list_item.dart';
+import 'package:time_progress_tracker/widgets/progress_list_view/progress_list_item.dart';
-import 'package:time_progress_tracker/ui/progress/progress_list_view.dart';
+import 'package:time_progress_tracker/widgets/progress_list_view/progress_list_view.dart';
 
 import 'MaterialTesterWidget.dart';