From 90890af33e8cd39b48825bbfd7738081ef4f5ce2 Mon Sep 17 00:00:00 2001 From: Amy Date: Fri, 4 Feb 2022 19:46:52 +0100 Subject: [PATCH] get rid of (almost) all warnings --- lib/Locales/{Africa.dart => africa.dart} | 2 +- lib/Locales/{America.dart => america.dart} | 0 lib/Locales/{Antarctica.dart => antarctica.dart} | 2 +- lib/Locales/{Arctic.dart => arctic.dart} | 2 +- lib/Locales/{Asia.dart => asia.dart} | 2 +- lib/Locales/{Atlantic.dart => atlantic.dart} | 2 +- lib/Locales/{Australia.dart => australia.dart} | 2 +- lib/Locales/{Brazil.dart => brazil.dart} | 2 +- lib/Locales/{Canada.dart => canada.dart} | 2 +- lib/Locales/{Chile.dart => chile.dart} | 2 +- lib/Locales/{Europe.dart => europe.dart} | 2 +- lib/Locales/{Indian.dart => indian.dart} | 2 +- lib/Locales/locales.dart | 2 +- lib/Locales/{Mexico.dart => mexico.dart} | 2 +- lib/Locales/{Pacific.dart => pacific.dart} | 2 +- lib/Locales/{US.dart => us.dart} | 2 +- lib/functions/locale.dart | 5 ++--- lib/functions/{ => location}/location.dart | 4 ++-- lib/functions/{Region.dart => location/region.dart} | 0 lib/functions/welcome.dart | 1 - lib/main.dart | 5 +---- 21 files changed, 20 insertions(+), 25 deletions(-) rename lib/Locales/{Africa.dart => africa.dart} (99%) rename lib/Locales/{America.dart => america.dart} (100%) rename lib/Locales/{Antarctica.dart => antarctica.dart} (96%) rename lib/Locales/{Arctic.dart => arctic.dart} (72%) rename lib/Locales/{Asia.dart => asia.dart} (99%) rename lib/Locales/{Atlantic.dart => atlantic.dart} (96%) rename lib/Locales/{Australia.dart => australia.dart} (97%) rename lib/Locales/{Brazil.dart => brazil.dart} (81%) rename lib/Locales/{Canada.dart => canada.dart} (93%) rename lib/Locales/{Chile.dart => chile.dart} (82%) rename lib/Locales/{Europe.dart => europe.dart} (99%) rename lib/Locales/{Indian.dart => indian.dart} (95%) rename lib/Locales/{Mexico.dart => mexico.dart} (86%) rename lib/Locales/{Pacific.dart => pacific.dart} (98%) rename lib/Locales/{US.dart => us.dart} (95%) rename lib/functions/{ => location}/location.dart (98%) rename lib/functions/{Region.dart => location/region.dart} (100%) diff --git a/lib/Locales/Africa.dart b/lib/Locales/africa.dart similarity index 99% rename from lib/Locales/Africa.dart rename to lib/Locales/africa.dart index 4fc0fb2..8ec7cb0 100644 --- a/lib/Locales/Africa.dart +++ b/lib/Locales/africa.dart @@ -1,4 +1,4 @@ -import '../classes/location.dart'; +import 'package:jade_gui/classes/location.dart'; List africa = [ Location( diff --git a/lib/Locales/America.dart b/lib/Locales/america.dart similarity index 100% rename from lib/Locales/America.dart rename to lib/Locales/america.dart diff --git a/lib/Locales/Antarctica.dart b/lib/Locales/antarctica.dart similarity index 96% rename from lib/Locales/Antarctica.dart rename to lib/Locales/antarctica.dart index d845403..8d76013 100644 --- a/lib/Locales/Antarctica.dart +++ b/lib/Locales/antarctica.dart @@ -1,4 +1,4 @@ -import '../classes/location.dart'; +import 'package:jade_gui/classes/location.dart'; List antarctica = [ Location( diff --git a/lib/Locales/Arctic.dart b/lib/Locales/arctic.dart similarity index 72% rename from lib/Locales/Arctic.dart rename to lib/Locales/arctic.dart index 570c065..79a8dce 100644 --- a/lib/Locales/Arctic.dart +++ b/lib/Locales/arctic.dart @@ -1,4 +1,4 @@ -import '../classes/location.dart'; +import 'package:jade_gui/classes/location.dart'; List arctic = [ Location( diff --git a/lib/Locales/Asia.dart b/lib/Locales/asia.dart similarity index 99% rename from lib/Locales/Asia.dart rename to lib/Locales/asia.dart index 04590a8..732da73 100644 --- a/lib/Locales/Asia.dart +++ b/lib/Locales/asia.dart @@ -1,4 +1,4 @@ -import '../classes/location.dart'; +import 'package:jade_gui/classes/location.dart'; List asia = [ Location( diff --git a/lib/Locales/Atlantic.dart b/lib/Locales/atlantic.dart similarity index 96% rename from lib/Locales/Atlantic.dart rename to lib/Locales/atlantic.dart index c25e150..fbce600 100644 --- a/lib/Locales/Atlantic.dart +++ b/lib/Locales/atlantic.dart @@ -1,4 +1,4 @@ -import '../classes/location.dart'; +import 'package:jade_gui/classes/location.dart'; List atlantic = [ Location( diff --git a/lib/Locales/Australia.dart b/lib/Locales/australia.dart similarity index 97% rename from lib/Locales/Australia.dart rename to lib/Locales/australia.dart index 2b15453..eee0787 100644 --- a/lib/Locales/Australia.dart +++ b/lib/Locales/australia.dart @@ -1,4 +1,4 @@ -import '../classes/location.dart'; +import 'package:jade_gui/classes/location.dart'; List australia = [ Location( diff --git a/lib/Locales/Brazil.dart b/lib/Locales/brazil.dart similarity index 81% rename from lib/Locales/Brazil.dart rename to lib/Locales/brazil.dart index 877a119..1fdf952 100644 --- a/lib/Locales/Brazil.dart +++ b/lib/Locales/brazil.dart @@ -1,4 +1,4 @@ -import '../classes/location.dart'; +import 'package:jade_gui/classes/location.dart'; List brazil = [ Location( diff --git a/lib/Locales/Canada.dart b/lib/Locales/canada.dart similarity index 93% rename from lib/Locales/Canada.dart rename to lib/Locales/canada.dart index d8a2a16..da5bf98 100644 --- a/lib/Locales/Canada.dart +++ b/lib/Locales/canada.dart @@ -1,4 +1,4 @@ -import '../classes/location.dart'; +import 'package:jade_gui/classes/location.dart'; List canada = [ Location( diff --git a/lib/Locales/Chile.dart b/lib/Locales/chile.dart similarity index 82% rename from lib/Locales/Chile.dart rename to lib/Locales/chile.dart index 796fca3..709e7f4 100644 --- a/lib/Locales/Chile.dart +++ b/lib/Locales/chile.dart @@ -1,4 +1,4 @@ -import '../classes/location.dart'; +import 'package:jade_gui/classes/location.dart'; List chile = [ Location( diff --git a/lib/Locales/Europe.dart b/lib/Locales/europe.dart similarity index 99% rename from lib/Locales/Europe.dart rename to lib/Locales/europe.dart index 9ea6aca..d47b207 100644 --- a/lib/Locales/Europe.dart +++ b/lib/Locales/europe.dart @@ -1,4 +1,4 @@ -import '../classes/location.dart'; +import 'package:jade_gui/classes/location.dart'; List europe = [ Location( diff --git a/lib/Locales/Indian.dart b/lib/Locales/indian.dart similarity index 95% rename from lib/Locales/Indian.dart rename to lib/Locales/indian.dart index 0ff62be..62d5a9c 100644 --- a/lib/Locales/Indian.dart +++ b/lib/Locales/indian.dart @@ -1,4 +1,4 @@ -import '../classes/location.dart'; +import 'package:jade_gui/classes/location.dart'; List indian = [ Location( diff --git a/lib/Locales/locales.dart b/lib/Locales/locales.dart index a50df51..0898ee4 100644 --- a/lib/Locales/locales.dart +++ b/lib/Locales/locales.dart @@ -12,7 +12,7 @@ import 'Indian.dart'; import 'Mexico.dart'; import 'Pacific.dart'; import 'US.dart'; -import '../classes/location.dart'; +import 'package:jade_gui/classes/location.dart'; class Local { List location = [Location()]; diff --git a/lib/Locales/Mexico.dart b/lib/Locales/mexico.dart similarity index 86% rename from lib/Locales/Mexico.dart rename to lib/Locales/mexico.dart index ae091dd..8af5f77 100644 --- a/lib/Locales/Mexico.dart +++ b/lib/Locales/mexico.dart @@ -1,4 +1,4 @@ -import '../classes/location.dart'; +import 'package:jade_gui/classes/location.dart'; List mexico = [ Location( diff --git a/lib/Locales/Pacific.dart b/lib/Locales/pacific.dart similarity index 98% rename from lib/Locales/Pacific.dart rename to lib/Locales/pacific.dart index 01ab091..b255a12 100644 --- a/lib/Locales/Pacific.dart +++ b/lib/Locales/pacific.dart @@ -1,4 +1,4 @@ -import '../classes/location.dart'; +import 'package:jade_gui/classes/location.dart'; List pacific = [ Location( diff --git a/lib/Locales/US.dart b/lib/Locales/us.dart similarity index 95% rename from lib/Locales/US.dart rename to lib/Locales/us.dart index 66d8156..662caf1 100644 --- a/lib/Locales/US.dart +++ b/lib/Locales/us.dart @@ -1,4 +1,4 @@ -import '../classes/location.dart'; +import 'package:jade_gui/classes/location.dart'; List us = [ Location( diff --git a/lib/functions/locale.dart b/lib/functions/locale.dart index 7ddf7f9..4c01aba 100644 --- a/lib/functions/locale.dart +++ b/lib/functions/locale.dart @@ -1,13 +1,12 @@ import 'package:flutter/material.dart'; -import 'Region.dart'; -import 'location.dart'; +import 'package:jade_gui/functions/location/region.dart'; +import 'package:jade_gui/functions/location/location.dart'; import 'package:jade_gui/Locales/locales.dart'; Widget locale(next, nextPage, selectlocation, isnextpage) { Widget widget; selectlocation(getSelectedRegion()); String selectedregion = getSelectedRegion(); - print(selectedregion); if (isnextpage == false) { widget = region(nextPage, locations); } else { diff --git a/lib/functions/location.dart b/lib/functions/location/location.dart similarity index 98% rename from lib/functions/location.dart rename to lib/functions/location/location.dart index f42dbfa..94f7632 100644 --- a/lib/functions/location.dart +++ b/lib/functions/location/location.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import '../Locales/locales.dart'; -import '../classes/location.dart'; +import 'package:jade_gui/Locales/locales.dart'; +import 'package:jade_gui/classes/location.dart'; Location choosenLocPack = Location(); Widget locationTemplate(location, nextSlide) { diff --git a/lib/functions/Region.dart b/lib/functions/location/region.dart similarity index 100% rename from lib/functions/Region.dart rename to lib/functions/location/region.dart diff --git a/lib/functions/welcome.dart b/lib/functions/welcome.dart index f1602fd..7ac456e 100644 --- a/lib/functions/welcome.dart +++ b/lib/functions/welcome.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:jade_gui/main.dart'; Widget welcome(next) { return Container( diff --git a/lib/main.dart b/lib/main.dart index bb3d0ff..418d6f3 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,10 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:jade_gui/functions/Region.dart'; -import 'package:jade_gui/functions/location.dart'; +import 'package:jade_gui/functions/location/location.dart'; import 'functions/welcome.dart'; import 'functions/locale.dart'; -import 'classes/location.dart'; -//import 'Locales/locales.dart'; void main() => runApp( const MaterialApp(