From fa2cd4c19261f2612daf0232ab03c5b6c81b9d05 Mon Sep 17 00:00:00 2001 From: Andreas Fahrecker Date: Sat, 13 Mar 2021 18:24:49 +0100 Subject: [PATCH] Moved App State to redux Signed-off-by: Andreas Fahrecker --- lib/actions/actions.dart | 2 +- lib/app.dart | 2 +- lib/main.dart | 2 +- lib/middleware/store_middleware.dart | 2 +- lib/reducers/app_state_reducer.dart | 2 +- lib/{models => redux}/app_state.dart | 0 lib/screens/progress_creation_screen.dart | 2 +- lib/selectors/time_progress_selectors.dart | 2 +- lib/widgets/store_connectors/settings_store_connector.dart | 2 +- .../store_connectors/time_progress_list_store_connector.dart | 2 +- lib/widgets/store_connectors/time_progress_store_connector.dart | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename lib/{models => redux}/app_state.dart (100%) diff --git a/lib/actions/actions.dart b/lib/actions/actions.dart index 708dcfd..7e3409e 100644 --- a/lib/actions/actions.dart +++ b/lib/actions/actions.dart @@ -1,6 +1,6 @@ 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/redux/app_state.dart'; import 'package:time_progress_tracker/models/time_progress.dart'; class LoadSettingsAction {} diff --git a/lib/app.dart b/lib/app.dart index 5486d06..2d800f3 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -3,7 +3,7 @@ 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/models/app_state.dart'; +import 'package:time_progress_tracker/redux/app_state.dart'; import 'package:time_progress_tracker/screens/dashboard_screen.dart'; import 'package:time_progress_tracker/utils/color_utils.dart'; diff --git a/lib/main.dart b/lib/main.dart index 7c0640c..7e632c3 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -3,7 +3,7 @@ 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/models/app_state.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'; diff --git a/lib/middleware/store_middleware.dart b/lib/middleware/store_middleware.dart index b79ddaf..754b32a 100644 --- a/lib/middleware/store_middleware.dart +++ b/lib/middleware/store_middleware.dart @@ -1,7 +1,7 @@ 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/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'; diff --git a/lib/reducers/app_state_reducer.dart b/lib/reducers/app_state_reducer.dart index ad684a8..48b6f8e 100644 --- a/lib/reducers/app_state_reducer.dart +++ b/lib/reducers/app_state_reducer.dart @@ -1,7 +1,7 @@ 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/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'; diff --git a/lib/models/app_state.dart b/lib/redux/app_state.dart similarity index 100% rename from lib/models/app_state.dart rename to lib/redux/app_state.dart diff --git a/lib/screens/progress_creation_screen.dart b/lib/screens/progress_creation_screen.dart index 22acb22..5b4ea8e 100644 --- a/lib/screens/progress_creation_screen.dart +++ b/lib/screens/progress_creation_screen.dart @@ -4,7 +4,7 @@ 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/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'; diff --git a/lib/selectors/time_progress_selectors.dart b/lib/selectors/time_progress_selectors.dart index cf77f79..5c06ec7 100644 --- a/lib/selectors/time_progress_selectors.dart +++ b/lib/selectors/time_progress_selectors.dart @@ -1,7 +1,7 @@ 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/redux/app_state.dart'; import 'package:time_progress_tracker/models/time_progress.dart'; List timeProgressListSelector(AppState state) => diff --git a/lib/widgets/store_connectors/settings_store_connector.dart b/lib/widgets/store_connectors/settings_store_connector.dart index 8ebc876..c060d95 100644 --- a/lib/widgets/store_connectors/settings_store_connector.dart +++ b/lib/widgets/store_connectors/settings_store_connector.dart @@ -3,7 +3,7 @@ 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/redux/app_state.dart'; class SettingsStoreConnector extends StatelessWidget { final Widget Function(BuildContext, SettingsViewModel) loadedBuilder; diff --git a/lib/widgets/store_connectors/time_progress_list_store_connector.dart b/lib/widgets/store_connectors/time_progress_list_store_connector.dart index 6929281..cd1ac44 100644 --- a/lib/widgets/store_connectors/time_progress_list_store_connector.dart +++ b/lib/widgets/store_connectors/time_progress_list_store_connector.dart @@ -2,7 +2,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/models/app_state.dart'; +import 'package:time_progress_tracker/redux/app_state.dart'; import 'package:time_progress_tracker/models/time_progress.dart'; class TimeProgressListStoreConnector extends StatelessWidget { diff --git a/lib/widgets/store_connectors/time_progress_store_connector.dart b/lib/widgets/store_connectors/time_progress_store_connector.dart index 4e89837..e164c94 100644 --- a/lib/widgets/store_connectors/time_progress_store_connector.dart +++ b/lib/widgets/store_connectors/time_progress_store_connector.dart @@ -2,7 +2,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/models/app_state.dart'; +import 'package:time_progress_tracker/redux/app_state.dart'; import 'package:time_progress_tracker/models/time_progress.dart'; import '../../utils/helper_functions.dart';