login screen improvement

design_3.0_latest
Sikander Saleem 1 year ago
parent bbcf093af3
commit 0131297029

@ -69,7 +69,7 @@ class AppColor {
static Color greenStatus(BuildContext context) => context.isDark ? const Color(0xff54C166) : green50; static Color greenStatus(BuildContext context) => context.isDark ? const Color(0xff54C166) : green50;
// static Color blueStatus(BuildContext context) => context.isDark ? primary40 : primary50; // static Color blueStatus(BuildContext context) => context.isDark ? primary40 : primary50;
static Color blueStatus(BuildContext context) => context.isDark ? primary40 : primary50; static Color blueStatus(BuildContext context) => context.isDark ? primary40 : primary10;
static Color redStatus(BuildContext context) => context.isDark ? const Color(0xffFFB6B8) : red30; static Color redStatus(BuildContext context) => context.isDark ? const Color(0xffFFB6B8) : red30;

@ -1,4 +1,3 @@
import 'dart:developer';
import 'dart:io'; import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -24,7 +23,6 @@ import '../../../views/widgets/dialogs/dialog.dart';
import '../../common_widgets/app_bottom_nav_bar.dart'; import '../../common_widgets/app_bottom_nav_bar.dart';
import '../../common_widgets/app_drawer.dart'; import '../../common_widgets/app_drawer.dart';
import 'contact_us_bottom_sheet.dart'; import 'contact_us_bottom_sheet.dart';
import 'dashboard_page.dart';
class LandPage extends StatefulWidget { class LandPage extends StatefulWidget {
static const String routeName = "/land-page"; static const String routeName = "/land-page";

@ -219,18 +219,10 @@ class _LoginPageState extends State<LoginPage> {
// }, // },
// backgroundColor: context.isDark ? AppColor.primary80 : AppColor.primary80), // backgroundColor: context.isDark ? AppColor.primary80 : AppColor.primary80),
context.translation.signInToYour.customHeadingText(context).custom( context.translation.signInToYour.customHeadingText(context).custom(color: Colors.white, fontSize: 27, fontWeight: FontWeight.w500),
color: AppColor.white20, context.translation.account.customHeadingText(context).custom(color: Colors.white, fontSize: 27, fontWeight: FontWeight.w500),
),
context.translation.account.customHeadingText(context).custom(
color: AppColor.white20,
),
25.height, 25.height,
context.translation.letSignInToAccount.customHeadingText(context).custom( context.translation.letSignInToAccount.customHeadingText(context).custom(color: Colors.white, fontWeight: FontWeight.w500, fontSize: 12),
color: AppColor.white20,
fontWeight: FontWeight.w500,
fontSize: 12,
),
], ],
), ),
), ),
@ -248,9 +240,11 @@ class _LoginPageState extends State<LoginPage> {
backgroundColor: AppColor.white20, backgroundColor: AppColor.white20,
validator: (value) => Validator.hasValue(value!) ? null : context.translation.requiredField, validator: (value) => Validator.hasValue(value!) ? null : context.translation.requiredField,
labelText: context.translation.username, labelText: context.translation.username,
style: TextStyle(fontWeight: FontWeight.w500, fontSize: 12, color: Color(0xff3B3D4A)),
labelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: 11, color: Color(0xff767676)),
textInputType: TextInputType.text, textInputType: TextInputType.text,
showWithoutDecoration: true, showWithoutDecoration: true,
contentPadding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 20.toScreenHeight), contentPadding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 12.toScreenHeight),
onSaved: (value) { onSaved: (value) {
_user.userName = value; _user.userName = value;
}, },
@ -261,7 +255,9 @@ class _LoginPageState extends State<LoginPage> {
showWithoutDecoration: true, showWithoutDecoration: true,
labelText: context.translation.password, labelText: context.translation.password,
backgroundColor: AppColor.white20, backgroundColor: AppColor.white20,
contentPadding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 20.toScreenHeight), style: TextStyle(fontWeight: FontWeight.w500, fontSize: 12, color: Color(0xff3B3D4A)),
labelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: 11, color: Color(0xff767676)),
contentPadding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 12.toScreenHeight),
obscureText: true, obscureText: true,
validator: (value) => Validator.isValidPassword(value!) validator: (value) => Validator.isValidPassword(value!)
? null ? null
@ -272,21 +268,22 @@ class _LoginPageState extends State<LoginPage> {
_user.password = value; _user.password = value;
}, },
), ),
16.height, 8.height,
Align( // Align(
alignment: AlignmentDirectional.centerEnd, // alignment: AlignmentDirectional.centerEnd,
child: InkWell( // child: InkWell(
onTap: () { // onTap: () {
/// TODO [zaid] : push to another screen // /// TODO [zaid] : push to another screen
}, // },
child: context.translation.forgotPassword.bodyText(context).custom(color: AppColor.primary10, fontWeight: FontWeight.w500), // child: context.translation.forgotPassword.bodyText(context).custom(color: AppColor.primary10, fontWeight: FontWeight.w500),
), // ),
), // ),
Row( Row(
children: [ children: [
Checkbox( Checkbox(
value: rememberMe, value: rememberMe,
activeColor: AppColor.blueStatus(context), activeColor: AppColor.blueStatus(context),
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
onChanged: (value) { onChanged: (value) {
setState(() { setState(() {
rememberMe = value!; rememberMe = value!;

Loading…
Cancel
Save