Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

23/3 #2

Open
wants to merge 1 commit into
base: cardstitle
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.thefinalproject">
<uses-permission android:name="android.permission.INTERNET" />
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
calls FlutterMain.startInitialization(this); in its onCreate method.
In most cases you can leave this as-is, but you if you want to provide
Expand Down
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/111111111.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
74 changes: 74 additions & 0 deletions lib/All_Screens.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
import 'package:thefinalproject/Custom_Widgets.dart';


class AllScreens extends StatefulWidget {
@override
_AllScreensState createState() => _AllScreensState();
}

class _AllScreensState extends State<AllScreens> {
@override
Widget build(BuildContext context) {
return Scaffold(
body: SafeArea(
child: Center(
child: Padding(padding: EdgeInsets.symmetric(vertical: 100),
child: Column(
children: [
FlatButton(onPressed: (){
Navigator.of(context).push(
MaterialPageRoute(
builder: (_) => SignInscreen()));
}, child: Text('SignInScreen'),color: Colors.redAccent,),


FlatButton(onPressed: (){
Navigator.of(context).push(
MaterialPageRoute(
builder: (_) => Signup()));
}, child: Text('Signup'),color: Colors.redAccent,),


FlatButton(onPressed: (){
Navigator.of(context).push(
MaterialPageRoute(
builder: (_) => Settings()));
}, child: Text('Settings'),color: Colors.redAccent,),


FlatButton(onPressed: (){
Navigator.of(context).push(
MaterialPageRoute(
builder: (_) => About()));
}, child: Text('About'),color: Colors.redAccent,),


FlatButton(onPressed: (){
Navigator.of(context).push(
MaterialPageRoute(
builder: (_) => Splash()));
}, child: Text('SplashScreen'),color: Colors.redAccent,),


FlatButton(onPressed: (){
Navigator.of(context).push(
MaterialPageRoute(
builder: (_) => Products()));
}, child: Text('AllProducts'),color: Colors.redAccent,),


FlatButton(onPressed: (){
Navigator.of(context).push(
MaterialPageRoute(
builder: (_) => ChangePassword()));
}, child: Text('ChangePassword'),color: Colors.redAccent,),


],
),
),
),
),
);
}
}
19 changes: 19 additions & 0 deletions lib/Custom_Widgets.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
export 'package:flutter/material.dart';
export 'package:thefinalproject/src/Screens/About.dart';
export 'package:thefinalproject/src/Screens/Auth/Confirmation.dart';
export 'package:thefinalproject/src/Screens/Auth/Change_Password.dart';
export 'dart:async';
export 'package:flutter/material.dart';
export 'package:pin_code_fields/pin_code_fields.dart';
export 'package:thefinalproject/src/Screens/Auth/Register.dart';
export 'package:thefinalproject/src/Screens/Auth/sign_in_screen.dart';
export 'package:thefinalproject/src/Screens/Settings/Settings.dart';
export 'package:thefinalproject/src/Screens/Shop/Category.dart';
export 'package:thefinalproject/src/Screens/splash_screen.dart';
export 'package:flutter/services.dart';
export 'Drawer.dart';
export 'package:thefinalproject/All_Screens.dart';
export 'package:country_icons/country_icons.dart';
export 'package:thefinalproject/constants.dart';
export 'package:thefinalproject/mylisttile.dart';
export 'package:thefinalproject/src/Screens/Auth/ForgotPassword.dart';
31 changes: 14 additions & 17 deletions lib/Drawer.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
import 'package:flutter/material.dart';
import 'package:thefinalproject/src/Screens/Auth/sign_in_screen.dart';
import 'package:thefinalproject/src/Screens/Settings/Settings.dart';
import 'package:thefinalproject/mylisttile.dart';
import 'package:thefinalproject/src/Screens/About.dart';
import 'package:thefinalproject/Custom_Widgets.dart';

class SideBar extends StatefulWidget {
@override
Expand Down Expand Up @@ -34,13 +30,11 @@ class _SideBarState extends State<SideBar> {
icon: Icon(
Icons.settings,
color: Colors.redAccent,

),
),
text: 'Settings',
onTap: () {
print("onclick");
Navigator.of(context).pushReplacement(
Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => Settings(),
),
Expand Down Expand Up @@ -77,17 +71,20 @@ class _SideBarState extends State<SideBar> {
text: 'My Activities',
onTap: () {},
),
GestureDetector(
child: MyListTile(
myicon: IconButton(
icon: Icon(
Icons.info,
color: Colors.redAccent,
),
MyListTile(
myicon: IconButton(
icon: Icon(
Icons.info,
color: Colors.redAccent,
),
text: 'About',

),
text: 'About',
onTap: (){
Navigator.of(context).push(MaterialPageRoute(
builder: (_) => About(),
));
},

),
Padding(
padding: EdgeInsets.only(top: h * 0.19),
Expand Down
2 changes: 1 addition & 1 deletion lib/constants.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
const kAppbarSizeText=TextStyle(fontSize: 20,fontWeight: FontWeight.bold,color: Colors.white,);
const kCardTextStyle=TextStyle(fontSize: 15,color: Colors.black,);
const kTextFlagStyle=TextStyle(fontSize: 23,fontWeight: FontWeight.bold,letterSpacing: 2.5);
const kTextFlagStyle=TextStyle(fontSize: 23,fontWeight: FontWeight.bold,);
Loading