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.

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

Jump to bottom

fix: Update Sign in UI #234

Merged
merged 4 commits into from
Jul 30, 2024
Merged

fix: Update Sign in UI #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
628ede9
fix:Update UI
Rushi67 Jul 28, 2024
d369e14
fix: updated logo on auth
Rushi67 Jul 28, 2024
61bd7c3
fix: signup and login page ui fixed
Niranjan-Dorage Jul 29, 2024
d25ee8c
fix: login signup fixed
Niranjan-Dorage Jul 30, 2024
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 modified assets/images/abhiyaan_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.
Binary file added assets/images/abhiyaan_logo1.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.
4 changes: 3 additions & 1 deletion lib/ui/views/auth/auth_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ class AuthView extends StatelessWidget {
children: [
Image(
width: double.infinity.w,
image: Image.asset(AssetImagePath.logoImg).image,
image: const AssetImage(
'assets/images/abhiyaan_logo1.png',
),
),
Image(image: Image.asset(AssetImagePath.login).image),
],
Expand Down
65 changes: 47 additions & 18 deletions lib/ui/views/auth/register/register_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,36 +33,65 @@ class RegisterView extends StatelessWidget {
child: Column(
children: [
Container(
margin: const EdgeInsets.symmetric(
horizontal: 30, vertical: 50),
width: 320.w,
child: Image.asset(
AssetImagePath.logoImg,
),
).animate(delay: 200.ms).fadeIn(
decoration: BoxDecoration(
boxShadow: [
BoxShadow(
color: context.colorScheme.primary,
spreadRadius: -45,
blurRadius: 70.0, // Adjust for desired fade
),
],
),
child: SizedBox(
width: 200.w,
height: 200.h,
child: Image.asset(
AssetImagePath.logoImg,
),
)).animate(delay: 100.ms).fadeIn(
delay: 100.ms,
curve: Curves.easeInOut,
duration: 700.ms,
),
30.verticalSpace,
Text("Abhiyaan",
textAlign: TextAlign.center,
style: FontThemeClass().header(
context,
)).animate(delay: 100.ms).fadeIn(
delay: 200.ms,
curve: Curves.easeInOut,
duration: 500.ms,
),
Text("Connect with Students, Teachers & Alumni",
textAlign: TextAlign.center,
style: FontThemeClass().body(
context,
color: context.colorScheme.secondaryText,
fontWeight: FontWeight.w500,
)).animate(delay: 200.ms).fadeIn(
delay: 100.ms,
curve: Curves.easeInOut,
duration: 500.ms,
),
40.verticalSpace,
TextFormField(
keyboardType: TextInputType.emailAddress,
cursorColor: context.colorScheme.accentColor,
controller: model.emailIdTextController,
decoration: InputDecoration(
contentPadding: const EdgeInsets.symmetric(
horizontal: 15, vertical: 15)
horizontal: 30, vertical: 15)
.r,
border: OutlineInputBorder(
borderRadius: BorderRadius.all(
const Radius.circular(15).r,
const Radius.circular(150).r,
),
borderSide: BorderSide.none,
),
fillColor: context.colorScheme.card,
filled: true,
focusColor: context.colorScheme.card,
hintText: 'Student Email ID',
hintText: 'Email ID',
errorText:
model.isEmailIdValid ? null : model.emailIdErrorText,
hintStyle: model.fontTheme.caption(
Expand All @@ -82,18 +111,18 @@ class RegisterView extends StatelessWidget {
controller: model.userNameController,
decoration: InputDecoration(
contentPadding: const EdgeInsets.symmetric(
horizontal: 15, vertical: 15)
horizontal: 30, vertical: 15)
.r,
border: OutlineInputBorder(
borderRadius: BorderRadius.all(
const Radius.circular(15).r,
const Radius.circular(150).r,
),
borderSide: BorderSide.none,
),
fillColor: context.colorScheme.card,
filled: true,
focusColor: context.colorScheme.card,
hintText: 'Enter Username',
hintText: 'Username',
errorText:
model.isEmailIdValid ? null : model.emailIdErrorText,
hintStyle: model.fontTheme.caption(
Expand All @@ -115,11 +144,11 @@ class RegisterView extends StatelessWidget {
obscureText: model.isCreatePasswordVisible ? false : true,
decoration: InputDecoration(
contentPadding: const EdgeInsets.symmetric(
horizontal: 15, vertical: 15)
horizontal: 30, vertical: 15)
.r,
border: OutlineInputBorder(
borderRadius: BorderRadius.all(
const Radius.circular(15).r,
const Radius.circular(150).r,
),
borderSide: BorderSide.none),
fillColor: context.colorScheme.card,
Expand Down Expand Up @@ -160,11 +189,11 @@ class RegisterView extends StatelessWidget {
obscureText: model.isConfirmPasswordVisible ? false : true,
decoration: InputDecoration(
contentPadding: const EdgeInsets.symmetric(
horizontal: 15, vertical: 15)
horizontal: 30, vertical: 15)
.r,
border: OutlineInputBorder(
borderRadius: BorderRadius.all(
const Radius.circular(15).r,
const Radius.circular(150).r,
),
borderSide: BorderSide.none,
),
Expand Down
Loading