Skip to content

Aboubakr #18

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.

Sign up for GitHub

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

Open
lahcenbcf wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Aboubakr #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bd475ed
Merge branch 'master' of https://github.com/lahcenbcf/flutter2cpiApp …
AboubakrLaid Mar 12, 2023
bfe5e02
fixing some issues in login page
AboubakrLaid Mar 12, 2023
29839a6
fixing some issues in login page
AboubakrLaid Mar 12, 2023
34398b8
fixing responsivity issues in Log in page
AboubakrLaid Mar 12, 2023
67b26c4
adding new password page fully responsive
AboubakrLaid Mar 22, 2023
07c2e40
.
AboubakrLaid Mar 22, 2023
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
Binary file added lib/images/checked.png
View file
Open in desktop
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 lib/images/white_logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 14 additions & 9 deletions lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import 'package:flluter2cpi/pages/Login_page/components/guest_box_view_model.dart';
import 'package:flluter2cpi/pages/New_password/new_password_vm.dart';
import 'package:flluter2cpi/pages/School_year/school_year_view_model.dart';
import 'package:flluter2cpi/pages/Sign_up/sign_up_view.dart';
import 'package:flluter2cpi/pages/Login_page/login.dart';
import 'package:flluter2cpi/pages/Sign_up/sign_up_view_model.dart';
import 'package:flluter2cpi/pages/Login_page/view_model.dart';
import 'package:flluter2cpi/routes.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:provider/provider.dart';

import 'pages/New_password/new_password_v.dart';

void main() {
runApp(const MyApp());
}
Expand All @@ -34,16 +35,20 @@ class MyApp extends StatelessWidget {
),
ChangeNotifierProvider(
create: (context) => View(),
)
),
ChangeNotifierProvider(
create: (context) => NewPasswordViewModel(),
),
],
builder: (context, child) {
return MaterialApp(
debugShowCheckedModeBanner: false,
theme: ThemeData(useMaterial3: true),
routes: generateRoutes(context),
home:const SafeArea(
child: SignUp(),
));
debugShowCheckedModeBanner: false,
theme: ThemeData(useMaterial3: true),
routes: generateRoutes(context),
home: const SafeArea(
child: NewPassword(),
),
);
});
});
}
Expand Down
58 changes: 28 additions & 30 deletions lib/pages/Login_page/components/guest_box_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,40 +37,38 @@ class GuestBox extends StatelessWidget {
child: SingleChildScrollView(
child: Column(
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 15.0).w,
child: Material(
color: Colors.transparent,
child: Form(
autovalidateMode: AutovalidateMode.onUserInteraction,
child: TextFormField(
controller: state.fullNameController,
validator: (value) => state.nameValidator(value),
textCapitalization: TextCapitalization.words,
keyboardType: TextInputType.name,
Material(
color: Colors.transparent,
child: Form(
autovalidateMode: AutovalidateMode.onUserInteraction,
child: TextFormField(
controller: state.fullNameController,
validator: (value) => state.nameValidator(value),
textCapitalization: TextCapitalization.words,
keyboardType: TextInputType.name,

cursorColor: Colors.black,

decoration: InputDecoration(
fillColor: const Color.fromRGBO(239, 238, 238, 1),
filled: true,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(10.r),
),
cursorColor: Colors.black,

decoration: InputDecoration(
contentPadding: EdgeInsets.only(left: 12.w, top: 14.h, bottom: 14.h),
fillColor: const Color.fromRGBO(239, 238, 238, 1),
filled: true,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(10.r),
),

focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(10.r),
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(10.r),
),

hintText: "Full name",
suffixIcon: Icon(
FluentIcons.person_12_filled,
size: iconSize,
color: Colors.black,
),
hintStyle:
const TextStyle(color: Color.fromRGBO(0, 0, 0, 0.61)),
hintText: "Full name",
suffixIcon: Icon(
FluentIcons.person_12_filled,
size: iconSize,
color: Colors.black,
),
hintStyle:
const TextStyle(color: Color.fromRGBO(0, 0, 0, 0.61)),
),
),
),
Expand Down
Loading