From 003e56db1ea09765976db04cef078a0c3ce387af Mon Sep 17 00:00:00 2001 From: Iiro Krankka Date: Tue, 3 Jul 2018 19:32:22 +0300 Subject: [PATCH] Refactor folder structure. --- lib/{data => }/models/actor.dart | 0 lib/{data => }/models/event.dart | 2 +- lib/{data => models}/loading_status.dart | 0 lib/{data => }/models/show.dart | 0 lib/{data => }/models/theater.dart | 0 lib/{data => }/networking/finnkino_api.dart | 6 +++--- lib/{data => }/networking/tmdb_api.dart | 7 ++----- lib/redux/actor/actor_actions.dart | 4 ++-- lib/redux/actor/actor_middleware.dart | 2 +- lib/redux/actor/actor_reducer.dart | 2 +- lib/redux/actor/actor_selectors.dart | 4 ++-- lib/redux/app/app_state.dart | 2 +- lib/redux/common_actions.dart | 6 +++--- lib/redux/event/event_actions.dart | 4 ++-- lib/redux/event/event_middleware.dart | 4 ++-- lib/redux/event/event_reducer.dart | 4 ++-- lib/redux/event/event_selectors.dart | 4 ++-- lib/redux/event/event_state.dart | 4 ++-- lib/redux/show/show_actions.dart | 4 ++-- lib/redux/show/show_middleware.dart | 7 +++---- lib/redux/show/show_reducer.dart | 2 +- lib/redux/show/show_selectors.dart | 2 +- lib/redux/show/show_state.dart | 4 ++-- lib/redux/store.dart | 4 ++-- lib/redux/theater/theater_middleware.dart | 2 +- lib/redux/theater/theater_selectors.dart | 2 +- lib/redux/theater/theater_state.dart | 2 +- lib/ui/common/loading_view.dart | 2 +- lib/ui/event_details/actor_scroller.dart | 4 ++-- lib/ui/event_details/event_backdrop_photo.dart | 2 +- lib/ui/event_details/event_details_page.dart | 4 ++-- lib/ui/event_details/showtime_information.dart | 2 +- lib/ui/event_details/storyline_widget.dart | 2 +- lib/ui/events/event_grid.dart | 2 +- lib/ui/events/event_grid_item.dart | 2 +- lib/ui/events/event_poster.dart | 2 +- lib/ui/events/events_page.dart | 2 +- lib/ui/events/events_page_view_model.dart | 4 ++-- lib/ui/main_page.dart | 4 ++-- lib/ui/showtimes/showtime_list.dart | 2 +- lib/ui/showtimes/showtime_list_tile.dart | 2 +- lib/ui/showtimes/showtime_page_view_model.dart | 4 ++-- lib/ui/theater_list/theater_list_view_model.dart | 2 +- test/mocks.dart | 2 +- test/{data => }/models/event_test.dart | 2 +- test/{data => }/models/show_test.dart | 2 +- test/{data => }/models/theater_test.dart | 2 +- test/redux/actor/actor_middleware_test.dart | 6 +++--- test/redux/actor/actor_reducer_test.dart | 2 +- test/redux/event/event_middleware_test.dart | 4 ++-- test/redux/event/event_reducer_test.dart | 4 ++-- test/redux/show/show_middleware_test.dart | 4 ++-- test/redux/theater/theater_middleware_test.dart | 2 +- test/ui/event_details/event_details_page_test.dart | 6 +++--- test/ui/events/events_page_test.dart | 6 +++--- test/ui/showtimes/showtimes_page_test.dart | 4 ++-- test/ui/theater_list/theater_list_test.dart | 2 +- 57 files changed, 85 insertions(+), 89 deletions(-) rename lib/{data => }/models/actor.dart (100%) rename lib/{data => }/models/event.dart (98%) rename lib/{data => models}/loading_status.dart (100%) rename lib/{data => }/models/show.dart (100%) rename lib/{data => }/models/theater.dart (100%) rename lib/{data => }/networking/finnkino_api.dart (89%) rename lib/{data => }/networking/tmdb_api.dart (89%) rename test/{data => }/models/event_test.dart (99%) rename test/{data => }/models/show_test.dart (99%) rename test/{data => }/models/theater_test.dart (95%) diff --git a/lib/data/models/actor.dart b/lib/models/actor.dart similarity index 100% rename from lib/data/models/actor.dart rename to lib/models/actor.dart diff --git a/lib/data/models/event.dart b/lib/models/event.dart similarity index 98% rename from lib/data/models/event.dart rename to lib/models/event.dart index 5a818312..a23510b7 100644 --- a/lib/data/models/event.dart +++ b/lib/models/event.dart @@ -1,4 +1,4 @@ -import 'package:inkino/data/models/actor.dart'; +import 'package:inkino/models/actor.dart'; import 'package:inkino/utils/event_name_cleaner.dart'; import 'package:inkino/utils/xml_utils.dart'; import 'package:meta/meta.dart'; diff --git a/lib/data/loading_status.dart b/lib/models/loading_status.dart similarity index 100% rename from lib/data/loading_status.dart rename to lib/models/loading_status.dart diff --git a/lib/data/models/show.dart b/lib/models/show.dart similarity index 100% rename from lib/data/models/show.dart rename to lib/models/show.dart diff --git a/lib/data/models/theater.dart b/lib/models/theater.dart similarity index 100% rename from lib/data/models/theater.dart rename to lib/models/theater.dart diff --git a/lib/data/networking/finnkino_api.dart b/lib/networking/finnkino_api.dart similarity index 89% rename from lib/data/networking/finnkino_api.dart rename to lib/networking/finnkino_api.dart index 797191e5..5d18bb3c 100644 --- a/lib/data/networking/finnkino_api.dart +++ b/lib/networking/finnkino_api.dart @@ -1,8 +1,8 @@ import 'dart:async'; -import 'package:inkino/data/models/event.dart'; -import 'package:inkino/data/models/show.dart'; -import 'package:inkino/data/models/theater.dart'; +import 'package:inkino/models/event.dart'; +import 'package:inkino/models/show.dart'; +import 'package:inkino/models/theater.dart'; import 'package:inkino/utils/http_utils.dart'; import 'package:intl/intl.dart'; diff --git a/lib/data/networking/tmdb_api.dart b/lib/networking/tmdb_api.dart similarity index 89% rename from lib/data/networking/tmdb_api.dart rename to lib/networking/tmdb_api.dart index 5ae19ed2..83be223d 100644 --- a/lib/data/networking/tmdb_api.dart +++ b/lib/networking/tmdb_api.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'dart:convert'; -import 'package:inkino/data/models/actor.dart'; -import 'package:inkino/data/models/event.dart'; +import 'package:inkino/models/actor.dart'; +import 'package:inkino/models/event.dart'; /// If this has a red underline, it means that the lib/tmdb_config.dart file /// is not present on the project. Refer to the README for instructions /// on how to do so. @@ -12,9 +12,6 @@ import 'package:inkino/utils/http_utils.dart'; /// is not present on the project. Refer to the README for instructions /// on how to do so. -/// If this has a red underline, it means that the lib/tmdb_config.dart file -/// is not present on the project. Refer to the README for instructions -/// on how to do so. class TMDBApi { diff --git a/lib/redux/actor/actor_actions.dart b/lib/redux/actor/actor_actions.dart index b48f9f01..63a1db24 100644 --- a/lib/redux/actor/actor_actions.dart +++ b/lib/redux/actor/actor_actions.dart @@ -1,5 +1,5 @@ -import 'package:inkino/data/models/actor.dart'; -import 'package:inkino/data/models/event.dart'; +import 'package:inkino/models/actor.dart'; +import 'package:inkino/models/event.dart'; class FetchActorAvatarsAction { FetchActorAvatarsAction(this.event); diff --git a/lib/redux/actor/actor_middleware.dart b/lib/redux/actor/actor_middleware.dart index 54e16e25..51338311 100644 --- a/lib/redux/actor/actor_middleware.dart +++ b/lib/redux/actor/actor_middleware.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:inkino/data/networking/tmdb_api.dart'; +import 'package:inkino/networking/tmdb_api.dart'; import 'package:inkino/redux/actor/actor_actions.dart'; import 'package:inkino/redux/app/app_state.dart'; import 'package:inkino/redux/common_actions.dart'; diff --git a/lib/redux/actor/actor_reducer.dart b/lib/redux/actor/actor_reducer.dart index 199427b8..fdfa3607 100644 --- a/lib/redux/actor/actor_reducer.dart +++ b/lib/redux/actor/actor_reducer.dart @@ -1,4 +1,4 @@ -import 'package:inkino/data/models/actor.dart'; +import 'package:inkino/models/actor.dart'; import 'package:inkino/redux/actor/actor_actions.dart'; import 'package:redux/redux.dart'; diff --git a/lib/redux/actor/actor_selectors.dart b/lib/redux/actor/actor_selectors.dart index 57d419af..4a0cdb33 100644 --- a/lib/redux/actor/actor_selectors.dart +++ b/lib/redux/actor/actor_selectors.dart @@ -1,5 +1,5 @@ -import 'package:inkino/data/models/actor.dart'; -import 'package:inkino/data/models/event.dart'; +import 'package:inkino/models/actor.dart'; +import 'package:inkino/models/event.dart'; import 'package:inkino/redux/app/app_state.dart'; List actorsForEventSelector(AppState state, Event event) { diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart index f127df96..bedae88e 100644 --- a/lib/redux/app/app_state.dart +++ b/lib/redux/app/app_state.dart @@ -1,4 +1,4 @@ -import 'package:inkino/data/models/actor.dart'; +import 'package:inkino/models/actor.dart'; import 'package:inkino/redux/event/event_state.dart'; import 'package:inkino/redux/show/show_state.dart'; import 'package:inkino/redux/theater/theater_state.dart'; diff --git a/lib/redux/common_actions.dart b/lib/redux/common_actions.dart index 3a982a68..8ee62cff 100644 --- a/lib/redux/common_actions.dart +++ b/lib/redux/common_actions.dart @@ -1,6 +1,6 @@ -import 'package:inkino/data/models/actor.dart'; -import 'package:inkino/data/models/event.dart'; -import 'package:inkino/data/models/theater.dart'; +import 'package:inkino/models/actor.dart'; +import 'package:inkino/models/event.dart'; +import 'package:inkino/models/theater.dart'; class InitAction {} diff --git a/lib/redux/event/event_actions.dart b/lib/redux/event/event_actions.dart index 7686c66f..9d136a1a 100644 --- a/lib/redux/event/event_actions.dart +++ b/lib/redux/event/event_actions.dart @@ -1,6 +1,6 @@ import 'package:flutter/foundation.dart'; -import 'package:inkino/data/models/event.dart'; -import 'package:inkino/data/models/theater.dart'; +import 'package:inkino/models/event.dart'; +import 'package:inkino/models/theater.dart'; class RefreshEventsAction {} diff --git a/lib/redux/event/event_middleware.dart b/lib/redux/event/event_middleware.dart index f2b5898a..1663c591 100644 --- a/lib/redux/event/event_middleware.dart +++ b/lib/redux/event/event_middleware.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:inkino/data/models/theater.dart'; -import 'package:inkino/data/networking/finnkino_api.dart'; +import 'package:inkino/models/theater.dart'; +import 'package:inkino/networking/finnkino_api.dart'; import 'package:inkino/redux/app/app_state.dart'; import 'package:inkino/redux/common_actions.dart'; import 'package:inkino/redux/event/event_actions.dart'; diff --git a/lib/redux/event/event_reducer.dart b/lib/redux/event/event_reducer.dart index b9e63542..2854a09d 100644 --- a/lib/redux/event/event_reducer.dart +++ b/lib/redux/event/event_reducer.dart @@ -1,5 +1,5 @@ -import 'package:inkino/data/loading_status.dart'; -import 'package:inkino/data/models/event.dart'; +import 'package:inkino/models/event.dart'; +import 'package:inkino/models/loading_status.dart'; import 'package:inkino/redux/common_actions.dart'; import 'package:inkino/redux/event/event_actions.dart'; import 'package:inkino/redux/event/event_state.dart'; diff --git a/lib/redux/event/event_selectors.dart b/lib/redux/event/event_selectors.dart index 42d86faf..fc0cc079 100644 --- a/lib/redux/event/event_selectors.dart +++ b/lib/redux/event/event_selectors.dart @@ -1,7 +1,7 @@ import 'dart:collection'; -import 'package:inkino/data/models/event.dart'; -import 'package:inkino/data/models/show.dart'; +import 'package:inkino/models/event.dart'; +import 'package:inkino/models/show.dart'; import 'package:inkino/redux/app/app_state.dart'; List eventsSelector(AppState state, EventListType type) { diff --git a/lib/redux/event/event_state.dart b/lib/redux/event/event_state.dart index b7689ca4..1ca63a70 100644 --- a/lib/redux/event/event_state.dart +++ b/lib/redux/event/event_state.dart @@ -1,5 +1,5 @@ -import 'package:inkino/data/loading_status.dart'; -import 'package:inkino/data/models/event.dart'; +import 'package:inkino/models/event.dart'; +import 'package:inkino/models/loading_status.dart'; import 'package:meta/meta.dart'; @immutable diff --git a/lib/redux/show/show_actions.dart b/lib/redux/show/show_actions.dart index b933e541..cc7ff1ba 100644 --- a/lib/redux/show/show_actions.dart +++ b/lib/redux/show/show_actions.dart @@ -1,5 +1,5 @@ -import 'package:inkino/data/models/show.dart'; -import 'package:inkino/data/models/theater.dart'; +import 'package:inkino/models/show.dart'; +import 'package:inkino/models/theater.dart'; class UpdateShowDatesAction {} diff --git a/lib/redux/show/show_middleware.dart b/lib/redux/show/show_middleware.dart index d272ba99..3c7d238a 100644 --- a/lib/redux/show/show_middleware.dart +++ b/lib/redux/show/show_middleware.dart @@ -1,8 +1,8 @@ import 'dart:async'; -import 'package:inkino/data/models/show.dart'; -import 'package:inkino/data/models/theater.dart'; -import 'package:inkino/data/networking/finnkino_api.dart'; +import 'package:inkino/models/show.dart'; +import 'package:inkino/models/theater.dart'; +import 'package:inkino/networking/finnkino_api.dart'; import 'package:inkino/redux/app/app_state.dart'; import 'package:inkino/redux/common_actions.dart'; import 'package:inkino/redux/show/show_actions.dart'; @@ -11,7 +11,6 @@ import 'package:redux/redux.dart'; class ShowMiddleware extends MiddlewareClass { ShowMiddleware(this.api); - final FinnkinoApi api; @override diff --git a/lib/redux/show/show_reducer.dart b/lib/redux/show/show_reducer.dart index 75c2c873..f01bcf7f 100644 --- a/lib/redux/show/show_reducer.dart +++ b/lib/redux/show/show_reducer.dart @@ -1,4 +1,4 @@ -import 'package:inkino/data/loading_status.dart'; +import 'package:inkino/models/loading_status.dart'; import 'package:inkino/redux/common_actions.dart'; import 'package:inkino/redux/show/show_actions.dart'; import 'package:inkino/redux/show/show_state.dart'; diff --git a/lib/redux/show/show_selectors.dart b/lib/redux/show/show_selectors.dart index 6735b778..9416e7a6 100644 --- a/lib/redux/show/show_selectors.dart +++ b/lib/redux/show/show_selectors.dart @@ -1,4 +1,4 @@ -import 'package:inkino/data/models/show.dart'; +import 'package:inkino/models/show.dart'; import 'package:inkino/redux/app/app_state.dart'; List showsSelector(AppState state) { diff --git a/lib/redux/show/show_state.dart b/lib/redux/show/show_state.dart index 587eea36..efccf2bb 100644 --- a/lib/redux/show/show_state.dart +++ b/lib/redux/show/show_state.dart @@ -1,5 +1,5 @@ -import 'package:inkino/data/loading_status.dart'; -import 'package:inkino/data/models/show.dart'; +import 'package:inkino/models/loading_status.dart'; +import 'package:inkino/models/show.dart'; import 'package:meta/meta.dart'; @immutable diff --git a/lib/redux/store.dart b/lib/redux/store.dart index fcf6763f..03ddb195 100644 --- a/lib/redux/store.dart +++ b/lib/redux/store.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'package:flutter/services.dart'; -import 'package:inkino/data/networking/finnkino_api.dart'; -import 'package:inkino/data/networking/tmdb_api.dart'; +import 'package:inkino/networking/finnkino_api.dart'; +import 'package:inkino/networking/tmdb_api.dart'; import 'package:inkino/redux/actor/actor_middleware.dart'; import 'package:inkino/redux/app/app_reducer.dart'; import 'package:inkino/redux/app/app_state.dart'; diff --git a/lib/redux/theater/theater_middleware.dart b/lib/redux/theater/theater_middleware.dart index b144c848..0d510050 100644 --- a/lib/redux/theater/theater_middleware.dart +++ b/lib/redux/theater/theater_middleware.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:flutter/services.dart'; import 'package:inkino/assets.dart'; -import 'package:inkino/data/models/theater.dart'; +import 'package:inkino/models/theater.dart'; import 'package:inkino/redux/app/app_state.dart'; import 'package:inkino/redux/common_actions.dart'; import 'package:redux/redux.dart'; diff --git a/lib/redux/theater/theater_selectors.dart b/lib/redux/theater/theater_selectors.dart index 97cd1929..107216f5 100644 --- a/lib/redux/theater/theater_selectors.dart +++ b/lib/redux/theater/theater_selectors.dart @@ -1,4 +1,4 @@ -import 'package:inkino/data/models/theater.dart'; +import 'package:inkino/models/theater.dart'; import 'package:inkino/redux/app/app_state.dart'; Theater currentTheaterSelector(AppState state) => diff --git a/lib/redux/theater/theater_state.dart b/lib/redux/theater/theater_state.dart index e2afa5b2..d303f03c 100644 --- a/lib/redux/theater/theater_state.dart +++ b/lib/redux/theater/theater_state.dart @@ -1,4 +1,4 @@ -import 'package:inkino/data/models/theater.dart'; +import 'package:inkino/models/theater.dart'; import 'package:meta/meta.dart'; @immutable diff --git a/lib/ui/common/loading_view.dart b/lib/ui/common/loading_view.dart index ebf373c6..6d666f71 100644 --- a/lib/ui/common/loading_view.dart +++ b/lib/ui/common/loading_view.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:inkino/data/loading_status.dart'; +import 'package:inkino/models/loading_status.dart'; import 'package:meta/meta.dart'; class LoadingView extends StatefulWidget { diff --git a/lib/ui/event_details/actor_scroller.dart b/lib/ui/event_details/actor_scroller.dart index 8635be74..00c2852e 100644 --- a/lib/ui/event_details/actor_scroller.dart +++ b/lib/ui/event_details/actor_scroller.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:inkino/assets.dart'; -import 'package:inkino/data/models/actor.dart'; -import 'package:inkino/data/models/event.dart'; +import 'package:inkino/models/actor.dart'; +import 'package:inkino/models/event.dart'; import 'package:inkino/redux/actor/actor_actions.dart'; import 'package:inkino/redux/actor/actor_selectors.dart'; import 'package:inkino/redux/app/app_state.dart'; diff --git a/lib/ui/event_details/event_backdrop_photo.dart b/lib/ui/event_details/event_backdrop_photo.dart index e8ab0616..584d0e6f 100644 --- a/lib/ui/event_details/event_backdrop_photo.dart +++ b/lib/ui/event_details/event_backdrop_photo.dart @@ -2,7 +2,7 @@ import 'dart:ui' as ui; import 'package:flutter/material.dart'; import 'package:inkino/assets.dart'; -import 'package:inkino/data/models/event.dart'; +import 'package:inkino/models/event.dart'; import 'package:inkino/utils/widget_utils.dart'; import 'package:meta/meta.dart'; diff --git a/lib/ui/event_details/event_details_page.dart b/lib/ui/event_details/event_details_page.dart index 42fec930..e76c9eb4 100644 --- a/lib/ui/event_details/event_details_page.dart +++ b/lib/ui/event_details/event_details_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:inkino/data/models/event.dart'; -import 'package:inkino/data/models/show.dart'; +import 'package:inkino/models/event.dart'; +import 'package:inkino/models/show.dart'; import 'package:inkino/ui/event_details/actor_scroller.dart'; import 'package:inkino/ui/event_details/event_backdrop_photo.dart'; import 'package:inkino/ui/event_details/event_details_scroll_effects.dart'; diff --git a/lib/ui/event_details/showtime_information.dart b/lib/ui/event_details/showtime_information.dart index 03620fcd..fc0c5135 100644 --- a/lib/ui/event_details/showtime_information.dart +++ b/lib/ui/event_details/showtime_information.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:inkino/data/models/show.dart'; +import 'package:inkino/models/show.dart'; import 'package:intl/intl.dart'; import 'package:meta/meta.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/lib/ui/event_details/storyline_widget.dart b/lib/ui/event_details/storyline_widget.dart index 731e20fb..c568e3dd 100644 --- a/lib/ui/event_details/storyline_widget.dart +++ b/lib/ui/event_details/storyline_widget.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:inkino/data/models/event.dart'; +import 'package:inkino/models/event.dart'; class StorylineWidget extends StatefulWidget { StorylineWidget(this.event); diff --git a/lib/ui/events/event_grid.dart b/lib/ui/events/event_grid.dart index 738fe3c7..1bbd1572 100644 --- a/lib/ui/events/event_grid.dart +++ b/lib/ui/events/event_grid.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:inkino/data/models/event.dart'; +import 'package:inkino/models/event.dart'; import 'package:inkino/ui/common/info_message_view.dart'; import 'package:inkino/ui/event_details/event_details_page.dart'; import 'package:inkino/ui/events/event_grid_item.dart'; diff --git a/lib/ui/events/event_grid_item.dart b/lib/ui/events/event_grid_item.dart index 0e6a081c..05876f56 100644 --- a/lib/ui/events/event_grid_item.dart +++ b/lib/ui/events/event_grid_item.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:inkino/data/models/event.dart'; +import 'package:inkino/models/event.dart'; import 'package:inkino/ui/events/event_poster.dart'; import 'package:meta/meta.dart'; diff --git a/lib/ui/events/event_poster.dart b/lib/ui/events/event_poster.dart index 0dd90454..f42d8f80 100644 --- a/lib/ui/events/event_poster.dart +++ b/lib/ui/events/event_poster.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:inkino/assets.dart'; -import 'package:inkino/data/models/event.dart'; +import 'package:inkino/models/event.dart'; import 'package:inkino/utils/widget_utils.dart'; import 'package:meta/meta.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/lib/ui/events/events_page.dart b/lib/ui/events/events_page.dart index 1e322d7a..575626af 100644 --- a/lib/ui/events/events_page.dart +++ b/lib/ui/events/events_page.dart @@ -1,7 +1,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_redux/flutter_redux.dart'; -import 'package:inkino/data/models/event.dart'; +import 'package:inkino/models/event.dart'; import 'package:inkino/redux/app/app_state.dart'; import 'package:inkino/ui/common/info_message_view.dart'; import 'package:inkino/ui/common/loading_view.dart'; diff --git a/lib/ui/events/events_page_view_model.dart b/lib/ui/events/events_page_view_model.dart index 8966bc41..86f99ece 100644 --- a/lib/ui/events/events_page_view_model.dart +++ b/lib/ui/events/events_page_view_model.dart @@ -1,5 +1,5 @@ -import 'package:inkino/data/loading_status.dart'; -import 'package:inkino/data/models/event.dart'; +import 'package:inkino/models/event.dart'; +import 'package:inkino/models/loading_status.dart'; import 'package:inkino/redux/app/app_state.dart'; import 'package:inkino/redux/event/event_actions.dart'; import 'package:inkino/redux/event/event_selectors.dart'; diff --git a/lib/ui/main_page.dart b/lib/ui/main_page.dart index e94d8fd1..8dffb350 100644 --- a/lib/ui/main_page.dart +++ b/lib/ui/main_page.dart @@ -2,8 +2,8 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter_redux/flutter_redux.dart'; -import 'package:inkino/data/models/event.dart'; -import 'package:inkino/data/models/theater.dart'; +import 'package:inkino/models/event.dart'; +import 'package:inkino/models/theater.dart'; import 'package:inkino/redux/app/app_state.dart'; import 'package:inkino/redux/search/search_actions.dart'; import 'package:inkino/ui/events/events_page.dart'; diff --git a/lib/ui/showtimes/showtime_list.dart b/lib/ui/showtimes/showtime_list.dart index c1154919..3eeacbc7 100644 --- a/lib/ui/showtimes/showtime_list.dart +++ b/lib/ui/showtimes/showtime_list.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:inkino/data/models/show.dart'; +import 'package:inkino/models/show.dart'; import 'package:inkino/ui/common/info_message_view.dart'; import 'package:inkino/ui/showtimes/showtime_list_tile.dart'; diff --git a/lib/ui/showtimes/showtime_list_tile.dart b/lib/ui/showtimes/showtime_list_tile.dart index 6b307786..0ee16764 100644 --- a/lib/ui/showtimes/showtime_list_tile.dart +++ b/lib/ui/showtimes/showtime_list_tile.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_redux/flutter_redux.dart'; -import 'package:inkino/data/models/show.dart'; +import 'package:inkino/models/show.dart'; import 'package:inkino/redux/app/app_state.dart'; import 'package:inkino/redux/event/event_selectors.dart'; import 'package:inkino/ui/event_details/event_details_page.dart'; diff --git a/lib/ui/showtimes/showtime_page_view_model.dart b/lib/ui/showtimes/showtime_page_view_model.dart index ffc2aecf..f99642c3 100644 --- a/lib/ui/showtimes/showtime_page_view_model.dart +++ b/lib/ui/showtimes/showtime_page_view_model.dart @@ -1,5 +1,5 @@ -import 'package:inkino/data/loading_status.dart'; -import 'package:inkino/data/models/show.dart'; +import 'package:inkino/models/loading_status.dart'; +import 'package:inkino/models/show.dart'; import 'package:inkino/redux/app/app_state.dart'; import 'package:inkino/redux/show/show_actions.dart'; import 'package:inkino/redux/show/show_selectors.dart'; diff --git a/lib/ui/theater_list/theater_list_view_model.dart b/lib/ui/theater_list/theater_list_view_model.dart index 30a83098..69ac443f 100644 --- a/lib/ui/theater_list/theater_list_view_model.dart +++ b/lib/ui/theater_list/theater_list_view_model.dart @@ -1,4 +1,4 @@ -import 'package:inkino/data/models/theater.dart'; +import 'package:inkino/models/theater.dart'; import 'package:inkino/redux/app/app_state.dart'; import 'package:inkino/redux/common_actions.dart'; import 'package:inkino/redux/theater/theater_selectors.dart'; diff --git a/test/mocks.dart b/test/mocks.dart index 557a67e9..11061605 100644 --- a/test/mocks.dart +++ b/test/mocks.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'package:flutter/services.dart'; -import 'package:inkino/data/networking/finnkino_api.dart'; +import 'package:inkino/networking/finnkino_api.dart'; import 'package:inkino/redux/app/app_state.dart'; import 'package:mockito/mockito.dart'; import 'package:redux/redux.dart'; diff --git a/test/data/models/event_test.dart b/test/models/event_test.dart similarity index 99% rename from test/data/models/event_test.dart rename to test/models/event_test.dart index 57cb8038..084ec5d9 100644 --- a/test/data/models/event_test.dart +++ b/test/models/event_test.dart @@ -1,4 +1,4 @@ -import 'package:inkino/data/models/event.dart'; +import 'package:inkino/models/event.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/data/models/show_test.dart b/test/models/show_test.dart similarity index 99% rename from test/data/models/show_test.dart rename to test/models/show_test.dart index c01b62f3..bbfcf6a5 100644 --- a/test/data/models/show_test.dart +++ b/test/models/show_test.dart @@ -1,4 +1,4 @@ -import 'package:inkino/data/models/show.dart'; +import 'package:inkino/models/show.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/data/models/theater_test.dart b/test/models/theater_test.dart similarity index 95% rename from test/data/models/theater_test.dart rename to test/models/theater_test.dart index cc4c1942..f63d303f 100644 --- a/test/data/models/theater_test.dart +++ b/test/models/theater_test.dart @@ -1,4 +1,4 @@ -import 'package:inkino/data/models/theater.dart'; +import 'package:inkino/models/theater.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/redux/actor/actor_middleware_test.dart b/test/redux/actor/actor_middleware_test.dart index 7a14cec7..44740085 100644 --- a/test/redux/actor/actor_middleware_test.dart +++ b/test/redux/actor/actor_middleware_test.dart @@ -1,8 +1,8 @@ import 'dart:async'; -import 'package:inkino/data/models/actor.dart'; -import 'package:inkino/data/models/event.dart'; -import 'package:inkino/data/networking/tmdb_api.dart'; +import 'package:inkino/models/actor.dart'; +import 'package:inkino/models/event.dart'; +import 'package:inkino/networking/tmdb_api.dart'; import 'package:inkino/redux/actor/actor_actions.dart'; import 'package:inkino/redux/actor/actor_middleware.dart'; import 'package:inkino/redux/common_actions.dart'; diff --git a/test/redux/actor/actor_reducer_test.dart b/test/redux/actor/actor_reducer_test.dart index 2d3eefa9..596d66bc 100644 --- a/test/redux/actor/actor_reducer_test.dart +++ b/test/redux/actor/actor_reducer_test.dart @@ -1,4 +1,4 @@ -import 'package:inkino/data/models/actor.dart'; +import 'package:inkino/models/actor.dart'; import 'package:inkino/redux/actor/actor_actions.dart'; import 'package:inkino/redux/app/app_reducer.dart'; import 'package:inkino/redux/app/app_state.dart'; diff --git a/test/redux/event/event_middleware_test.dart b/test/redux/event/event_middleware_test.dart index 8f1015e1..abd4b781 100644 --- a/test/redux/event/event_middleware_test.dart +++ b/test/redux/event/event_middleware_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:inkino/data/models/event.dart'; -import 'package:inkino/data/models/theater.dart'; +import 'package:inkino/models/event.dart'; +import 'package:inkino/models/theater.dart'; import 'package:inkino/redux/common_actions.dart'; import 'package:inkino/redux/event/event_actions.dart'; import 'package:inkino/redux/event/event_middleware.dart'; diff --git a/test/redux/event/event_reducer_test.dart b/test/redux/event/event_reducer_test.dart index d7bfb386..72f2fa27 100644 --- a/test/redux/event/event_reducer_test.dart +++ b/test/redux/event/event_reducer_test.dart @@ -1,5 +1,5 @@ -import 'package:inkino/data/models/actor.dart'; -import 'package:inkino/data/models/event.dart'; +import 'package:inkino/models/actor.dart'; +import 'package:inkino/models/event.dart'; import 'package:inkino/redux/common_actions.dart'; import 'package:inkino/redux/event/event_reducer.dart'; import 'package:inkino/redux/event/event_state.dart'; diff --git a/test/redux/show/show_middleware_test.dart b/test/redux/show/show_middleware_test.dart index fddccfe0..d058d7a5 100644 --- a/test/redux/show/show_middleware_test.dart +++ b/test/redux/show/show_middleware_test.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:inkino/data/models/show.dart'; -import 'package:inkino/data/models/theater.dart'; +import 'package:inkino/models/show.dart'; +import 'package:inkino/models/theater.dart'; import 'package:inkino/redux/app/app_state.dart'; import 'package:inkino/redux/common_actions.dart'; import 'package:inkino/redux/show/show_actions.dart'; diff --git a/test/redux/theater/theater_middleware_test.dart b/test/redux/theater/theater_middleware_test.dart index 865a5989..9c559180 100644 --- a/test/redux/theater/theater_middleware_test.dart +++ b/test/redux/theater/theater_middleware_test.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:inkino/data/models/theater.dart'; +import 'package:inkino/models/theater.dart'; import 'package:inkino/redux/common_actions.dart'; import 'package:inkino/redux/theater/theater_middleware.dart'; import 'package:mockito/mockito.dart'; diff --git a/test/ui/event_details/event_details_page_test.dart b/test/ui/event_details/event_details_page_test.dart index ec3150da..37b37b7a 100644 --- a/test/ui/event_details/event_details_page_test.dart +++ b/test/ui/event_details/event_details_page_test.dart @@ -2,9 +2,9 @@ import 'dart:io' as io; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:inkino/data/models/actor.dart'; -import 'package:inkino/data/models/event.dart'; -import 'package:inkino/data/models/show.dart'; +import 'package:inkino/models/actor.dart'; +import 'package:inkino/models/event.dart'; +import 'package:inkino/models/show.dart'; import 'package:inkino/ui/event_details/event_details_page.dart' as eventDetails; import 'package:inkino/ui/event_details/showtime_information.dart'; diff --git a/test/ui/events/events_page_test.dart b/test/ui/events/events_page_test.dart index d56138c0..4e0c4337 100644 --- a/test/ui/events/events_page_test.dart +++ b/test/ui/events/events_page_test.dart @@ -2,9 +2,9 @@ import 'dart:io' as io; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:inkino/data/loading_status.dart'; -import 'package:inkino/data/models/actor.dart'; -import 'package:inkino/data/models/event.dart'; +import 'package:inkino/models/actor.dart'; +import 'package:inkino/models/event.dart'; +import 'package:inkino/models/loading_status.dart'; import 'package:inkino/ui/common/info_message_view.dart'; import 'package:inkino/ui/common/loading_view.dart'; import 'package:inkino/ui/event_details/event_details_page.dart'; diff --git a/test/ui/showtimes/showtimes_page_test.dart b/test/ui/showtimes/showtimes_page_test.dart index fdfe6130..d51dcf11 100644 --- a/test/ui/showtimes/showtimes_page_test.dart +++ b/test/ui/showtimes/showtimes_page_test.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:inkino/data/loading_status.dart'; -import 'package:inkino/data/models/show.dart'; +import 'package:inkino/models/loading_status.dart'; +import 'package:inkino/models/show.dart'; import 'package:inkino/ui/common/info_message_view.dart'; import 'package:inkino/ui/common/loading_view.dart'; import 'package:inkino/ui/showtimes/showtime_list.dart'; diff --git a/test/ui/theater_list/theater_list_test.dart b/test/ui/theater_list/theater_list_test.dart index 776f1ecd..acb79299 100644 --- a/test/ui/theater_list/theater_list_test.dart +++ b/test/ui/theater_list/theater_list_test.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:inkino/data/models/theater.dart'; +import 'package:inkino/models/theater.dart'; import 'package:inkino/ui/theater_list/theater_list.dart'; import 'package:inkino/ui/theater_list/theater_list_view_model.dart'; import 'package:mockito/mockito.dart';