Haroon6138
/
car_common_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mirza_development' into 'master'

Browse Source 
Mirza development

See merge request mirza.shafique/car_common_app!4
merge-requests/5/merge
Mirza Shafique 2 years ago
parent ee24683504 86d352196d
commit 877907832d
10 changed files with 152 additions and 81 deletions
Show Stats Download Patch File Download Diff File

81
assets/langs/ar-SA.json
Unescape Escape View File

@ -7,7 +7,7 @@
"defineLicences": "تحديد الرخص", "defineLicences": "تحديد الرخص",
"dealershipSettings": "اعدادات البيع", "dealershipSettings": "اعدادات البيع",
"changePassword": "تغيير كلمة المرور", "changePassword": "تغيير كلمة المرور",
"retrievePassword" : "استرجاع كلمة المرور", "retrievePassword": "استرجاع كلمة المرور",
"changeEmail": "تغيير الايميل", "changeEmail": "تغيير الايميل",
"verify": "تحقق", "verify": "تحقق",
"verified": "تم التحقق", "verified": "تم التحقق",
@ -34,8 +34,8 @@
"editAccount": "تعديل الحساب", "editAccount": "تعديل الحساب",
"change": "تغيير", "change": "تغيير",
"verifyAccount": "التحقق من الحساب", "verifyAccount": "التحقق من الحساب",
"login" : "تسجيل دخول", "login": "تسجيل دخول",
"welcomeMessage" : "مرحبا", "welcomeMessage": "مرحبا",
"forgetPass": "نسيت كلمة المرور ؟", "forgetPass": "نسيت كلمة المرور ؟",
"enterPhoneNumber": "رقم جوال ", "enterPhoneNumber": "رقم جوال ",
"phoneNumberVerified": "تم التحقق من الجوال", "phoneNumberVerified": "تم التحقق من الجوال",
@ -43,37 +43,37 @@
"EnterPass": "ادخل كلمة المرور", "EnterPass": "ادخل كلمة المرور",
"alreadySigned": " تم تسجيل الدخول", "alreadySigned": " تم تسجيل الدخول",
"emailChangedSuccessfully": "تم تغيير الايميل بنجاح", "emailChangedSuccessfully": "تم تغيير الايميل بنجاح",
"passwordIsUpdated" : "تم تحجيث كلمة المرور", "passwordIsUpdated": "تم تحجيث كلمة المرور",
"passwordShouldContains" : "كلمة المرور يجب ان تحتوي على رمز رقم حرف كبير حرف صغير", "passwordShouldContains": "كلمة المرور يجب ان تحتوي على رمز رقم حرف كبير حرف صغير",
" successfullyRegistered": "تم التسجيل بنجاح", " successfullyRegistered": "تم التسجيل بنجاح",
"pleaseEnterSamePassword" : "ادخل كلمة مرور مطابقه", "pleaseEnterSamePassword": "ادخل كلمة مرور مطابقه",
"firstNameMandatory" : "ادخل الأسم الأول ", "firstNameMandatory": "ادخل الأسم الأول ",
"surnameNameMandatory" : "ادخل اسم العائله", "surnameNameMandatory": "ادخل اسم العائله",
"passwordNameMandatory" : "ادخل كلمة المرور", "passwordNameMandatory": "ادخل كلمة المرور",
"enterValidEmail" : "ادخل ايميل صحيح", "enterValidEmail": "ادخل ايميل صحيح",
"pleaseAcceptTerms" : "يجب الموافقه على الشروط", "pleaseAcceptTerms": "يجب الموافقه على الشروط",
"emailVerified" : "تم التحقق من الايميل بنجاح", "emailVerified": "تم التحقق من الايميل بنجاح",
"selectMethod" : "اختر", "selectMethod": "اختر",
"emailAddress" : "ايميل", "emailAddress": "ايميل",
"loginSelection" : "اختر", "loginSelection": "اختر",
"selectCountryCode" : "اختر رمز الدوله", "selectCountryCode": "اختر رمز الدوله",
"selectProviderRole" : "اختر نوع الخدمه", "selectProviderRole": "اختر نوع الخدمه",
"addPhoneNo" : "اضف الهاتف", "addPhoneNo": "اضف الهاتف",
"onlyCustomerApp": "نأسف هذا التطبيق فقط للعملاء", "onlyCustomerApp": "نأسف هذا التطبيق فقط للعملاء",
"imageUploaded" : "تم تحميل الصوره", "imageUploaded": "تم تحميل الصوره",
"fileLarger" : "1KB حجم الملف اكبر من", "fileLarger": "1KB حجم الملف اكبر من",
"account" : "الحساب", "account": "الحساب",
"edit" : "تعديل", "edit": "تعديل",
"imageDeleted" : "تم حذف الصوره", "imageDeleted": "تم حذف الصوره",
"dashboard" : "الصفحه الرئيسيه", "dashboard": "الصفحه الرئيسيه",
"termsOfService":"من خلال إنشاء حساب فإنك توافق على", "termsOfService": "من خلال إنشاء حساب فإنك توافق على",
"userInformation": "معلومات المتسخدم", "userInformation": "معلومات المتسخدم",
"faceRecognition": "تحقق مع بصمة الوجه", "faceRecognition": "تحقق مع بصمة الوجه",
"fingerPrint" : "تحقق مع بصمة الاصبع", "fingerPrint": "تحقق مع بصمة الاصبع",
"whatsapp": "تحقق مع Whatsapp", "whatsapp": "تحقق مع Whatsapp",
"SMS": "رسائل قصيره", "SMS": "رسائل قصيره",
"selectRole" : "حدد الدور", "selectRole": "حدد الدور",
"userRoleOrTitle" : "عنوان المستخدم", "userRoleOrTitle": "عنوان المستخدم",
"codeSentToEmail": "تم ارسال الرمز للايميل", "codeSentToEmail": "تم ارسال الرمز للايميل",
"number": "موبايل", "number": "موبايل",
"english": "English", "english": "English",
@ -134,18 +134,35 @@
"resend_code": "أعد إرسال الرمز", "resend_code": "أعد إرسال الرمز",
"check_code": "التحقق من الشفرة", "check_code": "التحقق من الشفرة",
"time_will_expire": "إعادة إرسال الرمز بتنسيق", "time_will_expire": "إعادة إرسال الرمز بتنسيق",
"sec" : "ثانية", "sec": "ثانية",
"providers": "الموفرون", "providers": "الموفرون",
"appointments": "تعيينات", "appointments": "تعيينات",
"home": "بيت", "home": "بيت",
"ads": "إعلانات", "ads": "إعلانات",
"settings": "إعدادات", "settings": "إعدادات",
"view_all": "مشاهدة الكل", "view_all": "مشاهدة الكل",
"my_active_Ads" : "إعلاناتي النشطة", "my_active_Ads": "إعلاناتي النشطة",
"recommended_ads": "الإعلانات الموصى بها", "recommended_ads": "الإعلانات الموصى بها",
"upcoming_appointment": "الموعد القادم", "upcoming_appointment": "الموعد القادم",
"my_service_providers": "مزودي الخدمة الجدد", "my_service_providers": "مزودي الخدمة الجدد",
"appointment_details": "تفاصيل الموعد", "appointment_details": "تفاصيل الموعد",
"no_city_available": "لا توجد مدينة متاحة لهذا البلد",
"branch_created": "تم إنشاء الفرع بنجاح",
"branch_updated": "تم تحديث الفرع بنجاح",
"branch_deleted": "تم حذف الفرع بنجاح",
"dashboard_main": "لوحة القيادة / الصفحة الرئيسية",
"logo_brand": "الشعار / العلامة التجارية",
"remove": "إزالة",
"no_branch": "لم يتم إضافة فرع حتى الآن",
"login_once": "الرجاء تسجيل الدخول مرة واحدة",
"defineLicenese": "تحميل التراخيص والشهادات",
"description": "وصف",
"attachFile": "أرفق ملف",
"branchLocation": "معلومات الفرع والموقع",
"tapToEdit": "انقر للتعديل",
"myServiceBranches": "فروع خدمتي",
"enter_licence_detail": "الرجاء إدخال تفاصيل السجلات التجارية وإرفاق صور الترخيص",
"country": "بلد",
"city": "مدينة",
"editServices": "تحرير الخدمات"
} }

21
assets/langs/en-US.json
Unescape Escape View File

@ -145,5 +145,24 @@
"recommended_ads": "Recommended Ads", "recommended_ads": "Recommended Ads",
"upcoming_appointment": "Upcoming Appointment", "upcoming_appointment": "Upcoming Appointment",
"my_service_providers": "My Recent Service Providers", "my_service_providers": "My Recent Service Providers",
"appointment_details": "Appointment Details" "appointment_details": "Appointment Details",
"no_city_available": "No City Available for this country",
"branch_created": "Branch is successfully created",
"branch_updated": "Branch is successfully Updated",
"branch_deleted": "Branch is successfully Deleted",
"dashboard_main": "Dashboard/Main Page",
"logo_brand": "Logo/Brand",
"remove": "Remove",
"no_branch": "No Branch Added Yet",
"login_once": "Please login once",
"defineLicenese": "Upload Licenses and Certificates",
"description": "Description",
"attachFile": "Attach File",
"branchLocation": "Branch info and Location",
"tapToEdit": "Tap to edit",
"myServiceBranches": "My Service Branches",
"enter_licence_detail": "Please enter the detail for commercial records and attach the license images",
"country": "country",
"city": "city",
"editServices": "Edit Services"
} }

4
lib/classes/consts.dart
Unescape Escape View File

@ -65,6 +65,10 @@ class GlobalConsts {
class MyAssets { class MyAssets {
//Banner
static String carBanner = "assets/images/bn_car.jpeg";
//NavBar Icons //NavBar Icons
static String homeIcon = "assets/icons/home_icon.svg"; static String homeIcon = "assets/icons/home_icon.svg";
static String announcementIcon = "assets/icons/anouncement_icon.svg"; static String announcementIcon = "assets/icons/anouncement_icon.svg";

7
lib/config/routes.dart
Unescape Escape View File

@ -21,6 +21,7 @@ import 'package:mc_common_app/views/user/login_with_password_page.dart';
// import 'package:mc_common_app/views/user/profile/profile_2_page.dart'; // import 'package:mc_common_app/views/user/profile/profile_2_page.dart';
// import 'package:mc_common_app/views/user/profile/profile_3_page.dart'; // import 'package:mc_common_app/views/user/profile/profile_3_page.dart';
import 'package:mc_common_app/views/user/register_page.dart'; import 'package:mc_common_app/views/user/register_page.dart';
import 'package:mc_common_app/views/user/register_provider_page.dart';
import 'package:mc_common_app/views/user/register_selection_page.dart'; import 'package:mc_common_app/views/user/register_selection_page.dart';
import 'package:mc_common_app/views/splash/splash_page.dart'; import 'package:mc_common_app/views/splash/splash_page.dart';
import 'package:mc_common_app/views/user/vertify_password_page.dart'; import 'package:mc_common_app/views/user/vertify_password_page.dart';
@ -31,7 +32,8 @@ class AppRoutes {
static const String splash = "/splash"; static const String splash = "/splash";
static const String registerSelection = "/registerSelection"; static const String registerSelection = "/registerSelection";
static const String loginVerifyAccount = "/loginVerifyAccount"; static const String loginVerifyAccount = "/loginVerifyAccount";
static const String register = "/register"; static const String registerCustomer = "/registerCustomer";
static const String registerProvider= "/registerProvider";
static const String forgetPassword = "/forgetPassword"; static const String forgetPassword = "/forgetPassword";
static const String loginVerification = "/loginVerification"; static const String loginVerification = "/loginVerification";
static const String loginWithPassword = "/loginWithPassword"; static const String loginWithPassword = "/loginWithPassword";
@ -59,7 +61,8 @@ class AppRoutes {
splash: (context) => const SplashPage(), splash: (context) => const SplashPage(),
registerSelection: (context) => RegisterSelectionPage(), registerSelection: (context) => RegisterSelectionPage(),
loginVerifyAccount: (context) => LoginVerifyAccountPage(), loginVerifyAccount: (context) => LoginVerifyAccountPage(),
register: (context) => RegisterPage(), registerCustomer: (context) => RegisterCustomerPage(),
registerProvider: (context) => RegisterProviderPage(),
forgetPassword: (context) => ForgetPasswordPage(), forgetPassword: (context) => ForgetPasswordPage(),
loginVerification: (context) => const LoginVerificationPage(), loginVerification: (context) => const LoginVerificationPage(),
loginWithPassword: (context) => LoginWithPassword(), loginWithPassword: (context) => LoginWithPassword(),

54
lib/view_models/user_view_model.dart
Unescape Escape View File

@ -1,6 +1,5 @@
import 'dart:convert'; import 'dart:convert';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -24,6 +23,7 @@ import 'package:mc_common_app/models/user/register_user.dart';
import 'package:mc_common_app/models/user/user.dart'; import 'package:mc_common_app/models/user/user.dart';
import 'package:mc_common_app/models/user/verify_email.dart'; import 'package:mc_common_app/models/user/verify_email.dart';
import 'package:mc_common_app/repositories/user_repo.dart'; import 'package:mc_common_app/repositories/user_repo.dart';
import 'package:mc_common_app/utils/enums.dart';
import 'package:mc_common_app/utils/navigator.dart'; import 'package:mc_common_app/utils/navigator.dart';
import 'package:mc_common_app/utils/shared_prefrence.dart'; import 'package:mc_common_app/utils/shared_prefrence.dart';
import 'package:mc_common_app/utils/utils.dart'; import 'package:mc_common_app/utils/utils.dart';
@ -143,14 +143,14 @@ class UserVM extends BaseVM {
} }
Future<void> performCompleteProfile( Future<void> performCompleteProfile(
BuildContext context, { BuildContext context, {
required String password, required String password,
required String confirmPassword, required String confirmPassword,
required String firstName, required String firstName,
required String lastName, required String lastName,
required String email, required String email,
required String? userId, required String? userId,
}) async { }) async {
if (Utils.passwordValidateStructure(password)) { if (Utils.passwordValidateStructure(password)) {
if (password == confirmPassword) { if (password == confirmPassword) {
Utils.showLoading(context); Utils.showLoading(context);
@ -320,7 +320,7 @@ class UserVM extends BaseVM {
} }
} }
Future<void> performBasicOtpLoginSelectionPage(BuildContext context, {required String userToken}) async { Future<void> performBasicOtpLoginSelectionPage(BuildContext context, {required String userToken, required AppType appType}) async {
Utils.showLoading(context); Utils.showLoading(context);
LoginPasswordRespModel user = await userRepo.loginV2OTP(userToken, "1"); LoginPasswordRespModel user = await userRepo.loginV2OTP(userToken, "1");
Utils.hideLoading(context); Utils.hideLoading(context);
@ -334,16 +334,30 @@ class UserVM extends BaseVM {
RegisterUserRespModel verifiedUser = RegisterUserRespModel.fromJson(jsonDecode(response2.body)); RegisterUserRespModel verifiedUser = RegisterUserRespModel.fromJson(jsonDecode(response2.body));
if (verifiedUser.messageStatus == 1) { if (verifiedUser.messageStatus == 1) {
User user = User.fromJson(jsonDecode(response2.body)); User user = User.fromJson(jsonDecode(response2.body));
if (user.data!.userInfo!.roleId == 4) {
AppState().setUser = user; if (appType == AppType.provider) {
SharedPrefManager.setUserToken(user.data!.accessToken ?? ""); if (user.data!.userInfo!.roleId == 5 || user.data!.userInfo!.roleId == 6) {
SharedPrefManager.setUserId(user.data!.userInfo!.userId ?? ""); AppState().setUser = user;
SharedPrefManager.setRefreshToken(user.data!.refreshToken ?? ""); SharedPrefManager.setUserToken(user.data!.accessToken ?? "");
SharedPrefManager.setData(jsonEncode(user.data!.userInfo!.toJson())); SharedPrefManager.setUserId(user.data!.userInfo!.userId ?? "");
navigateReplaceWithName(context, AppRoutes.dashboard); SharedPrefManager.setRefreshToken(user.data!.refreshToken ?? "");
} else { SharedPrefManager.setData(jsonEncode(user.data!.userInfo!.toJson()));
Utils.showToast navigateReplaceWithName(context, AppRoutes.dashboard);
("Sorry, Only Customer's can log in this app"); } else {
Utils.showToast("LocaleKeys.onlyProviderApp.tr()");
//("Sorry, Only Customer's can log in this app");
}
} else if (user.data!.userInfo!.roleId == 4) {
if (user.data!.userInfo!.roleId == 4) {
AppState().setUser = user;
SharedPrefManager.setUserToken(user.data!.accessToken ?? "");
SharedPrefManager.setUserId(user.data!.userInfo!.userId ?? "");
SharedPrefManager.setRefreshToken(user.data!.refreshToken ?? "");
SharedPrefManager.setData(jsonEncode(user.data!.userInfo!.toJson()));
navigateReplaceWithName(context, AppRoutes.dashboard);
} else {
Utils.showToast("Sorry, Only Customer's can log in this app");
}
} }
} else { } else {
Utils.showToast(verifiedUser.message ?? ""); Utils.showToast(verifiedUser.message ?? "");

9
lib/views/user/login_method_selection_page.dart
Unescape Escape View File

@ -18,6 +18,7 @@ class LoginMethodSelectionPage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
UserVM userVM = context.read<UserVM>(); UserVM userVM = context.read<UserVM>();
return Scaffold( return Scaffold(
appBar: CustomAppBar( isRemoveBackButton: true, title: LocaleKeys.log_in.tr()), appBar: CustomAppBar( isRemoveBackButton: true, title: LocaleKeys.log_in.tr()),
body: Container( body: Container(
@ -36,7 +37,7 @@ class LoginMethodSelectionPage extends StatelessWidget {
Expanded( Expanded(
child: ShowImageButton( child: ShowImageButton(
onClick: () { onClick: () {
userVM.performBasicOtpLoginSelectionPage(context, userToken: userToken); userVM.performBasicOtpLoginSelectionPage(context, userToken: userToken,appType: userVM.currentAppType);
}, },
title: LocaleKeys.fingerPrint.tr(), title: LocaleKeys.fingerPrint.tr(),
icon: icons + "ic_fingerprint.svg", icon: icons + "ic_fingerprint.svg",
@ -46,7 +47,7 @@ class LoginMethodSelectionPage extends StatelessWidget {
Expanded( Expanded(
child: ShowImageButton( child: ShowImageButton(
onClick: () { onClick: () {
userVM.performBasicOtpLoginSelectionPage(context, userToken: userToken); userVM.performBasicOtpLoginSelectionPage(context, userToken: userToken,appType: userVM.currentAppType);
}, },
title: LocaleKeys.faceRecognition.tr(), title: LocaleKeys.faceRecognition.tr(),
icon: icons + "ic_face.svg", icon: icons + "ic_face.svg",
@ -60,7 +61,7 @@ class LoginMethodSelectionPage extends StatelessWidget {
Expanded( Expanded(
child: ShowImageButton( child: ShowImageButton(
onClick: () { onClick: () {
userVM.performBasicOtpLoginSelectionPage(context, userToken: userToken); userVM.performBasicOtpLoginSelectionPage(context, userToken: userToken,appType: userVM.currentAppType);
}, },
title: LocaleKeys.SMS.tr(), title: LocaleKeys.SMS.tr(),
icon: icons + "ic_sms.svg", icon: icons + "ic_sms.svg",
@ -71,7 +72,7 @@ class LoginMethodSelectionPage extends StatelessWidget {
child: ShowImageButton( child: ShowImageButton(
onClick: () { onClick: () {
// navigateWithName(context, AppRoutes.dashboard); // navigateWithName(context, AppRoutes.dashboard);
userVM.performBasicOtpLoginSelectionPage(context, userToken: userToken); userVM.performBasicOtpLoginSelectionPage(context, userToken: userToken,appType: userVM.currentAppType);
}, },
title: LocaleKeys.whatsapp.tr(), title: LocaleKeys.whatsapp.tr(),
icon: icons + "ic_whatsapp.svg", icon: icons + "ic_whatsapp.svg",

8
lib/views/user/register_page.dart
Unescape Escape View File

@ -12,14 +12,14 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../theme/colors.dart'; import '../../theme/colors.dart';
class RegisterPage extends StatefulWidget { class RegisterCustomerPage extends StatefulWidget {
const RegisterPage({Key? key}) : super(key: key); const RegisterCustomerPage({Key? key}) : super(key: key);
@override @override
State<RegisterPage> createState() => _RegisterPageState(); State<RegisterCustomerPage> createState() => _RegisterPageState();
} }
class _RegisterPageState extends State<RegisterPage> { class _RegisterPageState extends State<RegisterCustomerPage> {
String phoneNum = "", countryCode = ""; String phoneNum = "", countryCode = "";
int role = 4, countryId = -1; int role = 4, countryId = -1;

8
lib/views/user/register_provider_page.dart
Unescape Escape View File

@ -18,14 +18,14 @@ import 'package:mc_common_app/widgets/tab/role_type_tab.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../../theme/colors.dart'; import '../../theme/colors.dart';
class RegisterPage extends StatefulWidget { class RegisterProviderPage extends StatefulWidget {
const RegisterPage({Key? key}) : super(key: key); const RegisterProviderPage({Key? key}) : super(key: key);
@override @override
State<RegisterPage> createState() => _RegisterPageState(); State<RegisterProviderPage> createState() => _RegisterPageState();
} }
class _RegisterPageState extends State<RegisterPage> { class _RegisterPageState extends State<RegisterProviderPage> {
String phoneNum = "", countryCode = ""; String phoneNum = "", countryCode = "";
int role = -1, countryId = -1; int role = -1, countryId = -1;

10
lib/views/user/register_selection_page.dart
Unescape Escape View File

@ -2,12 +2,15 @@ import 'package:mc_common_app/config/routes.dart';
import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/extensions/int_extensions.dart';
import 'package:mc_common_app/extensions/string_extensions.dart'; import 'package:mc_common_app/extensions/string_extensions.dart';
import 'package:mc_common_app/generated/locale_keys.g.dart'; import 'package:mc_common_app/generated/locale_keys.g.dart';
import 'package:mc_common_app/utils/enums.dart';
import 'package:mc_common_app/utils/navigator.dart'; import 'package:mc_common_app/utils/navigator.dart';
import 'package:mc_common_app/utils/utils.dart'; import 'package:mc_common_app/utils/utils.dart';
import 'package:mc_common_app/view_models/user_view_model.dart';
import 'package:mc_common_app/widgets/show_fill_button.dart'; import 'package:mc_common_app/widgets/show_fill_button.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:provider/provider.dart';
import '../../theme/colors.dart'; import '../../theme/colors.dart';
@ -16,6 +19,7 @@ class RegisterSelectionPage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
UserVM userVM = Provider.of(context, listen: false);
return Scaffold( return Scaffold(
body: Container( body: Container(
width: double.infinity, width: double.infinity,
@ -57,7 +61,11 @@ class RegisterSelectionPage extends StatelessWidget {
isFlatButton: true, isFlatButton: true,
txtColor: Colors.black, txtColor: Colors.black,
onPressed: () { onPressed: () {
navigateWithName(context, AppRoutes.register); if (userVM.currentAppType == AppType.customer) {
navigateWithName(context, AppRoutes.registerCustomer);
} else {
navigateWithName(context, AppRoutes.registerProvider);
}
}, },
), ),
10.height, 10.height,

31
lib/widgets/common_widgets/app_bar.dart
Unescape Escape View File

@ -71,6 +71,7 @@ class CustomAppBar extends StatelessWidget with PreferredSizeWidget {
final bool isRemoveBackButton; final bool isRemoveBackButton;
final String profileImageUrl; final String profileImageUrl;
final bool isDrawerEnabled; final bool isDrawerEnabled;
final VoidCallback? onTap;
const CustomAppBar({ const CustomAppBar({
Key? key, Key? key,
@ -84,6 +85,7 @@ class CustomAppBar extends StatelessWidget with PreferredSizeWidget {
this.elevation, this.elevation,
this.isTitleCenter, this.isTitleCenter,
this.titleColor, this.titleColor,
this.onTap,
}) : super(key: key); }) : super(key: key);
@override @override
@ -94,18 +96,21 @@ class CustomAppBar extends StatelessWidget with PreferredSizeWidget {
elevation: elevation ?? 0, elevation: elevation ?? 0,
centerTitle: isTitleCenter ?? true, centerTitle: isTitleCenter ?? true,
leading: isDrawerEnabled leading: isDrawerEnabled
? Row( ? InkWell(
children: [ onTap: onTap,
Image.asset( child: Row(
profileImageUrl, children: [
width: 34, Image.asset(
height: 34, profileImageUrl,
fit: BoxFit.fill, width: 34,
).toCircle(borderRadius: 100), height: 34,
10.width, fit: BoxFit.fill,
SvgPicture.asset(MyAssets.dashboardDrawerIcon), ).toCircle(borderRadius: 100),
], 10.width,
).paddingOnly(left: 21) SvgPicture.asset(MyAssets.dashboardDrawerIcon),
],
).paddingOnly(left: 21),
)
: isRemoveBackButton : isRemoveBackButton
? null ? null
: IconButton( : IconButton(
@ -121,5 +126,5 @@ class CustomAppBar extends StatelessWidget with PreferredSizeWidget {
} }
@override @override
Size get preferredSize => const Size.fromHeight(80); Size get preferredSize => const Size.fromHeight(55);
} }

Write Preview
Loading…
Cancel
Save