bugs fixed

This commit is contained in:
meet2711
2024-06-20 15:32:56 +05:30
parent 8ad120714f
commit 6964668987
23 changed files with 369 additions and 906 deletions

View File

@@ -10,8 +10,9 @@ class ChangePasswordLayout extends StatelessWidget {
@override
Widget build(BuildContext context) {
return const Scaffold(
backgroundColor: AppColor.plainWhite,
bottomNavigationBar: RestorePasswordBottomSection(),
body: RestorePasswordForm());
backgroundColor: AppColor.plainWhite,
body: RestorePasswordForm(),
bottomNavigationBar: RestorePasswordBottomSection(),
);
}
}

View File

@@ -1,9 +1,10 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:google_fonts/google_fonts.dart';
import '../../../../core/styles/app_color.dart';
import '../../../../core/styles/app_text.dart';
import '../../../../shared/components/appbar_widget.dart';
import '../bloc/change_password_bloc.dart';
import 'change_password_layout.dart';
@@ -14,9 +15,19 @@ class ChangePasswordScreen extends StatelessWidget {
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: AppColor.plainWhite,
appBar: const AppBarWidget(
height: 75,
titleTxt: AppText.changePasswordText,
appBar: AppBar(
backgroundColor: Colors.white,
elevation: 0,
scrolledUnderElevation: 0.0,
centerTitle: true,
title: Text(
AppText.changePasswordText,
style: GoogleFonts.dmSans(
color: const Color(0xFF272727),
fontSize: 20.sp,
fontWeight: FontWeight.w700,
),
),
),
resizeToAvoidBottomInset: false,
body: MultiBlocProvider(

View File

@@ -9,7 +9,6 @@ import '../../../../core/routes/routes.dart';
import '../../../../core/styles/app_color.dart';
import '../../../../core/styles/app_text.dart';
import '../../../../shared/components/button_widget.dart';
import '../../../../shared/components/text_widget.dart';
import '../bloc/change_password_bloc.dart';
import '../bloc/change_password_event.dart';
import '../bloc/change_password_state.dart';
@@ -87,13 +86,15 @@ class RestorePasswordBottomSection extends StatelessWidget {
},
),
const Gap(5),
ButtonWidget().textBtn(
function: () {
goRouter.pop();
},
text: TextWidget().text14W700(AppText.backText,
clr: AppColor.textLabelColor,
textDecoration: TextDecoration.underline)),
ButtonWidget().textBorderBtn(
clr: Colors.white,
borderClr: AppColor.txtBorderColor,
function: () {
goRouter.pop();
},
text: AppText.cancelText,
),
const Gap(10),
],
);
}

View File

@@ -69,13 +69,14 @@ class RestorePasswordForm extends StatelessWidget {
Align(
alignment: Alignment.topRight,
child: ButtonWidget().textBtn(
function: () {
goRouter.pushNamed(
RouteName.forgotPasswordPhoneVerificationScreen);
},
text: TextWidget().text15W400(AppText.forgorPassword,
clr: AppColor.forgotPassButtonColor,
textDecoration: TextDecoration.underline)),
function: () {
goRouter.pushNamed(
RouteName.forgotPasswordPhoneVerificationScreen);
},
text: TextWidget().text15W400(AppText.forgotPassword,
clr: AppColor.forgotPassButtonColor,
textDecoration: TextDecoration.underline),
),
),
const Gap(20),
],