few changes of UI

android/gradle.properties

@@ -1,3 +1,7 @@
 org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
+# This builtInKotlin flag was added automatically by Flutter migrator
+android.builtInKotlin=false
+# This newDsl flag was added automatically by Flutter migrator
+android.newDsl=false

lib/constants/app_constants.dart

@@ -179,7 +179,6 @@ class AppConstants {
   static const int projectIdSuwaidi = 17;
   static const int projectIdKhobar = 60;
   static const int projectIdTakhasusiWomen = 140;
-
 }
 
 class ApiConstants {
@@ -188,6 +187,7 @@ class ApiConstants {
   static String baseUrlDev = 'https://ms.hmg.com/nscapi2'; // DEV
 
   static String baseUrl = baseUrlUat;
+
   // static String baseUrl = baseUrlDev;
   static String baseUrlHub = '$baseUrl/PatientCallingHub';
   static String baseUrlApi = '$baseUrl/api';
@@ -281,9 +281,6 @@ class MockJsonRepo {
     queueNoText: 'رقم الانتظار',
     callForText: 'التوجه الى',
   );
-
-
-
 }
 
 // RAW DATA:

lib/main.dart

@@ -60,6 +60,8 @@ class MyApp extends StatelessWidget {
           log("=====================================");
 
           SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
+          // SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+
           // if (!isAndroid14) {
           //   SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
           // }

lib/views/common_widgets/app_header.dart

@@ -44,7 +44,7 @@ class AppHeader extends StatelessWidget implements PreferredSizeWidget {
                       mainAxisAlignment: MainAxisAlignment.end,
                       children: [
                         SvgPicture.asset(
-                          globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? AppAssets.hmgLogoFull : AppAssets.hmgLogoPharmacy,
+                          (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment || globalConfigurationsModel.qTypeEnum == QTypeEnum.lab) ? AppAssets.hmgLogoFull : AppAssets.hmgLogoPharmacy,
                           height: SizeConfig.getHeightMultiplier() * 0.48,
                         ),
                       ],

lib/views/main_queue_screen/components/priority_tickets.dart

@@ -59,14 +59,26 @@ class PriorityTickets extends StatelessWidget {
       case 2:
         return [
           Expanded(child: _buildPrimaryTicket(context, tickets[0], isFullWidth: true)),
-          globalConfigurationsModel.isFromTakhasusiMain ? SizedBox(height: SizeConfig.getHeightMultiplier()! * 0.2) : SizedBox(height: SizeConfig.getHeightMultiplier()! * 0.5),
+          globalConfigurationsModel.isFromTakhasusiMain
+              ? SizedBox(height: SizeConfig.getHeightMultiplier()! * 0.2)
+              : SizedBox(
+                  height: SizeConfig.getHeightMultiplier()! *
+                      (globalConfigurationsModel.orientationTypeEnum == ScreenOrientationEnum.landscapeRight || globalConfigurationsModel.orientationTypeEnum == ScreenOrientationEnum.landscapeLeft
+                          ? 0.7
+                          : 0.5)),
           Expanded(child: _buildSecondaryTicket(context, tickets[1], isHalf: true)),
         ];
       case 3:
       case 4:
         return [
           Expanded(child: _buildPrimaryTicket(context, tickets[0], isFullWidth: true)),
-          globalConfigurationsModel.isFromTakhasusiMain ? SizedBox(height: SizeConfig.getHeightMultiplier()! * 0.2) : SizedBox(height: SizeConfig.getHeightMultiplier()! * 0.5),
+          globalConfigurationsModel.isFromTakhasusiMain
+              ? SizedBox(height: SizeConfig.getHeightMultiplier()! * 0.2)
+              : SizedBox(
+                  height: SizeConfig.getHeightMultiplier()! *
+                      (globalConfigurationsModel.orientationTypeEnum == ScreenOrientationEnum.landscapeRight || globalConfigurationsModel.orientationTypeEnum == ScreenOrientationEnum.landscapeLeft
+                          ? 0.7
+                          : 0.5)),
           Expanded(child: _buildOtherTicketsRow(context, noOfTicketsToSkipFromStart: 1, isHalf: true)),
         ];
 

lib/views/main_queue_screen/components/priority_tickets_sidelist.dart

@@ -140,6 +140,13 @@ class PriorityTicketsWithSideSection extends StatelessWidget {
       priorityTickets = tickets;
     }
     final List<Widget> children = [
+      if (screenOrientationEnum == ScreenOrientationEnum.landscapeLeft || screenOrientationEnum == ScreenOrientationEnum.landscapeRight) ...[
+        if (tickets.length > 1 && tickets.length < 6) ...[
+          SizedBox(height: SizeConfig.getWidthMultiplier() * 7),
+        ] else ...[
+          SizedBox(height: SizeConfig.getWidthMultiplier() * 1.5),
+        ]
+      ],
       Expanded(flex: 5, child: PriorityTickets(globalConfigurationsModel: globalConfigurationsModel, tickets: priorityTickets)),
       // if (screenOrientationEnum == ScreenOrientationEnum.portraitUp || screenOrientationEnum == ScreenOrientationEnum.portraitDown) ...[
       //   SizedBox(width: SizeConfig.getWidthMultiplier() * 2),
@@ -150,9 +157,7 @@ class PriorityTicketsWithSideSection extends StatelessWidget {
       if (showThankyouMessage) ...[
         showThankyouWidget(),
       ] else ...[
-        // if (globalConfigurationsModel.isFromTakhasusiMain) ...[
-        //   SizedBox(height: SizeConfig.getHeightMultiplier()! * 0.1),
-        // ],
+        SizedBox(height: SizeConfig.getHeightMultiplier()! * 0.1),
         Expanded(
           flex: !globalConfigurationsModel.isRssFeedReq && (screenOrientationEnum == ScreenOrientationEnum.landscapeLeft || screenOrientationEnum == ScreenOrientationEnum.landscapeRight) ? 6 : 4,
           // flex: !globalConfigurationsModel.isRssFeedReq && (screenOrientationEnum == ScreenOrientationEnum.landscapeLeft || screenOrientationEnum == ScreenOrientationEnum.landscapeRight) ? 6 : 4,

pubspec.lock

@@ -45,10 +45,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
   clock:
     dependency: transitive
     description:
@@ -324,26 +324,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.17"
+    version: "0.12.19"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.11.1"
+    version: "0.13.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
       url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.18.0"
   nested:
     dependency: transitive
     description:
@@ -625,10 +625,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
+      sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.6"
+    version: "0.7.11"
   tuple:
     dependency: transitive
     description:
@@ -758,5 +758,5 @@ packages:
     source: hosted
     version: "1.0.1"
 sdks:
-  dart: ">=3.8.0-0 <4.0.0"
+  dart: ">=3.10.0-0 <4.0.0"
   flutter: ">=3.24.0"

qline_scripts/device_ips_tak.txt

@@ -24,4 +24,7 @@
 10.70.6.157
 10.70.6.159
 10.70.6.128
+10.70.6.123
+10.70.6.132
+10.70.6.198