You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
HMG_Patient_App/lib/widgets
Sikander Saleem 706832a1cb Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/locator.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/product_detail.dart
#	lib/pages/pharmacies/screens/cart-order-preview.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/widgets/ProductTileItem.dart
#	lib/pages/search_products_page.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/buttons/secondary_button.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/others/app_scafold_detail_page.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
..
Loader
app_map
avatar
bottom_navigation family file fixes 4 years ago
bottom_options
buttons Merge branch 'development' into development_new_design_2.0 4 years ago
card
carousel_indicator
charts My tracker fixes 4 years ago
data_display find us and prescription availability hospital location ui changes, 4 years ago
dialogs Updates & fixes 4 years ago
drawer Notification page fix 4 years ago
errors
in_app_browser UI fixes & updates 4 years ago
input
loadings
mobile-no
new_design find us and prescription availability hospital location ui changes, 4 years ago
nfc
offers_packages
others Merge branch 'development' into development_new_design_2.0 4 years ago
otp blood pressure, blood sugar, weight, order log & send feedback dialog changes and improvements (cont). 4 years ago
pharmacy Merge branch 'development' into development_new_design_2.0 4 years ago
pickupLocation
progress_indicator
text Translation updates, CMC, HHC & RRT APIs updates 4 years ago
transitions
typewriter
weather_slider
AnimatedTextFields.dart
CounterView.dart
LoadingButton.dart
TextFieldInertiaDirection.java
dragable_sheet.dart
habib_logo_widget.dart
hospital_location.dart find us and prescription availability hospital location ui changes, 4 years ago
my_rich_text.dart find us and prescription availability hospital location ui changes, 4 years ago
otp_widget.dart
photo_view_page.dart