Skip to content

Commit

Permalink
Minor bug fixes + a few optimizations
Browse files Browse the repository at this point in the history
  • Loading branch information
@MohEsmail143
MohEsmail143 committed Jul 5, 2023
1 parent b14dead commit 1fc66be
Show file tree
Hide file tree
Showing 12 changed files with 783 additions and 747 deletions.
100 changes: 3 additions & 97 deletions lib/main.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:firebase_auth/firebase_auth.dart';
import 'package:coach_ai/welcom.dart';
import 'package:coach_ai/screens/welcome_screen.dart';
import 'firebase_options.dart';

import 'package:coach_ai/screens/IntroPage.dart';
Expand All @@ -26,15 +26,6 @@ class MyApp extends StatelessWidget {
title: 'Coach.ai',
theme: ThemeData(
textTheme: GoogleFonts.urbanistTextTheme(),
// This is the theme of your application.
//
// Try running your application with "flutter run". You'll see the
// application has a blue toolbar. Then, without quitting the app, try
// changing the primarySwatch below to Colors.green and then invoke
// "hot reload" (press "r" in the console where you ran "flutter run",
// or simply save your changes to "hot reload" in a Flutter IDE).
// Notice that the counter didn't reset back to zero; the application
// is not restarted.
primarySwatch: Colors.blue,
),
home: StreamBuilder(
Expand All @@ -43,96 +34,11 @@ class MyApp extends StatelessWidget {
if (snapshot.hasData) {
return const HomeScreen();
} else {
return welcom();
// return IntroPage();
return WelcomeScreen();
// return IntroPage();
}
},
),
);
}
}

class MyHomePage extends StatefulWidget {
const MyHomePage({Key? key, required this.title}) : super(key: key);

// This widget is the home page of your application. It is stateful, meaning
// that it has a State object (defined below) that contains fields that affect
// how it looks.

// This class is the configuration for the state. It holds the values (in this
// case the title) provided by the parent (in this case the App widget) and
// used by the build method of the State. Fields in a Widget subclass are
// always marked "final".

final String title;

@override
State<MyHomePage> createState() => _MyHomePageState();
}

class _MyHomePageState extends State<MyHomePage> {
int _counter = 0;

void _incrementCounter() {
setState(() {
// This call to setState tells the Flutter framework that something has
// changed in this State, which causes it to rerun the build method below
// so that the display can reflect the updated values. If we changed
// _counter without calling setState(), then the build method would not be
// called again, and so nothing would appear to happen.
_counter++;
});
}

@override
Widget build(BuildContext context) {
// This method is rerun every time setState is called, for instance as done
// by the _incrementCounter method above.
//
// The Flutter framework has been optimized to make rerunning build methods
// fast, so that you can just rebuild anything that needs updating rather
// than having to individually change instances of widgets.
return Scaffold(
appBar: AppBar(
// Here we take the value from the MyHomePage object that was created by
// the App.build method, and use it to set our appbar title.
title: Text(widget.title),
),
body: Center(
// Center is a layout widget. It takes a single child and positions it
// in the middle of the parent.
child: Column(
// Column is also a layout widget. It takes a list of children and
// arranges them vertically. By default, it sizes itself to fit its
// children horizontally, and tries to be as tall as its parent.
//
// Invoke "debug painting" (press "p" in the console, choose the
// "Toggle Debug Paint" action from the Flutter Inspector in Android
// Studio, or the "Toggle Debug Paint" command in Visual Studio Code)
// to see the wireframe for each widget.
//
// Column has various properties to control how it sizes itself and
// how it positions its children. Here we use mainAxisAlignment to
// center the children vertically; the main axis here is the vertical
// axis because Columns are vertical (the cross axis would be
// horizontal).
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
const Text(
'You have pushed the button this many times:',
),
Text(
'$_counter',
style: Theme.of(context).textTheme.headline4,
),
],
),
),
floatingActionButton: FloatingActionButton(
onPressed: _incrementCounter,
tooltip: 'Increment',
child: const Icon(Icons.add),
), // This trailing comma makes auto-formatting nicer for build methods.
);
}
}
52 changes: 31 additions & 21 deletions lib/screens/IntroPage.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,11 @@ class _IntroPageState extends State<IntroPage> {
children: <Widget>[
CarouselSlider(
items: [

_buildCarouselItem(

'assets/images/image3.jpg',
'Get fit and healthy',
'Track your workouts and stay motivated to reach your fitness goals.',

) ,
_buildCarouselItem(
'assets/images/image3.jpg',
'Get fit and healthy',
'Track your workouts and stay motivated to reach your fitness goals.',
),
_buildCarouselItem(
'assets/images/emely.jpg',
'Join a community',
Expand Down Expand Up @@ -56,30 +53,43 @@ class _IntroPageState extends State<IntroPage> {
children: <Widget>[
ElevatedButton(
onPressed: () {

Navigator.push(context, MaterialPageRoute(builder: (context) => LoginScreen()));
Navigator.push(context,
MaterialPageRoute(builder: (context) => LoginScreen()));
},
child: Text('Login'),
style: ButtonStyle(
backgroundColor: MaterialStateProperty.all<Color>(Colors.green), // set the background color
padding: MaterialStateProperty.all<EdgeInsets>(EdgeInsets.all(20)), // set the padding
textStyle: MaterialStateProperty.all<TextStyle>(TextStyle(fontSize: 23)), // set the text style
backgroundColor: MaterialStateProperty.all<Color>(
Colors.green), // set the background color
padding: MaterialStateProperty.all<EdgeInsets>(
EdgeInsets.all(20)), // set the padding
textStyle: MaterialStateProperty.all<TextStyle>(
TextStyle(fontSize: 23)), // set the text style
fixedSize: MaterialStateProperty.all<Size>(Size(20, 50)),
shape: MaterialStateProperty.all<RoundedRectangleBorder>(RoundedRectangleBorder(borderRadius: BorderRadius.circular(10))), // set the shape
shape: MaterialStateProperty.all<RoundedRectangleBorder>(
RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(10))), // set the shape
),
),
SizedBox(height: 16),
OutlinedButton(
onPressed: () {
Navigator.push(context, MaterialPageRoute(builder: (context) => SignUpScreen()));
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => SignUpScreen()));
},
child: Text('Sign up',style: TextStyle(color: Colors.white)),
child: Text('Sign up', style: TextStyle(color: Colors.white)),
style: ButtonStyle(

padding: MaterialStateProperty.all<EdgeInsets>(EdgeInsets.all(20)), // set the padding
textStyle: MaterialStateProperty.all<TextStyle>(TextStyle(fontSize: 23)), // set the text style
padding: MaterialStateProperty.all<EdgeInsets>(
EdgeInsets.all(20)), // set the padding
textStyle: MaterialStateProperty.all<TextStyle>(
TextStyle(fontSize: 23)), // set the text style
fixedSize: MaterialStateProperty.all<Size>(Size(20, 50)),
shape: MaterialStateProperty.all<RoundedRectangleBorder>(RoundedRectangleBorder(borderRadius: BorderRadius.circular(10))), // set the shape
shape: MaterialStateProperty.all<RoundedRectangleBorder>(
RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(10))), // set the shape
),
),
],
Expand Down Expand Up @@ -127,4 +137,4 @@ class _IntroPageState extends State<IntroPage> {
),
);
}
}
}
Loading

0 comments on commit 1fc66be

Please sign in to comment.