diff --git a/assets/icons/anouncement_icon.svg b/assets/icons/anouncement_icon.svg deleted file mode 100644 index dad55fd..0000000 --- a/assets/icons/anouncement_icon.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/assets/icons/appointments_icon.svg b/assets/icons/appointments_icon.svg deleted file mode 100644 index ebf91e9..0000000 --- a/assets/icons/appointments_icon.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/assets/icons/close_icon.svg b/assets/icons/close_icon.svg deleted file mode 100644 index 0230942..0000000 --- a/assets/icons/close_icon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/drawer_icon.svg b/assets/icons/drawer_icon.svg deleted file mode 100644 index 363d413..0000000 --- a/assets/icons/drawer_icon.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/assets/icons/home_icon.svg b/assets/icons/home_icon.svg deleted file mode 100644 index 758dd1b..0000000 --- a/assets/icons/home_icon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/mini_clock.svg b/assets/icons/mini_clock.svg deleted file mode 100644 index d59971c..0000000 --- a/assets/icons/mini_clock.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/next_icon.svg b/assets/icons/next_icon.svg deleted file mode 100644 index 0a3dc04..0000000 --- a/assets/icons/next_icon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/notification_bell.svg b/assets/icons/notification_bell.svg deleted file mode 100644 index dd32254..0000000 --- a/assets/icons/notification_bell.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/assets/icons/providers_icon.svg b/assets/icons/providers_icon.svg deleted file mode 100644 index f4cc334..0000000 --- a/assets/icons/providers_icon.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/assets/icons/settings_icon.svg b/assets/icons/settings_icon.svg deleted file mode 100644 index 6fe8da9..0000000 --- a/assets/icons/settings_icon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/lib/views/branches/branch_detail_view.dart b/lib/views/branches/branch_detail_view.dart index 790302d..fe91961 100644 --- a/lib/views/branches/branch_detail_view.dart +++ b/lib/views/branches/branch_detail_view.dart @@ -96,10 +96,13 @@ class _BranchDetailViewState extends State { ], ), Row( + crossAxisAlignment: CrossAxisAlignment.start, children: [ (LocaleKeys.time.tr() + ":").toText(color: MyColors.lightTextColor, fontSize: 12), 4.width, - "${widget.branchDetailModel.openTime} - ${widget.branchDetailModel.closeTime}".toText(fontSize: 12, isBold: true), + Flexible( + child: "${widget.branchDetailModel.openTime} - ${widget.branchDetailModel.closeTime}".toText(fontSize: 12, isBold: true), + ) ], ), 2.height, @@ -169,7 +172,7 @@ class _BranchDetailViewState extends State { ), ShowFillButton( maxHeight: 55, - // isDisabled: widget.branchDetailModel.branchServices!.length == 0, + // isDisabled: widget.branchDetailModel.branchServices!.length == 0, title: LocaleKeys.bookAppointment.tr(), margin: EdgeInsets.all(12), maxWidth: double.infinity, diff --git a/lib/views/branches/provider_profile_view.dart b/lib/views/branches/provider_profile_view.dart index 6421658..282fd26 100644 --- a/lib/views/branches/provider_profile_view.dart +++ b/lib/views/branches/provider_profile_view.dart @@ -53,23 +53,24 @@ class _ProviderProfileViewState extends State { Icon( appointmentsVM.providerProfileModel!.isFavorite! ? Icons.favorite : Icons.favorite_border, color: appointmentsVM.providerProfileModel!.isFavorite! ? MyColors.darkPrimaryColor : MyColors.black, - ).horPaddingMain().onPress(() async { - if (appointmentsVM.providerProfileModel!.isFavorite!) { - bool status = await appointmentsVM.removeProviderFromFavorite(serviceProviderID: appointmentsVM.providerProfileModel!.id!, context: context); + ).horPaddingMain().onPress( + () async { + if (appointmentsVM.providerProfileModel!.isFavorite!) { + bool status = await appointmentsVM.removeProviderFromFavorite(serviceProviderID: appointmentsVM.providerProfileModel!.id!, context: context); + if (status) { + appointmentsVM.providerProfileModel!.isFavorite = false; + setState(() {}); + } + } else { + bool status = await appointmentsVM.addProviderToFavorite(serviceProviderID: appointmentsVM.providerProfileModel!.id!, context: context); - if (status) { - appointmentsVM.providerProfileModel!.isFavorite = false; - setState(() {}); + if (status) { + appointmentsVM.providerProfileModel!.isFavorite = true; + setState(() {}); + } } - } else { - bool status = await appointmentsVM.addProviderToFavorite(serviceProviderID: appointmentsVM.providerProfileModel!.id!, context: context); - - if (status) { - appointmentsVM.providerProfileModel!.isFavorite = true; - setState(() {}); - } - } - }), + }, + ), ], ), body: Container( @@ -93,12 +94,12 @@ class _ProviderProfileViewState extends State { if (appointmentsVM.providerProfileModel!.memberSince!.isNotEmpty) ...[ Row( children: [ - ("Member Since:").toText(color: MyColors.lightTextColor, fontSize: 12), + ("${LocaleKeys.memberSince.tr()}:").toText(color: MyColors.lightTextColor, fontSize: 12), 4.width, - "${DateHelper.formatAsMonthYear(DateHelper.parseStringToDate(DateHelper.formatDateT(appointmentsVM.providerProfileModel!.memberSince ?? "")))}".toText( - fontSize: 12, - isBold: true, - ), + "${DateHelper.formatAsMonthYear(DateHelper.parseStringToDate(DateHelper.formatDateT( + appointmentsVM.providerProfileModel!.memberSince ?? "", + )))}" + .toText(fontSize: 12, isBold: true), ], ), ],