swipe view ui changes

lib/new_views/common_widgets/app_filled_button.dart

@@ -47,7 +47,7 @@ class AppFilledButton extends StatelessWidget {
       alignment: Alignment.center,
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(10),
-        color: disableButton ?context.isDark ?AppColor.neutral20 :AppColor.neutral140 : (buttonColor ?? AppColor.blueStatus(context)),
+        color: disableButton ?context.isDark ?AppColor.neutral20 :AppColor.neutral140 : (buttonColor ?? AppColor.primary10),
         border: showBorder ? Border.all(color: textColor ?? AppColor.background(context)) : null,
       ),
       child: loading

lib/new_views/swipe_module/swipe_history_view.dart

@@ -13,7 +13,6 @@ import 'package:test_sa/views/widgets/date_and_time/date_picker.dart';
 import 'package:test_sa/views/widgets/loaders/lazy_loading.dart';
 import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
 
-
 import 'models/swipe_transaction_history.dart';
 
 class SwipeHistoryView extends StatefulWidget {
@@ -25,11 +24,11 @@ class SwipeHistoryView extends StatefulWidget {
   State<SwipeHistoryView> createState() => _SwipeHistoryViewState();
 }
 
-
 class _SwipeHistoryViewState extends State<SwipeHistoryView> {
   DateTime dateFrom = DateTime.now();
   DateTime dateTo = DateTime.now();
   UserProvider? _userProvider;
+
   @override
   void initState() {
     getSwipeHistory();
@@ -42,14 +41,16 @@ class _SwipeHistoryViewState extends State<SwipeHistoryView> {
       await _userProvider!.getSwipeTransactionHistory(userId: _userProvider!.user!.userID!, dateFrom: dateFrom, dateTo: dateTo);
     });
   }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: const DefaultAppBar(title: 'Swipe History',),
+      appBar: const DefaultAppBar(
+        title: 'Swipe History',
+      ),
       body: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-
           8.height,
           Row(
             children: [
@@ -107,9 +108,7 @@ class _SwipeHistoryViewState extends State<SwipeHistoryView> {
                         if (selectedDateTime != null) {
                           setState(() {
                             dateTo = selectedDateTime;
-
                           });
-
                         }
                       }
                     });
@@ -121,24 +120,19 @@ class _SwipeHistoryViewState extends State<SwipeHistoryView> {
           12.height,
           AppFilledButton(label: context.translation.search, maxWidth: false, onPressed: getSwipeHistory),
           8.height,
-          const Divider(thickness: 2,color:AppColor.white60 ,),
-
-          Consumer<UserProvider>(
-            builder: (context, snapshot,child) {
-              return SwipeHistoryList(snapshot.swipeHistory ?? [], snapshot.isLoading).expanded;
-            }
+          const Divider(
+            thickness: 2,
+            color: AppColor.white60,
           ),
-
-
+          Consumer<UserProvider>(builder: (context, snapshot, child) {
+            return SwipeHistoryList(snapshot.swipeHistory ?? [], snapshot.isLoading).expanded;
+          }),
         ],
       ).paddingAll(20),
     );
   }
 }
 
-
-
-
 class SwipeHistoryList extends StatelessWidget {
   List<SwipeHistory> list;
   bool isLoading;
@@ -159,10 +153,13 @@ class SwipeHistoryList extends StatelessWidget {
             itemCount: isLoading ? 6 : list.length);
   }
 }
+
 class SwipeHistoryCard extends StatelessWidget {
   final SwipeHistory swipeHistory;
   final bool showShadow;
+
   const SwipeHistoryCard(this.swipeHistory, {Key? key, this.showShadow = true}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return Column(
@@ -172,7 +169,8 @@ class SwipeHistoryCard extends StatelessWidget {
         Row(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            Text(swipeHistory.swipeTime!.toServiceRequestDetailsFormat, textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)),
+            Text(swipeHistory.swipeTime!.toServiceRequestDetailsFormat,
+                textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)),
           ],
         ),
         8.height,
@@ -185,4 +183,3 @@ class SwipeHistoryCard extends StatelessWidget {
     ).toShadowContainer(context, showShadow: showShadow);
   }
 }
-

lib/new_views/swipe_module/swipe_success_view.dart

@@ -8,6 +8,7 @@ import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
 
 class SwipeSuccessView extends StatelessWidget {
   static const routeName = '/swipe_success_view';
+
   const SwipeSuccessView({Key? key}) : super(key: key);
 
   @override
@@ -22,9 +23,15 @@ class SwipeSuccessView extends StatelessWidget {
               children: [
                 'swipe_success'.toSvgAsset(),
                 17.height,
-                context.translation.successful.heading4(context).custom(color: AppColor.white936),
+                Text(
+                  context.translation.successful,
+                  style: AppTextStyles.heading4.copyWith(color: AppColor.headingTextColor(context)),
+                ),
                 8.height,
-                context.translation.youHaveSuccessfullyMarkedYourAttendance.bodyText2(context).custom(color: AppColor.neutral120),
+                Text(
+                  context.translation.youHaveSuccessfullyMarkedYourAttendance,
+                  style: AppTextStyles.bodyText2.copyWith(color: AppColor.lightTextColor(context)),
+                ),
               ],
             ).expanded,
             AppFilledButton(
@@ -41,7 +48,6 @@ class SwipeSuccessView extends StatelessWidget {
   }
 }
 
-
 // ClipOval(
 //   child: Container(
 //      color: Colors.grey.withOpacity(0.2),