feat : persian calendar and date picker

features/inspection/lib/presentation/add_mobile_inspector/view.dart

@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:rasadyar_core/core.dart';
-import 'package:rasadyar_core/presentation/widget/buttons/elevated.dart';
-import 'package:rasadyar_core/presentation/widget/buttons/fab.dart';
-import 'package:rasadyar_core/presentation/widget/inputs/r_input.dart';
 import 'package:inspection/presentation/routes/app_routes.dart';
+import 'package:rasadyar_core/core.dart';
+import 'package:rasadyar_core/presentation/widget/buttons/fab.dart';
 
 import 'logic.dart';
 
@@ -18,7 +16,7 @@ class AddMobileInspectorPage extends GetView<AddMobileInspectorLogic> {
         title: 'افزودن بازرس همراه',
         leading: vecWidget(
           Assets.vecMessageAddSvg,
-          color: AppColor.blueNormal,
+          color: Colors.white,
           width: 16,
           height: 16,
         ),
@@ -32,13 +30,36 @@ class AddMobileInspectorPage extends GetView<AddMobileInspectorLogic> {
             child: ObxValue((data) {
               return ListView.separated(
                 padding: const EdgeInsets.fromLTRB(25, 10, 25, 0),
-                itemBuilder:
+                itemBuilder: (context, index) => mobileInspectorWidget(),
-                    (context, index) =>
+                separatorBuilder: (context, index) => SizedBox(height: 15),
-                    Container(
+                itemCount: data.value,
-                      padding: EdgeInsets.symmetric(
+              );
-                        horizontal: 12,
+            }, controller.countInspector),
-                        vertical: 16,
           ),
+
+          Padding(
+            padding: const EdgeInsets.fromLTRB(20, 4, 20, 25),
+            child: RElevated(
+              text: 'مرحله بعد',
+              onPressed: () {
+                Get.toNamed(InspectionRoutes.inspectionRegistrationOfViolation);
+              },
+              height: 40,
+              isFullWidth: true,
+              backgroundColor: AppColor.greenNormal,
+              textStyle: AppFonts.yekan16.copyWith(color: Colors.white),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+
+}
+Container mobileInspectorWidget() {
+  return Container(
+    padding: EdgeInsets.symmetric(horizontal: 12, vertical: 16),
     decoration: BoxDecoration(
       borderRadius: BorderRadius.circular(8),
       border: Border.all(width: 0.7, color: AppColor.bgDark),
@@ -81,14 +102,14 @@ class AddMobileInspectorPage extends GetView<AddMobileInspectorLogic> {
                 Expanded(
                   child: RElevated(
                     text: 'ثبت',
-                                      textStyle:AppFonts.yekan16.copyWith(color: Colors.white),
+                    textStyle: AppFonts.yekan16.copyWith(color: Colors.white),
                     onPressed: () {},
                   ),
                 ),
                 Expanded(
                   child: ROutlinedElevated(
                     text: 'انصراف',
-                                      textStyle:AppFonts.yekan16,
+                    textStyle: AppFonts.yekan16,
                     onPressed: () {},
                   ),
                 ),
@@ -98,29 +119,5 @@ class AddMobileInspectorPage extends GetView<AddMobileInspectorLogic> {
         ),
       ],
     ),
-                    ),
-                separatorBuilder: (context, index) => SizedBox(height: 15),
-                itemCount: data.value,
   );
-            }, controller.countInspector),
-          ),
-
-
-          Padding(
-            padding: const EdgeInsets.fromLTRB(20, 4, 20, 20),
-            child: RElevated(
-              text: 'مرحله بعد',
-              onPressed: () {
-                Get.toNamed(InspectionRoutes.inspectionRegistrationOfViolation);
-              },
-              height: 50,
-              isFullWidth: true,
-              backgroundColor: AppColor.greenNormal,
-              textStyle: AppFonts.yekan16.copyWith(color: Colors.white),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
 }

features/inspection/lib/presentation/add_supervision/view.dart

@@ -15,7 +15,7 @@ class AddSupervisionPage extends GetView<AddSupervisionLogic> {
         title: 'ایجاد بازرسی',
         leading: vecWidget(
           Assets.vecMessageAddSvg,
-          color: AppColor.blueNormal,
+          color: Colors.white,
           width: 16,
           height: 16,
         ),
@@ -136,14 +136,14 @@ class AddSupervisionPage extends GetView<AddSupervisionLogic> {
           ),
 
           Padding(
-            padding: const EdgeInsets.fromLTRB(20, 0, 20, 20),
+            padding: const EdgeInsets.fromLTRB(20, 0, 20, 25),
             child: RElevated(
               text: 'مرحله بعد',
               onPressed: () {
                   Get.toNamed(controller.routes.first);
 
               },
-              height: 50,
+              height: 40,
               isFullWidth: true,
               backgroundColor: AppColor.greenNormal,
               textStyle: AppFonts.yekan16.copyWith(color: Colors.white),

features/inspection/lib/presentation/display_information/view.dart

@@ -1,8 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:rasadyar_core/core.dart';
-import 'package:rasadyar_core/presentation/widget/buttons/elevated.dart';
-import 'package:rasadyar_core/presentation/widget/inputs/r_input.dart';
-import 'package:inspection/inspection.dart';
 
 import 'logic.dart';
 
@@ -12,6 +9,7 @@ class DisplayInformationPage extends GetView<DisplayInformationLogic> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: AppColor.bgLight,
       appBar: RAppBar(
         title: 'نمایش اطلاعات',
         leading: vecWidget(
@@ -22,33 +20,66 @@ class DisplayInformationPage extends GetView<DisplayInformationLogic> {
         ),
       ),
 
-      body: SingleChildScrollView(
+      body: Column(
+        children: [
+          Expanded(
+            child: SingleChildScrollView(
+              physics: BouncingScrollPhysics(),
               child: Column(
                 spacing: 20,
                 children: [
+                  ratingbarWidget(),
                   markerDetailsWidget(),
                   accompanyingInspectorsWidget(),
                   accompanyingInspectorsWidget(),
                   violationWidget(),
                   violationWidget(),
-        ratingbarWidget()
+                  SizedBox(height: 30,)
-
                 ],
               ),
-    ),);
+            
+            
+            ),
+          ),
+
+
+
+          Padding(
+            padding: const EdgeInsets.fromLTRB(20, 4, 20, 25),
+            child: Row(
+              children: [
+                Expanded(
+                  child: RElevated(height: 40, text: 'ثبت', onPressed: () {}),
+                ),
+                SizedBox(width: 8),
+                Expanded(
+                  child: ROutlinedElevated(
+                    height: 40,
+                    text: 'انصراف',
+                    onPressed: () {
+                      Get.until((route) => route.isFirst);
+                    },
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
   }
 
   Widget ratingbarWidget() {
     return Padding(
-      padding: const EdgeInsets.fromLTRB(35, 5, 35, 35),
+      padding: const EdgeInsets.fromLTRB(35, 35, 35,0),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
           Row(
-            children: [    Text('به این صنف امتیاز دهید',style: AppFonts.yekan12,),],
+            children: [Text('به این صنف امتیاز دهید', style: AppFonts.yekan12)],
           ),
 
-          SizedBox(height: 12,),
+          SizedBox(height: 12),
           RatingBar.builder(
             initialRating: 3,
             minRating: 1,
@@ -57,31 +88,9 @@ class DisplayInformationPage extends GetView<DisplayInformationLogic> {
             itemCount: 5,
             wrapAlignment: WrapAlignment.center,
             itemPadding: EdgeInsets.symmetric(horizontal: 4.0),
-              itemBuilder: (context, _) =>
+            itemBuilder: (context, _) => Icon(Icons.star, color: Colors.amber),
-                  Icon(
+            onRatingUpdate: (rating) {},
-                    Icons.star,
-                    color: Colors.amber,
           ),
-              onRatingUpdate: (rating) {
-
-              },
-            ),
-
-
-          Row(
-            children: [
-              Expanded(
-                  child: RElevated(
-                      height: 40,
-                      text: 'ثبت', onPressed: (){})),
-              SizedBox(width: 8,),
-              Expanded(child: ROutlinedElevated(
-                  height: 40,
-                  text: 'انصراف', onPressed: (){
-                    Get.until((route) => route.isFirst);
-              }))
-            ],
-          )
         ],
       ),
     );
@@ -94,48 +103,40 @@ Widget violationWidget() {
     padding: EdgeInsets.symmetric(horizontal: 8, vertical: 12),
     decoration: BoxDecoration(
       borderRadius: BorderRadius.circular(8),
-      border: Border.all(width: 1, color: AppColor.bgDark),
+      border: Border.all(width: 0.7, color: AppColor.bgDark),
-
     ),
     child: Column(
       spacing: 16,
       children: [
-
         RTextField(
           label: 'عنوان تخلف',
           filled: true,
           filledColor: AppColor.whiteLight,
-
         ),
         RTextField(
           label: 'توضیحات تخلف',
           filled: true,
           filledColor: AppColor.whiteLight,
-          maxLines: 5,
+          maxLines: 3,
-          minLines: 5,
+          minLines: 3,
-
         ),
         RTextField(
           label: 'عنوان تخلف',
           filled: true,
           filledColor: AppColor.whiteLight,
-
         ),
         RTextField(
           label: 'عنوان تخلف',
           filled: true,
           filledColor: AppColor.whiteLight,
-
         ),
         RTextField(
           label: 'توضیحات تخلف',
           filled: true,
           filledColor: AppColor.whiteLight,
-          maxLines: 5,
+          maxLines: 3,
-          minLines: 5,
+          minLines: 3,
-
         ),
-
       ],
     ),
   );
@@ -261,8 +262,7 @@ Widget markerDetailsWidget() {
 
         ...List.generate(
           5,
-              (index) =>
+          (index) => Row(
-              Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             crossAxisAlignment: CrossAxisAlignment.center,
 

features/inspection/lib/presentation/registration_of_violation/view.dart

@@ -16,7 +16,7 @@ class RegistrationOfViolationPage
         title: 'ثبت تخلف',
         leading: vecWidget(
           Assets.vecMessageAddSvg,
-          color: AppColor.blueNormal,
+          color: Colors.white,
           width: 16,
           height: 16,
         ),
@@ -31,15 +31,39 @@ class RegistrationOfViolationPage
             Expanded(
               child: ObxValue((data) {
                 return ListView.separated(
-                  itemBuilder:
+                  itemBuilder: (context, index) => violationWidget(),
-                      (context, index) => Container(
+                  separatorBuilder: (context, index) => SizedBox(height: 15),
-                        padding: EdgeInsets.symmetric(
+                  itemCount: data.value,
-                          horizontal: 8,
+                );
-                          vertical: 12,
+              }, controller.countViolation),
             ),
+
+            Padding(
+              padding: const EdgeInsets.fromLTRB(0, 4, 0, 25),
+              child: RElevated(
+                text: 'مرحله بعد',
+                onPressed: () {
+                  Get.toNamed(InspectionRoutes.inspectionDisplayInformation);
+                },
+                isFullWidth: true,
+                height: 40,
+                backgroundColor: AppColor.greenNormal,
+                textStyle: AppFonts.yekan16.copyWith(color: Colors.white),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+Container violationWidget() {
+  return Container(
+    padding: EdgeInsets.symmetric(horizontal: 8, vertical: 12),
     decoration: BoxDecoration(
       borderRadius: BorderRadius.circular(8),
-                          border: Border.all(width: 0.75, color: AppColor.bgDark),
+      border: Border.all(width: 0.7, color: AppColor.bgDark),
     ),
     child: Column(
       spacing: 16,
@@ -55,7 +79,6 @@ class RegistrationOfViolationPage
           filledColor: AppColor.whiteLight,
           maxLines: 3,
           minLines: 3,
-
         ),
         RTextField(
           label: 'عنوان تخلف',
@@ -80,44 +103,14 @@ class RegistrationOfViolationPage
           child: Row(
             spacing: 16,
             children: [
+              Expanded(child: RElevated(text: 'ثبت', onPressed: () {})),
               Expanded(
-                                    child: RElevated(
+                child: ROutlinedElevated(text: 'انصراف', onPressed: () {}),
-                                      text: 'ثبت',
-                                      onPressed: () {},
-                                    ),
-                                  ),
-                                  Expanded(
-                                    child: ROutlinedElevated(
-                                      text: 'انصراف',
-                                      onPressed: () {},
-                                    ),
               ),
             ],
           ),
         ),
       ],
     ),
-                      ),
-                  separatorBuilder: (context, index) => SizedBox(height: 15),
-                  itemCount: data.value,
-                );
-              }, controller.countViolation),
-            ),
-
-            RElevated(
-              text: 'مرحله بعد',
-              onPressed: () {
-                Get.toNamed(InspectionRoutes.inspectionDisplayInformation);
-              },
-              isFullWidth: true,
-              height: 40,
-              backgroundColor: AppColor.greenNormal,
-              textStyle: AppFonts.yekan16.copyWith(color: Colors.white),
-            ),
-            SizedBox(height: 25),
-          ],
-        ),
-      ),
   );
-  }
 }

packages/core/lib/presentation/widget/app_bar/r_app_bar.dart

@@ -16,8 +16,8 @@ class RAppBar extends StatelessWidget implements PreferredSizeWidget {
   const RAppBar({
     super.key,
     required this.title,
-    this.backgroundColor = AppColor.lightGreyLight,
+    this.backgroundColor = AppColor.blueNormal,
-    this.iconColor = AppColor.blueNormal,
+    this.iconColor = Colors.white,
     this.titleTextStyle,
     this.onBackPressed,
     this.additionalActions,
@@ -34,13 +34,13 @@ class RAppBar extends StatelessWidget implements PreferredSizeWidget {
       scrolledUnderElevation: 0,
       titleTextStyle:
           titleTextStyle ??
-          AppFonts.yekan16.copyWith(color: AppColor.blueNormal),
+          AppFonts.yekan16.copyWith(color:Colors.white),
       title: Text(title),
 
-      leading:Padding(
+      leading:leading!=null ? Padding(
         padding: const EdgeInsets.only(right: 16),
         child: leading,
-      ),
+      ) : null,
       actions: [
         if (additionalActions != null) ...additionalActions!,
         Padding(