Refactor folder structure.

ronyitc · Jul 3, 2018 · 003e56d · 003e56d
1 parent 1b1f246
commit 003e56d
Show file tree

Hide file tree

Showing 57 changed files with 85 additions and 89 deletions.
diff --git a/lib/data/models/actor.dart → lib/models/actor.dart b/lib/data/models/actor.dart → lib/models/actor.dart
diff --git a/lib/data/models/event.dart → lib/models/event.dart b/lib/data/models/event.dart → 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 → lib/models/loading_status.dart b/lib/data/loading_status.dart → lib/models/loading_status.dart
diff --git a/lib/data/models/show.dart → lib/models/show.dart b/lib/data/models/show.dart → lib/models/show.dart
diff --git a/lib/data/models/theater.dart → lib/models/theater.dart b/lib/data/models/theater.dart → lib/models/theater.dart
diff --git a/lib/data/networking/finnkino_api.dart → lib/networking/finnkino_api.dart b/lib/data/networking/finnkino_api.dart → 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 → lib/networking/tmdb_api.dart b/lib/data/networking/tmdb_api.dart → 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
@@ -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
@@ -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
@@ -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
@@ -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<Actor> actorsForEventSelector(AppState state, Event event) {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<Event> eventsSelector(AppState state, EventListType type) {

diff --git 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
@@ -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
@@ -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<AppState> {
   ShowMiddleware(this.api);
-
   final FinnkinoApi api;
 
   @override

diff --git 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
@@ -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<Show> showsSelector(AppState state) {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → test/models/event_test.dart b/test/data/models/event_test.dart → 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 → test/models/show_test.dart b/test/data/models/show_test.dart → 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 → test/models/theater_test.dart b/test/data/models/theater_test.dart → 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
@@ -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
@@ -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
@@ -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';