Cleaned up the repo

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

README.md

@@ -9,17 +9,13 @@ including their current percentages.
 
 ## Current State of the repo.
 
-Currently, the code in this branch is pretty messed up. Since I wrote that application from a
-prototype which, was developed as my first flutter project and in a very short time.
-Since, then most of the work that went into this project was cleanup work.
+Now the repo is mostly cleaned up.
 
-Currently I am working on a clean codebase in the feature/platform-widget branch.
-
-At this state, the base screens of the app are located in lib/screens,
-all other ui widgets are located in li/widgets,
-the model classes are located in lib/model,
-files related to persisting the data are in lib/persistence,
-and redux related files are spread over lib/actions lib/middleware lib/reducers and lib/reducers.
+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)
 

lib/actions/actions.dart

@@ -1,58 +0,0 @@
-import 'package:redux/redux.dart';
-import 'package:time_progress_tracker/models/app_settings.dart';
-import 'package:time_progress_tracker/redux/app_state.dart';
-import 'package:time_progress_tracker/models/time_progress.dart';
-
-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

@@ -4,7 +4,7 @@ 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/screens/dashboard_screen.dart';
+import 'package:time_progress_tracker/ui/screens/dashboard_screen.dart';
 import 'package:time_progress_tracker/utils/color_utils.dart';
 
 class TimeProgressTrackerApp extends StatelessWidget {

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/middleware/store_middleware.dart';
 import 'package:time_progress_tracker/redux/app_state.dart';
 import 'package:time_progress_tracker/persistence/app_settings.dart';
-import 'package:time_progress_tracker/persistence/time_progress_repository.dart';
-import 'package:time_progress_tracker/reducers/app_state_reducer.dart';
+import 'package:time_progress_tracker/persistence/time_progress.dart';
+import 'package:time_progress_tracker/redux/reducers/app_state_reducer.dart';
+import 'package:time_progress_tracker/redux/store_middleware.dart';
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();

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_entity.dart';
+import 'package:time_progress_tracker/persistence/time_progress.dart';
 import 'package:time_progress_tracker/uuid.dart';
 
 @immutable

lib/persistence/app_settings.dart

@@ -1,16 +1,14 @@
-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';
 
-class AppSettingsRepository {
+class AppSettingsRepository extends Repository<AppSettingsEntity> {
   static const String _key = "app_settings";
-  final SharedPreferences prefs;
-  final JsonCodec codec;
 
-  AppSettingsRepository(this.prefs, {this.codec = json});
+  AppSettingsRepository(SharedPreferences prefs) : super(prefs);
 
-  Future<AppSettingsEntity> loadAppSettings() {
+  @override
+  Future<AppSettingsEntity> load() {
     final String jsonString = this.prefs.getString(_key);
     if (jsonString == null)
       return Future<AppSettingsEntity>.value(AppSettingsEntity.defaults());
@@ -18,7 +16,8 @@ class AppSettingsRepository {
         AppSettingsEntity.fromJson(codec.decode(jsonString)));
   }
 
-  Future<bool> saveAppSettings(AppSettingsEntity appSettings) =>
+  @override
+  Future<bool> save(AppSettingsEntity appSettings) =>
       this.prefs.setString(_key, codec.encode(appSettings));
 }
 

lib/persistence/repository.dart

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,62 @@
+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';
+
+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) =>
+    AppSettings.defaults();
+
+AppSettings _updateAppSettings(
+        AppSettings appSettings, AppSettingsAction action) =>
+    action.appSettings;

lib/redux/store_connectors/settings_store_connector.dart

@@ -1,9 +1,10 @@
 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/redux/app_state.dart';
+import 'package:time_progress_tracker/utils/helper_functions.dart';
 
 class SettingsStoreConnector extends StatelessWidget {
   final Widget Function(BuildContext, SettingsViewModel) loadedBuilder;

lib/redux/store_connectors/time_progress_list_store_connector.dart

@@ -1,9 +1,9 @@
 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/redux/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;

lib/redux/store_connectors/time_progress_store_connector.dart

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

lib/redux/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/redux/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_entity.dart';
-import 'package:time_progress_tracker/persistence/time_progress_repository.dart';
-import 'package:time_progress_tracker/selectors/time_progress_selectors.dart';
+import 'package:time_progress_tracker/persistence/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';
+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, LoadSettingsAction>(loadSettings),
+    TypedMiddleware<AppState, LoadAppSettingsAction>(loadSettings),
     TypedMiddleware<AppState, UpdateAppSettingsActions>(saveSettings)
   ];
 }
@@ -31,7 +31,7 @@ Middleware<AppState> _createSaveTimeProgressList(
   return (Store<AppState> store, dynamic action, NextDispatcher next) {
     next(action);
 
-    repository.saveTimeProgressList(
+    repository.save(
       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.loadTimeProgressList().then((timeProgresses) {
+    repository.load().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.saveAppSettings(store.state.appSettings.toEntity());
+      repo.save(store.state.appSettings.toEntity());
     };
 
 Middleware<AppState> _createLoadAppSettings(AppSettingsRepository repo) =>
     (Store<AppState> store, dynamic action, NextDispatcher next) {
-      repo.loadAppSettings().then((appSettings) {
+      repo.load().then((appSettings) {
         store.dispatch(
             AppSettingsLoadedActions(AppSettings.fromEntity(appSettings)));
       });

lib/screens/home_screen.dart

@@ -1,47 +0,0 @@
-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/ui/buttons/create_progress_button.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:time_progress_tracker/screens/progress_creation_screen.dart';
+import 'package:time_progress_tracker/ui/screens/progress_creation_screen.dart';
 
 class CreateProgressButton extends StatelessWidget {
   final String _heroTag = "createProgressBTN";

lib/ui/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/widgets/app_yes_no_dialog_widget.dart';
+import 'package:time_progress_tracker/ui/app_yes_no_dialog_widget.dart';
 
 class DetailScreenFloatingActionButtons extends StatelessWidget {
   final bool editMode, isEditedProgressValid;

lib/ui/progress/progress_editor_widget.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:time_progress_tracker/models/time_progress.dart';
-import 'package:time_progress_tracker/widgets/buttons/date_picker_btn.dart';
+import 'package:time_progress_tracker/ui/buttons/date_picker_btn.dart';
 
 class ProgressEditorWidget extends StatefulWidget {
   final TimeProgress timeProgress;

lib/ui/progress/progress_list_item.dart

@@ -5,7 +5,7 @@ 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';
+import 'package:time_progress_tracker/ui/screens/progress_detail_screen.dart';
 
 class ProgressListTileStrings {
   static String percentString(TimeProgress tp) =>

lib/ui/progress/progress_list_view.dart

@@ -3,7 +3,7 @@ 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/widgets/progress_list_view/progress_list_item.dart';
+import 'package:time_progress_tracker/ui/progress/progress_list_item.dart';
 
 class ProgressListView extends StatelessWidget {
   final List<TimeProgress> timeProgressList;

lib/ui/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/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/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';
+import 'package:time_progress_tracker/ui/progress/progress_list_view.dart';
 
 class ActiveTimeProgressesScreen extends StatelessWidget {
   @override

lib/ui/screens/dashboard_screen.dart

@@ -1,13 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
-import 'package:time_progress_tracker/screens/active_time_progresses_screen.dart';
-import 'package:time_progress_tracker/screens/inactive_time_progresses_screen.dart';
-import 'package:time_progress_tracker/screens/settings_screen.dart';
+import 'package:time_progress_tracker/ui/screens/active_time_progresses_screen.dart';
+import 'package:time_progress_tracker/ui/screens/inactive_time_progresses_screen.dart';
+import 'package:time_progress_tracker/ui/screens/settings_screen.dart';
 import 'package:time_progress_tracker/utils/color_utils.dart';
 import 'package:time_progress_tracker/utils/constants.dart';
 
 class DashboardScreen extends StatefulWidget {
+  static const routeName = "/dashboard";
+
   @override
   State<StatefulWidget> createState() => _DashboardScreenState();
 }

lib/ui/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/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/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';
+import 'package:time_progress_tracker/ui/progress/progress_list_view.dart';
 
 class InactiveTimeProgressesScreen extends StatelessWidget {
   @override

lib/ui/screens/progress_creation_screen.dart

@@ -2,12 +2,13 @@ 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/redux/actions/time_progress_actions.dart';
 import 'package:time_progress_tracker/redux/app_state.dart';
 import 'package:time_progress_tracker/models/time_progress.dart';
-import 'package:time_progress_tracker/selectors/time_progress_selectors.dart';
-import 'package:time_progress_tracker/widgets/progress_editor_widget.dart';
+import 'package:time_progress_tracker/redux/redux_selectors.dart';
+import 'package:time_progress_tracker/utils/helper_functions.dart';
+import 'package:time_progress_tracker/ui/progress/progress_editor_widget.dart';
 
 class ProgressCreationScreen extends StatefulWidget {
   static const routeName = "/create-progress";

lib/ui/screens/progress_detail_screen.dart

@@ -1,11 +1,11 @@
 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';
+import 'package:time_progress_tracker/redux/store_connectors/settings_store_connector.dart';
+import 'package:time_progress_tracker/redux/store_connectors/time_progress_store_connector.dart';
+import 'package:time_progress_tracker/ui/screens/dashboard_screen.dart';
+import 'package:time_progress_tracker/ui/detail_screen_floating_action_buttons.dart';
+import 'package:time_progress_tracker/ui/progress/progress_editor_widget.dart';
+import 'package:time_progress_tracker/ui/progress/progress_view_widget.dart';
 
 class ProgressDetailScreenArguments {
   final String id;
@@ -110,7 +110,7 @@ class _ProgressDetailScreenState extends State<ProgressDetailScreen> {
           void _deleteTimeProgress() {
             tpVm.deleteTimeProgress();
             Navigator.popUntil(
-                context, ModalRoute.withName(HomeScreen.routeName));
+                context, ModalRoute.withName(DashboardScreen.routeName));
           }
 
           return DetailScreenFloatingActionButtons(

lib/ui/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/widgets/buttons/color_picker_btn.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';
+import 'package:time_progress_tracker/redux/store_connectors/settings_store_connector.dart';
+import 'package:time_progress_tracker/ui/buttons/color_picker_btn.dart';
+import 'package:time_progress_tracker/ui/settings/duration_settings_widget.dart';
 
 class SettingsScreen extends StatelessWidget {
   Widget _renderColorSettings(

lib/ui/settings/color_settings_widget.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:time_progress_tracker/widgets/buttons/color_picker_btn.dart';
+import 'package:time_progress_tracker/ui/buttons/color_picker_btn.dart';
 
 class ColorSettingsWidget extends StatelessWidget {
   final Color doneColor, leftColor;

lib/ui/settings/duration_settings_widget.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:time_progress_tracker/widgets/buttons/select_duration_btn.dart';
+import 'package:time_progress_tracker/ui/buttons/select_duration_btn.dart';
 
 class DurationSettingsWidget extends StatelessWidget {
   final Duration duration;

lib/utils/helper_functions.dart

@@ -1,6 +1,19 @@
 import 'dart:ui';
 
+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);

lib/widgets/home/home_bottom_navbar.dart

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

@@ -1,36 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:time_progress_tracker/utils/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

@@ -1,36 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:time_progress_tracker/utils/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

@@ -1,52 +0,0 @@
-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"),
-                  ),
-                ),
-              ],
-            ),
-          ),
-        );
-      },
-    );
-  }
-}

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/widgets/progress_list_view/progress_list_item.dart';
-import 'package:time_progress_tracker/widgets/progress_list_view/progress_list_view.dart';
+import 'package:time_progress_tracker/ui/progress/progress_list_item.dart';
+import 'package:time_progress_tracker/ui/progress/progress_list_view.dart';
 
 import 'MaterialTesterWidget.dart';