shimmer & swipe history improvement

main_production_RSG
Sikander Saleem 2 months ago
parent a7fada1115
commit 873a4dddeb

@ -83,7 +83,7 @@ extension WidgetExtensions on Widget {
Widget toShimmer({bool isShow = true, double radius = 20, double? width, double? height, required BuildContext context}) => isShow Widget toShimmer({bool isShow = true, double radius = 20, double? width, double? height, required BuildContext context}) => isShow
? Shimmer.fromColors( ? Shimmer.fromColors(
baseColor: context.isDark ? AppColor.backgroundDark : const Color(0xffe8eff0), baseColor: context.isDark ? AppColor.containerBorderDark : const Color(0xffe8eff0),
highlightColor: AppColor.background(context), highlightColor: AppColor.background(context),
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.circular(radius), borderRadius: BorderRadius.circular(radius),

@ -10,6 +10,7 @@ import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/common_widgets/app_filled_button.dart'; import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
import 'package:test_sa/new_views/common_widgets/default_app_bar.dart'; import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
import 'package:test_sa/views/widgets/date_and_time/date_picker.dart'; import 'package:test_sa/views/widgets/date_and_time/date_picker.dart';
import 'package:test_sa/views/widgets/item_views/info_text_widget.dart';
import 'package:test_sa/views/widgets/loaders/lazy_loading.dart'; import 'package:test_sa/views/widgets/loaders/lazy_loading.dart';
import 'package:test_sa/views/widgets/loaders/no_data_found.dart'; import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
@ -169,17 +170,15 @@ class SwipeHistoryCard extends StatelessWidget {
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text(swipeHistory.swipeTime!.toServiceRequestDetailsFormat, Text(swipeHistory.swipeTime!.toServiceRequestDetailsFormat, textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: AppColor.textStyleColor(context))),
textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)),
], ],
), ),
8.height, 8.height,
'${context.translation.swipeTypeName}: ${swipeHistory.swipeTypeName?.cleanupWhitespace.capitalizeFirstOfEach}'.bodyText(context), InfoTextWidget(label: context.translation.swipeTypeName, value: swipeHistory.swipeTypeName?.cleanupWhitespace.capitalizeFirstOfEach),
'${context.translation.userName}: ${swipeHistory.userName}'.bodyText(context), InfoTextWidget(label: context.translation.userName, value: swipeHistory.userName, showEmptyValue: true),
'${context.translation.siteName}: ${swipeHistory.siteName}'.bodyText(context), InfoTextWidget(label: context.translation.siteName, value: swipeHistory.siteName, showEmptyValue: true),
'${context.translation.pointName}: ${swipeHistory.pointName}'.bodyText(context), InfoTextWidget(label: context.translation.pointName, value: swipeHistory.pointName, showEmptyValue: true),
8.height,
], ],
).toShadowContainer(context, showShadow: showShadow); ).toShadowContainer(context, padding: 16);
} }
} }

@ -117,13 +117,9 @@ class SwipeGeneralUtils {
return Container( return Container(
padding: const EdgeInsets.all(12), padding: const EdgeInsets.all(12),
decoration: BoxDecoration( decoration: BoxDecoration(
color: isEnabled color: isEnabled ? AppColor.tabBarBackground(context) : AppColor.background(context),
? context.isDark
? AppColor.neutral60
: Colors.white
: AppColor.background(context),
borderRadius: BorderRadius.circular(18), borderRadius: BorderRadius.circular(18),
border: Border.all(color: context.isDark ? AppColor.neutral60 : Colors.white70, width: 2), border: Border.all(color: AppColor.borderColor(context), width: 2),
), ),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -632,7 +628,7 @@ class SwipeGeneralUtils {
children: [ children: [
context.translation.markAttendance.heading4(context).custom(color: context.isDark ? AppColor.white50 : AppColor.white936), context.translation.markAttendance.heading4(context).custom(color: context.isDark ? AppColor.white50 : AppColor.white936),
8.height, 8.height,
context.translation.selectMethodToMarkAttendance.bodyText2(context).custom(color: AppColor.neutral120), context.translation.selectMethodToMarkAttendance.bodyText2(context).custom(color: AppColor.lightTextColor(context)),
12.height, 12.height,
GridView( GridView(
padding: const EdgeInsets.all(0), padding: const EdgeInsets.all(0),

Loading…
Cancel
Save