dashboard progress view improvements

main_design2.0
Sikander Saleem 2 years ago
parent 89bcb20314
commit 2c8af84814

@ -35,6 +35,19 @@ extension WidgetExtensions on Widget {
) )
: this; : this;
Widget toRequestShimmer(BuildContext context, bool isShow) => isShow
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(width: 250, height: 24).toShimmer(isShow: isShow),
8.height,
const SizedBox(width: 160, height: 16).toShimmer(isShow: isShow),
8.height,
const SizedBox(width: 120, height: 18).toShimmer(isShow: isShow).toShimmer(isShow: isShow),
],
).toShadowContainer(context)
: this;
Widget toShadowContainer(BuildContext context) => Container( Widget toShadowContainer(BuildContext context) => Container(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
decoration: ShapeDecoration( decoration: ShapeDecoration(

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:pie_chart/pie_chart.dart'; import 'package:pie_chart/pie_chart.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:test_sa/controllers/providers/api/all_requests_provider.dart'; import 'package:test_sa/controllers/providers/api/all_requests_provider.dart';
import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/context_extension.dart';
@ -45,7 +46,7 @@ class ProgressFragment extends StatelessWidget {
chartValueStyle: AppTextStyles.heading6.copyWith(color: AppColor.neutral20), chartValueStyle: AppTextStyles.heading6.copyWith(color: AppColor.neutral20),
showChartValuesOutside: true, showChartValuesOutside: true,
), ),
).toShimmer(isShow: snapshot.isOpenLoading || snapshot.isInProgressLoading || snapshot.isCloseLoading, radius: 300).paddingAll(12).toShadowContainer, ).toShimmer(isShow: snapshot.isOpenLoading || snapshot.isInProgressLoading || snapshot.isCloseLoading, radius: 300).paddingAll(12).toShadowContainer(context),
).paddingOnly(start: 16, end: 16, bottom: 16), ).paddingOnly(start: 16, end: 16, bottom: 16),
DefaultTabController( DefaultTabController(
length: 3, length: 3,
@ -93,6 +94,7 @@ class ProgressFragment extends StatelessWidget {
return ListView.separated( return ListView.separated(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
itemBuilder: (cxt, index) { itemBuilder: (cxt, index) {
if (isLoading) return SizedBox().toRequestShimmer(cxt, isLoading);
bool isServiceRequest = list[index].nameOfType == "ServiceRequest"; bool isServiceRequest = list[index].nameOfType == "ServiceRequest";
bool isGasRefill = list[index].nameOfType == "GasRefill"; bool isGasRefill = list[index].nameOfType == "GasRefill";
bool isAssetTransfer = list[index].nameOfType == "AssetTransfer"; bool isAssetTransfer = list[index].nameOfType == "AssetTransfer";
@ -113,6 +115,6 @@ class ProgressFragment extends StatelessWidget {
); );
}, },
separatorBuilder: (cxt, index) => 8.height, separatorBuilder: (cxt, index) => 8.height,
itemCount: list.length); itemCount: isLoading ? 6 : list.length);
} }
} }

@ -53,6 +53,6 @@ class AssetItemView extends StatelessWidget {
], ],
), ),
], ],
).toShadowContainer.onPress(() {}); ).toShadowContainer(context).onPress(() {});
} }
} }

@ -59,6 +59,6 @@ class GasRefillItemView extends StatelessWidget {
], ],
), ),
], ],
).toShadowContainer.onPress(() {}); ).toShadowContainer(context).onPress(() {});
} }
} }

@ -38,7 +38,7 @@ class PpmItemView extends StatelessWidget {
// ], // ],
// ), // ),
// 8.height, // 8.height,
Text(context.translation.preventiveMaintenance, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))), Text("PPMs Request", style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))),
8.height, 8.height,
Text( Text(
'${context.translation.assetNumber}: ${request.assetName}', '${context.translation.assetNumber}: ${request.assetName}',
@ -65,8 +65,6 @@ class PpmItemView extends StatelessWidget {
], ],
), ),
], ],
).toShadowContainer.onPress(() { ).toShadowContainer(context).onPress(() {});
});
} }
} }

@ -1,21 +1,10 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:test_sa/controllers/localization/localization.dart';
import 'package:test_sa/controllers/providers/api/service_requests_provider.dart';
import 'package:test_sa/controllers/providers/api/user_provider.dart';
import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/string_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/all_requests_and_count_model.dart'; import 'package:test_sa/models/all_requests_and_count_model.dart';
import 'package:test_sa/models/enums/translation_keys.dart';
import 'package:test_sa/models/service_request/service_request.dart';
import 'package:test_sa/models/subtitle.dart';
import 'package:test_sa/models/user.dart';
import 'package:test_sa/views/app_style/colors.dart';
import 'package:test_sa/views/widgets/requests/request_status.dart';
class ServiceRequestItemView extends StatelessWidget { class ServiceRequestItemView extends StatelessWidget {
final RequestsDetails request; final RequestsDetails request;
@ -77,8 +66,6 @@ class ServiceRequestItemView extends StatelessWidget {
], ],
), ),
], ],
).toShadowContainer.onPress(() { ).toShadowContainer(context).onPress(() { });
//onPressed(request);
});
} }
} }

Loading…
Cancel
Save