From f952e535817d4ee4966929d7e0c284d403f055f3 Mon Sep 17 00:00:00 2001 From: shas6395 Date: Wed, 1 Jun 2022 13:10:04 +0200 Subject: [PATCH] Cleaning --- ...ottomNavPage.dart => bottom_nav_page.dart} | 8 +-- lib/{FavoritePage.dart => favorite_page.dart} | 6 +- lib/{FeedbackPage.dart => feedback_page.dart} | 4 +- lib/{Form.dart => form.dart} | 0 lib/globals.dart | 12 ++-- lib/{HomePage.dart => home_page.dart} | 8 +-- ...{ListViewPage.dart => list_view_page.dart} | 4 +- ...ountPage.dart => create_account_page.dart} | 12 ++-- .../{EncryptData.dart => encrypt_data.dart} | 0 ...ider.dart => google_sign_in_provider.dart} | 0 .../{signInPage.dart => sign_in_page.dart} | 16 ++--- lib/login/{User.dart => user.dart} | 2 +- lib/main.dart | 18 +++--- ...ountPage.dart => manage_account_page.dart} | 6 +- lib/{Map.dart => map.dart} | 44 ++++--------- .../shadow_map.dart} | 0 .../web_scraper.dart} | 0 .../{InputField.dart => input_field.dart} | 0 .../{returnButton.dart => return_button.dart} | 2 +- lib/{SettingsPage.dart => settings_page.dart} | 10 +-- ...adowDetector.dart => shadow_detector.dart} | 2 +- lib/{Venue.dart => venue.dart} | 2 +- lib/{VenueInfo.dart => venue_info.dart} | 64 +------------------ lib/{venuePage.dart => venue_page.dart} | 16 ++--- lib/{WeatherData.dart => weather_data.dart} | 0 ...PageTest.dart => list_view_page_test.dart} | 4 +- ...est.dart => manage_account_page_test.dart} | 2 +- test/venue_info_test.dart | 4 +- ...enuePageTest.dart => venue_page_test.dart} | 6 +- 29 files changed, 84 insertions(+), 168 deletions(-) rename lib/{BottomNavPage.dart => bottom_nav_page.dart} (91%) rename lib/{FavoritePage.dart => favorite_page.dart} (98%) rename lib/{FeedbackPage.dart => feedback_page.dart} (99%) rename lib/{Form.dart => form.dart} (100%) rename lib/{HomePage.dart => home_page.dart} (96%) rename lib/{ListViewPage.dart => list_view_page.dart} (96%) rename lib/login/{CreateAccountPage.dart => create_account_page.dart} (95%) rename lib/login/{EncryptData.dart => encrypt_data.dart} (100%) rename lib/login/{GoogleSignInProvider.dart => google_sign_in_provider.dart} (100%) rename lib/login/{signInPage.dart => sign_in_page.dart} (95%) rename lib/login/{User.dart => user.dart} (94%) rename lib/{ManageAccountPage.dart => manage_account_page.dart} (97%) rename lib/{Map.dart => map.dart} (94%) rename lib/{ShadowMap.dart => nonusables/shadow_map.dart} (100%) rename lib/{WebScraper.dart => nonusables/web_scraper.dart} (100%) rename lib/reusables/{InputField.dart => input_field.dart} (100%) rename lib/reusables/{returnButton.dart => return_button.dart} (91%) rename lib/{SettingsPage.dart => settings_page.dart} (98%) rename lib/{ShadowDetector.dart => shadow_detector.dart} (99%) rename lib/{Venue.dart => venue.dart} (98%) rename lib/{VenueInfo.dart => venue_info.dart} (71%) rename lib/{venuePage.dart => venue_page.dart} (96%) rename lib/{WeatherData.dart => weather_data.dart} (100%) rename test/{ListViewPageTest.dart => list_view_page_test.dart} (82%) rename test/{ManageAccountPage_test.dart => manage_account_page_test.dart} (96%) rename test/{VenuePageTest.dart => venue_page_test.dart} (73%) diff --git a/lib/BottomNavPage.dart b/lib/bottom_nav_page.dart similarity index 91% rename from lib/BottomNavPage.dart rename to lib/bottom_nav_page.dart index 2cfb9af..a8632c4 100644 --- a/lib/BottomNavPage.dart +++ b/lib/bottom_nav_page.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'Map.dart'; -import 'FavoritePage.dart'; -import 'SettingsPage.dart'; +import 'map.dart'; +import 'favorite_page.dart'; +import 'settings_page.dart'; import 'globals.dart' as globals; -import 'ListViewPage.dart'; +import 'list_view_page.dart'; class BottomNavPage extends StatefulWidget { @override diff --git a/lib/FavoritePage.dart b/lib/favorite_page.dart similarity index 98% rename from lib/FavoritePage.dart rename to lib/favorite_page.dart index 4170a20..4bda107 100644 --- a/lib/FavoritePage.dart +++ b/lib/favorite_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:flutter_applicationdemo/venuePage.dart'; -import 'Venue.dart'; +import 'package:flutter_applicationdemo/venue_page.dart'; +import 'venue.dart'; import 'globals.dart' as globals; -import 'login/signInPage.dart'; +import 'login/sign_in_page.dart'; import 'mysql.dart'; diff --git a/lib/FeedbackPage.dart b/lib/feedback_page.dart similarity index 99% rename from lib/FeedbackPage.dart rename to lib/feedback_page.dart index 21afa6a..973198b 100644 --- a/lib/FeedbackPage.dart +++ b/lib/feedback_page.dart @@ -1,8 +1,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter_applicationdemo/mysql.dart'; -import 'BottomNavPage.dart'; +import 'bottom_nav_page.dart'; import 'package:flutter/material.dart'; -import 'Form.dart'; +import 'form.dart'; Color _backgroundColor = const Color.fromARGB(255, 190, 146, 160); diff --git a/lib/Form.dart b/lib/form.dart similarity index 100% rename from lib/Form.dart rename to lib/form.dart diff --git a/lib/globals.dart b/lib/globals.dart index 7915fbf..8e20f9c 100644 --- a/lib/globals.dart +++ b/lib/globals.dart @@ -1,14 +1,14 @@ -import 'package:flutter_applicationdemo/WeatherData.dart'; +import 'package:flutter_applicationdemo/weather_data.dart'; -import 'Venue.dart'; -import 'package:flutter_applicationdemo/login/User.dart'; -import '../login/User.dart'; +import 'venue.dart'; +import 'package:flutter_applicationdemo/login/user.dart'; +import '../login/user.dart'; import 'dart:ui'; import 'package:flutter/material.dart'; -import 'HomePage.dart'; -import 'Venue.dart'; +import 'home_page.dart'; +import 'venue.dart'; import 'main.dart'; User LOGGED_IN_USER = User(0, "", ""); diff --git a/lib/HomePage.dart b/lib/home_page.dart similarity index 96% rename from lib/HomePage.dart rename to lib/home_page.dart index 9e3b726..8744da1 100644 --- a/lib/HomePage.dart +++ b/lib/home_page.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'BottomNavPage.dart'; -import 'login/CreateAccountPage.dart'; -import 'login/signInPage.dart'; -import 'package:flutter_applicationdemo/login/User.dart' as User; +import 'bottom_nav_page.dart'; +import 'login/create_account_page.dart'; +import 'login/sign_in_page.dart'; +import 'package:flutter_applicationdemo/login/user.dart' as User; import 'globals.dart' as globals; diff --git a/lib/ListViewPage.dart b/lib/list_view_page.dart similarity index 96% rename from lib/ListViewPage.dart rename to lib/list_view_page.dart index dc16472..d61e715 100644 --- a/lib/ListViewPage.dart +++ b/lib/list_view_page.dart @@ -4,8 +4,8 @@ import 'package:google_fonts/google_fonts.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'globals.dart' as globals; -import 'package:flutter_applicationdemo/Venue.dart'; -import 'VenuePage.dart'; +import 'package:flutter_applicationdemo/venue.dart'; +import 'venue_page.dart'; class ListViewPage extends StatefulWidget { const ListViewPage({Key? key}) : super(key: key); diff --git a/lib/login/CreateAccountPage.dart b/lib/login/create_account_page.dart similarity index 95% rename from lib/login/CreateAccountPage.dart rename to lib/login/create_account_page.dart index ed83ea1..acd0d84 100644 --- a/lib/login/CreateAccountPage.dart +++ b/lib/login/create_account_page.dart @@ -1,16 +1,16 @@ // ignore_for_file: prefer_const_constructors import 'package:flutter/material.dart'; -import 'package:flutter_applicationdemo/BottomNavPage.dart'; -import 'package:flutter_applicationdemo/login/EncryptData.dart'; +import 'package:flutter_applicationdemo/bottom_nav_page.dart'; +import 'package:flutter_applicationdemo/login/encrypt_data.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:flutter_applicationdemo/mysql.dart'; -import 'package:flutter_applicationdemo/HomePage.dart'; +import 'package:flutter_applicationdemo/home_page.dart'; import '../globals.dart' as globals; -import '../reusables/InputField.dart'; -import 'User.dart'; -import '../reusables/returnButton.dart'; +import '../reusables/input_field.dart'; +import 'user.dart'; +import '../reusables/return_button.dart'; class CreateAccountPage extends StatefulWidget { _CreateAccountPageState createState() => _CreateAccountPageState(); diff --git a/lib/login/EncryptData.dart b/lib/login/encrypt_data.dart similarity index 100% rename from lib/login/EncryptData.dart rename to lib/login/encrypt_data.dart diff --git a/lib/login/GoogleSignInProvider.dart b/lib/login/google_sign_in_provider.dart similarity index 100% rename from lib/login/GoogleSignInProvider.dart rename to lib/login/google_sign_in_provider.dart diff --git a/lib/login/signInPage.dart b/lib/login/sign_in_page.dart similarity index 95% rename from lib/login/signInPage.dart rename to lib/login/sign_in_page.dart index 13a429a..220868a 100644 --- a/lib/login/signInPage.dart +++ b/lib/login/sign_in_page.dart @@ -1,17 +1,17 @@ import 'dart:io'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_applicationdemo/login/EncryptData.dart'; -import 'package:flutter_applicationdemo/BottomNavPage.dart'; +import 'package:flutter_applicationdemo/login/encrypt_data.dart'; +import 'package:flutter_applicationdemo/bottom_nav_page.dart'; import '../mysql.dart'; -import '../HomePage.dart'; +import '../home_page.dart'; import '../main.dart'; -import 'User.dart'; -import '../reusables/InputField.dart'; -import '../reusables/returnButton.dart'; +import 'user.dart'; +import '../reusables/input_field.dart'; +import '../reusables/return_button.dart'; import 'package:flutter_signin_button/flutter_signin_button.dart'; -import 'GoogleSignInProvider.dart'; -import 'CreateAccountPage.dart'; +import 'google_sign_in_provider.dart'; +import 'create_account_page.dart'; import 'package:provider/provider.dart'; import 'package:flutter_applicationdemo/globals.dart' as globals; diff --git a/lib/login/User.dart b/lib/login/user.dart similarity index 94% rename from lib/login/User.dart rename to lib/login/user.dart index 18f0d0e..29cc394 100644 --- a/lib/login/User.dart +++ b/lib/login/user.dart @@ -1,4 +1,4 @@ -import 'package:flutter_applicationdemo/Venue.dart'; +import 'package:flutter_applicationdemo/venue.dart'; import 'package:flutter_applicationdemo/mysql.dart'; import 'package:flutter_applicationdemo/globals.dart' as globals; diff --git a/lib/main.dart b/lib/main.dart index 0ca43d7..394978c 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -5,20 +5,20 @@ import 'dart:io'; import 'package:firebase_auth/firebase_auth.dart'; import 'package:flutter/material.dart'; import 'package:firebase_core/firebase_core.dart'; -import 'package:flutter_applicationdemo/ShadowDetector.dart'; -import 'package:flutter_applicationdemo/login/GoogleSignInProvider.dart'; +import 'package:flutter_applicationdemo/shadow_detector.dart'; +import 'package:flutter_applicationdemo/login/google_sign_in_provider.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; -import 'package:flutter_applicationdemo/login/GoogleSignInProvider.dart'; +import 'package:flutter_applicationdemo/login/google_sign_in_provider.dart'; import 'package:provider/provider.dart'; import 'package:http/http.dart' as http; -import 'BottomNavPage.dart'; -import 'Map.dart'; -import 'WeatherData.dart'; -import 'Venue.dart'; +import 'bottom_nav_page.dart'; +import 'map.dart'; +import 'weather_data.dart'; +import 'venue.dart'; import 'mysql.dart'; -import 'package:flutter_applicationdemo/login/User.dart'; -import 'login/User.dart'; +import 'package:flutter_applicationdemo/login/user.dart'; +import 'login/user.dart'; import 'globals.dart' as globals; void main() async { diff --git a/lib/ManageAccountPage.dart b/lib/manage_account_page.dart similarity index 97% rename from lib/ManageAccountPage.dart rename to lib/manage_account_page.dart index 039735e..9337d20 100644 --- a/lib/ManageAccountPage.dart +++ b/lib/manage_account_page.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; -import 'package:flutter_applicationdemo/login/EncryptData.dart'; -import 'package:flutter_applicationdemo/reusables/InputField.dart'; +import 'package:flutter_applicationdemo/login/encrypt_data.dart'; +import 'package:flutter_applicationdemo/reusables/input_field.dart'; import 'package:flutter_applicationdemo/mysql.dart'; -import 'HomePage.dart'; +import 'home_page.dart'; class ManageAccountPage extends StatefulWidget { @override diff --git a/lib/Map.dart b/lib/map.dart similarity index 94% rename from lib/Map.dart rename to lib/map.dart index 305d80e..0d68f63 100644 --- a/lib/Map.dart +++ b/lib/map.dart @@ -1,23 +1,22 @@ import 'package:flutter/material.dart'; -import 'package:flutter_applicationdemo/BottomNavPage.dart'; -import 'package:flutter_applicationdemo/WebScraper.dart'; +import 'package:flutter_applicationdemo/bottom_nav_page.dart'; import 'package:google_fonts/google_fonts.dart'; import 'dart:async'; -import 'login/User.dart'; +import 'login/user.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:flutter_google_places/flutter_google_places.dart'; import 'package:location/location.dart'; -import 'package:flutter_applicationdemo/login/User.dart'; -import 'SettingsPage.dart'; -import 'venuePage.dart'; -import 'Venue.dart'; +import 'package:flutter_applicationdemo/login/user.dart'; +import 'settings_page.dart'; +import 'venue_page.dart'; +import 'venue.dart'; import 'globals.dart' as globals; import 'package:syncfusion_flutter_sliders/sliders.dart'; -import 'FeedbackPage.dart'; -import 'login/CreateAccountPage.dart'; -import 'login/signInPage.dart'; +import 'feedback_page.dart'; +import 'login/create_account_page.dart'; +import 'login/sign_in_page.dart'; class Map extends StatefulWidget { @override @@ -63,25 +62,6 @@ class MapState extends State { hiddenVenues.addAll(globals.VENUES); } - void createBottomSheet(String venueName) async { - var webScraper = WebScraper(); - await webScraper.getWebsiteData(venueName); - Scaffold.of(context).showBottomSheet(((context) { - return Container( - height: 420, - color: Colors.white, - child: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - mainAxisSize: MainAxisSize.min, - children: [ - Text(webScraper.openingHoursThisWeek.length.toString()), - ], - )), - ); - })); - } - Future _getLocationPermission() async { Location location = Location(); @@ -170,8 +150,6 @@ class MapState extends State { closeBottomSheetIfOpen(); }, ), - // ElevatedButton(onPressed: () {} //_handelPressButton - // ,child: const Text("Search Placses")) ], ), floatingActionButton: Padding( @@ -362,7 +340,7 @@ class MapState extends State { Marker marker = Marker( markerId: MarkerId(globals.VENUES[i].venueID.toString()), position: globals.VENUES[i].position, - onTap: () => createBottomDrawer(globals.VENUES[i]), + onTap: () => createBottomSheet(globals.VENUES[i]), icon: globals.VENUES[i].drawIconColor()); globals.VENUES[i].isShownOnMap = true; closeByMarkersList.add(marker); @@ -370,7 +348,7 @@ class MapState extends State { } } - createBottomDrawer(Venue venue) async { + createBottomSheet(Venue venue) async { _bottomSheetIsOpen = true; // Scaffold.of(context).showBottomSheet(((context) { showModalBottomSheet( diff --git a/lib/ShadowMap.dart b/lib/nonusables/shadow_map.dart similarity index 100% rename from lib/ShadowMap.dart rename to lib/nonusables/shadow_map.dart diff --git a/lib/WebScraper.dart b/lib/nonusables/web_scraper.dart similarity index 100% rename from lib/WebScraper.dart rename to lib/nonusables/web_scraper.dart diff --git a/lib/reusables/InputField.dart b/lib/reusables/input_field.dart similarity index 100% rename from lib/reusables/InputField.dart rename to lib/reusables/input_field.dart diff --git a/lib/reusables/returnButton.dart b/lib/reusables/return_button.dart similarity index 91% rename from lib/reusables/returnButton.dart rename to lib/reusables/return_button.dart index 07c1e2e..055d7d1 100644 --- a/lib/reusables/returnButton.dart +++ b/lib/reusables/return_button.dart @@ -1,6 +1,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_applicationdemo/HomePage.dart'; +import 'package:flutter_applicationdemo/home_page.dart'; class ReturnButton extends StatelessWidget { final onPressed; diff --git a/lib/SettingsPage.dart b/lib/settings_page.dart similarity index 98% rename from lib/SettingsPage.dart rename to lib/settings_page.dart index e26354e..280b9fc 100644 --- a/lib/SettingsPage.dart +++ b/lib/settings_page.dart @@ -1,14 +1,14 @@ import 'package:firebase_auth/firebase_auth.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_applicationdemo/BottomNavPage.dart'; -import 'package:flutter_applicationdemo/login/GoogleSignInProvider.dart'; +import 'package:flutter_applicationdemo/bottom_nav_page.dart'; +import 'package:flutter_applicationdemo/login/google_sign_in_provider.dart'; import 'package:google_sign_in/google_sign_in.dart'; import 'package:settings_ui/settings_ui.dart'; -import 'ManageAccountPage.dart'; -import 'login/GoogleSignInProvider.dart'; +import 'manage_account_page.dart'; +import 'login/google_sign_in_provider.dart'; import 'package:provider/provider.dart'; -import 'FeedbackPage.dart'; +import 'feedback_page.dart'; // Standard color of app Color _backgroundColor = const Color.fromARGB(255, 190, 146, 160); diff --git a/lib/ShadowDetector.dart b/lib/shadow_detector.dart similarity index 99% rename from lib/ShadowDetector.dart rename to lib/shadow_detector.dart index 53b8a2b..03ed9cb 100644 --- a/lib/ShadowDetector.dart +++ b/lib/shadow_detector.dart @@ -2,7 +2,7 @@ import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:http/http.dart'; import 'dart:async'; -import 'Venue.dart'; +import 'venue.dart'; class ShadowDetector { diff --git a/lib/Venue.dart b/lib/venue.dart similarity index 98% rename from lib/Venue.dart rename to lib/venue.dart index e1835c7..b15e56a 100644 --- a/lib/Venue.dart +++ b/lib/venue.dart @@ -1,6 +1,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_applicationdemo/ShadowDetector.dart'; +import 'package:flutter_applicationdemo/shadow_detector.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; class Venue { diff --git a/lib/VenueInfo.dart b/lib/venue_info.dart similarity index 71% rename from lib/VenueInfo.dart rename to lib/venue_info.dart index 23db92c..e219012 100644 --- a/lib/VenueInfo.dart +++ b/lib/venue_info.dart @@ -5,7 +5,7 @@ import 'package:html/dom.dart' as dom; import 'package:intl/intl.dart'; import 'dart:io'; -import 'Venue.dart'; +import 'venue.dart'; class VenueInfo { @@ -66,55 +66,6 @@ class VenueInfo { } } - /*Future getVenueInfo(String venueName) async { - - final fourSquareURL = - Uri.parse('https://foursquare.com/explore?mode=url&near=Stockholm%2C%20Sweden&nearGeoId=72057594040601666&q=$venueName'); - - final response1 = await http.get(fourSquareURL); - if(response1.statusCode == 200) { - dom.Document html = dom.Document.html(response1.body); - - var fsqId = html.getElementsByClassName('card singleRecommendation hasPhoto tipWithLogging leftPhotoLayout').map((e) => e.attributes['data-id']).toList()[0]; - - final response2 = await http.get( - Uri.parse('https://api.foursquare.com/v3/places/$fsqId?fields=price%2Crating%2Cphotos%2Chours%2Cstats%2Ctastes'), - headers: { - HttpHeaders.authorizationHeader: 'fsq3LBbeZ8imQK8X1hov7DTb9F64Xs1fs2bojHQ99QNm4TE=' - }, - ); - - if(response2.statusCode == 200) { - Map data = jsonDecode(response2.body); - if(data['price'] != null) { - _priceClass = data['price']; - } - if(data['rating'] != null) { - _rating = data['rating']; - } - if(data['photos'][0] != null) { - _photos = data['photos'][0]; - } - if(data['hours']['open now'] != null) { - _openNow = data['hours']['open_now']; - } - if(data['stats']['total_ratings'] != null) { - _totalRatings = data['stats']['total_ratings']; - } - if(data['hours']['display'] != null) { - _openHoursToday = data['hours']['display']; - } - } - else { - throw const HttpException("No connection to api.foursquare.com"); - } - } - else { - throw const HttpException("No connection to foursquare.com"); - } - }*/ - - String getPopularHoursToday() { var today = DateFormat('EEEE').format(DateTime.now()); if(_hoursPopular.isEmpty) { @@ -189,17 +140,4 @@ class VenueInfo { String getVenueURL () { return 'https://api.foursquare.com$_fsqLink'; } - -} - - -enum WeekDays { - monday, - tuesday, - wednesday, - thursday, - friday, - saturday, - sunday, - } \ No newline at end of file diff --git a/lib/venuePage.dart b/lib/venue_page.dart similarity index 96% rename from lib/venuePage.dart rename to lib/venue_page.dart index 213a450..667b653 100644 --- a/lib/venuePage.dart +++ b/lib/venue_page.dart @@ -2,14 +2,14 @@ import 'dart:convert'; import 'dart:io'; import 'package:share_plus/share_plus.dart'; -import 'package:flutter_applicationdemo/Venue.dart'; +import 'package:flutter_applicationdemo/venue.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:http/http.dart' as http; -import 'VenueInfo.dart'; -import 'WeatherData.dart'; +import 'venue_info.dart'; +import 'weather_data.dart'; import 'globals.dart' as globals; -import 'Venue.dart'; +import 'venue.dart'; // Color _backgroundColor = const Color(0xffac7b84); @@ -38,9 +38,9 @@ class VenuePageState extends State { } Future gatherVenueInfo() async { - VenueInfo vu = VenueInfo(); - venueInfo = vu; - venueInfo = await vu.getVenueInfo(venue); + VenueInfo vi = VenueInfo(); + venueInfo = vi; + venueInfo = await vi.getVenueInfo(venue); } Future refreshWeather() async { @@ -264,7 +264,7 @@ class LikeVenueButton extends StatelessWidget { ), label: const Text('Like place'), style: TextButton.styleFrom( - primary: Color(0xff4f6272), + primary: const Color(0xff4f6272), ), )); } diff --git a/lib/WeatherData.dart b/lib/weather_data.dart similarity index 100% rename from lib/WeatherData.dart rename to lib/weather_data.dart diff --git a/test/ListViewPageTest.dart b/test/list_view_page_test.dart similarity index 82% rename from test/ListViewPageTest.dart rename to test/list_view_page_test.dart index a194763..fc8752e 100644 --- a/test/ListViewPageTest.dart +++ b/test/list_view_page_test.dart @@ -1,8 +1,8 @@ import 'dart:math'; -import 'package:flutter_applicationdemo/ListViewPage.dart'; -import 'package:flutter_applicationdemo/Venue.dart'; +import 'package:flutter_applicationdemo/list_view_page.dart'; +import 'package:flutter_applicationdemo/venue.dart'; import 'package:flutter_applicationdemo/globals.dart' as globals; import 'package:google_maps_flutter/google_maps_flutter.dart'; diff --git a/test/ManageAccountPage_test.dart b/test/manage_account_page_test.dart similarity index 96% rename from test/ManageAccountPage_test.dart rename to test/manage_account_page_test.dart index 70b9aeb..bf75ce0 100644 --- a/test/ManageAccountPage_test.dart +++ b/test/manage_account_page_test.dart @@ -1,5 +1,5 @@ import 'package:test/test.dart'; -import 'package:flutter_applicationdemo/ManageAccountPage.dart'; +import 'package:flutter_applicationdemo/manage_account_page.dart'; void main() { group('ManageAccountPage', () { diff --git a/test/venue_info_test.dart b/test/venue_info_test.dart index 2b54a3b..6ef7515 100644 --- a/test/venue_info_test.dart +++ b/test/venue_info_test.dart @@ -1,6 +1,6 @@ -import 'package:flutter_applicationdemo/Venue.dart'; +import 'package:flutter_applicationdemo/venue.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:flutter_applicationdemo/VenueInfo.dart'; +import 'package:flutter_applicationdemo/venue_info.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; main() { diff --git a/test/VenuePageTest.dart b/test/venue_page_test.dart similarity index 73% rename from test/VenuePageTest.dart rename to test/venue_page_test.dart index 855ee8e..eda2716 100644 --- a/test/VenuePageTest.dart +++ b/test/venue_page_test.dart @@ -1,6 +1,6 @@ -import 'package:flutter_applicationdemo/Venue.dart'; -import 'package:flutter_applicationdemo/WeatherData.dart'; -import 'package:flutter_applicationdemo/venuePage.dart'; +import 'package:flutter_applicationdemo/venue.dart'; +import 'package:flutter_applicationdemo/weather_data.dart'; +import 'package:flutter_applicationdemo/venue_page.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:test/test.dart'; -- 2.39.5