shas6395----- #56

Merged
shas6395 merged 7 commits from shas6395----- into master 2022-05-30 18:28:11 +02:00
2 changed files with 12 additions and 38 deletions
Showing only changes of commit 2b6e2bb4ad - Show all commits

View File

@ -32,31 +32,23 @@ class _HomePageState extends State<HomePage> {
padding: EdgeInsets.fromLTRB(80, 80, 80, 0), padding: EdgeInsets.fromLTRB(80, 80, 80, 0),
child: Text( child: Text(
'Sun Chasers', 'Sun Chasers',
style: GoogleFonts.libreBaskerville( style: GoogleFonts.roboto(
fontSize: 35, fontSize: 52,
color: globals.TEXTCOLOR, color: globals.TEXTCOLOR,
), ),
textAlign: TextAlign.center,
), ),
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
Text(
'The #1 Sunny Spot Finder',
style: GoogleFonts.libreBaskerville(
fontSize: 20,
fontWeight: FontWeight. bold,
color: globals.TEXTCOLOR,
),
),
Container( Container(
padding: EdgeInsets.fromLTRB(80, 40, 80, 80), margin: EdgeInsets.fromLTRB(80, 80, 80, 80),
child: ElevatedButton( child: ElevatedButton(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
fixedSize: const Size(200, 200), fixedSize: const Size(200, 200),
primary: globals.BUTTONCOLOR, primary: globals.BUTTONCOLOR,
elevation: 100, elevation: globals.elevation,
shape: const CircleBorder(), shape: const CircleBorder(),
), ),
onPressed: () { onPressed: () {
@ -66,19 +58,12 @@ class _HomePageState extends State<HomePage> {
); );
}, },
child: Text( child: Text(
(globals.LOGGED_IN_USER.userID == 0 ? 'FIND SPOT BY LOCATION \n \n without signing in' : 'FIND SPOT BY LOCATION'), (globals.LOGGED_IN_USER.userID == 0 ? '\nFIND SPOT BY LOCATION \n \n as guest' : 'FIND SPOT BY LOCATION'),
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 18,
color: Colors.white, color: Colors.white,
shadows: <Shadow> [
Shadow(
offset: Offset(2, 2),
blurRadius: 10.0,
color: globals.SHADOWCOLOR,
),
]
), ),
), ),
), ),
@ -100,7 +85,7 @@ class _HomePageState extends State<HomePage> {
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
fixedSize: const Size(200, 50), fixedSize: const Size(200, 50),
primary: globals.BUTTONCOLOR, primary: globals.BUTTONCOLOR,
elevation: 100, elevation: globals.elevation,
), ),
onPressed: () { onPressed: () {
Navigator.push( Navigator.push(
@ -112,13 +97,7 @@ class _HomePageState extends State<HomePage> {
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 18,
color: Colors.white, color: Colors.white,
shadows: <Shadow> [ )
Shadow(
offset: Offset(2, 2),
blurRadius: 10.0,
color: globals.SHADOWCOLOR,
),
])
), ),
), ),
Padding(padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5)), Padding(padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5)),
@ -126,7 +105,7 @@ class _HomePageState extends State<HomePage> {
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
fixedSize: const Size(200, 50), fixedSize: const Size(200, 50),
primary: globals.BUTTONCOLOR, primary: globals.BUTTONCOLOR,
elevation: 100, elevation: globals.elevation,
), ),
onPressed: () { onPressed: () {
Navigator.push( Navigator.push(
@ -138,13 +117,7 @@ class _HomePageState extends State<HomePage> {
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 18,
color: Colors.white, color: Colors.white,
shadows: <Shadow> [ )
Shadow(
offset: Offset(2, 2),
blurRadius: 10.0,
color: Color.fromARGB(255, 0, 0, 0),
),
])
), ),
) )
] ]
@ -157,7 +130,7 @@ class _HomePageState extends State<HomePage> {
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
fixedSize: const Size(200, 50), fixedSize: const Size(200, 50),
primary: globals.BUTTONCOLOR, primary: globals.BUTTONCOLOR,
elevation: 100, elevation: globals.elevation,
), ),
onPressed: () { onPressed: () {
globals.LOGGED_IN_USER = User.User(0, "", ""); globals.LOGGED_IN_USER = User.User(0, "", "");

View File

@ -19,6 +19,7 @@ Color PINKBACKGROUND = const Color.fromARGB(255, 240, 229, 229);
Color TEXTCOLOR = const Color.fromARGB(255, 79, 98, 114); Color TEXTCOLOR = const Color.fromARGB(255, 79, 98, 114);
Color SHADOWCOLOR = const Color.fromARGB(255, 0, 0, 0); Color SHADOWCOLOR = const Color.fromARGB(255, 0, 0, 0);
Color TEXTWHITE = const Color.fromARGB(0, 0, 0, 0); Color TEXTWHITE = const Color.fromARGB(0, 0, 0, 0);
const double elevation = 5;
late List<Venue> VENUES = []; late List<Venue> VENUES = [];
late WeatherData forecast; late WeatherData forecast;