From 0f39a3092197043e0e65eb5c7a1c8197f6743416 Mon Sep 17 00:00:00 2001
From: Dan Cojocaru <dancojocaru2010@hotmail.com>
Date: Sat, 19 Nov 2022 09:41:30 +0100
Subject: [PATCH] Fix Cupertino split screen UI

---
 .../view_train/train_info_cupertino.dart      | 95 ++++++++++---------
 1 file changed, 49 insertions(+), 46 deletions(-)

diff --git a/lib/pages/train_info_page/view_train/train_info_cupertino.dart b/lib/pages/train_info_page/view_train/train_info_cupertino.dart
index 64f54d4..c353aef 100644
--- a/lib/pages/train_info_page/view_train/train_info_cupertino.dart
+++ b/lib/pages/train_info_page/view_train/train_info_cupertino.dart
@@ -214,59 +214,62 @@ class TrainInfoBodyCupertino extends TrainInfoBodyShared {
       return Row(
         mainAxisSize: MainAxisSize.max,
         children: [
-          Container(
-            constraints: const BoxConstraints(
-              minWidth: 400,
-              maxWidth: 400,
-            ),
-            child: Column(
-              mainAxisSize: MainAxisSize.max,
-              children: [
-                DisplayTrainID(trainData: trainData),
-                DisplayTrainOperator(trainData: trainData),
-                DisplayTrainRoute(trainData: trainData),
-                DisplayTrainDeparture(trainData: trainData),
-                const CupertinoDivider(
-                  color: foregroundWhite,
-                ),
-                DisplayTrainLastInfo(trainData: trainData),
-                const CupertinoDivider(),
-                IntrinsicHeight(
-                  child: Row(
-                    children: <Widget>[
-                      // Expanded(
-                      //   child: DisplayTrainNextStop(trainData: trainData,),
-                      // ),
-                      Expanded(
-                        child: DisplayTrainRouteDuration(
-                          trainData: trainData,
+          SafeArea(
+            right: false,
+            child: Container(
+              constraints: const BoxConstraints(
+                minWidth: 400,
+                maxWidth: 400,
+              ),
+              child: Column(
+                mainAxisSize: MainAxisSize.max,
+                children: [
+                  DisplayTrainID(trainData: trainData),
+                  DisplayTrainOperator(trainData: trainData),
+                  DisplayTrainRoute(trainData: trainData),
+                  DisplayTrainDeparture(trainData: trainData),
+                  const CupertinoDivider(
+                    color: foregroundWhite,
+                  ),
+                  DisplayTrainLastInfo(trainData: trainData),
+                  const CupertinoDivider(),
+                  IntrinsicHeight(
+                    child: Row(
+                      children: <Widget>[
+                        // Expanded(
+                        //   child: DisplayTrainNextStop(trainData: trainData,),
+                        // ),
+                        Expanded(
+                          child: DisplayTrainRouteDuration(
+                            trainData: trainData,
+                          ),
                         ),
-                      ),
-                      // Expanded(
-                      //   child: DisplayTrainDestination(trainData: trainData,),
-                      // ),
-                      const SizedBox(
-                        height: double.infinity,
-                        child: CupertinoVerticalDivider(),
-                      ),
-                      Expanded(
-                        child: DisplayTrainRouteDistance(
-                          trainData: trainData,
+                        // Expanded(
+                        //   child: DisplayTrainDestination(trainData: trainData,),
+                        // ),
+                        const SizedBox(
+                          height: double.infinity,
+                          child: CupertinoVerticalDivider(),
                         ),
-                      ),
-                    ],
+                        Expanded(
+                          child: DisplayTrainRouteDistance(
+                            trainData: trainData,
+                          ),
+                        ),
+                      ],
+                    ),
                   ),
-                ),
-                const CupertinoDivider(
-                  color: foregroundWhite,
-                ),
-                if (onViewYesterdayTrain != null && trainData.stations.first.departure!.scheduleTime.compareTo(DateTime.now()) > 0) ...[
-                  DisplayTrainYesterdayWarningCupertino(onViewYesterdayTrain!),
                   const CupertinoDivider(
                     color: foregroundWhite,
                   ),
+                  if (onViewYesterdayTrain != null && trainData.stations.first.departure!.scheduleTime.compareTo(DateTime.now()) > 0) ...[
+                    DisplayTrainYesterdayWarningCupertino(onViewYesterdayTrain!),
+                    const CupertinoDivider(
+                      color: foregroundWhite,
+                    ),
+                  ],
                 ],
-              ],
+              ),
             ),
           ),
           Expanded(