Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal

* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  added shimmer

# Conflicts:
#	lib/generated/locale_keys.g.dart
wala_plus_with_dialog_removal
Sultan khan 2 weeks ago
commit 3a73ec1c2e

@ -837,7 +837,9 @@ class CodegenLoader extends AssetLoader{
"reset": "إعادة تعيين", "reset": "إعادة تعيين",
"applyFilters": "تطبيق الفلاتر", "applyFilters": "تطبيق الفلاتر",
"distanceKm": "{} كم", "distanceKm": "{} كم",
"discountPercentPlus": "{}%+" "discountPercentPlus": "{}%+",
"visitMerchantWebsite": "زيارة موقع التاجر",
"merchantWebsiteNotAvailable": "موقع التاجر غير متوفر"
}; };
static const Map<String,dynamic> _en_US = { static const Map<String,dynamic> _en_US = {
"mohemm": "Mohemm", "mohemm": "Mohemm",
@ -1662,7 +1664,9 @@ static const Map<String,dynamic> _en_US = {
"reset": "Reset", "reset": "Reset",
"applyFilters": "Apply filters", "applyFilters": "Apply filters",
"distanceKm": "{} km", "distanceKm": "{} km",
"discountPercentPlus": "{}%+" "discountPercentPlus": "{}%+",
"visitMerchantWebsite": "Visit Merchant Website",
"merchantWebsiteNotAvailable": "Merchant website not available"
}; };
static const Map<String, Map<String,dynamic>> mapLocales = {"ar_SA": _ar_SA, "en_US": _en_US}; static const Map<String, Map<String,dynamic>> mapLocales = {"ar_SA": _ar_SA, "en_US": _en_US};
} }

@ -812,7 +812,18 @@ class _DashboardScreenForDependetState extends State<DashboardScreenForDependet>
Expanded( Expanded(
child: child:
isSubcategoriesLoading isSubcategoriesLoading
? const Center(child: SizedBox(width: 16, height: 16, child: CircularProgressIndicator(strokeWidth: 2, color: Color(0xFF94A3B8)))) ? Shimmer.fromColors(
baseColor: const Color(0xFFE2E8F0),
highlightColor: const Color(0xFFF8FAFC),
child: ListView.separated(
scrollDirection: Axis.horizontal,
physics: const NeverScrollableScrollPhysics(),
itemCount: 4,
separatorBuilder: (BuildContext _, int __) => const SizedBox(width: 8),
itemBuilder:
(BuildContext _, int __) => Container(width: 70, height: 32, decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(6))),
),
)
: ListView.separated( : ListView.separated(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
physics: const BouncingScrollPhysics(), physics: const BouncingScrollPhysics(),

Loading…
Cancel
Save