fixes

3 years ago · c22556d9b6
parent e826f5048c
commit c22556d9b6
8 changed files with 107 additions and 8 deletions
--- a/lib/classes/consts.dart
+++ b/lib/classes/consts.dart
@ -1,7 +1,7 @@
 class ApiConsts {
  //static String baseUrl = "http://10.200.204.20:2801/"; // Local server
-  static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
-  //static String baseUrl = "https://hmgwebservices.com"; // Live server
+  // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
+  static String baseUrl = "https://hmgwebservices.com"; // Live server
  static String baseUrlServices = baseUrl + "/Services/"; // server
  // static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server
  static String utilitiesRest = baseUrlServices + "Utilities.svc/REST/";
--- a/lib/main.dart
+++ b/lib/main.dart
@ -92,6 +92,12 @@ class MyApp extends StatelessWidget {
          MonthYearPickerLocalizations.delegate,
        );
        return MaterialApp(
+          builder: (BuildContext context, Widget? child) {
+            return MediaQuery(
+              data: MediaQuery.of(context).copyWith(textScaleFactor: 1.0),
+              child: child!,
+            );
+          },
          theme: AppTheme.getTheme(
            EasyLocalization.of(context)?.locale.languageCode == "ar",
          ),
--- a/lib/ui/dialogs/success_dialog.dart
+++ b/lib/ui/dialogs/success_dialog.dart
@ -53,8 +53,8 @@ class _SuccessDialogState extends State<SuccessDialog> with TickerProviderStateM
              repeat: false,
              reverse: false,
              controller: _controller,
+              frameRate: FrameRate(60.0),
              onLoaded: (LottieComposition v) async {
-                print("calling_lottie " + v.seconds.toString());
                await playSuccessSound();
                _controller
                  ..duration = v.duration
--- a/lib/ui/landing/dashboard_screen.dart
+++ b/lib/ui/landing/dashboard_screen.dart
@ -256,7 +256,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                                              margin: EdgeInsets.only(top: AppState().isArabic(context) ? 6 : 0),
                                                              width: 45,
                                                              height: 45,
-                                                              padding: const EdgeInsets.only(left: 14, right: 14),
+                                                              padding: const EdgeInsets.only(left: 10, right: 10),
                                                              decoration: BoxDecoration(
                                                                color: Color(0xff259EA4),
                                                                borderRadius: BorderRadius.only(
@ -296,7 +296,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                        ),
                      ],
                    ).paddingOnly(left: 21, right: 21, top: 7),
-                    MarathonBanner().paddingAll(20),
+                    const MarathonBanner().paddingAll(20),
                    ServicesWidget(),
                    // 8.height,
                    Container(
--- a/lib/ui/landing/widget/services_widget.dart
+++ b/lib/ui/landing/widget/services_widget.dart
@ -39,7 +39,7 @@ class ServicesWidget extends StatelessWidget {
                  return Column(
                    crossAxisAlignment: CrossAxisAlignment.start,
                    mainAxisSize: MainAxisSize.min,
-                    children: [ 
+                    children: [
                      data.homeMenus![parentIndex].menuEntry.prompt!.toSectionHeading().paddingOnly(left: 21, right: 21),
                      SizedBox(
                        height: 105 + 26,
@ -69,7 +69,7 @@ class ServicesWidget extends StatelessWidget {
                                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
                                          crossAxisAlignment: CrossAxisAlignment.start,
                                          children: [
-                                            SvgPicture.asset(iconT[index]),
+                                            SvgPicture.asset(AppState().isArabic(context) ? getMenuIconAr(data.homeMenus![parentIndex].menuEntiesList[index].prompt!) : getMenuIconEn(data.homeMenus![parentIndex].menuEntiesList[index].prompt!)),
                                            Row(
                                              crossAxisAlignment: CrossAxisAlignment.end,
                                              children: [
@ -102,6 +102,92 @@ class ServicesWidget extends StatelessWidget {
    );
  }

+  String getMenuIconAr(String name) {
+    String returnImage = "";
+    switch (name) {
+      case "الحضور الشهري":
+        returnImage = "assets/images/services_icons/monthly_attendance.svg";
+        break;
+      case "كشف الراتب":
+        returnImage = "assets/images/services_icons/payslips.svg";
+        break;
+      case "تغيير معلومات البنك":
+        returnImage = "assets/images/services_icons/change_bank_details.svg";
+        break;
+      case "طلب بدل السكن مقدما":
+        returnImage = "assets/images/services_icons/housing_allowance.svg";
+        break;
+      case "شهادات تعريف الموظف":
+        returnImage = "assets/images/services_icons/employee_certificates.svg";
+        break;
+      case "البيانات الشخصية":
+        returnImage = "assets/images/personal-info.svg";
+        break;
+      case "الحضور":
+        returnImage = "assets/images/services_icons/my_attendance.svg";
+        break;
+      case "طلبات أخرى":
+        returnImage = "assets/images/services_icons/other_requests.svg";
+        break;
+      case "الإجازات":
+        returnImage = "assets/images/services_icons/my_leaves.svg";
+        break;
+      case "طلب تذكرة":
+        returnImage = "assets/images/services_icons/ticket_bal.svg";
+        break;
+      case "قاعدة الاجازات":
+        returnImage = "assets/images/services_icons/vacation_rule.svg";
+        break;
+      default:
+        returnImage = "assets/images/monthly_attendance.svg";
+        break;
+    }
+    return returnImage;
+  }
+
+  String getMenuIconEn(String name) {
+    String returnImage = "";
+    switch (name) {
+      case "Monthly Attendance":
+        returnImage = "assets/images/services_icons/monthly_attendance.svg";
+        break;
+      case "Payslip":
+        returnImage = "assets/images/services_icons/payslips.svg";
+        break;
+      case "Change Bank Details":
+        returnImage = "assets/images/services_icons/change_bank_details.svg";
+        break;
+      case "Housing Advance":
+        returnImage = "assets/images/services_icons/housing_allowance.svg";
+        break;
+      case "Employee Certificate":
+        returnImage = "assets/images/services_icons/employee_certificates.svg";
+        break;
+      case "Personal Information":
+        returnImage = "assets/images/personal-info.svg";
+        break;
+      case "My Attendance":
+        returnImage = "assets/images/services_icons/my_attendance.svg";
+        break;
+      case "Other Requests":
+        returnImage = "assets/images/services_icons/other_requests.svg";
+        break;
+      case "My Leave":
+        returnImage = "assets/images/services_icons/my_leaves.svg";
+        break;
+      case "Ticket Request":
+        returnImage = "assets/images/services_icons/ticket_bal.svg";
+        break;
+      case "Vacation Rule":
+        returnImage = "assets/images/services_icons/vacation_rule.svg";
+        break;
+      default:
+        returnImage = "assets/images/monthly_attendance.svg";
+        break;
+    }
+    return returnImage;
+  }
+
  void handleOnPress(context, GetMenuEntriesList menuEntry) {
    var pro = Provider.of<DashboardProviderModel>(context, listen: false);
    if (menuEntry.requestType == "MONTHLY_ATTENDANCE") {
--- a/lib/ui/screens/items_for_sale/fragments/add_details_fragment.dart
+++ b/lib/ui/screens/items_for_sale/fragments/add_details_fragment.dart
@ -25,8 +25,9 @@ class AddItemDetailsFragment extends StatefulWidget {
  final Function changePageViewIndex;
  final GetSaleCategoriesList selectedSaleCategory;
  static late ItemReviewModel itemReviewModel;
+  static late bool isUpdate;

-  const AddItemDetailsFragment({Key? key, required this.changePageViewIndex, required this.selectedSaleCategory}) : super(key: key);
+  AddItemDetailsFragment({Key? key, required this.changePageViewIndex, required this.selectedSaleCategory}) : super(key: key);

  @override
  State<AddItemDetailsFragment> createState() => _AddItemDetailsFragmentState();
@ -246,6 +247,7 @@ class _AddItemDetailsFragmentState extends State<AddItemDetailsFragment> {
    String details = await Utils.getStringFromPrefs(SharedPrefsConsts.editItemForSale);
    if(details.isNotEmpty) {
      var body = json.decode(details);
+      AddItemDetailsFragment.isUpdate = true;

      GetRegionsList selectedRegionAd = GetRegionsList();

@ -268,6 +270,8 @@ class _AddItemDetailsFragmentState extends State<AddItemDetailsFragment> {

      AddItemDetailsFragment.itemReviewModel = itemReviewModel;
      SelectCategoryFragment.selectedSaleCategory = selectedSaleCategoryAd;
+    } else {
+      AddItemDetailsFragment.isUpdate = false;
    }
  }

--- a/lib/ui/screens/items_for_sale/fragments/item_review_fragment.dart
+++ b/lib/ui/screens/items_for_sale/fragments/item_review_fragment.dart
@ -26,11 +26,13 @@ class ItemReviewFragment extends StatefulWidget {

 class _ItemReviewFragmentState extends State<ItemReviewFragment> {
  ItemReviewModel? itemReviewModel;
+  late bool isUpdate;

  @override
  void initState() {
    itemReviewModel = AddItemDetailsFragment.itemReviewModel;
    itemReviewModel!.selectedSaleCategory = SelectCategoryFragment.selectedSaleCategory;
+    isUpdate = AddItemDetailsFragment.isUpdate;
    super.initState();
  }

--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -128,6 +128,7 @@ flutter:
    - assets/audio/
    - assets/images/
    - assets/images/worklist/
+    - assets/images/services_icons/
    - assets/images/login/
    - assets/icons/chat/
    - assets/images/logos/