Skip to content

Commit

Permalink
begin standardizing visuals
Browse files Browse the repository at this point in the history
  • Loading branch information
@Wsutton424
Wsutton424 committed Dec 3, 2022
1 parent abc62bb commit c95e5f4
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 45 deletions.
14 changes: 7 additions & 7 deletions app/lib/data/catergories.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,26 @@ final categories = <Category>[
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',
),
Expand Down
3 changes: 1 addition & 2 deletions app/lib/main.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions app/lib/screens/ExploreScreen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
16 changes: 10 additions & 6 deletions app/lib/screens/ProfileScreen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ class _ProfileScreenState extends State<ProfileScreen> {
@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,
Expand All @@ -25,11 +26,14 @@ class _ProfileScreenState extends State<ProfileScreen> {
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')
Expand All @@ -39,7 +43,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
'name': '',
});

}, child: Text("Delete Account")),
}, child: Text(" Delete Account ")),
],
));
}
Expand Down
20 changes: 10 additions & 10 deletions app/lib/screens/SignUpScreen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -78,14 +78,14 @@ class _SignUpPage extends State<SignUpPageState> {
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) {
Expand Down Expand Up @@ -132,7 +132,7 @@ class _SignUpPage extends State<SignUpPageState> {
controller: passwordController,
decoration: const InputDecoration(
border: OutlineInputBorder(),
labelText: 'Password',
labelText: 'Password ',
labelStyle: TextStyle(color: Colors.black),
),
),
Expand Down
12 changes: 6 additions & 6 deletions app/lib/screens/WelcomeScreen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ 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) {
return MaterialApp(
home: Scaffold(
appBar: AppBar(backgroundColor: (c), centerTitle: true),
body: const WelcomeState(),
backgroundColor: (background),
backgroundColor: (Color.fromARGB(255, 117, 178, 221)),
),
);
}
Expand Down
26 changes: 14 additions & 12 deletions app/lib/screens/loginPage.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -37,11 +37,13 @@ class LoginPageState extends StatefulWidget {
class _LoginPage extends State<LoginPageState> {
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) {
Expand Down Expand Up @@ -87,7 +89,7 @@ class _LoginPage extends State<LoginPageState> {
controller: passwordController,
decoration: const InputDecoration(
border: OutlineInputBorder(),
labelText: 'Password',
labelText: 'Password ',
labelStyle: TextStyle(color: Colors.black),
),
),
Expand Down

0 comments on commit c95e5f4

Please sign in to comment.