diff --git a/lib/classes/consts.dart b/lib/classes/consts.dart index dfcd6c6..1884e63 100644 --- a/lib/classes/consts.dart +++ b/lib/classes/consts.dart @@ -119,6 +119,7 @@ class GlobalConsts { static String attachDamagePartImage = "Please add part image"; static String adDurationDateError = "Ad Duration start date cannot be empty"; static String adReservablePriceErrorConst = "Ad Reservable price cannot be empty"; + static String homeLocationEmptyError = "Home location cannot be empty"; static String reserveAdPriceInfo = "Some dummy description to explain the following concept. This price will be for 24 hours and if a user cancels the reservations before 24 hours then the amount will be automatically refunded to the buyer."; } diff --git a/lib/config/routes.dart b/lib/config/routes.dart index a32a7b2..ba6f03b 100644 --- a/lib/config/routes.dart +++ b/lib/config/routes.dart @@ -56,10 +56,14 @@ class AppRoutes { static const String adsDetailView = "/adsDetailView"; static const String createAdView = "/createAdView"; static const String bookAppointmenServicesView = "/bookAppointmenServicesView"; + static const String bookAppointmentsItemView = "/bookAppointmentsItemView"; + + + // Payments static const String paymentMethodsView = "/paymentMethodsView"; - //Subcriptions + // Subcriptions static final String mySubscriptionsPage = "/mySubscriptionsPage"; static final String subscriptionsPage = "/subscriptionsPage"; @@ -84,5 +88,6 @@ class AppRoutes { changeMobilePage: (context) => ChangeMobilePage(), changeEmailPage: (context) => const ChangeEmailPage(), editAccountPage: (context) => EditAccountPage(), + }; } diff --git a/lib/views/advertisement/bottom_sheet_content.dart b/lib/views/advertisement/bottom_sheet_content.dart index f3eade5..61d74f9 100644 --- a/lib/views/advertisement/bottom_sheet_content.dart +++ b/lib/views/advertisement/bottom_sheet_content.dart @@ -273,6 +273,7 @@ class BottomSheetAdSpecialServiceContent extends StatelessWidget { 8.height, BuildTimeSlots( timeSlots: adVM.adSSTimeSlots, + onPressed: (index) => adVM.updateIsSelectedInSlots(index), ), ], diff --git a/lib/views/user/login_with_password_page.dart b/lib/views/user/login_with_password_page.dart index 16204a9..c3d4005 100644 --- a/lib/views/user/login_with_password_page.dart +++ b/lib/views/user/login_with_password_page.dart @@ -28,7 +28,8 @@ class _LoginWithPasswordState extends State { int otpType = 1; ClassType type = ClassType.EMAIL; - String phoneNum = "580816976", password = "123@Shf"; + //TODO: ONLY FOR DEVELOPMENT PURPOSE + String phoneNum = "966504278212", password = "Fa@123"; String email = ""; String countryCode = ""; Country? _country; diff --git a/lib/widgets/checkbox_with_title_desc.dart b/lib/widgets/checkbox_with_title_desc.dart index 99088aa..5419254 100644 --- a/lib/widgets/checkbox_with_title_desc.dart +++ b/lib/widgets/checkbox_with_title_desc.dart @@ -3,11 +3,11 @@ import 'package:mc_common_app/extensions/string_extensions.dart'; import 'package:mc_common_app/theme/colors.dart'; class CheckBoxWithTitleDescription extends StatelessWidget { - bool isSelected; - String title, description; - Function(bool) onSelection; + final bool isSelected; + final String title, description; + final Function(bool) onSelection; - CheckBoxWithTitleDescription({required this.isSelected, required this.title, required this.description, required this.onSelection, Key? key}) : super(key: key); + const CheckBoxWithTitleDescription({required this.isSelected, required this.title, required this.description, required this.onSelection, Key? key}) : super(key: key); @override Widget build(BuildContext context) { diff --git a/lib/widgets/common_widgets/time_slots.dart b/lib/widgets/common_widgets/time_slots.dart index 0514d69..9e56974 100644 --- a/lib/widgets/common_widgets/time_slots.dart +++ b/lib/widgets/common_widgets/time_slots.dart @@ -15,8 +15,10 @@ class BuildTimeSlots extends StatelessWidget { height: 37, width: double.infinity, child: ListView.builder( + physics: const BouncingScrollPhysics(), itemCount: timeSlots.length, scrollDirection: Axis.horizontal, + shrinkWrap: true, itemBuilder: (BuildContext context, int index) { return InkWell( onTap: () {