Updated the Complete design for AppointmentModule

android/app/src/main/kotlin/com/example/hmg_qline/hmg_qline/BootForegroundService.kt

@@ -1,37 +1,22 @@
 package com.example.hmg_qline.hmg_qline
 
-
-import android.app.AlarmManager
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
 import android.content.Intent
 import android.os.Build
-import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.lifecycle.LifecycleService
-import android.app.ActivityManager
 
 class BootForegroundService : LifecycleService() {
     override fun onCreate() {
         super.onCreate()
         startForegroundService()
-        schedulePeriodicCheck()
     }
 
     private fun startForegroundService() {
         val channelId = "boot_service_channel"
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel = NotificationChannel(
-                channelId,
-                "Boot Service Channel",
-                NotificationManager.IMPORTANCE_HIGH
-            )
-            val manager = getSystemService(NotificationManager::class.java)
-            manager?.createNotificationChannel(channel)
-        }
+        createNotificationChannel()
 
         val notification: Notification = NotificationCompat.Builder(this, channelId)
             .setContentTitle("QLine App")
@@ -41,67 +26,24 @@ class BootForegroundService : LifecycleService() {
 
         startForeground(1, notification)
 
-        val activityManager = getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
-        val runningProcesses = activityManager.runningAppProcesses
-
-        var isAppInForeground = false
-        for (process in runningProcesses) {
-            if (process.processName == packageName &&
-                process.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
-            ) {
-                isAppInForeground = true
-                break
-            }
+        // Only launch MainActivity if this service is started by the system (e.g. on boot)
+        val intent = Intent(this, MainActivity::class.java).apply {
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
         }
-
-        if (!isAppInForeground) {
-            Log.d("BootForegroundService", "App is NOT in foreground — launching MainActivity.")
-            val intent = Intent(this, MainActivity::class.java).apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            }
-            startActivity(intent)
-        } else {
-            Log.d("BootForegroundService", "App is already in foreground.")
-        }
-
-        stopSelf() // Stop the service after check
-    }
-
-
-    private fun schedulePeriodicCheck() {
-        val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager
-        val intent = Intent(this, BootForegroundService::class.java)
-        val pendingIntent = PendingIntent.getService(
-            this,
-            0,
-            intent,
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-        )
-        // Repeat every 1 minute
-        alarmManager.setRepeating(
-            AlarmManager.RTC_WAKEUP,
-            System.currentTimeMillis() + 60 * 1000,
-            60 * 1000,
-            pendingIntent
-        )
-
+        startActivity(intent)
+        stopSelf() // Stop the service after initialization
     }
 
-    private fun bringAppToFrontIfNotVisible() {
-        val activityManager = getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
-        val runningProcesses = activityManager.runningAppProcesses
-
-        val isAppInForeground = runningProcesses.any {
-            it.processName == packageName && it.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
-        }
-
-        if (!isAppInForeground) {
-            Log.d("BootForegroundService", "App is not in foreground, launching MainActivity")
-            val intent = Intent(this, MainActivity::class.java)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
-            startActivity(intent)
-        } else {
-            Log.d("BootForegroundService", "App is already in foreground")
+    private fun createNotificationChannel() {
+        val channelId = "boot_service_channel"
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channel = NotificationChannel(
+                channelId,
+                "Boot Service Channel",
+                NotificationManager.IMPORTANCE_HIGH
+            )
+            val manager = getSystemService(NotificationManager::class.java)
+            manager?.createNotificationChannel(channel)
         }
     }
 }

android/app/src/main/kotlin/com/example/hmg_qline/hmg_qline/BootReceiver.kt

@@ -9,11 +9,17 @@ import android.util.Log
 class BootBroadcastReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         Log.d("BootReceiver", "Received intent: ${intent.action}")
-        if (intent.action == Intent.ACTION_BOOT_COMPLETED || intent.action == "android.intent.action.QUICKBOOT_POWERON") {
+
+        if (intent.action == Intent.ACTION_BOOT_COMPLETED ||
+            intent.action == "android.intent.action.QUICKBOOT_POWERON" ||
+            intent.action == "com.htc.intent.action.QUICKBOOT_POWERON"
+        ) {
+
             Log.d("BootReceiver", "Starting BootForegroundService.")
             val serviceIntent = Intent(context, BootForegroundService::class.java)
+
+            // Use foreground service for Android 8.0+ (API 26+)
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                // For Android 11 (API level 30) or later
                 context.startForegroundService(serviceIntent)
             } else {
                 context.startService(serviceIntent)

android/app/src/main/kotlin/com/example/hmg_qline/hmg_qline/MainActivity.kt

@@ -13,14 +13,18 @@ class MainActivity : FlutterActivity() {
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
 
-        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL).setMethodCallHandler {
-                call, _ ->
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL).setMethodCallHandler { call, result ->
             Log.d("MainActivity", "MethodChannel call received: ${call.method}")
-            if (call.method == "reopenApp") {
-                Log.d("MainActivity", "reopenApp called, launching MainActivity")
-                val intent = Intent(this, MainActivity::class.java)
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP)
-                startActivity(intent)
+            when (call.method) {
+                "reopenApp" -> {
+                    Log.d("MainActivity", "reopenApp called, bringing app to foreground")
+                    // Simply bring current activity to foreground
+                    moveTaskToBack(false)
+                    // Or trigger Flutter navigation if needed
+                    result.success("App brought to foreground")
+                }
+
+                else -> result.notImplemented()
             }
         }
     }

assets/new_design_icons/hmg_logo_pattern_dark.svg

@@ -0,0 +1,6 @@
+<svg width="120" height="121" viewBox="0 0 120 121" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.8">
+<path d="M0.0357295 120.891C0.0357295 120.891 5.91992 120.847 10.0616 120.847L41.4695 121C45.2182 121 48.3403 117.04 48.5162 111.319L48.5519 85.2434C48.5519 79.6836 51.0528 75.3335 54.9307 75.085L64.5636 75.0085C68.447 75.2461 71.1128 79.6508 71.1128 85.1751L71.0881 111.39C71.2585 117.109 73.8749 120.842 77.6429 120.842L119.923 120.956L120 88.7333C120 83.1899 117.318 78.8835 113.404 78.6295L96.4194 78.5449C92.6625 78.5449 89.708 74.6044 89.5486 68.878L89.4826 60.1614C89.6695 54.4432 92.6405 50.5109 96.4057 50.5109L113.484 50.56C117.364 50.3115 119.893 45.7594 119.893 40.2241L119.934 0C118.538 2.2708 116.629 4.18742 114.359 5.598C112.088 7.00858 109.518 7.87436 106.852 8.12674L78.1321 8.10216C74.3916 8.10216 71.2612 12.1546 71.0853 17.8728V43.7031C70.9095 49.4104 67.9715 53.4492 64.2145 53.4492L55.5244 53.3836C51.7564 53.3836 48.7443 49.4759 48.5739 43.785L48.5959 17.6708C48.4255 11.9498 45.4408 8.11309 41.6811 8.11309L0.00276778 8.1322V40.2569C0.00276778 45.8058 2.6109 50.2487 6.50252 50.5054L23.5806 50.4344C27.442 50.6856 30.1766 55.2624 30.1766 60.7813L30.1244 68.2171C30.1244 73.7633 27.486 78.2008 23.6054 78.452L6.4998 78.411C2.60817 78.6841 0 83.0534 0 88.5995L0.0357295 120.891Z" fill="#706262" fill-opacity="0.07"/>
+<path d="M0.0357295 120.891C0.0357295 120.891 5.91992 120.847 10.0616 120.847L41.4695 121C45.2182 121 48.3403 117.04 48.5162 111.319L48.5519 85.2434C48.5519 79.6836 51.0528 75.3335 54.9307 75.085L64.5636 75.0085C68.447 75.2461 71.1128 79.6508 71.1128 85.1751L71.0881 111.39C71.2585 117.109 73.8749 120.842 77.6429 120.842L119.923 120.956L120 88.7333C120 83.1899 117.318 78.8835 113.404 78.6295L96.4194 78.5449C92.6625 78.5449 89.708 74.6044 89.5486 68.878L89.4826 60.1614C89.6695 54.4432 92.6405 50.5109 96.4057 50.5109L113.484 50.56C117.364 50.3115 119.893 45.7594 119.893 40.2241L119.934 0C118.538 2.2708 116.629 4.18742 114.359 5.598C112.088 7.00858 109.518 7.87436 106.852 8.12674L78.1321 8.10216C74.3916 8.10216 71.2612 12.1546 71.0853 17.8728V43.7031C70.9095 49.4104 67.9715 53.4492 64.2145 53.4492L55.5244 53.3836C51.7564 53.3836 48.7443 49.4759 48.5739 43.785L48.5959 17.6708C48.4255 11.9498 45.4408 8.11309 41.6811 8.11309L0.00276778 8.1322V40.2569C0.00276778 45.8058 2.6109 50.2487 6.50252 50.5054L23.5806 50.4344C27.442 50.6856 30.1766 55.2624 30.1766 60.7813L30.1244 68.2171C30.1244 73.7633 27.486 78.2008 23.6054 78.452L6.4998 78.411C2.60817 78.6841 0 83.0534 0 88.5995L0.0357295 120.891Z" fill="#706262" fill-opacity="0.07"/>
+</g>
+</svg>

assets/new_design_icons/hmg_logo_pattern_light.svg

@@ -0,0 +1,6 @@
+<svg width="110" height="110" viewBox="0 0 110 110" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.8">
+<path d="M0.0327521 109.901C0.0327521 109.901 5.42659 109.861 9.22317 109.861L38.0137 110C41.45 110 44.3119 106.4 44.4732 101.2L44.5059 77.494C44.5059 72.4396 46.7984 68.485 50.3532 68.2591L59.1833 68.1896C62.7431 68.4056 65.1868 72.4098 65.1868 77.432L65.1641 101.264C65.3203 106.462 67.7187 109.856 71.1726 109.856L109.929 109.96L110 80.6667C110 75.6272 107.541 71.7122 103.954 71.4814L88.3845 71.4044C84.9406 71.4044 82.2324 67.8222 82.0862 62.6163L82.0257 54.6922C82.1971 49.4938 84.9204 45.919 88.3719 45.919L104.027 45.9637C107.584 45.7378 109.902 41.5994 109.902 36.5674L109.94 0C108.66 2.06437 106.91 3.80674 104.829 5.08909C102.747 6.37143 100.391 7.15851 97.9477 7.38795L71.6211 7.3656C68.1923 7.3656 65.3228 11.0496 65.1616 16.248V39.7301C65.0003 44.9185 62.3072 48.5902 58.8633 48.5902L50.8973 48.5306C47.4434 48.5306 44.6823 44.9781 44.5261 39.8046L44.5462 16.0643C44.39 10.8635 41.654 7.37554 38.2076 7.37554L0.00253713 7.39291V36.5972C0.00253713 41.6416 2.39332 45.6807 5.96065 45.914L21.6156 45.8495C25.1552 46.0779 27.6619 50.2386 27.6619 55.2557L27.614 62.0156C27.614 67.0576 25.1955 71.0916 21.6382 71.32L5.95815 71.2828C2.39083 71.531 0 75.5031 0 80.545L0.0327521 109.901Z" fill="#CFCED1" fill-opacity="0.08"/>
+<path d="M0.0327521 109.901C0.0327521 109.901 5.42659 109.861 9.22317 109.861L38.0137 110C41.45 110 44.3119 106.4 44.4732 101.2L44.5059 77.494C44.5059 72.4396 46.7984 68.485 50.3532 68.2591L59.1833 68.1896C62.7431 68.4056 65.1868 72.4098 65.1868 77.432L65.1641 101.264C65.3203 106.462 67.7187 109.856 71.1726 109.856L109.929 109.96L110 80.6667C110 75.6272 107.541 71.7122 103.954 71.4814L88.3845 71.4044C84.9406 71.4044 82.2324 67.8222 82.0862 62.6163L82.0257 54.6922C82.1971 49.4938 84.9204 45.919 88.3719 45.919L104.027 45.9637C107.584 45.7378 109.902 41.5994 109.902 36.5674L109.94 0C108.66 2.06437 106.91 3.80674 104.829 5.08909C102.747 6.37143 100.391 7.15851 97.9477 7.38795L71.6211 7.3656C68.1923 7.3656 65.3228 11.0496 65.1616 16.248V39.7301C65.0003 44.9185 62.3072 48.5902 58.8633 48.5902L50.8973 48.5306C47.4434 48.5306 44.6823 44.9781 44.5261 39.8046L44.5462 16.0643C44.39 10.8635 41.654 7.37554 38.2076 7.37554L0.00253713 7.39291V36.5972C0.00253713 41.6416 2.39332 45.6807 5.96065 45.914L21.6156 45.8495C25.1552 46.0779 27.6619 50.2386 27.6619 55.2557L27.614 62.0156C27.614 67.0576 25.1955 71.0916 21.6382 71.32L5.95815 71.2828C2.39083 71.531 0 75.5031 0 80.545L0.0327521 109.901Z" fill="#CFCED1" fill-opacity="0.08"/>
+</g>
+</svg>

assets/new_design_icons/new_doctor_icon.svg

@@ -0,0 +1,5 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M46.5107 36.0539C46.9977 37.178 47.281 38.5536 47.3435 40.1442C48.987 40.5208 50.217 41.9908 50.217 43.7464C50.217 45.7853 48.5581 47.4442 46.5192 47.4442C44.4803 47.4442 42.8214 45.7853 42.8214 43.7464C42.8214 42.0107 44.0246 40.5561 45.6391 40.1584C45.568 38.5786 45.1903 36.1751 43.644 34.9884C42.855 34.7841 42.0438 34.6362 41.2115 34.56C41.15 37.3276 32.0023 44.1577 32.0023 44.1577C32.0023 44.1577 22.8517 37.3288 22.7897 34.5611C21.8653 34.6453 20.9659 34.8143 20.0972 35.0578C18.9691 35.9509 18.3854 37.6149 18.3552 40.0338C18.6869 40.2244 18.9548 40.522 19.1192 40.8821C20.3344 41.4561 21.4079 42.6632 22.2299 44.3819C22.3676 44.6709 22.3858 44.9974 22.2845 45.2955C22.7772 46.5636 23.0588 47.9494 23.0588 49.1133C23.0588 50.7443 23.0588 52.2866 21.281 52.6825C21.0887 52.8424 20.8475 52.9306 20.5944 52.9306H19.4065C18.8109 52.9306 18.3262 52.4447 18.3262 51.8508L18.3274 51.8087C18.3501 51.2341 18.8308 50.7705 19.4065 50.7705H20.5944C20.7161 50.7705 20.835 50.791 20.9499 50.8308C21.0216 50.8109 21.0444 50.7944 21.0449 50.7938C21.1769 50.5594 21.1769 49.5832 21.1769 49.1144C21.1769 48.169 20.9403 47.0272 20.5255 45.9662C20.3105 45.8439 20.1364 45.659 20.0295 45.4354C19.3093 43.9273 18.3296 42.9534 17.5343 42.9534C16.7208 42.9534 15.6923 44.007 14.9749 45.5725C14.8577 45.828 14.6523 46.0356 14.3997 46.1602C14.0248 47.1751 13.8189 48.2202 13.8189 49.1139C13.8189 49.5076 13.8189 50.552 13.9691 50.7978C13.9708 50.7978 14.0044 50.8183 14.0988 50.8416C14.2217 50.7944 14.3537 50.7699 14.4856 50.7699H15.6758C16.2304 50.7699 16.6941 51.192 16.7498 51.741L16.7555 51.8076C16.7555 52.4453 16.2708 52.9311 15.6758 52.9311H14.4856C14.2496 52.9311 14.0214 52.852 13.8337 52.7087C13.1539 52.5807 12.6749 52.2809 12.3717 51.7928C12.0042 51.2028 11.937 50.428 11.937 49.1139C11.937 47.9613 12.2033 46.6335 12.6868 45.3655C12.6157 45.0941 12.6396 44.8108 12.7579 44.5554C13.2614 43.454 13.902 42.5108 14.6097 41.8287C14.9988 41.4538 15.4169 41.1523 15.8544 40.9321C16.0182 40.5487 16.3027 40.2341 16.6503 40.0356C16.6685 38.5195 16.9017 37.2105 17.3329 36.1313C12.3961 38.6355 9.01294 43.7572 9.01294 49.672C9.01294 57.2302 14.5351 57.6 21.764 57.6C22.5531 57.6 23.3609 57.5954 24.1863 57.5954H39.812C40.6363 57.5954 41.4442 57.6 42.2332 57.6C49.4632 57.6 54.9877 57.2302 54.9877 49.672C54.9871 43.6946 51.5317 38.528 46.5107 36.0539Z" fill="#03A567"/>
+<path d="M32.0045 36.5466C38.9928 36.5466 44.6572 26.0386 44.6572 19.051C44.6572 12.0645 38.9928 6.40002 32.0045 6.40002C25.0175 6.40002 19.353 12.0645 19.353 19.051C19.353 26.0386 25.0175 36.5466 32.0045 36.5466Z" fill="#03A567"/>
+<path d="M46.5187 45.4531C47.4612 45.4531 48.2253 44.689 48.2253 43.7465C48.2253 42.8039 47.4612 42.0398 46.5187 42.0398C45.5761 42.0398 44.812 42.8039 44.812 43.7465C44.812 44.689 45.5761 45.4531 46.5187 45.4531Z" fill="#03A567"/>
+</svg>

assets/new_design_icons/new_vital_sign_icon.svg

@@ -0,0 +1,5 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M32.471 46.9731C31.673 46.9731 31.103 46.5171 30.8749 45.719L26.8847 30.556L26.0866 35.2303C25.9726 36.0284 25.2886 36.5984 24.4905 36.5984H7.84546V33.2922H23.1224L24.9466 22.4615C25.0606 21.6635 25.7446 21.0934 26.5427 21.0934C27.3407 21.0934 28.0248 21.5495 28.2528 22.3475L32.129 37.0545L35.3212 14.595C35.4352 13.797 36.1193 13.2269 36.8033 13.2269C37.6014 13.2269 38.2854 13.683 38.5134 14.481L43.5298 33.4062H57.0966V36.7124H42.2757C41.4776 36.7124 40.9076 36.2564 40.6796 35.4584L37.3734 23.0316L34.0671 45.491C33.9531 46.4031 33.3831 46.9731 32.471 46.9731Z" fill="#4B5B6A"/>
+<path d="M21.6402 22.1195C21.9822 19.8394 24.0344 18.1293 26.3145 18.0153H26.5425C28.5947 18.0153 30.3048 19.2693 31.1028 20.9794L32.1289 14.139C32.4709 11.8589 34.409 10.0347 36.6892 9.92073H36.9172C39.1973 9.92073 41.1355 11.4028 41.7055 13.569L46.0378 30.1H56.0704C57.4385 27.5919 58.1226 24.9697 58.1226 22.0055C58.1226 13.683 51.3961 6.95654 43.0736 6.95654C38.7413 6.95654 34.6371 8.78066 31.7869 11.9729C28.9367 8.78066 24.8324 6.95654 20.5001 6.95654C12.2916 6.95654 5.56519 13.797 5.56519 22.1195C5.56519 25.0837 6.13522 27.7059 7.2753 30.214H20.2721L21.6402 22.1195Z" fill="#4B5B6A"/>
+<path d="M38.5133 38.3086L37.3733 46.0611C37.0312 48.3412 35.0931 50.1654 32.813 50.2794H32.5849C30.3048 50.2794 28.3667 48.7973 27.7966 46.6311L25.9725 39.7907C25.5165 39.9047 25.0605 40.0187 24.4904 40.0187H14.6858C16.8519 42.0708 19.2461 44.237 21.7542 46.5171C24.6044 49.0253 27.7966 51.7615 31.1028 54.9537L31.9009 55.7517L32.699 54.9537C36.1192 51.4194 39.4254 48.3412 42.3896 45.6051C44.4417 43.6669 46.4938 41.8428 48.2039 40.0187H42.2756C40.7935 40.0187 39.4254 39.3347 38.5133 38.3086Z" fill="#4B5B6A"/>
+</svg>

assets/new_design_icons/salah_time_icon.svg

@@ -0,0 +1,8 @@
+<svg width="74" height="64" viewBox="0 0 74 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M55.7304 17.6388C55.3682 17.0394 54.7189 16.6731 54.0186 16.6731C53.3183 16.6731 52.669 17.0394 52.3069 17.6388C52.233 17.761 52.0291 18.0211 51.5601 18.4799C51.1103 18.9198 50.509 19.4549 49.7265 20.1304C49.3003 20.4983 48.8247 20.904 48.3015 21.3503C46.9322 22.5183 45.237 23.9644 43.2525 25.7347C43.2152 25.768 43.1791 25.8028 43.1443 25.8388C40.3429 28.7436 38.856 31.6565 38.8034 34.6734C38.7738 36.3734 39.2027 37.9661 39.9382 39.4629H39.3906C38.2861 39.4629 37.3906 40.3583 37.3906 41.4629C37.3906 42.5674 38.2861 43.4629 39.3906 43.4629H40.2462V56.249C40.2462 56.2889 40.2474 56.3288 40.2497 56.3685L40.26 56.5526C40.2787 56.897 40.3033 57.3502 40.3702 57.7414C40.4574 58.2518 40.6586 58.9738 41.2566 59.5882C41.857 60.2051 42.6134 60.4658 43.3009 60.5782C43.9558 60.6853 44.7109 60.6846 45.5463 60.6272H62.89C62.9513 60.6272 63.0125 60.6244 63.0735 60.6188C63.2129 60.6059 63.3153 60.6044 63.4661 60.6021C63.589 60.6003 63.7444 60.5979 63.978 60.5885C64.3623 60.5732 64.9609 60.5341 65.5569 60.3238C66.2131 60.0923 66.9297 59.629 67.3728 58.7708C67.7616 58.0177 67.8199 57.1878 67.7357 56.4028V43.4629H68.6668C69.7714 43.4629 70.6668 42.5674 70.6668 41.4629C70.6668 40.3583 69.7714 39.4629 68.6668 39.4629H68.1275C68.8837 37.8205 69.2837 36.0705 69.2203 34.2726C69.1113 31.1817 67.6425 28.2385 64.8358 25.7347C62.7711 23.8928 61.0162 22.4053 59.6101 21.2134C59.145 20.8192 58.7176 20.4569 58.3302 20.1252C57.5402 19.4488 56.9328 18.9135 56.4783 18.4732C56.0033 18.013 55.801 17.7556 55.7304 17.6388ZM44.2462 56.19V43.4629H63.7357V56.5196C63.7357 56.5446 63.7362 56.5696 63.7372 56.5946C63.6622 56.597 63.5882 56.5985 63.5042 56.6002L63.3318 56.6038C63.1811 56.6074 62.9979 56.6129 62.8074 56.6272H56.0018L56.0624 52.9681C56.0806 51.8637 55.2002 50.9535 54.0957 50.9353C52.9913 50.917 52.0812 51.7975 52.0629 52.9019L52.0012 56.6272H45.476C45.4279 56.6272 45.3799 56.629 45.3319 56.6324C44.857 56.6667 44.5153 56.6712 44.2733 56.6607C44.2678 56.5752 44.2631 56.4905 44.2577 56.3941L44.2462 56.19ZM42.8028 34.743C42.7773 36.207 43.3514 37.7421 44.6159 39.4629H63.5208C64.7221 37.7641 65.28 36.0352 65.2228 34.4135C65.1586 32.5933 64.3108 30.6267 62.173 28.7196C60.1501 26.915 58.4523 25.4759 57.0511 24.2881C56.5773 23.8865 56.1357 23.5122 55.7287 23.1636C55.0852 22.6126 54.5112 22.1118 54.0241 21.6582C53.5428 22.1103 52.9763 22.6093 52.3402 23.1584C51.8889 23.5479 51.3975 23.9671 50.8638 24.4223C49.5154 25.5726 47.8961 26.9538 45.9725 28.6686C43.6203 31.1241 42.8314 33.1041 42.8028 34.743Z" fill="#EC1C2B" fill-opacity="0.06"/>
+<path d="M13.3359 24.008C13.3359 12.5897 22.5945 3.33423 34.0145 3.33423C40.9651 3.33423 47.8877 6.77899 51.6649 12.1929C52.2969 13.0988 52.0749 14.3455 51.169 14.9775C50.2631 15.6095 49.0164 15.3875 48.3844 14.4816C45.4111 10.22 39.7583 7.33423 34.0145 7.33423C24.8027 7.33423 17.3359 14.7998 17.3359 24.008C17.3359 32.8214 24.1737 40.0766 32.8211 40.6868C33.9229 40.7645 34.7531 41.7208 34.6753 42.8226C34.5976 43.9244 33.6413 44.7546 32.5395 44.6768C21.8005 43.9191 13.3359 34.9243 13.3359 24.008Z" fill="#EC1C2B" fill-opacity="0.06"/>
+<path d="M34.0132 16.6731C35.1177 16.6731 36.0132 17.5685 36.0132 18.6731V25.3423C36.0132 26.0111 35.6789 26.6356 35.1224 27.0065L31.1198 29.6742C30.2007 30.2868 28.959 30.0383 28.3464 29.1192C27.7338 28.2001 27.9823 26.9584 28.9014 26.3458L32.0132 24.2718V18.6731C32.0132 17.5685 32.9086 16.6731 34.0132 16.6731Z" fill="#EC1C2B" fill-opacity="0.06"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M35.7269 27.7803C35.4439 27.312 34.9367 27.0258 34.3896 27.0258C33.8424 27.0258 33.3352 27.312 33.0522 27.7803C32.9945 27.8758 32.8352 28.079 32.4688 28.4374C32.1174 28.7811 31.6477 29.1992 31.0363 29.7269C30.7034 30.0143 30.3318 30.3313 29.9231 30.6799C28.8533 31.5924 27.5289 32.7222 25.9785 34.1052C25.9494 34.1313 25.9212 34.1584 25.894 34.1865C23.7054 36.4559 22.5437 38.7316 22.5027 41.0886C22.4795 42.4167 22.8146 43.661 23.3892 44.8303H22.9614C22.0985 44.8303 21.3989 45.5299 21.3989 46.3928C21.3989 47.2558 22.0985 47.9553 22.9614 47.9553H23.6298V57.9446C23.6298 57.9757 23.6307 58.0068 23.6326 58.0379L23.6407 58.1817C23.6553 58.4508 23.6745 58.8048 23.7267 59.1105C23.7948 59.5092 23.952 60.0732 24.4192 60.5533C24.8883 61.0352 25.4792 61.2389 26.0164 61.3267C26.528 61.4104 27.1179 61.4099 27.7706 61.365H41.3203C41.3682 61.365 41.416 61.3628 41.4637 61.3584C41.5726 61.3484 41.6526 61.3472 41.7704 61.3454C41.8664 61.3439 41.9878 61.3421 42.1703 61.3348C42.4706 61.3228 42.9382 61.2923 43.4038 61.128C43.9165 60.9471 44.4763 60.5851 44.8225 59.9146C45.1263 59.3263 45.1718 58.678 45.106 58.0647V47.9553H45.8335C46.6964 47.9553 47.396 47.2558 47.396 46.3928C47.396 45.5299 46.6964 44.8303 45.8335 44.8303H45.4121C46.0029 43.5472 46.3154 42.1801 46.2659 40.7754C46.1807 38.3607 45.0332 36.0614 42.8405 34.1052C41.2274 32.6662 39.8564 31.5041 38.7579 30.573C38.3945 30.265 38.0606 29.9819 37.758 29.7228C37.1408 29.1944 36.6663 28.7762 36.3112 28.4322C35.9401 28.0726 35.782 27.8716 35.7269 27.7803ZM26.7548 57.8984V47.9553H41.981V58.1559C41.981 58.1755 41.9814 58.195 41.9822 58.2145C41.9236 58.2164 41.8658 58.2175 41.8002 58.2189L41.6655 58.2217C41.5477 58.2245 41.4046 58.2288 41.2558 58.24H35.9389L35.9862 55.3813C36.0005 54.5185 35.3126 53.8075 34.4498 53.7932C33.587 53.7789 32.8759 54.4668 32.8616 55.3296L32.8135 58.24H27.7156C27.6781 58.24 27.6405 58.2414 27.6031 58.2441C27.232 58.2709 26.9651 58.2743 26.776 58.2662C26.7717 58.1993 26.768 58.1332 26.7638 58.0579L26.7548 57.8984ZM25.6272 41.143C25.6073 42.2867 26.0558 43.486 27.0437 44.8303H41.8131C42.7516 43.5032 43.1875 42.1525 43.1428 40.8855C43.0927 39.4635 42.4303 37.9271 40.7601 36.4372C39.1798 35.0273 37.8534 33.903 36.7587 32.9751C36.3885 32.6613 36.0436 32.3689 35.7255 32.0966C35.2228 31.6661 34.7744 31.2748 34.3938 30.9205C34.0178 31.2737 33.5753 31.6635 33.0783 32.0925C32.7257 32.3968 32.3418 32.7243 31.9248 33.0799C30.8714 33.9786 29.6063 35.0577 28.1035 36.3974C26.2659 38.3157 25.6495 39.8626 25.6272 41.143Z" fill="#EC1C2B"/>
+<path d="M2.6062 32.7563C2.6062 23.8357 9.83947 16.6049 18.7613 16.6049C24.1915 16.6049 29.5998 19.2961 32.5507 23.5257C33.0445 24.2334 32.871 25.2074 32.1633 25.7012C31.4556 26.195 30.4816 26.0215 29.9878 25.3138C27.665 21.9844 23.2487 19.7299 18.7613 19.7299C11.5646 19.7299 5.7312 25.5624 5.7312 32.7563C5.7312 39.6417 11.0732 45.3098 17.829 45.7865C18.6898 45.8473 19.3383 46.5943 19.2776 47.4551C19.2169 48.3159 18.4698 48.9645 17.609 48.9038C9.21915 48.3118 2.6062 41.2846 2.6062 32.7563Z" fill="#EC1C2B"/>
+<path d="M18.7603 27.0258C19.6232 27.0258 20.3228 27.7254 20.3228 28.5884V33.7987C20.3228 34.3212 20.0616 34.8091 19.6269 35.0989L16.4999 37.183C15.7818 37.6616 14.8117 37.4674 14.3331 36.7494C13.8545 36.0313 14.0487 35.0612 14.7667 34.5826L17.1978 32.9623V28.5884C17.1978 27.7254 17.8973 27.0258 18.7603 27.0258Z" fill="#EC1C2B"/>
+</svg>

lib/constants/app_constants.dart

@@ -13,6 +13,7 @@ class AppStrings {
   static String poweredBy = "Powered By";
   static String appName = "QLine";
   static String fontNamePoppins = "Poppins";
+  static String fontNameGesTwo = "GE_SS_Two";
   static String fontNameCairo = "Cairo";
   static String noInternetConnection = "No Internet Connection";
   static String awaitingArrivalEng = "Awaiting Patients Arrival";
@@ -26,6 +27,10 @@ class AppStrings {
   static String errorLogsFileName = "error_logs.txt";
 
   static String openAppNativeFunctionName = "reopenApp";
+
+  static String dummyRssFeedText =
+      "Breaking: New Flutter 3.16 released with enhanced performance and stability features • Weather Update: Sunny skies expected throughout the week with temperatures reaching 25°C • Traffic Alert: Highway A1 experiencing delays due to construction work between exits 15-18 • Market Update: Stock indices show positive growth with technology sector leading gains • Company Announcement: Q4 results exceed expectations • New product launch scheduled for next month • Employee appreciation event on Friday • Special Offer: 20% discount on all services this week • Limited time promotion • Terms and conditions apply • Contact customer service for details • Welcome to our digital queue management system • Please follow the instructions on screen • For assistance, contact our support team • Thank you for your patience";
+  static List<String> prayersArray = ["الفجر", "الظهر", "العصر", "المغرب", "العشاء"];
 }
 
 class AppColors {
@@ -47,7 +52,6 @@ class AppColors {
   static Color procedureColor = const Color(0xFF460707);
 
   //Decoration
-
   static BoxDecoration configWidgetDecoration = BoxDecoration(
     color: Colors.white,
     borderRadius: BorderRadius.circular(12),
@@ -64,6 +68,36 @@ class AppColors {
       ),
     ],
   );
+
+  // New Design Colors
+
+  static Color backgroundColor = const Color(0xFFF7F7F7);
+  static Color greyTextColor = const Color(0xFF3E3C47);
+  static Color darkGreyTextColor = const Color(0xFF2B353E);
+  static Color greyContainerColor = const Color(0xFF4B5B6A);
+  static Color newGreenColor = const Color(0xFF03A567);
+  static Color newRedColor = const Color(0xFFEC1C2B);
+  static Color lightBorderColor = const Color(0xFFEDEDED);
+
+  static Color newVitalSignColor = greyContainerColor;
+  static Color newDoctorColor = newGreenColor;
+
+  // Custom Shadow Container Colors
+  static Color smoothContainerShadow = const Color(0x14000000); // 8% black without opacity
+
+  static List<Color> gradientBorderComboForVitalSigns = [
+    const Color(0xFFFFFFFF), // start
+    const Color(0xFFAFEAD4), // start
+    const Color(0xFF42BB8D), // end
+    const Color(0xFF42BB8D), // base color
+  ];
+
+  static List<Color> gradientBorderComboForDoctor = [
+    const Color(0xFFFFFFFF), // start
+    const Color(0xFFF2F3F4),
+    const Color(0xFFA5ADB4),
+    const Color(0xFF78848F),
+  ];
 }
 
 class AppAssets {
@@ -78,8 +112,8 @@ class AppAssets {
 
   //IconPaths
   static String vitalSignIcon = "assets/images/vitalsign_icon.svg";
-  static String nebulizationIcon = "assets/images/nebulization_icon.svg";
   static String doctorIcon = "assets/images/doctor_icon.svg";
+  static String nebulizationIcon = "assets/images/nebulization_icon.svg";
   static String procedureIcon = "assets/images/procedure_icon.svg";
   static String vaccinationIcon = "assets/images/vaccination_icon.svg";
 
@@ -96,6 +130,16 @@ class AppAssets {
 
   //Tones
   static String callTone = "assets/tones/call_tone.mp3";
+
+  // New Design Icons
+  static String hmgLogoPatternLightIcon = "assets/new_design_icons/hmg_logo_pattern_light.svg";
+  static String hmgLogoPatternDarkIcon = "assets/new_design_icons/hmg_logo_pattern_dark.svg";
+  static String salahTimeIcon = "assets/new_design_icons/salah_time_icon.svg";
+  static String hmgLogoFull = "assets/new_design_icons/hmg_logo_full.svg";
+  static String cloudSolutionsLogo = "assets/new_design_icons/cloud_solutions_logo.svg";
+
+  static String newVitalSignIcon = "assets/images/vitalsign_icon.svg";
+  static String newDoctorIcon = "assets/images/doctor_icon.svg";
 }
 
 class AppConstants {
@@ -105,9 +149,8 @@ class AppConstants {
   static String onlyDate = "[0-9/]";
   static String apiKey = 'EE17D21C7943485D9780223CCE55DCE5';
   static String testIP = '12.4.5.1'; // projectID.QlineType.ScreenType.AnyNumber (1 to 10)
-  static int thresholdForListUI = 3;
-
-  static double currentBuildVersion = 8.8;
+  static int thresholdForListUI = 5;
+  static double currentBuildVersion = 8.9;
   static double clearLogsHoursThreshold = 48;
 }
 

lib/models/global_config_model.dart

@@ -1,4 +1,5 @@
 import 'dart:ui';
+import 'package:hmg_qline/constants/app_constants.dart';
 import 'package:hmg_qline/models/kiosk_language_config_model.dart';
 import 'package:hmg_qline/models/kiosk_queue_model.dart';
 import 'package:hmg_qline/utilities/enums.dart';
@@ -18,29 +19,41 @@ class GlobalConfigurationsModel {
   TextDirection textDirection = TextDirection.ltr;
   LanguageEnum voiceLanguageEnum = LanguageEnum.english;
   String? voiceLanguageText;
-  int screenMaxDisplayPatients = 10;
+  int screenMaxDisplayPatients = 16;
   bool? isNotiReq;
   int? prioritySMS;
   int? priorityWhatsApp;
   int? priorityEmail;
   String ticketNoText = "Ticket Number";
   String postVoiceText = "Please Visit Counter";
-  String? roomText;
+
   int? roomNo;
   bool? isRoomNoRequired;
-  String? counterText;
-  String? queueNoText;
-  String? callForText;
-  String? currentServeText;
+  String? roomTextEng;
+  String? counterTextEng;
+  String? queueNoTextEng;
+  String? callForTextEng;
+  String? roomTextArb;
+  String? counterTextArb;
+  String? queueNoTextArb;
+  String? callForTextArb;
+  String? currentServeTextEng;
+  String? currentServeTextArb;
   String maxText = "";
   String minText = "";
-  String nextPrayerText = "";
+  String nextPrayerTextEng = "Next Prayer";
+  String nextPrayerTextArb = "الصلا<EFBFBD><EFBFBD> القادمة";
   String weatherText = "Weather";
-  String? fajarText;
-  String? dhuhrText;
-  String? asarText;
-  String? maghribText;
-  String? ishaText;
+  String? fajarTextEng;
+  String? dhuhrTextEng;
+  String? asarTextEng;
+  String? maghribTextEng;
+  String? ishaTextEng;
+  String? fajarTextArb;
+  String? dhuhrTextArb;
+  String? asarTextArb;
+  String? maghribTextArb;
+  String? ishaTextArb;
   bool? isActive;
   int? createdBy;
   String? createdOn;
@@ -64,16 +77,27 @@ class GlobalConfigurationsModel {
   List<KioskQueueModel>? kioskQueueList;
   List<KioskLanguageConfigModel>? kioskLanguageConfigList;
 
-  String vitalSignText = "Vital Sign";
-  String doctorText = "Doctor";
-  String procedureText = "Procedure";
-  String vaccinationText = "Vaccination";
-  String nebulizationText = "Nebulization";
-  String callForVitalSignText = "Call for Vital Sign";
-  String callForDoctorText = "Call for Doctor";
-  String callForProcedureText = "Call for Procedure";
-  String callForVaccinationText = "Call for Vaccination";
-  String callForNebulizationText = "Call for Nebulization";
+  String vitalSignTextEng = "Vital Sign";
+  String doctorTextEng = "Doctor";
+  String procedureTextEng = "Procedure";
+  String vaccinationTextEng = "Vaccination";
+  String nebulizationTextEng = "Nebulization";
+  String callForVitalSignTextEng = "Call for Vital Sign";
+  String callForDoctorTextEng = "Call for Doctor";
+  String callForProcedureTextEng = "Call for Procedure";
+  String callForVaccinationTextEng = "Call for Vaccination";
+  String callForNebulizationTextEng = "Call for Nebulization";
+
+  String vitalSignTextArb = "العلامات الحيوية";
+  String doctorTextArb = "الطبيب";
+  String procedureTextArb = "الإجراء";
+  String vaccinationTextArb = "التطعيم";
+  String nebulizationTextArb = "البخاخة";
+  String callForVitalSignTextArb = "الرجاء التوجّه إلى غرفة العلامات الحيوية";
+  String callForDoctorTextArb = "الرجاء التوجّه إلى غرفة الطبيب";
+  String callForProcedureTextArb = "الرجاء التوجّه إلى غرفة الإجراء";
+  String callForVaccinationTextArb = "الرجاء التوجّه إلى غرفة التطعيم";
+  String callForNebulizationTextArb = "الرجاء التوجّه إلى غرفة البخاخة";
 
   GlobalConfigurationsModel({
     this.id,
@@ -89,29 +113,39 @@ class GlobalConfigurationsModel {
     this.textDirection = TextDirection.ltr,
     this.voiceLanguageEnum = LanguageEnum.english,
     this.voiceLanguageText,
-    this.screenMaxDisplayPatients = 10,
+    this.screenMaxDisplayPatients = 16,
     this.isNotiReq,
     this.prioritySMS,
     this.priorityWhatsApp,
     this.priorityEmail,
     this.ticketNoText = "Ticket Number",
     this.postVoiceText = "Please Visit Counter",
-    this.roomText,
+    this.roomTextEng,
     this.roomNo,
     this.isRoomNoRequired = true,
-    this.counterText,
-    this.queueNoText,
-    this.callForText,
-    this.currentServeText,
+    this.counterTextEng,
+    this.queueNoTextEng,
+    this.callForTextEng,
+    this.counterTextArb,
+    this.queueNoTextArb,
+    this.callForTextArb,
+    this.currentServeTextEng,
+    this.currentServeTextArb,
     this.maxText = "",
     this.minText = "",
-    this.nextPrayerText = "",
+    this.nextPrayerTextEng = "Next Prayer",
+    this.nextPrayerTextArb = "الصلاة القادمة",
     this.weatherText = "Weather",
-    this.fajarText,
-    this.dhuhrText,
-    this.asarText,
-    this.maghribText,
-    this.ishaText,
+    this.fajarTextEng,
+    this.dhuhrTextEng,
+    this.asarTextEng,
+    this.maghribTextEng,
+    this.ishaTextEng,
+    this.fajarTextArb,
+    this.dhuhrTextArb,
+    this.asarTextArb,
+    this.maghribTextArb,
+    this.ishaTextArb,
     this.isActive,
     this.createdBy,
     this.createdOn,
@@ -134,16 +168,26 @@ class GlobalConfigurationsModel {
     this.cityKey,
     this.kioskQueueList,
     this.kioskLanguageConfigList,
-    this.vitalSignText = "Vital Sign",
-    this.doctorText = "Doctor",
-    this.procedureText = "Procedure",
-    this.vaccinationText = "Vaccination",
-    this.nebulizationText = "Nebulization",
-    this.callForVitalSignText = "Call for Vital Sign",
-    this.callForDoctorText = "Call for Doctor",
-    this.callForProcedureText = "Call for Procedure",
-    this.callForVaccinationText = "Call for Vaccination",
-    this.callForNebulizationText = "Call for Nebulization",
+    this.vitalSignTextEng = "Vital Sign",
+    this.doctorTextEng = "Doctor",
+    this.procedureTextEng = "Procedure",
+    this.vaccinationTextEng = "Vaccination",
+    this.nebulizationTextEng = "Nebulization",
+    this.callForVitalSignTextEng = "Call for Vital Sign",
+    this.callForDoctorTextEng = "Call for Doctor",
+    this.callForProcedureTextEng = "Call for Procedure",
+    this.callForVaccinationTextEng = "Call for Vaccination",
+    this.callForNebulizationTextEng = "Call for Nebulization",
+    this.vitalSignTextArb = "العلامات الحيوية",
+    this.doctorTextArb = "الطبيب",
+    this.procedureTextArb = "الإجراء",
+    this.vaccinationTextArb = "التطعيم",
+    this.nebulizationTextArb = "البخاخة",
+    this.callForVitalSignTextArb = "استدعاء للعلامات الحيوية",
+    this.callForDoctorTextArb = "الرجاء التوجّه إلى غرفة الطبيب",
+    this.callForProcedureTextArb = "الرجاء التوجّه إلى غرفة الإجراء",
+    this.callForVaccinationTextArb = "الرجاء التوجّه إلى غرفة التطعيم",
+    this.callForNebulizationTextArb = "الرجاء التوجّه إلى غرفة البخاخة",
   });
 
   GlobalConfigurationsModel.fromJson({required Map<String, dynamic> json, int qType = 1, int screenType = 1}) {
@@ -158,31 +202,45 @@ class GlobalConfigurationsModel {
     screenLanguageEnum = (json['screenLanguage'] as int).toLanguageEnum();
     screenLanguageText = json['screenLanguageText'];
     textDirection = json['textDirection'] == 2 ? TextDirection.rtl : TextDirection.ltr;
+    // textDirection = TextDirection.rtl;
+    // screenMaxDisplayPatients = json['screenMaxDisplayPatients'] ?? 16;
+    // TODO: Uncomment this screenMaxDisplayPatients
+    screenMaxDisplayPatients = 16;
     voiceLanguageEnum = (json['voiceLanguage'] as int).toLanguageEnum();
     voiceLanguageText = json['voiceLanguageText'];
-    screenMaxDisplayPatients = json['screenMaxDisplayPatients'] ?? 10;
     isNotiReq = json['isNotiReq'];
     prioritySMS = json['prioritySMS'];
     priorityWhatsApp = json['priorityWhatsApp'];
-    priorityEmail = json['priorityEmail']; 
+    priorityEmail = json['priorityEmail'];
     ticketNoText = json['ticketNoText'] ?? "Ticket Number";
     postVoiceText = json['pleaseVisitCounterText'] ?? "Please Visit Counter";
-    counterText = json['counterText'];
-    roomText = json['roomText'];
     roomNo = json['roomNo'];
     isRoomNoRequired = json['isRoomNoReq'] ?? true;
-    queueNoText = json['queueNoText'];
-    callForText = json['callForText'];
-    currentServeText = json['currentServeText'];
+    queueNoTextEng = json['queueNoText'];
+    callForTextEng = json['callForText'];
+    counterTextEng = json['counterText'];
+    roomTextEng = json['roomText'];
+    queueNoTextArb = json['queueNoTextAr'] ?? "الرقم";
+    callForTextArb = json['callForTextAr'] ?? "التوجه إلى";
+    counterTextArb = json['counterTextAr'] ?? "";
+    roomTextArb = json['roomTextAr'] ?? "الغرفة";
+    currentServeTextEng = json['currentServeText'];
+    currentServeTextArb = json['currentServeTextAr'] ?? "يتم خدمة";
     maxText = json['maxText'] ?? "";
     minText = json['minText'] ?? "";
-    nextPrayerText = json['nextPrayerText'] ?? "";
+    nextPrayerTextEng = json['nextPrayerText'] ?? "Next Prayer";
+    nextPrayerTextArb = json['nextPrayerTextArb'] ?? "الصلاة القادمة";
     weatherText = json['weatherText'] ?? "Weather";
-    fajarText = json['fajarText'];
-    dhuhrText = json['dhuhrText'];
-    asarText = json['asarText'];
-    maghribText = json['maghribText'];
-    ishaText = json['ishaText'];
+    fajarTextEng = json['fajarText'];
+    dhuhrTextEng = json['dhuhrText'];
+    asarTextEng = json['asarText'];
+    maghribTextEng = json['maghribText'];
+    ishaTextEng = json['ishaText'];
+    fajarTextArb = json['fajarTextAr'] ?? AppStrings.prayersArray[0];
+    dhuhrTextArb = json['dhuhrTextAr'] ?? AppStrings.prayersArray[1];
+    asarTextArb = json['asarTextAr'] ?? AppStrings.prayersArray[2];
+    maghribTextArb = json['maghribTextAr'] ?? AppStrings.prayersArray[3];
+    ishaTextArb = json['ishaTextAr'] ?? AppStrings.prayersArray[4];
     isActive = json['isActive'];
     createdBy = json['createdBy'];
     createdOn = json['createdOn'];
@@ -213,25 +271,31 @@ class GlobalConfigurationsModel {
     } else {
       kioskLanguageConfigList = [];
     }
-    vitalSignText = json['vitalSignText'];
-    doctorText = json['doctorText'];
-    procedureText = json['procedureText'];
-    vaccinationText = json['vaccinationText'];
-    nebulizationText = json['nebulizationText'];
-    callForVitalSignText = json['callForVitalSignText'];
-    callForDoctorText = json['callForDoctorText'];
-    callForProcedureText = json['callForProcedureText'];
-    callForVaccinationText = json['callForVaccinationText'];
-    callForNebulizationText = json['callForNebulizationText'];
+    vitalSignTextEng = json['vitalSignText'];
+    doctorTextEng = json['doctorText'];
+    procedureTextEng = json['procedureText'];
+    vaccinationTextEng = json['vaccinationText'];
+    nebulizationTextEng = json['nebulizationText'];
+    callForVitalSignTextEng = json['callForVitalSignText'];
+    callForDoctorTextEng = json['callForDoctorText'];
+    callForProcedureTextEng = json['callForProcedureText'];
+    callForVaccinationTextEng = json['callForVaccinationText'];
+    callForNebulizationTextEng = json['callForNebulizationText'];
+
+    vitalSignTextArb = json['vitalSignTextAr'] ?? "غرفة العلامات الحيوية";
+    doctorTextArb = json['doctorTextAr'] ?? " غرفة الطبيب";
+    procedureTextArb = json['procedureTextAr'] ?? "غرفة الإجراء";
+    vaccinationTextArb = json['vaccinationTextAr'] ?? "غرفة التطعيم";
+    nebulizationTextArb = json['nebulizationTextAr'] ?? "غرفة البخاخة";
+    callForVitalSignTextArb = json['callForVitalSignTextAr'] ?? " غرفة استدعاء للعلامات الحيوية";
+    callForDoctorTextArb = json['callForDoctorTextAr'] ?? "الرجاء التوّه إلى غرفة الطبيب";
+    callForProcedureTextArb = json['callForProcedureTextAr'] ?? "الرجاء التوجّه إلى غرفة الإجراء";
+    callForVaccinationTextArb = json['callForVaccinationTextAr'] ?? "الرجاء لتوجّه إلى غرفة التطعيم";
+    callForNebulizationTextArb = json['callForNebulizationTextAr'] ?? "الرجاء التوجّه إلى غرفة البخاخة";
   }
 
   @override
   String toString() {
-    return 'GlobalConfigurationsModel{id: $id, configType: $configType, description: $description, counterStart: $counterStart, counterEnd: $counterEnd, concurrentCallDelaySec: $concurrentCallDelaySec, voiceType: $voiceType, voiceTypeText: $voiceTypeText, screenLanguageEnum: $screenLanguageEnum, screenLanguageText: $screenLanguageText, textDirection: $textDirection, voiceLanguageEnum: $voiceLanguageEnum, voiceLanguageText: $voiceLanguageText, screenMaxDisplayPatients: $screenMaxDisplayPatients, isNotiReq: $isNotiReq, prioritySMS: $prioritySMS, priorityWhatsApp: $priorityWhatsApp, priorityEmail: $priorityEmail, ticketNoText: $ticketNoText, postVoiceText: $postVoiceText, roomText: $roomText, roomNo: $roomNo, isRoomNoRequired: $isRoomNoRequired, counterText: $counterText, queueNoText: $queueNoText, callForText: $callForText, currentServeText: $currentServeText, maxText: $maxText, minText: $minText, nextPrayerText: $nextPrayerText, weatherText: $weatherText, fajarText: $fajarText, dhuhrText: $dhuhrText, asarText: $asarText, maghribText: $maghribText, ishaText: $ishaText, isActive: $isActive, createdBy: $createdBy, createdOn: $createdOn, editedBy: $editedBy, editedOn: $editedOn, isToneReq: $isToneReq, isVoiceReq: $isVoiceReq, orientationTypeEnum: $orientationTypeEnum, isTurnOn: $isTurnOn, waitingAreaType: $waitingAreaType, gender: $gender, isWeatherReq: $isWeatherReq, isPrayerTimeReq: $isPrayerTimeReq, isRssFeedReq: $isRssFeedReq, qTypeEnum: $qTypeEnum, screenTypeEnum: $screenTypeEnum, projectID: $projectID, projectLatitude: $projectLatitude, projectLongitude: $projectLongitude, cityKey: $cityKey, kioskQueueList: $kioskQueueList, kioskLanguageConfigList: $kioskLanguageConfigList, vitalSignText: $vitalSignText, doctorText: $doctorText, procedureText: $procedureText, vaccinationText: $vaccinationText, nebulizationText: $nebulizationText, callForVitalSignText: $callForVitalSignText, callForDoctorText: $callForDoctorText, callForProcedureText: $callForProcedureText, callForVaccinationText: $callForVaccinationText, callForNebulizationText: $callForNebulizationText}';
+    return 'GlobalConfigurationsModel{id: $id, configType: $configType, description: $description, counterStart: $counterStart, counterEnd: $counterEnd, concurrentCallDelaySec: $concurrentCallDelaySec, voiceType: $voiceType, voiceTypeText: $voiceTypeText, screenLanguageEnum: $screenLanguageEnum, screenLanguageText: $screenLanguageText, textDirection: $textDirection, voiceLanguageEnum: $voiceLanguageEnum, voiceLanguageText: $voiceLanguageText, screenMaxDisplayPatients: $screenMaxDisplayPatients, isNotiReq: $isNotiReq, prioritySMS: $prioritySMS, priorityWhatsApp: $priorityWhatsApp, priorityEmail: $priorityEmail, ticketNoText: $ticketNoText, postVoiceText: $postVoiceText, roomText: $roomTextEng, roomNo: $roomNo, isRoomNoRequired: $isRoomNoRequired, counterText: $counterTextEng, queueNoText: $queueNoTextEng, callForText: $callForTextEng, currentServeTextArb: $currentServeTextArb,, currentServeTextEng: $currentServeTextEng, maxText: $maxText, minText: $minText, nextPrayerTextEng: $nextPrayerTextEng, nextPrayerTextArb: $nextPrayerTextArb, weatherText: $weatherText, fajarText: $fajarTextEng, dhuhrText: $dhuhrTextEng, asarText: $asarTextEng, maghribText: $maghribTextEng, ishaText: $ishaTextEng, isActive: $isActive, createdBy: $createdBy, createdOn: $createdOn, editedBy: $editedBy, editedOn: $editedOn, isToneReq: $isToneReq, isVoiceReq: $isVoiceReq, orientationTypeEnum: $orientationTypeEnum, isTurnOn: $isTurnOn, waitingAreaType: $waitingAreaType, gender: $gender, isWeatherReq: $isWeatherReq, isPrayerTimeReq: $isPrayerTimeReq, isRssFeedReq: $isRssFeedReq, qTypeEnum: $qTypeEnum, screenTypeEnum: $screenTypeEnum, projectID: $projectID, projectLatitude: $projectLatitude, projectLongitude: $projectLongitude, cityKey: $cityKey, kioskQueueList: $kioskQueueList, kioskLanguageConfigList: $kioskLanguageConfigList, vitalSignText: $vitalSignTextEng, doctorText: $doctorTextEng, procedureText: $procedureTextEng, vaccinationText: $vaccinationTextEng, nebulizationText: $nebulizationTextEng, callForVitalSignText: $callForVitalSignTextEng, callForDoctorText: $callForDoctorTextEng, callForProcedureText: $callForProcedureTextEng, callForVaccinationText: $callForVaccinationTextEng, callForNebulizationText: $callForNebulizationTextEng, vitalSignTextArb: $vitalSignTextArb, doctorTextArb: $doctorTextArb, procedureTextArb: $procedureTextArb, vaccinationTextArb: $vaccinationTextArb, nebulizationTextArb: $nebulizationTextArb, callForVitalSignTextArb: $callForVitalSignTextArb, callForDoctorTextArb: $callForDoctorTextArb, callForProcedureTextArb: $callForProcedureTextArb, callForVaccinationTextArb: $callForVaccinationTextArb, callForNebulizationTextArb: $callForNebulizationTextArb}';
   }
 }
-
-// {
-//   "latitude": 24.722136,
-//   "longitude": 46.774303
-//  }

lib/repositories/screen_details_repo.dart

@@ -50,7 +50,6 @@ class ScreenDetailsRepoImp implements ScreenDetailsRepo {
       List<GlobalConfigurationsModel> globalConfigurationsModel = List.generate(genericModel.data.length, (index) => GlobalConfigurationsModel.fromJson(json: genericModel.data[index]));
       if (globalConfigurationsModel.isNotEmpty) {
         loggerService.logToFile(message: globalConfigurationsModel.toString(), type: LogTypeEnum.data, source: "getGlobalScreenConfigurations-> screen_details_repo.dart");
-
         return globalConfigurationsModel.first;
       }
       return null;

lib/services/logger_service.dart

@@ -47,7 +47,7 @@ class LoggerServiceImp implements LoggerService {
 
       if (lastLogsClearedAt != null &&
           now.difference(lastLogsClearedAt).inHours >= AppConstants.clearLogsHoursThreshold) {
-        final clearingMessage = "[$timestamp] [SOURCE: $source] ${type.name.toUpperCase()}: LOGS HAVE BEEN CLEARED";
+        final clearingMessage = "[$timestamp] [SOURCE: $source] ${type.name.toUpperCase()}: LOGS HAVE BEEN CLEARED\n";
         await file.writeAsString(clearingMessage);
         screenConfigViewModel.lastTimeLogsCleared = now;
         cacheService.setLastTimeLogsCleared(lastTimeCleared: now.millisecondsSinceEpoch);

lib/utilities/extensions.dart

@@ -38,9 +38,11 @@ extension NavigationExt on BuildContext {
   navigateReplaceTo(String route) {
     Navigator.pushReplacementNamed(this, route);
   }
+
   navigateTo(String route) {
     Navigator.pushNamed(this, route);
   }
+
   popScreen() => Navigator.of(this).pop();
 }
 
@@ -55,11 +57,9 @@ extension ScreenOrientationExt on ScreenOrientationEnum {
         return 2;
       case ScreenOrientationEnum.landscapeLeft:
         return 4;
-      default:
-        return 0;
     }
   }
-} 
+}
 
 extension QTypeEnumExtension on int {
   QTypeEnum toQTypeEnum() {
@@ -146,19 +146,16 @@ extension LanguageEnumToString on LanguageEnum {
         return "en-US";
       case LanguageEnum.arabic:
         return "ar-SA";
-      default:
-        return "en-US";
     }
   }
 }
 
-
 extension XCallType on CallTypeEnum {
   Color getColorByCallType() {
     if (this == CallTypeEnum.vitalSign) {
-      return AppColors.vitalSignColor;
+      return AppColors.newVitalSignColor;
     } else if (this == CallTypeEnum.doctor) {
-      return AppColors.doctorColor;
+      return AppColors.newDoctorColor;
     } else if (this == CallTypeEnum.procedure) {
       return AppColors.procedureColor;
     } else if (this == CallTypeEnum.vaccination) {
@@ -170,32 +167,46 @@ extension XCallType on CallTypeEnum {
     }
   }
 
-  String getMessageByCallType(GlobalConfigurationsModel globalConfig, {bool isListView = false}) {
+  String getMessageByCallTypeForEnglish(GlobalConfigurationsModel globalConfig, {bool isListView = false}) {
     switch (this) {
       case CallTypeEnum.vitalSign:
-        return !isListView ? globalConfig.callForVitalSignText : globalConfig.vitalSignText;
+        return !isListView ? globalConfig.callForVitalSignTextEng : globalConfig.vitalSignTextEng;
       case CallTypeEnum.doctor:
-        return !isListView ? globalConfig.callForDoctorText : globalConfig.doctorText;
+        return !isListView ? globalConfig.callForDoctorTextEng : globalConfig.doctorTextEng;
       case CallTypeEnum.procedure:
-        return !isListView ? globalConfig.callForProcedureText : globalConfig.procedureText;
+        return !isListView ? globalConfig.callForProcedureTextEng : globalConfig.procedureTextEng;
       case CallTypeEnum.vaccination:
-        return !isListView ? globalConfig.callForVaccinationText : globalConfig.vaccinationText;
+        return !isListView ? globalConfig.callForVaccinationTextEng : globalConfig.vaccinationTextEng;
       case CallTypeEnum.nebulization:
-        return !isListView ? globalConfig.callForNebulizationText : globalConfig.nebulizationText;
+        return !isListView ? globalConfig.callForNebulizationTextEng : globalConfig.nebulizationTextEng;
       case CallTypeEnum.none:
-        return !isListView ? globalConfig.callForVitalSignText : globalConfig.vitalSignText;
+        return !isListView ? globalConfig.callForVitalSignTextEng : globalConfig.vitalSignTextEng;
+    }
+  }
 
-      default:
-        return globalConfig.callForVitalSignText;
+  String getMessageByCallTypeForArabic(GlobalConfigurationsModel globalConfig, {bool isListView = false}) {
+    switch (this) {
+      case CallTypeEnum.vitalSign:
+        return !isListView ? globalConfig.callForVitalSignTextArb : globalConfig.vitalSignTextArb;
+      case CallTypeEnum.doctor:
+        return !isListView ? globalConfig.callForDoctorTextArb : globalConfig.doctorTextArb;
+      case CallTypeEnum.procedure:
+        return !isListView ? globalConfig.callForProcedureTextArb : globalConfig.procedureTextArb;
+      case CallTypeEnum.vaccination:
+        return !isListView ? globalConfig.callForVaccinationTextArb : globalConfig.vaccinationTextArb;
+      case CallTypeEnum.nebulization:
+        return !isListView ? globalConfig.callForNebulizationTextArb : globalConfig.nebulizationTextArb;
+      case CallTypeEnum.none:
+        return !isListView ? globalConfig.callForVitalSignTextArb : globalConfig.vitalSignTextArb;
     }
   }
 
   SvgPicture getIconByCallType(double height, {double? width, BoxFit fit = BoxFit.contain}) {
     String iconPath = "";
     if (this == CallTypeEnum.vitalSign) {
-      iconPath = AppAssets.vitalSignIcon;
+      iconPath = AppAssets.newVitalSignIcon;
     } else if (this == CallTypeEnum.doctor) {
-      iconPath = AppAssets.doctorIcon;
+      iconPath = AppAssets.newDoctorIcon;
     } else if (this == CallTypeEnum.procedure) {
       iconPath = AppAssets.procedureIcon;
     } else if (this == CallTypeEnum.vaccination) {
@@ -230,6 +241,23 @@ extension XCallType on CallTypeEnum {
     }
   }
 
+  List<Color> getGradientComboByCallType() {
+    switch (this) {
+      case CallTypeEnum.vitalSign:
+        return AppColors.gradientBorderComboForVitalSigns;
+      case CallTypeEnum.doctor:
+        return AppColors.gradientBorderComboForDoctor;
+      case CallTypeEnum.procedure:
+        return AppColors.gradientBorderComboForVitalSigns;
+      case CallTypeEnum.vaccination:
+        return AppColors.gradientBorderComboForVitalSigns;
+      case CallTypeEnum.nebulization:
+        return AppColors.gradientBorderComboForVitalSigns;
+      case CallTypeEnum.none:
+        return AppColors.gradientBorderComboForVitalSigns;
+    }
+  }
+
   String getCallTextFromCallType(TicketData ticket) {
     switch (this) {
       case CallTypeEnum.vitalSign:

lib/utilities/lifecycle_handler.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/widgets.dart';
 import 'package:hmg_qline/config/dependency_injection.dart';
 import 'package:hmg_qline/services/logger_service.dart';
-import 'package:hmg_qline/utilities/enums.dart';
 
 class LifecycleHandler extends WidgetsBindingObserver {
   final void Function()? onResumed;
@@ -18,6 +17,7 @@ class LifecycleHandler extends WidgetsBindingObserver {
     this.onHidden,
   });
 
+
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
     LoggerService loggerService = getIt.get<LoggerService>();

lib/utilities/native_method_handler.dart

@@ -6,7 +6,6 @@ import 'package:restart_app/restart_app.dart';
 
 abstract class NativeMethodChannelService {
   void reopenApp();
-
   void restartApp();
 }
 

lib/view_models/queuing_view_model.dart

@@ -192,7 +192,6 @@ class QueuingViewModel extends ChangeNotifier {
   }
 
   Future<void> testSpeech() async {
-
     textToSpeechService.speechTextTest(MockJsonRepo.ticket);
   }
 

lib/view_models/screen_config_view_model.dart

@@ -4,7 +4,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:hmg_qline/config/dependency_injection.dart';
 import 'package:hmg_qline/constants/app_constants.dart';
-import 'package:hmg_qline/main.dart';
 import 'package:hmg_qline/models/generic_response_model.dart';
 import 'package:hmg_qline/models/global_config_model.dart';
 import 'package:hmg_qline/models/kiosk_language_config_model.dart';
@@ -55,10 +54,12 @@ class ScreenConfigViewModel extends ChangeNotifier {
 
   Future<void> onAppPaused() async {
     loggerService.logToFile(message: "[didChangeAppLifecycleState] : [onAppPaused]", source: "onAppPaused -> screen_config_view_model.dart", type: LogTypeEnum.data);
+    nativeMethodChannelService.restartApp();
+  }
 
-    // nativeMethodChannelService.reopenApp();
+  Future<void> onAppDetached() async {
+    loggerService.logToFile(message: "[didChangeAppLifecycleState] : [onAppDetached]", source: "onAppDetached -> screen_config_view_model.dart", type: LogTypeEnum.data);
     nativeMethodChannelService.restartApp();
-    // runApp(const MyApp());
   }
 
   Future<void> waitForIPAndInitializeConfigVM() async {
@@ -226,7 +227,9 @@ class ScreenConfigViewModel extends ChangeNotifier {
     notifyListeners();
   }
 
-  String nextPrayerToShowWithTime = '';
+  String nextPrayerTime = '';
+  String nextPrayerToShowEng = '';
+  String nextPrayerToShowArb = '';
 
   void getNextPrayerToShow() async {
     final current = DateTime.now();
@@ -246,39 +249,55 @@ class ScreenConfigViewModel extends ChangeNotifier {
 
     if (prayersWidgetModel.fajr != null && prayersWidgetModel.fajr!.toDateTimeFromInt().isAfter(current)) {
       final namazTime = prayersWidgetModel.fajr!.toFormattedDateTimeFromInt();
-      nextPrayerToShowWithTime = "${globalConfigurationsModel.fajarText} at $namazTime";
+      nextPrayerTime = namazTime;
+      nextPrayerToShowEng = "${globalConfigurationsModel.fajarTextEng}";
+      nextPrayerToShowArb = "${globalConfigurationsModel.fajarTextArb}";
       notifyListeners();
       return;
     }
     if (prayersWidgetModel.dhuhr != null && prayersWidgetModel.dhuhr!.toDateTimeFromInt().isAfter(current)) {
       final namazTime = prayersWidgetModel.dhuhr!.toFormattedDateTimeFromInt();
-      nextPrayerToShowWithTime = "${globalConfigurationsModel.dhuhrText} at $namazTime";
+      nextPrayerTime = namazTime;
+      nextPrayerToShowEng = "${globalConfigurationsModel.dhuhrTextEng}";
+      nextPrayerToShowArb = "${globalConfigurationsModel.dhuhrTextArb}";
+
       notifyListeners();
       return;
     }
     if (prayersWidgetModel.asr != null && prayersWidgetModel.asr!.toDateTimeFromInt().isAfter(current)) {
       final namazTime = prayersWidgetModel.asr!.toFormattedDateTimeFromInt();
-      nextPrayerToShowWithTime = "${globalConfigurationsModel.asarText} at $namazTime";
+      nextPrayerTime = namazTime;
+      nextPrayerToShowEng = "${globalConfigurationsModel.asarTextEng}";
+      nextPrayerToShowArb = "${globalConfigurationsModel.asarTextArb}";
+
       notifyListeners();
       return;
     }
     if (prayersWidgetModel.maghrib != null && prayersWidgetModel.maghrib!.toDateTimeFromInt().isAfter(current)) {
       final namazTime = prayersWidgetModel.maghrib!.toFormattedDateTimeFromInt();
-      nextPrayerToShowWithTime = "${globalConfigurationsModel.maghribText} at $namazTime";
+      nextPrayerTime = namazTime;
+      nextPrayerToShowEng = "${globalConfigurationsModel.maghribTextEng}";
+      nextPrayerToShowArb = "${globalConfigurationsModel.maghribTextArb}";
+
       notifyListeners();
       return;
     }
     if (prayersWidgetModel.isha != null && prayersWidgetModel.isha!.toDateTimeFromInt().isAfter(current)) {
       final namazTime = prayersWidgetModel.isha!.toFormattedDateTimeFromInt();
-      nextPrayerToShowWithTime = "${globalConfigurationsModel.ishaText} at $namazTime";
+      nextPrayerTime = namazTime;
+      nextPrayerToShowEng = "${globalConfigurationsModel.ishaTextEng}";
+      nextPrayerToShowArb = "${globalConfigurationsModel.ishaTextArb}";
+
       notifyListeners();
       return;
     }
-      final namazTime = prayersWidgetModel.fajr!.toFormattedDateTimeFromInt();
-      nextPrayerToShowWithTime = "${globalConfigurationsModel.fajarText} at $namazTime";
-      notifyListeners();
-      return;
+    final namazTime = prayersWidgetModel.fajr!.toFormattedDateTimeFromInt();
+    nextPrayerTime = namazTime;
+    nextPrayerToShowEng = "${globalConfigurationsModel.fajarTextEng}";
+    nextPrayerToShowArb = "${globalConfigurationsModel.fajarTextArb}";
 
+    notifyListeners();
+    return;
   }
 
   int counter = 0;
@@ -298,13 +317,13 @@ class ScreenConfigViewModel extends ChangeNotifier {
       return;
     }
 
-    _midnightTimer = Timer.periodic(const Duration(minutes: 1), (timer) async {
+    _midnightTimer = Timer.periodic(const Duration(minutes: 10), (timer) async {
       counter++;
       DateTime now = DateTime.now();
       log("counterValue: $counter");
 
-      // Every hour, update RSS feed if required
-      if (counter % 60 == 0 && globalConfigurationsModel.isRssFeedReq) {
+      // Every Two hour, update RSS feed if required
+      if (counter % 12 == 0 && globalConfigurationsModel.isRssFeedReq) {
         await getRssFeedDetailsFromServer();
       }
 
@@ -314,6 +333,7 @@ class ScreenConfigViewModel extends ChangeNotifier {
       // At midnight, update weather and prayer details if required
       if (now.day != lastChecked.day) {
         if (now.difference(now.copyWith(hour: 0, minute: 0, second: 0, millisecond: 0, microsecond: 0)).inMinutes >= 5) {
+          nativeMethodChannelService.restartApp();
           if (globalConfigurationsModel.isWeatherReq) {
             await getWeatherDetailsFromServer();
           }

lib/views/common_widgets/app_footer.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:hmg_qline/view_models/queuing_view_model.dart';
 import 'package:hmg_qline/view_models/screen_config_view_model.dart';
+import 'package:hmg_qline/views/common_widgets/app_general_widgets.dart';
 import 'package:marquee/marquee.dart';
 import 'package:provider/provider.dart';
 import 'package:hmg_qline/constants/app_constants.dart';
@@ -11,110 +13,187 @@ import 'package:hmg_qline/views/view_helpers/size_config.dart';
 class AppFooter extends StatelessWidget {
   const AppFooter({super.key});
 
+  Widget _buildStatusRow(String label, bool isConnected) {
+    return Row(
+      children: [
+        AppText(
+          "$label:",
+          fontSize: SizeConfig.getWidthMultiplier()! * 1.5,
+        ),
+        AppText(
+          " ${isConnected ? "Connected" : "Disconnected"}",
+          fontSize: SizeConfig.getWidthMultiplier()! * 1.5,
+          color: isConnected ? AppColors.greenColor : AppColors.redColor,
+        ),
+      ],
+    );
+  }
+
+  Widget _buildPrayerColumn(String label, String prayerName, {bool isForArabic = false}) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        AppText(
+          label,
+          fontSize: SizeConfig.getWidthMultiplier()! * 1.8,
+          fontFamily: isForArabic ? AppStrings.fontNameGesTwo : AppStrings.fontNamePoppins,
+        ),
+        AppText(
+          prayerName,
+          fontSize: SizeConfig.getWidthMultiplier()! * 2,
+          fontWeight: FontWeight.bold,
+          color: AppColors.darkGreyTextColor,
+          fontFamily: isForArabic ? AppStrings.fontNameGesTwo : AppStrings.fontNamePoppins,
+        ),
+      ],
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return Consumer(builder: (BuildContext context, ScreenConfigViewModel screenConfigVM, Widget? child) {
-      return Container(
-          color: Colors.grey.withOpacity(0.1),
-          height: SizeConfig.getHeightMultiplier() * 0.7,
-          width: double.infinity,
-          child: Row(
-            crossAxisAlignment: CrossAxisAlignment.center,
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Row(
-                children: [
-                  const SizedBox(width: 20),
-                  Column(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      AppText(
-                        AppStrings.poweredBy,
-                        fontSize: SizeConfig.getWidthMultiplier() * 2.5,
-                      ),
-                      Text("v${screenConfigVM.currentScreenIP}(${AppConstants.currentBuildVersion})",
-                          style: TextStyle(
-                            fontWeight: FontWeight.w500,
-                            fontSize: SizeConfig.getWidthMultiplier() * 1.5,
-                          )),
-                      // Row(
-                      //   children: [
-                      //     InkWell(
-                      //       onTap: () {
-                      //         screenConfigVM.updateCurrentScreenRotation(ScreenOrientationEnum.portraitUp);
-                      //       },
-                      //       child: Icon(
-                      //         Icons.arrow_upward,
-                      //         size: SizeConfig.getWidthMultiplier() * 2,
-                      //       ),
-                      //     ),
-                      //     InkWell(
-                      //       onTap: () {
-                      //         screenConfigVM.updateCurrentScreenRotation(ScreenOrientationEnum.landscapeRight);
-                      //       },
-                      //       child: Icon(Icons.arrow_forward, size: SizeConfig.getWidthMultiplier() * 2),
-                      //     ),
-                      //     InkWell(
-                      //       onTap: () {
-                      //         screenConfigVM.updateCurrentScreenRotation(ScreenOrientationEnum.portraitDown);
-                      //       },
-                      //       child: Icon(
-                      //         Icons.arrow_downward,
-                      //         size: SizeConfig.getWidthMultiplier() * 2,
-                      //       ),
-                      //     ),
-                      //     InkWell(
-                      //       onTap: () {
-                      //         screenConfigVM.updateCurrentScreenRotation(ScreenOrientationEnum.landscapeLeft);
-                      //       },
-                      //       child: Icon(
-                      //         Icons.arrow_back,
-                      //         size: SizeConfig.getWidthMultiplier() * 2,
-                      //       ),
-                      //     ),
-                      //   ],
-                      // ),
-                    ],
-                  ),
-                  const SizedBox(width: 10),
-                  InkWell(
-                    onTap: () {
-                      // context.read<ScreenConfigViewModel>().createAutoTickets(numOfTicketsToCreate: 20);
-                    },
-                    child: Image.asset(
-                      AppAssets.cloudLogo,
-                      height: SizeConfig.getHeightMultiplier() * 0.6,
+      bool isPortrait = screenConfigVM.globalConfigurationsModel.orientationTypeEnum == ScreenOrientationEnum.portraitUp ||
+          screenConfigVM.globalConfigurationsModel.orientationTypeEnum == ScreenOrientationEnum.portraitDown;
+      return Padding(
+        padding: EdgeInsets.symmetric(
+          horizontal: SizeConfig.getWidthMultiplier() * 4,
+          vertical: SizeConfig.getHeightMultiplier() * 0.14,
+        ),
+        child: Row(
+          children: [
+            Expanded(
+              flex: 3,
+              child: customShadowSmoothContainer(
+                height: SizeConfig.getHeightMultiplier() * 0.8,
+                padding: EdgeInsets.symmetric(
+                  horizontal: SizeConfig.getWidthMultiplier() * 3,
+                  vertical: SizeConfig.getHeightMultiplier() * 0.1,
+                ),
+                child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.end,
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    Row(
+                      crossAxisAlignment: CrossAxisAlignment.end,
+                      children: [
+                        Padding(
+                          padding: EdgeInsets.only(top: SizeConfig.getHeightMultiplier()! * 0.1),
+                          child: Column(
+                            mainAxisAlignment: MainAxisAlignment.center,
+                            children: [
+                              AppText(
+                                AppStrings.poweredBy,
+                                fontSize: SizeConfig.getWidthMultiplier()! * 1.5,
+                                fontWeight: FontWeight.w400,
+                                color: AppColors.darkGreyTextColor,
+                              ),
+                              AppText(
+                                "v${screenConfigVM.currentScreenIP.replaceAll(".", "").replaceAll("0", "-")}(${AppConstants.currentBuildVersion})",
+                                fontSize: SizeConfig.getWidthMultiplier()! * 1,
+                                fontWeight: FontWeight.w400,
+                                color: AppColors.darkGreyTextColor,
+                              ),
+                            ],
+                          ),
+                        ),
+                        SizedBox(width: SizeConfig.getWidthMultiplier()!),
+                        Padding(
+                          padding: EdgeInsets.only(bottom: SizeConfig.getHeightMultiplier()! * 0.06),
+                          child: Image.asset(
+                            AppAssets.cloudLogo,
+                            height: isPortrait ? SizeConfig.getHeightMultiplier()! * 0.6 : SizeConfig.getHeightMultiplier()! * 0.4,
+                          ),
+                        ),
+                      ],
                     ),
-                  ),
-                ],
+                    Padding(
+                      padding: isPortrait
+                          ? EdgeInsets.only(
+                              top: SizeConfig.getHeightMultiplier()! * 0.3,
+                            )
+                          : EdgeInsets.only(
+                              top: SizeConfig.getHeightMultiplier()! * 0.15,
+                            ),
+                      child: isPortrait
+                          ? Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                _buildStatusRow("Hub Status ", screenConfigVM.isHubConnected),
+                                SizedBox(width: SizeConfig.getWidthMultiplier()! * 2),
+                                _buildStatusRow("Network Status ", screenConfigVM.isInternetConnected),
+                              ],
+                            )
+                          : Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                _buildStatusRow("Hub Status ", screenConfigVM.isHubConnected),
+                                SizedBox(height: SizeConfig.getHeightMultiplier()! * 0.05),
+                                _buildStatusRow("Network Status ", screenConfigVM.isInternetConnected),
+                              ],
+                            ),
+                    ),
+                  ],
+                ),
               ),
-              if (screenConfigVM.globalConfigurationsModel.isRssFeedReq && screenConfigVM.rssFeedModel.rssFeed != null && screenConfigVM.rssFeedModel.rssFeed!.isNotEmpty) ...[
-                Expanded(
-                  child: Container(
-                    padding: const EdgeInsets.symmetric(horizontal: 10),
-                    child: Marquee(
-                      text: screenConfigVM.rssFeedModel.rssFeed ?? "",
-                      style: TextStyle(
-                        fontWeight: FontWeight.w500,
-                        fontSize: SizeConfig.getWidthMultiplier() * 4,
-                        fontFamily: AppStrings.fontNamePoppins,
-                      ),
-                      scrollAxis: Axis.horizontal,
-                      crossAxisAlignment: CrossAxisAlignment.center,
-                      blankSpace: 20.0,
-                      velocity: 100.0,
-                      pauseAfterRound: const Duration(seconds: 1),
-                      startPadding: 10.0,
-                      accelerationDuration: const Duration(seconds: 1),
-                      accelerationCurve: Curves.linear,
-                      decelerationDuration: const Duration(milliseconds: 500),
-                      decelerationCurve: Curves.easeOut,
+            ),
+            if (screenConfigVM.globalConfigurationsModel.isPrayerTimeReq) ...[
+              SizedBox(width: SizeConfig.getWidthMultiplier()! * 1.7),
+              Directionality(
+                textDirection: screenConfigVM.globalConfigurationsModel.textDirection,
+                child: Expanded(
+                  flex: isPortrait ? 2 : 3,
+                  child: customShadowSmoothContainer(
+                    height: SizeConfig.getHeightMultiplier() * 0.8,
+                    padding: EdgeInsets.symmetric(
+                      horizontal: isPortrait ? SizeConfig.getWidthMultiplier() * 3 : SizeConfig.getWidthMultiplier() * 1.5,
+                      vertical: SizeConfig.getHeightMultiplier() * 0.1,
+                    ),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        AppText(
+                          screenConfigVM.nextPrayerTime,
+                          fontSize: SizeConfig.getWidthMultiplier()! * 3,
+                          fontWeight: FontWeight.bold,
+                          color: AppColors.newRedColor,
+                          letterSpacing: 1.5,
+                        ),
+                        Row(
+                          children: [
+                            if (screenConfigVM.nextPrayerToShowEng.isNotEmpty) ...[
+                              _buildPrayerColumn(screenConfigVM.globalConfigurationsModel.nextPrayerTextEng, "${screenConfigVM.nextPrayerToShowEng}   "),
+                            ],
+                            if (screenConfigVM.nextPrayerToShowEng.isNotEmpty && screenConfigVM.nextPrayerToShowArb.isNotEmpty) ...[
+                              Padding(
+                                padding: EdgeInsets.fromLTRB(
+                                  SizeConfig.getWidthMultiplier()! * 0.1,
+                                  SizeConfig.getHeightMultiplier()! * 0.18,
+                                  SizeConfig.getWidthMultiplier()! * 0.1,
+                                  0,
+                                ),
+                                child: AppText("|", fontSize: SizeConfig.getWidthMultiplier()! * 1.8, color: AppColors.darkGreyTextColor),
+                              ),
+                            ],
+                            if (screenConfigVM.nextPrayerToShowArb.isNotEmpty) ...[
+                              _buildPrayerColumn(screenConfigVM.globalConfigurationsModel.nextPrayerTextArb, screenConfigVM.nextPrayerToShowArb, isForArabic: true),
+                            ],
+                          ],
+                        ),
+                        if (isPortrait) ...[
+                          SvgPicture.asset(
+                            AppAssets.salahTimeIcon,
+                            height: SizeConfig.getHeightMultiplier() * 0.5,
+                          ),
+                        ],
+                      ],
                     ),
                   ),
-                )
-              ]
+                ),
+              ),
             ],
-          ));
+          ],
+        ),
+      );
     });
   }
 }

lib/views/common_widgets/app_general_widgets.dart

@@ -1,12 +1,13 @@
-import 'dart:developer';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:hmg_qline/constants/app_constants.dart';
 import 'package:hmg_qline/utilities/enums.dart';
+import 'package:hmg_qline/utilities/extensions.dart';
 import 'package:hmg_qline/view_models/screen_config_view_model.dart';
 import 'package:hmg_qline/views/common_widgets/app_texts_widget.dart';
 import 'package:hmg_qline/views/view_helpers/size_config.dart';
+import 'package:marquee/marquee.dart';
+import 'package:zo_animated_border/zo_animated_border.dart';
 
 Widget getWeatherWidget(ScreenConfigViewModel screenConfigViewModel) {
   if (screenConfigViewModel.weathersWidgetModel.maxTemp == null || screenConfigViewModel.weathersWidgetModel.minTemp == null || screenConfigViewModel.weathersWidgetModel.iconPhrase == null) {
@@ -55,7 +56,7 @@ Widget getWeatherWidget(ScreenConfigViewModel screenConfigViewModel) {
 }
 
 Widget getPrayerWidget(ScreenConfigViewModel screenConfigViewModel) {
-  if (screenConfigViewModel.nextPrayerToShowWithTime.isEmpty) {
+  if (screenConfigViewModel.nextPrayerTime.isEmpty) {
     return const SizedBox.shrink();
   }
   return SizedBox(
@@ -77,13 +78,13 @@ Widget getPrayerWidget(ScreenConfigViewModel screenConfigViewModel) {
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
                 AppText(
-                  screenConfigViewModel.globalConfigurationsModel.nextPrayerText,
+                  screenConfigViewModel.globalConfigurationsModel.nextPrayerTextEng,
                   color: Colors.grey,
                   fontSize: SizeConfig.getWidthMultiplier() * 1.5,
                   fontFamily: screenConfigViewModel.globalConfigurationsModel.screenLanguageEnum == LanguageEnum.arabic ? AppStrings.fontNameCairo : AppStrings.fontNamePoppins,
                 ),
                 AppText(
-                  screenConfigViewModel.nextPrayerToShowWithTime,
+                  screenConfigViewModel.nextPrayerTime,
                   fontSize: SizeConfig.getWidthMultiplier() * 2.7,
                   fontHeight: 1,
                   fontFamily: screenConfigViewModel.globalConfigurationsModel.screenLanguageEnum == LanguageEnum.arabic ? AppStrings.fontNameCairo : AppStrings.fontNamePoppins,
@@ -268,3 +269,204 @@ Widget customShadowTextField({
     ),
   );
 }
+
+Widget engArabicTextWithSeparatorWidget({
+  required String englishText,
+  required String arabicText,
+  double? fontSize,
+  Color? color,
+  MainAxisAlignment? mainAxisAlignment,
+}) {
+  return Row(
+    mainAxisAlignment: mainAxisAlignment ?? MainAxisAlignment.start,
+    children: [
+      AppText(
+        englishText,
+        fontSize: fontSize ?? SizeConfig.getWidthMultiplier() * 2.6,
+        color: color ?? AppColors.darkGreyTextColor,
+      ),
+      AppText(
+        " | ",
+        fontSize: fontSize ?? SizeConfig.getWidthMultiplier() * 2.6,
+        color: color ?? AppColors.darkGreyTextColor,
+      ),
+      AppText(
+        arabicText,
+        color: color ?? AppColors.darkGreyTextColor,
+        fontSize: fontSize ?? SizeConfig.getWidthMultiplier() * 2.6,
+        fontFamily: AppStrings.fontNameGesTwo,
+        fontWeight: FontWeight.bold,
+      ),
+    ],
+  );
+}
+
+Widget customShadowSmoothContainer({
+  EdgeInsetsGeometry? padding,
+  EdgeInsetsGeometry? margin,
+  required Widget child,
+  double? height,
+  double? width,
+}) {
+  return Container(
+    padding: padding,
+    margin: margin,
+    height: height,
+    width: width,
+    alignment: Alignment.center,
+    decoration: BoxDecoration(
+      color: AppColors.whiteColor,
+      borderRadius: BorderRadius.circular(SizeConfig.widthMultiplier! * 1.2),
+      boxShadow: [
+        BoxShadow(
+          color: AppColors.smoothContainerShadow,
+          offset: const Offset(0, 4), // X: 0, Y: 4
+          blurRadius: 14,
+          spreadRadius: 0,
+        ),
+      ],
+    ),
+    child: child,
+  );
+}
+
+Widget customShadowSmoothContainerWithBackground({
+  EdgeInsetsGeometry? padding,
+  EdgeInsetsGeometry? margin,
+  required Widget child,
+  double? height,
+  double? width,
+  CallTypeEnum? callTypeEnum,
+}) {
+  callTypeEnum ??= CallTypeEnum.vitalSign;
+
+  List<Color> borderGradientCombo = [];
+  if (callTypeEnum == CallTypeEnum.vitalSign) {
+    borderGradientCombo = [
+      const Color(0xFFFFFFFF), // start
+      const Color(0xFFF2F3F4),
+      const Color(0xFFF2F3F4),
+      const Color(0xFFA5ADB4),
+      const Color(0xFFA5ADB4),
+      const Color(0xFF78848F),
+    ];
+  } else {
+    borderGradientCombo = [
+      const Color(0xFFFFFFFF), // start
+      const Color(0xFFAFEAD4), // start
+      const Color(0xFFAFEAD4), // start
+      const Color(0xFF42BB8D), // end
+      const Color(0xFF42BB8D), // end
+      const Color(0xFF42BB8D),
+    ];
+  }
+  return ZoAnimatedGradientBorder(
+    animationDuration: const Duration(seconds: 4),
+    glowOpacity: 0.0,
+    borderThickness: 8,
+    gradientColor: borderGradientCombo,
+    borderRadius: SizeConfig.getWidthMultiplier()! * 1.2,
+    child: Container(
+        padding: padding,
+        margin: margin,
+        height: height,
+        width: width,
+        alignment: Alignment.center,
+        decoration: BoxDecoration(
+          gradient: const LinearGradient(
+            begin: Alignment.topLeft,
+            end: Alignment.bottomRight,
+            colors: [
+              Color(0xFFECF1F4), // #ECF1F4 (0deg)
+              Color(0x71B1B7BC), // rgba(177, 183, 188, 0.445) (90deg)
+              Color(0x89BEBDC7), // rgba(190, 195, 199, 0.5375) (135deg)
+              Color(0xA1CBCFD3), // rgba(203, 207, 211, 0.63) (178.66deg)
+              Color(0xFFE5E7E9), // #E5E7E9 (270deg)
+              Color(0xFFF2F3F4), // #F2F3F4 (315deg)
+              Color(0xFFECF1F4), // #ECF1F4 (360deg)
+            ],
+            stops: [0.0, 0.25, 0.375, 0.496, 0.75, 0.875, 1.0],
+          ),
+          color: AppColors.whiteColor,
+          borderRadius: BorderRadius.circular(SizeConfig.getWidthMultiplier()! * 1.2),
+          boxShadow: [
+            BoxShadow(
+              color: AppColors.smoothContainerShadow,
+              offset: const Offset(0, 4), // X: 0, Y: 4
+              blurRadius: 14,
+              spreadRadius: 0,
+            ),
+          ],
+        ),
+        child: child),
+  );
+}
+
+Widget rssFeedWidget({required String feed}) {
+  return Expanded(
+    child: Container(
+      padding: const EdgeInsets.fromLTRB(10, 30, 10, 0),
+      child: Marquee(
+        text: feed,
+        style: TextStyle(
+          fontWeight: FontWeight.w400,
+          fontSize: SizeConfig.getWidthMultiplier() * 2,
+          fontFamily: AppStrings.fontNamePoppins,
+        ),
+        scrollAxis: Axis.horizontal,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        blankSpace: 20.0,
+        velocity: 100.0,
+        pauseAfterRound: const Duration(seconds: 1),
+        startPadding: 10.0,
+        accelerationDuration: const Duration(seconds: 1),
+        accelerationCurve: Curves.linear,
+        decelerationDuration: const Duration(milliseconds: 500),
+        decelerationCurve: Curves.easeOut,
+      ),
+    ),
+  );
+}
+
+Widget callTypeContainer({
+  EdgeInsetsGeometry? padding,
+  EdgeInsetsGeometry? margin,
+  required Widget child,
+  double? height,
+  double? width,
+  required Color color,
+  required TextDirection textDirection,
+  bool isDisableRightBorderRadius = true,
+}) {
+  final border = SizeConfig.getWidthMultiplier()! * 1;
+  return Container(
+    padding: padding,
+    margin: margin,
+    height: height,
+    width: width,
+    alignment: Alignment.center,
+    decoration: BoxDecoration(
+      color: color,
+      borderRadius: isDisableRightBorderRadius
+          ? textDirection == TextDirection.ltr
+              ? BorderRadius.only(
+                  topLeft: Radius.circular(border),
+                  bottomLeft: Radius.circular(border),
+                )
+              : BorderRadius.only(
+                  topRight: Radius.circular(border),
+                  bottomRight: Radius.circular(border),
+                )
+          : BorderRadius.circular(border),
+      boxShadow: [
+        BoxShadow(
+          color: AppColors.smoothContainerShadow,
+          offset: const Offset(0, 4), // X: 0, Y: 4
+          blurRadius: 14,
+          spreadRadius: 0,
+        ),
+      ],
+    ),
+    child: child,
+  );
+}

lib/views/common_widgets/app_header.dart

@@ -5,6 +5,7 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:hmg_qline/models/global_config_model.dart';
 import 'package:hmg_qline/utilities/enums.dart';
 import 'package:hmg_qline/view_models/screen_config_view_model.dart';
+import 'package:hmg_qline/views/common_widgets/app_general_widgets.dart';
 import 'package:provider/provider.dart';
 import 'package:hmg_qline/constants/app_constants.dart';
 
@@ -14,89 +15,41 @@ import 'package:hmg_qline/views/view_helpers/size_config.dart';
 class AppHeader extends StatelessWidget implements PreferredSizeWidget {
   const AppHeader({super.key});
 
-  Widget networkStatusBar() {
-    return Consumer(builder: (BuildContext context, ScreenConfigViewModel screenConfigVM, Widget? child) {
-      return Container(
-        color: Colors.grey.withOpacity(0.1),
-        padding: EdgeInsets.symmetric(horizontal: SizeConfig.getWidthMultiplier() * 3),
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Row(
-              children: [
-                AppText(
-                  "Network Status :",
-                  fontSize: SizeConfig.getWidthMultiplier() * 2,
-                ),
-                AppText(
-                  " ${screenConfigVM.isInternetConnected ? "Connected" : "Disconnected"}",
-                  fontSize: SizeConfig.getWidthMultiplier() * 2.5,
-                  color: screenConfigVM.isInternetConnected ? AppColors.greenColor : AppColors.redColor,
-                ),
-              ],
-            ),
-            Row(
-              children: [
-                Row(
-                  children: [
-                    AppText(
-                      "Hub Status :",
-                      fontSize: SizeConfig.getWidthMultiplier() * 2,
-                    ),
-                    AppText(
-                      " ${screenConfigVM.isHubConnected ? "Connected" : "Disconnected"}",
-                      fontSize: SizeConfig.getWidthMultiplier() * 2.5,
-                      color: screenConfigVM.isHubConnected ? AppColors.greenColor : AppColors.redColor,
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ],
-        ),
-      );
-    });
-  }
-
   @override
   Widget build(BuildContext context) {
     return Selector<ScreenConfigViewModel, GlobalConfigurationsModel>(
       selector: (context, screenConfigViewModel) => screenConfigViewModel.globalConfigurationsModel,
       builder: (BuildContext context, GlobalConfigurationsModel globalConfigurationsModel, Widget? child) {
-        return Column(
-          children: [
-            Container(
-              alignment: Alignment.center,
-              height: SizeConfig.getHeightMultiplier() * 0.6,
-              padding: const EdgeInsets.symmetric(horizontal: 20),
-              decoration: BoxDecoration(color: globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? AppColors.redColor : AppColors.greenColor),
-              child: Directionality(
-                textDirection: globalConfigurationsModel.textDirection,
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  crossAxisAlignment: CrossAxisAlignment.center,
+        return Directionality(
+          textDirection: globalConfigurationsModel.textDirection,
+          child: Padding(
+            padding: EdgeInsets.symmetric(horizontal: SizeConfig.getWidthMultiplier() * 4),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.end,
                   children: [
-                    AppText(
-                      globalConfigurationsModel.currentServeText ?? "",
-                      color: Colors.white,
-                      fontSize: SizeConfig.getHeightMultiplier() * 0.4,
-                      fontFamily: globalConfigurationsModel.screenLanguageEnum == LanguageEnum.arabic ? AppStrings.fontNameCairo : AppStrings.fontNamePoppins,
-                    ),
                     SvgPicture.asset(
-                      globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? AppAssets.hmgLogo : AppAssets.hmgLogoPharmacy,
-                      height: SizeConfig.getHeightMultiplier() * 0.5,
+                      globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? AppAssets.hmgLogoFull : AppAssets.hmgLogoPharmacy,
+                      height: SizeConfig.getHeightMultiplier() * 0.48,
                     ),
                   ],
                 ),
-              ),
+                engArabicTextWithSeparatorWidget(
+                  englishText: globalConfigurationsModel.currentServeTextEng ?? "",
+                  arabicText: globalConfigurationsModel.currentServeTextArb ?? "",
+                ),
+
+                // networkStatusBar(),
+              ],
             ),
-            networkStatusBar(),
-          ],
+          ),
         );
       },
     );
   }
 
   @override
-  Size get preferredSize => Size(double.maxFinite, SizeConfig.getHeightMultiplier());
+  Size get preferredSize => Size(double.maxFinite, SizeConfig.getHeightMultiplier() * 1.1);
 }

lib/views/common_widgets/app_texts_widget.dart

@@ -5,7 +5,7 @@ import 'package:hmg_qline/views/view_helpers/size_config.dart';
 class AppText extends StatefulWidget {
   final String text;
   final String? variant;
-  final Color color;
+  final Color? color;
   final FontWeight? fontWeight;
   final double? fontSize;
   final double? fontHeight;
@@ -35,7 +35,7 @@ class AppText extends StatefulWidget {
   const AppText(
     this.text, {
     super.key,
-    this.color = Colors.black,
+    this.color,
     this.fontWeight,
     this.variant,
     this.fontSize,
@@ -112,14 +112,14 @@ class AppTextState extends State<AppText> {
               style: widget.style != null
                   ? _getFontStyle()?.copyWith(
                       fontStyle: widget.italic ? FontStyle.italic : null,
-                      color: widget.color,
+                      color: widget.color ?? AppColors.darkGreyTextColor,
                       fontFamily: widget.fontFamily,
                       fontWeight: widget.fontWeight ?? _getFontWeight(),
                       height: widget.fontHeight,
                     )
                   : TextStyle(
                       fontStyle: widget.italic ? FontStyle.italic : null,
-                      color: widget.color,
+                      color: widget.color ?? AppColors.darkGreyTextColor,
                       fontSize: widget.fontSize ?? _getFontSize(),
                       letterSpacing: widget.letterSpacing ?? (widget.variant == "overline" ? 1.5 : null),
                       fontWeight: widget.fontWeight ?? _getFontWeight(),

lib/views/main_queue_screen/components/priority_tickets.dart

@@ -1,64 +1,421 @@
+// import 'dart:developer';
+//
+// import 'package:flutter/material.dart';
+// import 'package:hmg_qline/constants/app_constants.dart';
+// import 'package:hmg_qline/models/global_config_model.dart';
+// import 'package:hmg_qline/models/ticket_model.dart';
+// import 'package:hmg_qline/utilities/enums.dart';
+// import 'package:hmg_qline/views/common_widgets/app_general_widgets.dart';
+// import 'package:hmg_qline/views/main_queue_screen/components/ticket_item.dart';
+// import 'package:hmg_qline/views/main_queue_screen/components/ticket_item_calling_card.dart';
+// import 'package:hmg_qline/views/main_queue_screen/components/ticket_item_normal_card.dart';
+// import 'package:hmg_qline/views/view_helpers/size_config.dart';
+// import 'package:zo_animated_border/widget/zo_color_change_border.dart';
+//
+// class PriorityTickets extends StatelessWidget {
+//   final List<TicketDetailsModel> tickets;
+//   final GlobalConfigurationsModel globalConfigurationsModel;
+//
+//   const PriorityTickets({required this.tickets, required this.globalConfigurationsModel, super.key});
+//
+//   @override
+//   Widget build(BuildContext context) {
+//     final TicketData firstTicket = tickets[0].ticketModel!;
+//     TicketData? secondTicket;
+//     List<TicketDetailsModel> otherTickets = [];
+//     if (tickets.length > 1) {
+//       secondTicket = tickets[1].ticketModel!;
+//     }
+//
+//     if (tickets.length > 3) {
+//       otherTickets = tickets.sublist(2, tickets.length);
+//     }
+//
+//     log("tickets: ${tickets.length}");
+//
+//     return Directionality(
+//       textDirection: globalConfigurationsModel.textDirection,
+//       child: Column(
+//         mainAxisAlignment: MainAxisAlignment.center,
+//         crossAxisAlignment: CrossAxisAlignment.center,
+//         children: [
+//           if (tickets.length == 1) ...[
+//             QueueItemCallingCard(
+//               isGradientRequired: true,
+//               isBorderRequired: true,
+//               ticketNo: firstTicket.queueNo ?? '',
+//               scale: globalConfigurationsModel.screenTypeEnum == ScreenTypeEnum.roomLevelScreen ? 2 : 1.2,
+//               blink: true,
+//               roomNo: firstTicket.roomNo ?? '',
+//               roomText: (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomTextEng : globalConfigurationsModel.counterTextEng) ?? "",
+//               roomTextAr: (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomTextArb : globalConfigurationsModel.counterTextArb) ?? "",
+//               isClinicAdded: false,
+//               callTypeEnum: firstTicket.callTypeEnum,
+//               textDirection: globalConfigurationsModel.textDirection,
+//               screenTypeEnum: globalConfigurationsModel.screenTypeEnum,
+//               langTypeEnum: globalConfigurationsModel.screenLanguageEnum,
+//               globalConfigurationsModel: globalConfigurationsModel,
+//             ),
+//           ],
+//           if (tickets.length == 2) ...[
+//             Row(
+//               children: [
+//                 Expanded(
+//                   flex: 2,
+//                   child: QueueItemCallingCard(
+//                     isGradientRequired: true,
+//                     isBorderRequired: true,
+//                     ticketNo: firstTicket.queueNo ?? '',
+//                     scale: globalConfigurationsModel.screenTypeEnum == ScreenTypeEnum.roomLevelScreen ? 2 : 1.2,
+//                     blink: true,
+//                     roomNo: firstTicket.roomNo ?? '',
+//                     roomText: (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomTextEng : globalConfigurationsModel.counterTextEng) ?? "",
+//                     roomTextAr: (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomTextArb : globalConfigurationsModel.counterTextArb) ?? "",
+//                     isClinicAdded: false,
+//                     callTypeEnum: firstTicket.callTypeEnum,
+//                     textDirection: globalConfigurationsModel.textDirection,
+//                     screenTypeEnum: globalConfigurationsModel.screenTypeEnum,
+//                     langTypeEnum: globalConfigurationsModel.screenLanguageEnum,
+//                     globalConfigurationsModel: globalConfigurationsModel,
+//                   ),
+//                 ),
+//                 SizedBox(width: SizeConfig.getWidthMultiplier() * 2),
+//                 Expanded(
+//                   flex: 1,
+//                   child: QueueItemNormalCard(
+//                     ticketNo: secondTicket!.queueNo ?? '',
+//                     roomNo: secondTicket.roomNo ?? '',
+//                     roomText: (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomTextEng : globalConfigurationsModel.counterTextEng) ?? "",
+//                     roomTextAr: (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomTextArb : globalConfigurationsModel.counterTextArb) ?? "",
+//                     isClinicAdded: false,
+//                     callTypeEnum: secondTicket.callTypeEnum,
+//                     textDirection: globalConfigurationsModel.textDirection,
+//                     screenTypeEnum: globalConfigurationsModel.screenTypeEnum,
+//                     langTypeEnum: globalConfigurationsModel.screenLanguageEnum,
+//                     globalConfigurationsModel: globalConfigurationsModel,
+//                   ),
+//                 ),
+//               ],
+//             ),
+//           ],
+//           if (tickets.length > 2) ...[
+//             Column(
+//               children: [
+//                 Row(
+//                   children: [
+//                     Expanded(
+//                       flex: 2,
+//                       child: QueueItemCallingCard(
+//                         isGradientRequired: true,
+//                         isBorderRequired: true,
+//                         ticketNo: firstTicket.queueNo ?? '',
+//                         scale: globalConfigurationsModel.screenTypeEnum == ScreenTypeEnum.roomLevelScreen ? 2 : 1.2,
+//                         blink: true,
+//                         roomNo: firstTicket.roomNo ?? '',
+//                         roomText: (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomTextEng : globalConfigurationsModel.counterTextEng) ?? "",
+//                         roomTextAr: (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomTextArb : globalConfigurationsModel.counterTextArb) ?? "",
+//                         isClinicAdded: false,
+//                         callTypeEnum: firstTicket.callTypeEnum,
+//                         textDirection: globalConfigurationsModel.textDirection,
+//                         screenTypeEnum: globalConfigurationsModel.screenTypeEnum,
+//                         langTypeEnum: globalConfigurationsModel.screenLanguageEnum,
+//                         globalConfigurationsModel: globalConfigurationsModel,
+//                       ),
+//                     ),
+//                     SizedBox(width: SizeConfig.getWidthMultiplier() * 2),
+//                     Expanded(
+//                       flex: 1,
+//                       child: QueueItemNormalCard(
+//                         ticketNo: secondTicket!.queueNo ?? '',
+//                         roomNo: secondTicket.roomNo ?? '',
+//                         roomText: (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomTextEng : globalConfigurationsModel.counterTextEng) ?? "",
+//                         roomTextAr: (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomTextArb : globalConfigurationsModel.counterTextArb) ?? "",
+//                         isClinicAdded: false,
+//                         callTypeEnum: secondTicket.callTypeEnum,
+//                         textDirection: globalConfigurationsModel.textDirection,
+//                         screenTypeEnum: globalConfigurationsModel.screenTypeEnum,
+//                         langTypeEnum: globalConfigurationsModel.screenLanguageEnum,
+//                         globalConfigurationsModel: globalConfigurationsModel,
+//                       ),
+//                     ),
+//                   ],
+//                 ),
+//                 Padding(
+//                   padding: EdgeInsets.symmetric(vertical: SizeConfig.getHeightMultiplier() * 0.1),
+//                   child: engArabicTextWithSeparatorWidget(
+//                     englishText: globalConfigurationsModel.currentServeTextEng ?? "",
+//                     arabicText: globalConfigurationsModel.currentServeTextArb ?? "",
+//                   ),
+//                 ),
+//                 Row(
+//                   children: List.generate(
+//                     otherTickets.length,
+//                     (index) => Expanded(
+//                       child: Padding(
+//                         padding: EdgeInsets.only(right: index != otherTickets.length - 1 ? SizeConfig.getWidthMultiplier() * 2 : 0),
+//                         child: QueueItemNormalCard(
+//                           ticketNo: otherTickets[index].ticketModel!.queueNo ?? '',
+//                           roomNo: otherTickets[index].ticketModel!.roomNo ?? '',
+//                           roomText: (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomTextEng : globalConfigurationsModel.counterTextEng) ?? "",
+//                           roomTextAr: (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomTextArb : globalConfigurationsModel.counterTextArb) ?? "",
+//                           isClinicAdded: false,
+//                           callTypeEnum: otherTickets[index].ticketModel!.callTypeEnum,
+//                           textDirection: globalConfigurationsModel.textDirection,
+//                           screenTypeEnum: globalConfigurationsModel.screenTypeEnum,
+//                           langTypeEnum: globalConfigurationsModel.screenLanguageEnum,
+//                           globalConfigurationsModel: globalConfigurationsModel,
+//                         ),
+//                       ),
+//                     ),
+//                   ),
+//                 ),
+//               ],
+//             ),
+//           ],
+//         ],
+//       ),
+//     );
+//   }
+// }
+
 import 'dart:developer';
 
 import 'package:flutter/material.dart';
 import 'package:hmg_qline/models/global_config_model.dart';
 import 'package:hmg_qline/models/ticket_model.dart';
 import 'package:hmg_qline/utilities/enums.dart';
-import 'package:hmg_qline/views/main_queue_screen/components/ticket_item.dart';
+import 'package:hmg_qline/views/common_widgets/app_general_widgets.dart';
+import 'package:hmg_qline/views/main_queue_screen/components/ticket_item_calling_card.dart';
+import 'package:hmg_qline/views/main_queue_screen/components/ticket_item_normal_card.dart';
 import 'package:hmg_qline/views/view_helpers/size_config.dart';
 
 class PriorityTickets extends StatelessWidget {
   final List<TicketDetailsModel> tickets;
   final GlobalConfigurationsModel globalConfigurationsModel;
 
-  const PriorityTickets({required this.tickets, required this.globalConfigurationsModel, super.key});
+  const PriorityTickets({
+    required this.tickets,
+    required this.globalConfigurationsModel,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
-    final TicketData firstTicket = tickets[0].ticketModel!;
-    final List<TicketDetailsModel> otherTickets = tickets.sublist(1, tickets.length);
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.center,
-      crossAxisAlignment: CrossAxisAlignment.center,
-      children: [
-        TicketItem(
-          ticketNo: firstTicket.queueNo ?? '',
-          scale: globalConfigurationsModel.screenTypeEnum == ScreenTypeEnum.roomLevelScreen ? 2 : 1.2,
-          blink: true,
-          roomNo: firstTicket.roomNo ?? '',
-          roomText: (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomText : globalConfigurationsModel.counterText) ?? "",
-          isClinicAdded: false,
-          callTypeEnum: firstTicket.callTypeEnum,
-          textDirection: globalConfigurationsModel.textDirection,
-          screenTypeEnum: globalConfigurationsModel.screenTypeEnum,
-          langTypeEnum: globalConfigurationsModel.screenLanguageEnum,
-          globalConfigurationsModel: globalConfigurationsModel,
+    log("tickets: ${tickets.length}");
+    return Directionality(
+      textDirection: globalConfigurationsModel.textDirection,
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: _buildTicketLayout(context),
+      ),
+    );
+  }
+
+  Widget _buildAnimatedTicket({required Widget child, required int delay, String? key}) {
+    return TweenAnimationBuilder<double>(
+      key: key != null ? ValueKey(key) : null,
+      duration: Duration(milliseconds: 400 + delay),
+      tween: Tween(begin: 0.0, end: 1.0),
+      curve: Curves.easeOutCubic,
+      // Changed from elasticOut to prevent overshoot
+      builder: (context, value, child) {
+        final clampedValue = value.clamp(0.0, 1.0);
+
+        return Transform.scale(
+          scale: 0.8 + (clampedValue * 0.2), // Scale from 0.8 to 1.0 instead of 0 to 1
+          child: Opacity(
+            opacity: clampedValue,
+            child: child,
+          ),
+        );
+      },
+      child: child,
+    );
+  }
+
+  Widget _buildAnimatedOtherTicketsRow() {
+    final otherTickets = tickets.length > 2 ? tickets.sublist(2) : <TicketDetailsModel>[];
+    if (otherTickets.isEmpty) return const SizedBox.shrink();
+
+    return Row(
+      children: List.generate(
+        otherTickets.length,
+        (index) => Expanded(
+          child: _buildAnimatedTicket(
+            key: 'other_ticket_${otherTickets[index].ticketModel?.queueNo ?? index}',
+            child: Padding(
+              padding: EdgeInsets.only(
+                right: (index != otherTickets.length - 1 && globalConfigurationsModel.textDirection == TextDirection.ltr) ? SizeConfig.getWidthMultiplier() * 2 : 0,
+                left: (index != otherTickets.length - 1 && globalConfigurationsModel.textDirection == TextDirection.rtl) ? SizeConfig.getWidthMultiplier() * 2 : 0,
+              ),
+              child: _buildSecondaryTicket(otherTickets[index]),
+            ),
+            delay: 200 + (index * 100),
+          ),
         ),
-        if (tickets.length > 1) ...[
-          Column(
-            mainAxisAlignment: MainAxisAlignment.spaceAround,
-            children: otherTickets.map((ticketDetailsModel) {
-              TicketData ticketData = ticketDetailsModel.ticketModel!;
-
-              return Padding(
-                padding: EdgeInsets.only(top: SizeConfig.getHeightMultiplier() * 0.5),
-                child: TicketItem(
-                  ticketNo: ticketData.queueNo ?? '',
-                  scale: 0.8,
-                  roomNo: ticketData.roomNo ?? '',
-                  roomText: (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomText : globalConfigurationsModel.counterText) ?? "",
-                  isClinicAdded: false,
-                  callTypeEnum: ticketData.callTypeEnum,
-                  textDirection: globalConfigurationsModel.textDirection,
-                  screenTypeEnum: globalConfigurationsModel.screenTypeEnum,
-                  langTypeEnum: globalConfigurationsModel.screenLanguageEnum,
-                  globalConfigurationsModel: globalConfigurationsModel,
+      ),
+    );
+  }
+
+  List<Widget> _buildTicketLayout(BuildContext context) {
+    if (tickets.isEmpty) return [];
+    log("tickets.length: ${tickets.length}");
+    switch (tickets.length) {
+      case 1:
+        return [
+          _buildAnimatedTicket(
+            child: _buildPrimaryTicket(context, tickets[0], isFullWidth: true),
+            delay: 0,
+          ),
+        ];
+
+      case 2:
+        return [
+          Row(
+            children: [
+              Expanded(
+                flex: 3,
+                child: _buildAnimatedTicket(
+                  child: _buildPrimaryTicket(context, tickets[0]),
+                  delay: 0,
+                ),
+              ),
+              _buildSpacing(),
+              Expanded(
+                flex: 2,
+                child: _buildAnimatedTicket(
+                  child: _buildSecondaryTicket(tickets[1]),
+                  delay: 150,
+                ),
+              ),
+            ],
+          ),
+        ];
+
+      default:
+        return [
+          Row(
+            children: [
+              Expanded(
+                flex: 2,
+                child: _buildAnimatedTicket(
+                  child: _buildPrimaryTicket(context, tickets[0]),
+                  delay: 0,
                 ),
-              );
-            }).toList(),
-          )
-        ]
-      ],
+              ),
+              _buildSpacing(),
+              Expanded(
+                flex: 1,
+                child: _buildAnimatedTicket(
+                  child: _buildSecondaryTicket(tickets[1]),
+                  delay: 100,
+                ),
+              ),
+            ],
+          ),
+          _buildCurrentServeText(),
+          _buildAnimatedOtherTicketsRow(),
+        ];
+    }
+  }
+
+  Widget _buildPrimaryTicket(BuildContext context, TicketDetailsModel ticket, {bool isFullWidth = false}) {
+    Widget primaryCallingCard = QueueItemCallingCard(
+      isGradientRequired: true,
+      isBorderRequired: true,
+      isSingleTicket: isFullWidth,
+      ticketNo: ticket.ticketModel?.queueNo ?? '',
+      scale: _getTicketScale(),
+      blink: true,
+      roomNo: ticket.ticketModel?.roomNo ?? '',
+      roomText: _getRoomText(),
+      roomTextAr: _getRoomTextAr(),
+      isClinicAdded: false,
+      callTypeEnum: ticket.ticketModel?.callTypeEnum ?? CallTypeEnum.vitalSign,
+      textDirection: globalConfigurationsModel.textDirection,
+      screenTypeEnum: globalConfigurationsModel.screenTypeEnum,
+      langTypeEnum: globalConfigurationsModel.screenLanguageEnum,
+      globalConfigurationsModel: globalConfigurationsModel,
     );
+
+    if (isFullWidth) {
+      return Center(
+        child: ConstrainedBox(
+          constraints: BoxConstraints(
+            maxWidth: MediaQuery.of(context).size.width * 0.6, // 60% of screen width
+            minHeight: SizeConfig.getHeightMultiplier() * 2.5, // Minimum height
+          ),
+          child: Transform.scale(
+            scale: _getTicketScale() + 0.2,
+            child: primaryCallingCard,
+          ),
+        ),
+      );
+    }
+
+    return primaryCallingCard;
+  }
+
+  Widget _buildSecondaryTicket(TicketDetailsModel ticket) {
+    return QueueItemNormalCard(
+      ticketNo: ticket.ticketModel?.queueNo ?? '',
+      roomNo: ticket.ticketModel?.roomNo ?? '',
+      roomText: _getRoomText(),
+      roomTextAr: _getRoomTextAr(),
+      isClinicAdded: false,
+      callTypeEnum: ticket.ticketModel?.callTypeEnum ?? CallTypeEnum.vitalSign,
+      textDirection: globalConfigurationsModel.textDirection,
+      screenTypeEnum: globalConfigurationsModel.screenTypeEnum,
+      langTypeEnum: globalConfigurationsModel.screenLanguageEnum,
+      globalConfigurationsModel: globalConfigurationsModel,
+    );
+  }
+
+  Widget _buildOtherTicketsRow(TextDirection textDirection) {
+    final otherTickets = tickets.length > 2 ? tickets.sublist(2) : <TicketDetailsModel>[];
+    if (otherTickets.isEmpty) return const SizedBox.shrink();
+
+    return Row(
+      children: List.generate(
+        otherTickets.length,
+        (index) => Expanded(
+          child: Padding(
+            padding: EdgeInsets.only(
+              right: (index != otherTickets.length - 1 && textDirection == TextDirection.ltr) ? SizeConfig.getWidthMultiplier() * 2 : 0,
+              left: (index != otherTickets.length - 1 && textDirection == TextDirection.rtl) ? SizeConfig.getWidthMultiplier() * 2 : 0,
+            ),
+            child: _buildSecondaryTicket(otherTickets[index]),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildCurrentServeText() {
+    return Padding(
+      padding: EdgeInsets.symmetric(vertical: SizeConfig.getHeightMultiplier() * 0.13),
+      child: engArabicTextWithSeparatorWidget(
+        englishText: globalConfigurationsModel.currentServeTextEng ?? "",
+        arabicText: globalConfigurationsModel.currentServeTextArb ?? "",
+      ),
+    );
+  }
+
+  Widget _buildSpacing() {
+    return SizedBox(width: SizeConfig.getWidthMultiplier() * 2);
+  }
+
+  // Helper methods to reduce repetition
+  double _getTicketScale() {
+    return globalConfigurationsModel.screenTypeEnum == ScreenTypeEnum.roomLevelScreen ? 2.0 : 1.2;
+  }
+
+  String _getRoomText() {
+    return globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomTextEng ?? "" : globalConfigurationsModel.counterTextEng ?? "";
+  }
+
+  String _getRoomTextAr() {
+    return globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomTextArb ?? "" : globalConfigurationsModel.counterTextArb ?? "";
   }
 }

lib/views/main_queue_screen/components/priority_tickets_sidelist.dart

@@ -4,6 +4,7 @@ import 'package:hmg_qline/models/global_config_model.dart';
 import 'package:hmg_qline/models/ticket_model.dart';
 import 'package:hmg_qline/utilities/enums.dart';
 import 'package:hmg_qline/utilities/extensions.dart';
+import 'package:hmg_qline/views/common_widgets/app_general_widgets.dart';
 import 'package:hmg_qline/views/common_widgets/app_texts_widget.dart';
 import 'package:hmg_qline/views/main_queue_screen/components/priority_tickets.dart';
 import 'package:hmg_qline/views/view_helpers/size_config.dart';
@@ -20,87 +21,68 @@ class PriorityTicketsWithSidelist extends StatelessWidget {
     required this.screenOrientationEnum,
   });
 
-  @override
-  Widget build(BuildContext context) {
-    final priorityTickets = tickets.sublist(0, AppConstants.thresholdForListUI);
-    final otherTickets = tickets.sublist(AppConstants.thresholdForListUI, tickets.length);
+  Widget ticketListItem({required TicketData? ticketModel}) {
+    final callMessageEng = (ticketModel?.callTypeEnum.getMessageByCallTypeForEnglish(globalConfigurationsModel, isListView: true)) ?? "";
+    final callMessageAr = (ticketModel?.callTypeEnum.getMessageByCallTypeForArabic(globalConfigurationsModel, isListView: true)) ?? "";
 
-    final List<Widget> children = [
-      Expanded(flex: 7, child: PriorityTickets(globalConfigurationsModel: globalConfigurationsModel, tickets: priorityTickets)),
-      Container(color: Colors.grey.withOpacity(0.1), width: 10, margin: const EdgeInsets.symmetric(horizontal: 10, vertical: 50)),
-      Expanded(
-        flex: 6,
-        child: ListView(
-          children: [
-            Padding(
-              padding: const EdgeInsets.fromLTRB(10, 0, 10, 10),
-              child: Directionality(
-                textDirection: globalConfigurationsModel.textDirection,
+    return Directionality(
+      textDirection: globalConfigurationsModel.textDirection,
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          Expanded(
+            flex: 3,
+            child: Center(
+              child: AppText(
+                ticketModel!.queueNo ?? "",
+                fontWeight: FontWeight.w500,
+                color: AppColors.greyTextColor,
+                fontSize: SizeConfig.getWidthMultiplier() * 2,
+                textAlign: TextAlign.center,
+                fontFamily: AppStrings.fontNamePoppins,
+              ),
+            ),
+          ),
+          if (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment) ...[
+            Expanded(
+              flex: 8,
+              child: SizedBox(
+                height: SizeConfig.getHeightMultiplier() * 0.25,
                 child: Row(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  mainAxisAlignment: MainAxisAlignment.spaceAround,
+                  mainAxisAlignment: MainAxisAlignment.center,
                   children: [
                     Expanded(
-                      flex: 5,
+                      flex: 2,
                       child: Row(
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
-                          AppText(
-                            globalConfigurationsModel.queueNoText ?? "",
-                            letterSpacing: -2,
-                            fontHeight: 0.5,
-                            fontWeight: FontWeight.bold,
-                            fontSize: SizeConfig.getWidthMultiplier() * 3.8,
-                            textAlign: TextAlign.center,
-                            fontFamily: globalConfigurationsModel.screenLanguageEnum == LanguageEnum.arabic ? AppStrings.fontNameCairo : AppStrings.fontNamePoppins,
-                          ),
+                          ticketModel.callTypeEnum.getIconByCallType(SizeConfig.getHeightMultiplier() * 0.2),
                         ],
                       ),
                     ),
-                    Container(
-                      color: Colors.grey.withOpacity(0.5),
-                      width: 5,
-                      height: SizeConfig.getHeightMultiplier() * 0.3,
-                      margin: const EdgeInsets.symmetric(horizontal: 15),
-                    ),
-                    if (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment) ...[
-                      Expanded(
-                        flex: 5,
-                        child: Row(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          children: [
-                            AppText(
-                              globalConfigurationsModel.callForText ?? "",
-                              letterSpacing: -2,
-                              fontHeight: 0.5,
-                              fontWeight: FontWeight.bold,
-                              fontSize: SizeConfig.getWidthMultiplier() * 3.8,
-                              textAlign: TextAlign.center,
-                            ),
-                          ],
-                        ),
-                      ),
-                      Container(
-                        color: Colors.grey.withOpacity(0.5),
-                        width: 5,
-                        height: SizeConfig.getHeightMultiplier() * 0.3,
-                        margin: const EdgeInsets.symmetric(horizontal: 15),
-                      ),
-                    ],
                     Expanded(
-                      flex: 3,
+                      flex: 9,
                       child: Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
+                        mainAxisAlignment: MainAxisAlignment.start,
                         children: [
                           AppText(
-                            (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomText : globalConfigurationsModel.counterText) ?? "",
-                            letterSpacing: -2,
-                            fontHeight: 0.5,
+                            callMessageAr,
+                            color: ticketModel.callTypeEnum.getColorByCallType(),
+                            fontSize: SizeConfig.getWidthMultiplier() * 2,
                             fontWeight: FontWeight.bold,
-                            fontSize: SizeConfig.getWidthMultiplier() * 3.8,
-                            textAlign: TextAlign.center,
-                            fontFamily: globalConfigurationsModel.screenLanguageEnum == LanguageEnum.arabic ? AppStrings.fontNameCairo : AppStrings.fontNamePoppins,
+                            fontFamily: AppStrings.fontNameGesTwo,
+                            fontHeight: 1,
                           ),
+                          SizedBox(width: SizeConfig.getWidthMultiplier()),
+                          if (callMessageEng.isNotEmpty) ...[
+                            AppText(
+                              "($callMessageEng)",
+                              color: ticketModel.callTypeEnum.getColorByCallType(),
+                              fontSize: SizeConfig.getWidthMultiplier() * 2,
+                              fontFamily: AppStrings.fontNamePoppins,
+                              fontHeight: 1,
+                            ),
+                          ]
                         ],
                       ),
                     ),
@@ -108,100 +90,116 @@ class PriorityTicketsWithSidelist extends StatelessWidget {
                 ),
               ),
             ),
-            ListView.builder(
-              shrinkWrap: true,
-              itemCount: otherTickets.length,
-              itemBuilder: (ctx, index) {
-                final ticketModel = otherTickets[index].ticketModel;
-                return Padding(
-                  padding: const EdgeInsets.all(8),
-                  child: Directionality(
-                    textDirection: globalConfigurationsModel.textDirection,
-                    child: Row(
-                      crossAxisAlignment: CrossAxisAlignment.center,
-                      children: [
+          ],
+          Expanded(
+            flex: 2,
+            child: Center(
+              child: AppText(
+                ticketModel.roomNo ?? "",
+                fontWeight: FontWeight.w500,
+                color: AppColors.greyTextColor,
+                fontSize: SizeConfig.getWidthMultiplier() * 2,
+                fontFamily: globalConfigurationsModel.screenLanguageEnum == LanguageEnum.arabic ? AppStrings.fontNameCairo : AppStrings.fontNamePoppins,
+              ),
+            ),
+          )
+        ],
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final priorityTickets = tickets.sublist(0, AppConstants.thresholdForListUI);
+    final otherTickets = tickets.sublist(AppConstants.thresholdForListUI, tickets.length);
+    final List<Widget> children = [
+      Expanded(flex: 5, child: PriorityTickets(globalConfigurationsModel: globalConfigurationsModel, tickets: priorityTickets)),
+      if (screenOrientationEnum == ScreenOrientationEnum.portraitUp || screenOrientationEnum == ScreenOrientationEnum.portraitDown) ...[
+        SizedBox(width: SizeConfig.getWidthMultiplier() * 2),
+      ],
+      Expanded(
+        flex: 5,
+        child: customShadowSmoothContainer(
+          child: Column(
+            children: [
+              Directionality(
+                textDirection: globalConfigurationsModel.textDirection,
+                child: Padding(
+                  padding: EdgeInsets.symmetric(
+                    vertical: SizeConfig.getHeightMultiplier()! * 0.12,
+                    horizontal: SizeConfig.getWidthMultiplier()! * 2,
+                  ),
+                  child: Row(
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Expanded(
+                        flex: 3,
+                        child: engArabicTextWithSeparatorWidget(
+                          englishText: globalConfigurationsModel.queueNoTextEng ?? "",
+                          arabicText: globalConfigurationsModel.queueNoTextArb ?? "",
+                          fontSize: SizeConfig.getWidthMultiplier()! * 2.2,
+                          mainAxisAlignment: MainAxisAlignment.start,
+                        ),
+                      ),
+                      if (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment) ...[
                         Expanded(
                           flex: 5,
-                          child: Row(
+                          child: engArabicTextWithSeparatorWidget(
                             mainAxisAlignment: MainAxisAlignment.center,
-                            children: [
-                              AppText(
-                                ticketModel!.queueNo ?? "",
-                                letterSpacing: -1,
-                                fontWeight: FontWeight.bold,
-                                fontSize: SizeConfig.getWidthMultiplier() * 3.5,
-                                textAlign: TextAlign.center,
-                                fontHeight: 0.5,
-                                fontFamily: globalConfigurationsModel.screenLanguageEnum == LanguageEnum.arabic ? AppStrings.fontNameCairo : AppStrings.fontNamePoppins,
-                              ),
-                            ],
+                            englishText: globalConfigurationsModel.callForTextEng ?? "",
+                            arabicText: globalConfigurationsModel.callForTextArb ?? "",
+                            fontSize: SizeConfig.getWidthMultiplier()! * 2.2,
                           ),
                         ),
-                        Container(
-                          color: Colors.grey.withOpacity(0.5),
-                          width: 5,
-                          height: SizeConfig.getHeightMultiplier() * 0.3,
-                          margin: const EdgeInsets.symmetric(horizontal: 15),
-                        ),
-                        if (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment) ...[
-                          Expanded(
-                            flex: 5,
-                            child: Row(
-                              mainAxisAlignment: MainAxisAlignment.center,
-                              crossAxisAlignment: CrossAxisAlignment.center,
-                              children: [
-                                Padding(
-                                  padding: const EdgeInsets.only(bottom: 8.0),
-                                  child: SizedBox(
-                                    height: SizeConfig.getWidthMultiplier() * 3,
-                                    child: ticketModel.callTypeEnum.getIconByCallType(SizeConfig.getHeightMultiplier() * 0.3),
-                                  ),
-                                ),
-                                const SizedBox(width: 15),
-                                AppText(
-                                  ticketModel.callTypeEnum.getMessageByCallType(globalConfigurationsModel, isListView: true),
-                                  color: ticketModel.callTypeEnum.getColorByCallType(),
-                                  fontSize: SizeConfig.getWidthMultiplier() * 3,
-                                  fontWeight: FontWeight.w600,
-                                  fontHeight: 0.5,
-                                ),
-                              ],
-                            ),
-                          ),
-                          Container(
-                            color: Colors.grey.withOpacity(0.5),
-                            width: 5,
-                            height: SizeConfig.getHeightMultiplier() * 0.3,
-                            margin: const EdgeInsets.symmetric(horizontal: 15),
-                          ),
-                        ],
-                        Expanded(
-                          flex: 3,
-                          child: Row(
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            children: [
-                              AppText(
-                                ticketModel.roomNo ?? "",
-                                color: AppColors.blackColor,
-                                letterSpacing: -1.5,
-                                fontHeight: 0.5,
-                                fontSize: SizeConfig.getWidthMultiplier() * 3.3,
-                                fontWeight: FontWeight.w600,
-                                fontFamily: globalConfigurationsModel.screenLanguageEnum == LanguageEnum.arabic ? AppStrings.fontNameCairo : AppStrings.fontNamePoppins,
-                              ),
-                            ],
-                          ),
-                        )
                       ],
+                      Expanded(
+                        flex: 3,
+                        child: Container(
+                          child: engArabicTextWithSeparatorWidget(
+                            mainAxisAlignment: MainAxisAlignment.end,
+                            englishText: (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomTextEng : globalConfigurationsModel.counterTextEng) ?? "",
+                            arabicText: (globalConfigurationsModel.qTypeEnum == QTypeEnum.appointment ? globalConfigurationsModel.roomTextArb : globalConfigurationsModel.counterTextArb) ?? "",
+                            fontSize: SizeConfig.getWidthMultiplier()! * 2.2,
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+              SizedBox(height: SizeConfig.getHeightMultiplier()! * 0.06),
+              Expanded(
+                child: Padding(
+                  padding: EdgeInsets.symmetric(horizontal: SizeConfig.getWidthMultiplier() * 6),
+                  child: ListView.separated(
+                    separatorBuilder: (context, int index) => Divider(
+                      color: AppColors.lightBorderColor,
+                      thickness: SizeConfig.getHeightMultiplier()! * 0.01,
+                      height: SizeConfig.getHeightMultiplier()! * 0.14,
                     ),
+                    itemCount: otherTickets.length,
+                    itemBuilder: (ctx, index) {
+                      final ticketModel = otherTickets[index].ticketModel;
+                      return ticketListItem(ticketModel: ticketModel);
+                    },
                   ),
-                );
-              },
-            ),
-          ],
+                ),
+              ),
+            ],
+          ),
         ),
       )
     ];
-    return (screenOrientationEnum == ScreenOrientationEnum.portraitUp || screenOrientationEnum == ScreenOrientationEnum.portraitDown) ? Row(children: children) : Column(children: children);
+
+    return (screenOrientationEnum == ScreenOrientationEnum.portraitUp || screenOrientationEnum == ScreenOrientationEnum.portraitDown)
+        ? Directionality(
+            textDirection: globalConfigurationsModel.textDirection,
+            child: Row(children: children),
+          )
+        : Directionality(
+            textDirection: globalConfigurationsModel.textDirection,
+            child: Column(children: children),
+          );
   }
 }

lib/views/main_queue_screen/components/ticket_item.dart

@@ -84,7 +84,7 @@ class TicketItem extends StatelessWidget {
                       ),
                       const SizedBox(width: 13),
                       AppText(
-                        callTypeEnum.getMessageByCallType(globalConfigurationsModel, isListView: false),
+                        callTypeEnum.getMessageByCallTypeForEnglish(globalConfigurationsModel, isListView: false),
                         color: callTypeEnum.getColorByCallType(),
                         fontSize: SizeConfig.getWidthMultiplier() * 3.8,
                         fontWeight: FontWeight.w600,

lib/views/main_queue_screen/components/ticket_item_calling_card.dart

@@ -0,0 +1,163 @@
+import 'package:blinking_text/blinking_text.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:hmg_qline/constants/app_constants.dart';
+import 'package:hmg_qline/models/global_config_model.dart';
+import 'package:hmg_qline/utilities/enums.dart';
+import 'package:hmg_qline/utilities/extensions.dart';
+import 'package:hmg_qline/views/common_widgets/app_general_widgets.dart';
+import 'package:hmg_qline/views/common_widgets/app_texts_widget.dart';
+import 'package:hmg_qline/views/view_helpers/size_config.dart';
+
+class QueueItemCallingCard extends StatelessWidget {
+  final String ticketNo;
+  final String roomNo;
+  final bool blink;
+  final double scale;
+  final bool isClinicAdded;
+  final bool isGradientRequired;
+  final bool isBorderRequired;
+  final TextDirection textDirection;
+  final String roomText;
+  final String roomTextAr;
+  final GlobalConfigurationsModel globalConfigurationsModel;
+  final CallTypeEnum callTypeEnum;
+  final ScreenTypeEnum screenTypeEnum;
+  final LanguageEnum langTypeEnum;
+  final bool isSingleTicket;
+
+  const QueueItemCallingCard({
+    super.key,
+    required this.isClinicAdded,
+    required this.ticketNo,
+    required this.roomNo,
+    required this.scale,
+    required this.textDirection,
+    required this.roomText,
+    required this.roomTextAr,
+    required this.globalConfigurationsModel,
+    required this.callTypeEnum,
+    required this.screenTypeEnum,
+    required this.langTypeEnum,
+    this.isGradientRequired = false,
+    this.isBorderRequired = false,
+    this.isSingleTicket = false,
+    this.blink = false,
+  });
+
+  String getFormattedTicket(String ticketNo, bool isClinicAdded) {
+    if (isClinicAdded) {
+      var formattedString = ticketNo.split(" ");
+      if (formattedString.length > 1) {
+        return "${formattedString[0]}   ${formattedString[1]}";
+      } else {
+        return ticketNo;
+      }
+    }
+    return ticketNo;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final text = "${callTypeEnum.getMessageByCallTypeForEnglish(globalConfigurationsModel, isListView: false)} | $roomText $roomNo";
+
+    return Stack(
+      children: [
+        customShadowSmoothContainerWithBackground(
+          padding: EdgeInsets.symmetric(vertical: SizeConfig.getHeightMultiplier() * 0.1),
+          callTypeEnum: callTypeEnum,
+          child: Directionality(
+            textDirection: textDirection,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.end,
+              children: [
+                Padding(
+                  padding: EdgeInsets.only(
+                    right: textDirection == TextDirection.ltr ? SizeConfig.getWidthMultiplier() * 3.5 : 0,
+                    left: textDirection == TextDirection.rtl ? SizeConfig.getWidthMultiplier() * 3.5 : 0,
+                  ),
+                  child: callTypeEnum.getIconByCallType(SizeConfig.getHeightMultiplier() * 0.5),
+                ),
+                SizedBox(height: SizeConfig.getHeightMultiplier()! * 0.15),
+                IntrinsicWidth(
+                  child: callTypeContainer(
+                    textDirection: textDirection,
+                    padding: EdgeInsets.all(SizeConfig.getHeightMultiplier() * 0.1),
+                    color: callTypeEnum.getColorByCallType(),
+                    child: engArabicTextWithSeparatorWidget(
+                      englishText: roomNo,
+                      arabicText: roomTextAr,
+                      color: AppColors.whiteColor,
+                      mainAxisAlignment: MainAxisAlignment.center,
+                    ),
+                  ),
+                ),
+                SizedBox(height: SizeConfig.getHeightMultiplier()! * 0.15),
+                Padding(
+                  padding: EdgeInsets.only(
+                    right: textDirection == TextDirection.ltr ? SizeConfig.getWidthMultiplier() * 3.5 : 0,
+                    left: textDirection == TextDirection.rtl ? SizeConfig.getWidthMultiplier() * 3.5 : 0,
+                  ),
+                  child: AppText(
+                    callTypeEnum.getMessageByCallTypeForArabic(globalConfigurationsModel, isListView: false),
+                    color: callTypeEnum.getColorByCallType(),
+                    fontSize: SizeConfig.getWidthMultiplier() * 2.5,
+                    fontHeight: 1,
+                    fontFamily: AppStrings.fontNameGesTwo,
+                  ),
+                ),
+                SizedBox(height: SizeConfig.getHeightMultiplier()! * 0.15),
+                Padding(
+                  padding: EdgeInsets.only(
+                    right: textDirection == TextDirection.ltr ? SizeConfig.getWidthMultiplier() * 3.5 : 0,
+                    left: textDirection == TextDirection.rtl ? SizeConfig.getWidthMultiplier() * 3.5 : 0,
+                  ),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.end,
+                    children: [
+                      ClipRRect(
+                        child: AppText(
+                          text,
+                          color: callTypeEnum.getColorByCallType(),
+                          fontSize: SizeConfig.getWidthMultiplier() * 2.4,
+                          fontFamily: AppStrings.fontNamePoppins,
+                          textAlign: TextAlign.left,
+                          textOverflow: TextOverflow.clip,
+                          maxLines: 1,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+        Padding(
+          padding: EdgeInsets.only(
+            top: SizeConfig.getHeightMultiplier() * 0.1,
+            left: textDirection == TextDirection.ltr ? SizeConfig.getWidthMultiplier() * 2 : 0,
+            right: textDirection == TextDirection.rtl ? SizeConfig.getWidthMultiplier() * 2 : 0,
+          ),
+          child: SvgPicture.asset(AppAssets.hmgLogoPatternDarkIcon, height: SizeConfig.getHeightMultiplier() * 1),
+        ),
+        Padding(
+          padding: EdgeInsets.only(
+            left: textDirection == TextDirection.ltr ? SizeConfig.getWidthMultiplier() * 6 : 0,
+            right: textDirection == TextDirection.rtl ? SizeConfig.getWidthMultiplier() * 6 : 0,
+            top: SizeConfig.getHeightMultiplier() * 0.4,
+          ),
+          child: AppText(
+            getFormattedTicket(ticketNo, isClinicAdded),
+            fontSize: SizeConfig.getWidthMultiplier() * 7.4,
+            letterSpacing: -1,
+            fontHeight: 0.5,
+            color: AppColors.greyTextColor,
+            fontWeight: FontWeight.bold,
+            fontFamily: AppStrings.fontNamePoppins,
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/views/main_queue_screen/components/ticket_item_normal_card.dart

@@ -0,0 +1,144 @@
+import 'package:blinking_text/blinking_text.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:hmg_qline/constants/app_constants.dart';
+import 'package:hmg_qline/models/global_config_model.dart';
+import 'package:hmg_qline/utilities/enums.dart';
+import 'package:hmg_qline/utilities/extensions.dart';
+import 'package:hmg_qline/views/common_widgets/app_general_widgets.dart';
+import 'package:hmg_qline/views/common_widgets/app_texts_widget.dart';
+import 'package:hmg_qline/views/view_helpers/size_config.dart';
+
+class QueueItemNormalCard extends StatelessWidget {
+  final String ticketNo;
+  final String roomNo;
+  final bool isClinicAdded;
+  final TextDirection textDirection;
+  final String roomText;
+  final String roomTextAr;
+  final GlobalConfigurationsModel globalConfigurationsModel;
+  final CallTypeEnum callTypeEnum;
+  final ScreenTypeEnum screenTypeEnum;
+  final LanguageEnum langTypeEnum;
+
+  const QueueItemNormalCard({
+    super.key,
+    required this.isClinicAdded,
+    required this.ticketNo,
+    required this.roomNo,
+    required this.textDirection,
+    required this.roomText,
+    required this.roomTextAr,
+    required this.globalConfigurationsModel,
+    required this.callTypeEnum,
+    required this.screenTypeEnum,
+    required this.langTypeEnum,
+  });
+
+  String getFormattedTicket(String ticketNo, bool isClinicAdded) {
+    if (isClinicAdded) {
+      var formattedString = ticketNo.split(" ");
+      if (formattedString.length > 1) {
+        return "${formattedString[0]}   ${formattedString[1]}";
+      } else {
+        return ticketNo;
+      }
+    }
+    return ticketNo;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final text = "${callTypeEnum.getMessageByCallTypeForEnglish(globalConfigurationsModel, isListView: false)} | $roomText $roomNo";
+    return Stack(
+      children: [
+        customShadowSmoothContainer(
+          padding: EdgeInsets.symmetric(
+            vertical: SizeConfig.getHeightMultiplier() * 0.1,
+            horizontal: SizeConfig.getWidthMultiplier() * 1.5,
+          ),
+          child: Directionality(
+            textDirection: textDirection,
+            child: Column(
+              children: [
+                SizedBox(height: SizeConfig.getHeightMultiplier()! * 0.14),
+                AppText(
+                  getFormattedTicket(ticketNo, isClinicAdded),
+                  fontSize: SizeConfig.getWidthMultiplier() * 5,
+                  letterSpacing: -1,
+                  fontHeight: 0.5,
+                  color: AppColors.greyTextColor,
+                  fontWeight: FontWeight.bold,
+                  fontFamily: AppStrings.fontNamePoppins,
+                ),
+                SizedBox(height: SizeConfig.getHeightMultiplier()! * 0.15),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.end,
+                  children: [
+                    callTypeEnum.getIconByCallType(SizeConfig.getHeightMultiplier() * 0.35),
+                  ],
+                ),
+                SizedBox(height: SizeConfig.getHeightMultiplier()! * 0.14),
+                IntrinsicWidth(
+                  child: callTypeContainer(
+                    textDirection: textDirection,
+                    isDisableRightBorderRadius: false,
+                    padding: EdgeInsets.all(SizeConfig.getHeightMultiplier() * 0.05),
+                    color: callTypeEnum.getColorByCallType(),
+                    child: engArabicTextWithSeparatorWidget(
+                      fontSize: SizeConfig.getWidthMultiplier()! * 1.8,
+                      englishText: roomNo,
+                      arabicText: roomTextAr,
+                      color: AppColors.whiteColor,
+                      mainAxisAlignment: MainAxisAlignment.center,
+                    ),
+                  ),
+                ),
+                SizedBox(height: SizeConfig.getHeightMultiplier()! * 0.14),
+                AppText(
+                  textAlign: TextAlign.center,
+                  callTypeEnum.getMessageByCallTypeForArabic(globalConfigurationsModel, isListView: false),
+                  color: callTypeEnum.getColorByCallType(),
+                  fontSize: SizeConfig.getWidthMultiplier() * 2,
+                  fontHeight: 1,
+                  fontFamily: AppStrings.fontNameGesTwo,
+                  maxLines: 2,
+                  textOverflow: TextOverflow.clip,
+                ),
+                SizedBox(height: SizeConfig.getHeightMultiplier()! * 0.14),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Expanded(
+                      child: Center(
+                        child: ClipRRect(
+                          child: AppText(
+                            text,
+                            color: callTypeEnum.getColorByCallType(),
+                            fontSize: SizeConfig.getWidthMultiplier() * 1.6,
+                            fontFamily: AppStrings.fontNamePoppins,
+                            textAlign: TextAlign.left,
+                            textOverflow: TextOverflow.clip,
+                            maxLines: 1,
+                          ),
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ],
+            ),
+          ),
+        ),
+        Padding(
+          padding: EdgeInsets.only(
+            left: textDirection == TextDirection.ltr ? SizeConfig.getWidthMultiplier() * 2 : 0,
+            right: textDirection == TextDirection.rtl ? SizeConfig.getWidthMultiplier() * 2 : 0,
+            top: SizeConfig.getHeightMultiplier() * 0.1,
+          ),
+          child: SvgPicture.asset(AppAssets.hmgLogoPatternLightIcon, height: SizeConfig.getHeightMultiplier() * 0.8),
+        ),
+      ],
+    );
+  }
+}

lib/views/main_queue_screen/main_queue_screen.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/material.dart';
 import 'package:hmg_qline/constants/app_constants.dart';
 import 'package:hmg_qline/utilities/enums.dart';
@@ -12,6 +11,7 @@ import 'package:hmg_qline/views/common_widgets/app_header.dart';
 import 'package:hmg_qline/views/common_widgets/app_scaffold.dart';
 import 'package:hmg_qline/views/main_queue_screen/components/priority_tickets.dart';
 import 'package:hmg_qline/views/main_queue_screen/components/priority_tickets_sidelist.dart';
+import 'package:hmg_qline/views/view_helpers/size_config.dart';
 import 'package:provider/provider.dart';
 
 class MainQueueScreen extends StatefulWidget {
@@ -27,11 +27,11 @@ class _MainQueueScreenState extends State<MainQueueScreen> {
   @override
   void initState() {
     super.initState();
-
     final ScreenConfigViewModel screenConfigViewModel = context.read<ScreenConfigViewModel>();
     lifecycleHandler = LifecycleHandler(
       onResumed: () => screenConfigViewModel.onAppResumed(),
       onPaused: () => screenConfigViewModel.onAppPaused(),
+      onDetached: () => screenConfigViewModel.onAppDetached(),
     );
     lifecycleHandler.register();
   }
@@ -86,7 +86,7 @@ class _MainQueueScreenState extends State<MainQueueScreen> {
             isForRoomLevel: isForRoomLevel,
             isRoomNoRequired: screenConfigViewModel.globalConfigurationsModel.isRoomNoRequired ?? true,
             counterNo: screenConfigViewModel.globalConfigurationsModel.roomNo ?? 0,
-            roomText: screenConfigViewModel.globalConfigurationsModel.roomText ?? AppStrings.counterNo,
+            roomText: screenConfigViewModel.globalConfigurationsModel.roomTextEng ?? AppStrings.counterNo,
           );
         } else if (screenConfigViewModel.globalConfigurationsModel.screenTypeEnum == ScreenTypeEnum.roomLevelScreen) {
           widget = Row(
@@ -98,7 +98,7 @@ class _MainQueueScreenState extends State<MainQueueScreen> {
                 children: [
                   counterNoText(
                     counterNo: screenConfigViewModel.globalConfigurationsModel.roomNo ?? 0,
-                    roomText: screenConfigViewModel.globalConfigurationsModel.roomText ?? AppStrings.counterNo,
+                    roomText: screenConfigViewModel.globalConfigurationsModel.roomTextEng ?? AppStrings.counterNo,
                     isRoomNoRequired: screenConfigViewModel.globalConfigurationsModel.isRoomNoRequired ?? true,
                   ),
                   PriorityTickets(
@@ -133,30 +133,31 @@ class _MainQueueScreenState extends State<MainQueueScreen> {
       builder: (BuildContext context, ScreenConfigViewModel screenConfigVM, Widget? child) {
         return Column(
           children: [
-            if (screenConfigVM.globalConfigurationsModel.screenTypeEnum != ScreenTypeEnum.roomLevelScreen) ...[
-              Expanded(
-                flex: getFlexForScreenTypes(screenConfigVM),
+            // if (screenConfigVM.globalConfigurationsModel.screenTypeEnum != ScreenTypeEnum.roomLevelScreen) ...[
+            //   Expanded(
+            //     flex: getFlexForScreenTypes(screenConfigVM),
+            //     child: Padding(
+            //       padding: const EdgeInsets.symmetric(horizontal: 20),
+            //       child: Row(
+            //         children: [
+            //           if (screenConfigVM.globalConfigurationsModel.isWeatherReq) ...[
+            //             getWeatherWidget(screenConfigVM),
+            //           ],
+            //           const SizedBox(width: 20),
+            //           if (screenConfigVM.globalConfigurationsModel.isPrayerTimeReq) ...[
+            //             getPrayerWidget(screenConfigVM),
+            //           ],
+            //         ],
+            //       ),
+            //     ),
+            //   )
+            // ],
+            Expanded(
+                flex: 10,
                 child: Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 20),
-                  child: Row(
-                    children: [
-                      if (screenConfigVM.globalConfigurationsModel.isWeatherReq) ...[
-                        getWeatherWidget(screenConfigVM),
-                      ],
-                      const SizedBox(width: 20),
-                      if (screenConfigVM.globalConfigurationsModel.isPrayerTimeReq) ...[
-                        getPrayerWidget(screenConfigVM),
-                      ],
-                    ],
-                  ),
-                ),
-              )
-            ],
-            const SizedBox(height: 12),
-            Expanded(flex: 10, child: dataContent(context: context)),
-            if (!screenConfigVM.globalConfigurationsModel.isWeatherReq && !screenConfigVM.globalConfigurationsModel.isPrayerTimeReq) ...[
-              const SizedBox(height: 100),
-            ],
+                  padding: EdgeInsets.symmetric(horizontal: SizeConfig.getWidthMultiplier()! * 4),
+                  child: dataContent(context: context),
+                )),
           ],
         );
       },
@@ -174,6 +175,7 @@ class _MainQueueScreenState extends State<MainQueueScreen> {
         return RotatedBox(
           quarterTurns: screenOrientationEnum.getTurnsByOrientation(),
           child: AppScaffold(
+            backgroundColor: AppColors.backgroundColor,
             appBar: const AppHeader(),
             body: getBody(context: context),
             bottomNavigationBar: const AppFooter(),

lib/views/view_helpers/size_config.dart

@@ -88,4 +88,12 @@ class SizeConfig {
     }
     return heightMultiplier! * 8;
   }
+
+  static double getTextMultiplier({double? height}) {
+    // TODO handel LandScape case
+    if (height != null) {
+      return height / 100;
+    }
+    return textMultiplier!;
+  }
 }

pubspec.lock

@@ -45,26 +45,26 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   clock:
     dependency: transitive
     description:
       name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
       url: "https://pub.dev"
     source: hosted
-    version: "1.19.0"
+    version: "1.19.1"
   connectivity_plus:
     dependency: "direct main"
     description:
@@ -125,10 +125,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.3"
   ffi:
     dependency: transitive
     description:
@@ -268,26 +268,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
+      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.7"
+    version: "11.0.2"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.8"
+    version: "3.0.10"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   lints:
     dependency: transitive
     description:
@@ -324,10 +324,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16+1"
+    version: "0.12.17"
   material_color_utilities:
     dependency: transitive
     description:
@@ -340,10 +340,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
       url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   nested:
     dependency: transitive
     description:
@@ -380,10 +380,10 @@ packages:
     dependency: transitive
     description:
       name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   path_parsing:
     dependency: transitive
     description:
@@ -593,26 +593,26 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.12.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.2.0"
   synchronized:
     dependency: transitive
     description:
@@ -633,10 +633,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
+      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.3"
+    version: "0.7.6"
   tuple:
     dependency: transitive
     description:
@@ -689,18 +689,18 @@ packages:
     dependency: transitive
     description:
       name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.2.0"
   vm_service:
     dependency: transitive
     description:
       name: vm_service
-      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "14.3.0"
+    version: "14.2.5"
   wakelock_plus:
     dependency: "direct main"
     description:
@@ -757,6 +757,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.5.0"
+  zo_animated_border:
+    dependency: "direct main"
+    description:
+      name: zo_animated_border
+      sha256: cff6eb92b3b714618fa9fd6f268d1cf1daf30190ef23b4da085c97ca35ffa03d
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
 sdks:
-  dart: ">=3.5.4 <4.0.0"
+  dart: ">=3.8.0-0 <4.0.0"
   flutter: ">=3.24.0"

pubspec.yaml

@@ -55,6 +55,7 @@ dependencies:
   path_provider: ^2.1.5
   flutter_foreground_task: ^9.1.0
   restart_app: ^1.3.2
+  zo_animated_border: ^1.0.1
 
 #  esc_pos_printer: ^4.0.0  # Ensure you are using the latest version
 #  esc_pos_utils: ^1.0.0
@@ -90,6 +91,7 @@ flutter:
     - assets/images/
     - assets/tones/
     - assets/icons/
+    - assets/new_design_icons/
 
 
   fonts:
@@ -103,9 +105,9 @@ flutter:
           weight: 600
         - asset: assets/fonts/Poppins/Poppins-Bold.ttf
           weight: 700
-        - asset: assets/fonts/Poppins/Poppins-Bold.ttf
+        - asset: assets/fonts/Poppins/Poppins-ExtraBold.ttf
           weight: 800
-        - asset: assets/fonts/Poppins/Poppins-Bold.ttf
+        - asset: assets/fonts/Poppins/Poppins-Black.ttf
           weight: 900
     - family: Cairo
       fonts:
@@ -117,6 +119,11 @@ flutter:
         - asset: assets/fonts/Cairo/Cairo-Bold/Cairo-Bold.otf
         - asset: assets/fonts/Cairo/Cairo-Bold/Cairo-Bold.ttf
           weight: 700
-
-
-
+    - family: GE_SS_Two
+      fonts:
+        - asset: assets/fonts/Ge_SS_Two/GE_SS_Two_Light.otf
+          weight: 300
+        - asset: assets/fonts/Ge_SS_Two/GE_SS_Two_Medium.otf
+          weight: 400
+        - asset: assets/fonts/Ge_SS_Two/GE_SS_Two_Bold.otf
+          weight: 700