From a18621b2be179e933021b6e01af11c670b36c25a Mon Sep 17 00:00:00 2001 From: Daniel Borges Date: Wed, 7 Aug 2019 17:20:22 -0300 Subject: [PATCH] better file organization --- lib/src/openlp_remote_app.dart | 6 +++--- .../search_service_item.dart} | 2 +- .../service_list_view.dart} | 0 .../slides_listview.dart => screens/slides_list_view.dart} | 6 +++--- lib/src/widgets/bottom_navigation_bar.dart | 2 +- ...ptions_bottom_sheet.dart => display_options_dialog.dart} | 0 lib/src/widgets/service_item_bottom_sheet.dart | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) rename lib/src/{widgets/service_item_search.dart => screens/search_service_item.dart} (97%) rename lib/src/{widgets/service_listview.dart => screens/service_list_view.dart} (100%) rename lib/src/{widgets/slides_listview.dart => screens/slides_list_view.dart} (95%) rename lib/src/widgets/{display_options_bottom_sheet.dart => display_options_dialog.dart} (100%) diff --git a/lib/src/openlp_remote_app.dart b/lib/src/openlp_remote_app.dart index d3ad085..a098c1a 100644 --- a/lib/src/openlp_remote_app.dart +++ b/lib/src/openlp_remote_app.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'widgets/bottom_navigation_bar.dart'; import 'widgets/search_floating_button.dart'; -import 'widgets/service_listview.dart'; -import 'widgets/slides_listview.dart'; +import 'screens/service_list_view.dart'; +import 'screens/slides_list_view.dart'; class OpenLPRemoteApp extends StatefulWidget { @override @@ -46,7 +46,7 @@ class _OpenLPRemoteAppState extends State controller: tabController, children: [ ServiceListView(), - SlideListView(), + SlidesListView(), ], ), floatingActionButton: SearchFloatingButton(), diff --git a/lib/src/widgets/service_item_search.dart b/lib/src/screens/search_service_item.dart similarity index 97% rename from lib/src/widgets/service_item_search.dart rename to lib/src/screens/search_service_item.dart index 8d01512..5afce2b 100644 --- a/lib/src/widgets/service_item_search.dart +++ b/lib/src/screens/search_service_item.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -class ServiceItemSearch extends SearchDelegate { +class SearchServiceItem extends SearchDelegate { @override List buildActions(BuildContext context) { return null; diff --git a/lib/src/widgets/service_listview.dart b/lib/src/screens/service_list_view.dart similarity index 100% rename from lib/src/widgets/service_listview.dart rename to lib/src/screens/service_list_view.dart diff --git a/lib/src/widgets/slides_listview.dart b/lib/src/screens/slides_list_view.dart similarity index 95% rename from lib/src/widgets/slides_listview.dart rename to lib/src/screens/slides_list_view.dart index 882445b..495d473 100644 --- a/lib/src/widgets/slides_listview.dart +++ b/lib/src/screens/slides_list_view.dart @@ -2,12 +2,12 @@ import 'package:flutter/material.dart'; import '../models/slide_item.dart'; -class SlideListView extends StatefulWidget { +class SlidesListView extends StatefulWidget { @override - _SlideListViewState createState() => _SlideListViewState(); + _SlidesListViewState createState() => _SlidesListViewState(); } -class _SlideListViewState extends State { +class _SlidesListViewState extends State { List slidesItems; @override diff --git a/lib/src/widgets/bottom_navigation_bar.dart b/lib/src/widgets/bottom_navigation_bar.dart index c19bf4e..f62f7e1 100644 --- a/lib/src/widgets/bottom_navigation_bar.dart +++ b/lib/src/widgets/bottom_navigation_bar.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'display_options_bottom_sheet.dart'; +import 'display_options_dialog.dart'; import 'show_alert_dialog.dart'; class _Action { diff --git a/lib/src/widgets/display_options_bottom_sheet.dart b/lib/src/widgets/display_options_dialog.dart similarity index 100% rename from lib/src/widgets/display_options_bottom_sheet.dart rename to lib/src/widgets/display_options_dialog.dart diff --git a/lib/src/widgets/service_item_bottom_sheet.dart b/lib/src/widgets/service_item_bottom_sheet.dart index 8fa3943..57f10a4 100644 --- a/lib/src/widgets/service_item_bottom_sheet.dart +++ b/lib/src/widgets/service_item_bottom_sheet.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'service_item_search.dart'; +import '../screens/search_service_item.dart'; class _ServiceItem { IconData icon; @@ -26,7 +26,7 @@ class ServiceItemBottomSheet extends StatelessWidget { title: Text(item.title), onTap: () { Navigator.of(context).pop(); - showSearch(context: context, delegate: ServiceItemSearch()); + showSearch(context: context, delegate: SearchServiceItem()); }, ); }).toList(),