Merge branch 'aamir_dev' into faiz_development

# Conflicts:
#	lib/views/dashboard/dashboard_view.dart
faiz_development
Faiz Hashmi 3 weeks ago
commit eec6420064

@ -41,7 +41,7 @@ class _ItemsListSheetState extends State<ItemsListSheet> {
return Center(child: CircularProgressIndicator());
}
return appointmentsVM.serviceItemsFromApi.isEmpty
? const EmptyWidget()
? const EmptyWidget(text: "No Items Found", isWrapedColumn: false,)
: ListView.separated(
itemCount: appointmentsVM.serviceItemsFromApi.length,
itemBuilder: (BuildContext context, int index) {

@ -4,6 +4,7 @@ import 'package:car_customer_app/views/dashboard/fragments/home_fragment.dart';
import 'package:car_customer_app/views/dashboard/widgets/bottom_nav_bar.dart';
import 'package:flutter/material.dart';
import 'package:mc_common_app/view_models/dashboard_view_model_customer.dart';
import 'package:mc_common_app/views/common_fragments/requests_fragment.dart';
import 'package:provider/provider.dart';
import 'fragments/branches_fragment.dart';
import 'package:mc_common_app/views/common_fragments/ads_fragment.dart';

Loading…
Cancel
Save