From c95e5f4abad729fbd384a50ecddda0c8287a8409 Mon Sep 17 00:00:00 2001 From: Wsutton424 Date: Fri, 2 Dec 2022 21:44:41 -0500 Subject: [PATCH] begin standardizing visuals --- app/lib/data/catergories.dart | 14 +++++++------- app/lib/main.dart | 3 +-- app/lib/screens/ExploreScreen.dart | 4 ++-- app/lib/screens/ProfileScreen.dart | 16 ++++++++++------ app/lib/screens/SignUpScreen.dart | 20 ++++++++++---------- app/lib/screens/WelcomeScreen.dart | 12 ++++++------ app/lib/screens/loginPage.dart | 26 ++++++++++++++------------ 7 files changed, 50 insertions(+), 45 deletions(-) diff --git a/app/lib/data/catergories.dart b/app/lib/data/catergories.dart index dd75990..85ec10d 100644 --- a/app/lib/data/catergories.dart +++ b/app/lib/data/catergories.dart @@ -13,26 +13,26 @@ final categories = [ categoryName: 'Greetings', backgroundColor: Colors.blue, icon: FontAwesomeIcons.handHolding, - description: 'Test your knowledge on greetings', + description: 'Test your knowledge on common greetings', ), Category( questions: getQuestions2(), categoryName: 'Family', - backgroundColor: Colors.orange, + backgroundColor: Colors.pink, icon: FontAwesomeIcons.children, - description: 'Test your knowledge on Family', + description: 'Test your knowledge on Family Words', ), Category( questions: getQuestions3(), - categoryName: 'Food', - backgroundColor: Colors.purple, + categoryName: 'Food words', + backgroundColor: Colors.red, icon: FontAwesomeIcons.burger, - description: 'Test your knowledge on Food', + description: 'Test your knowledge on Food and drink', ), Category( questions: getQuestions4(), categoryName: 'Objects', - backgroundColor: Color.fromARGB(255, 216, 98, 137), + backgroundColor: Colors.yellow, icon: FontAwesomeIcons.book, description: 'Test your knowledge on random objects', ), diff --git a/app/lib/main.dart b/app/lib/main.dart index 84c1dc6..947eae7 100644 --- a/app/lib/main.dart +++ b/app/lib/main.dart @@ -4,8 +4,7 @@ import 'package:flutter/material.dart'; import 'screens/SignUpScreen.dart'; -//import 'package:pohnpeian_language_app/screens/pages/home.dart'; -import 'package:pohnpeian_language_app/screens/pages/home.dart'; + //import 'screens/pages/result_page.dart'; import 'package:firebase_core/firebase_core.dart'; diff --git a/app/lib/screens/ExploreScreen.dart b/app/lib/screens/ExploreScreen.dart index 55adac7..c71181e 100644 --- a/app/lib/screens/ExploreScreen.dart +++ b/app/lib/screens/ExploreScreen.dart @@ -13,7 +13,7 @@ class ExploreScreen extends StatelessWidget { appBar: AppBar( title: const Text('Explore Screen', style: customStyle.appBarText), - backgroundColor: customStyle.light, + backgroundColor: Color.fromARGB(255, 117, 178, 221), ), body: GridView.count( primary: false, @@ -58,7 +58,7 @@ class ExploreScreen extends StatelessWidget { Container( alignment: Alignment.center, child: const Text( - 'wildlife', + 'Wildlife', style: TextStyle( color: Colors.white, fontWeight: FontWeight.bold, diff --git a/app/lib/screens/ProfileScreen.dart b/app/lib/screens/ProfileScreen.dart index 1212e39..e0bc5b0 100644 --- a/app/lib/screens/ProfileScreen.dart +++ b/app/lib/screens/ProfileScreen.dart @@ -12,9 +12,10 @@ class _ProfileScreenState extends State { @override Widget build(BuildContext context) { return Scaffold( - appBar: AppBar(title: Text("Profile") - //title: Text(widget.title, style: custom_style.appBarText), - //backgroundColor: custom_style.light), + // ignore: prefer_const_constructors + appBar: AppBar(title: Text("Profile"), + backgroundColor: Color.fromARGB(255, 117, 178, 221), + ), body: Column( mainAxisAlignment: MainAxisAlignment.center, @@ -25,11 +26,14 @@ class _ProfileScreenState extends State { child: CircleAvatar( backgroundImage: NetworkImage( "https://static.vecteezy.com/system/resources/thumbnails/003/337/584/small/default-avatar-photo-placeholder-profile-icon-vector.jpg"))), - Text("NAME"), + Text("USERNAME"), Container( margin: EdgeInsets.all(30), + // ignore: prefer_const_constructors child: Text( - "BIO: Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")), + "BIO: This is where the profile would be. " + "This is would hold the users information as well as the settings area of the app. " + "This would keep statistics such as your streaks and could even show proficiencies.") ), TextButton(onPressed: () { final docUser = FirebaseFirestore.instance .collection('Users') @@ -39,7 +43,7 @@ class _ProfileScreenState extends State { 'name': '', }); - }, child: Text("Delete Account")), + }, child: Text(" Delete Account ")), ], )); } diff --git a/app/lib/screens/SignUpScreen.dart b/app/lib/screens/SignUpScreen.dart index 106a4b6..3d37c77 100644 --- a/app/lib/screens/SignUpScreen.dart +++ b/app/lib/screens/SignUpScreen.dart @@ -28,18 +28,18 @@ class User{ // Holds user data, just holds name as of right now class SignUpPage extends StatelessWidget { const SignUpPage({Key? key}) : super(key: key); - static const String _title = "Pweek"; + static const String _title = "Welcome to Pweek"; static const Color a1 = Color.fromRGBO(117, 178, 221, .5); static const Color a2 = Color.fromRGBO(117, 178, 221, .75); static const Color a3 = Color.fromRGBO(117, 178, 221, 1.0); - static const Color b1 = Color.fromRGBO(45, 211, 111, .5); - static const Color b2 = Color.fromRGBO(45, 211, 111, .75); - static const Color b3 = Color.fromRGBO(45, 211, 111, 1.0); + static const Color b1 = Color.fromRGBO(45, 211, 112, .5); + static const Color b2 = Color.fromRGBO(45, 211, 112, .75); + static const Color b3 = Color.fromRGBO(45, 211, 112, 1.0); static const Color c1 = Color.fromRGBO(38, 77, 105, .5); static const Color c2 = Color.fromRGBO(38, 77, 105, .75); static const Color c3 = Color.fromRGBO(38, 77, 105, 1.0); static const Color d = Color.fromRGBO(146, 148, 156, 1.0); - static const Color background = Color.fromRGBO(255, 100, 100, 1.0); + static const background = Color.fromARGB(219, 39, 183, 196); @override Widget build(BuildContext context) { @@ -78,14 +78,14 @@ class _SignUpPage extends State { static const a1 = Color.fromRGBO(117, 178, 221, .5); static const a2 = Color.fromRGBO(117, 178, 221, .75); static const a3 = Color.fromRGBO(117, 178, 221, 1.0); - static const b1 = Color.fromRGBO(45, 211, 111, .5); - static const b2 = Color.fromRGBO(45, 211, 111, .75); - static const b3 = Color.fromRGBO(45, 211, 111, 1.0); + static const b1 = Color.fromRGBO(45, 211, 112, .5); + static const b2 = Color.fromRGBO(45, 211, 112, .75); + static const b3 = Color.fromRGBO(45, 211, 112, 1.0); static const c1 = Color.fromRGBO(38, 77, 105, .5); static const c2 = Color.fromRGBO(38, 77, 105, .75); static const c3 = Color.fromRGBO(38, 77, 105, 1.0); static const d = Color.fromRGBO(146, 148, 156, 1.0); - static const background = Color.fromRGBO(255, 100, 100, 1.0); + static const background = Color.fromARGB(219, 39, 183, 196); @override Widget build(BuildContext context) { @@ -132,7 +132,7 @@ class _SignUpPage extends State { controller: passwordController, decoration: const InputDecoration( border: OutlineInputBorder(), - labelText: 'Password', + labelText: 'Password ', labelStyle: TextStyle(color: Colors.black), ), ), diff --git a/app/lib/screens/WelcomeScreen.dart b/app/lib/screens/WelcomeScreen.dart index efa136b..abba00b 100644 --- a/app/lib/screens/WelcomeScreen.dart +++ b/app/lib/screens/WelcomeScreen.dart @@ -8,11 +8,11 @@ import 'package:pohnpeian_language_app/data/user.dart'; class WelcomePage extends StatelessWidget { const WelcomePage({Key? key}) : super(key: key); - static const Color a = Color.fromRGBO(255, 50, 50, 1.0); - static const Color b = Color.fromRGBO(255, 50, 50, .75); - static const Color c = Color.fromRGBO(255, 50, 50, .5); - static const Color d = Color.fromRGBO(255, 50, 50, .25); - static const Color background = Color.fromRGBO(255, 100, 100, 1.0); + static const Color a = Color.fromARGB(255, 117, 178, 221); + static const Color b = Color.fromARGB(255, 117, 178, 221); + static const Color c = Color.fromARGB(255, 117, 178, 221); + static const Color d = Color.fromARGB(255, 117, 178, 221); + static const Color backgroundColor = Color.fromARGB(255, 117, 178, 221); @override Widget build(BuildContext context) { @@ -20,7 +20,7 @@ class WelcomePage extends StatelessWidget { home: Scaffold( appBar: AppBar(backgroundColor: (c), centerTitle: true), body: const WelcomeState(), - backgroundColor: (background), + backgroundColor: (Color.fromARGB(255, 117, 178, 221)), ), ); } diff --git a/app/lib/screens/loginPage.dart b/app/lib/screens/loginPage.dart index a618c12..837763e 100644 --- a/app/lib/screens/loginPage.dart +++ b/app/lib/screens/loginPage.dart @@ -5,12 +5,12 @@ import 'SignUpScreen.dart'; class LoginPage extends StatelessWidget { const LoginPage({Key? key}) : super(key: key); - static const String _title = "Name pending"; - static const Color a = Color.fromRGBO(255, 50, 50, 1.0); - static const Color b = Color.fromRGBO(255, 50, 50, .75); - static const Color c = Color.fromRGBO(255, 50, 50, .5); - static const Color d = Color.fromRGBO(255, 50, 50, .25); - static const Color background = Color.fromRGBO(255, 100, 100, 1.0); + static const String _title = "Welcome to Pweek"; + static const Color a = Color.fromRGBO(45, 211, 112, .5); + static const Color b = Color.fromRGBO(45, 211, 112, .75); + static const Color c = Color.fromRGBO(45, 211, 112, 1.0); + static const Color d = Color.fromARGB(255, 65, 213, 236); + static const Color background = Color.fromARGB(255, 30, 216, 240); @override Widget build(BuildContext context) { @@ -37,11 +37,13 @@ class LoginPageState extends StatefulWidget { class _LoginPage extends State { TextEditingController nameController = TextEditingController(); TextEditingController passwordController = TextEditingController(); - - static const Color a = Color.fromRGBO(255, 50, 50, 1.0); - static const Color b = Color.fromRGBO(255, 50, 50, .75); - static const Color c = Color.fromRGBO(255, 50, 50, .5); - static const Color d = Color.fromRGBO(255, 50, 50, .25); + + //The login button color + static const Color a = Color.fromRGBO(45, 211, 112, 1.0); + static const Color b = Color.fromRGBO(45, 211, 112, 1.0); + //Sign up button color + static const Color c = Color.fromRGBO(45, 211, 112, 1.0); + static const Color d = Color.fromRGBO(45, 211, 112, 1.0); @override Widget build(BuildContext context) { @@ -87,7 +89,7 @@ class _LoginPage extends State { controller: passwordController, decoration: const InputDecoration( border: OutlineInputBorder(), - labelText: 'Password', + labelText: 'Password ', labelStyle: TextStyle(color: Colors.black), ), ),