From fa7b10318fdf58ad1e2ef1238bae37c65ba301d5 Mon Sep 17 00:00:00 2001
From: Christian Landgren <christian@landgren.nu>
Date: Mon, 21 Jun 2021 00:56:50 +0200
Subject: [PATCH] feat: login screen and move logout button

---
 .../app/components/children.component.tsx     |  6 ++--
 packages/app/ios/Podfile.lock                 |  2 +-
 .../app/ios/app.xcodeproj/project.pbxproj     |  4 +--
 packages/app/ios/app/LaunchScreen.storyboard  | 30 +++++++------------
 4 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/packages/app/components/children.component.tsx b/packages/app/components/children.component.tsx
index 7b895592..3776e489 100644
--- a/packages/app/components/children.component.tsx
+++ b/packages/app/components/children.component.tsx
@@ -25,7 +25,7 @@ import { defaultStackStyling } from '../design/navigationThemes'
 import { Colors, Layout as LayoutStyle, Sizing, Typography } from '../styles'
 import { translate } from '../utils/translation'
 import { ChildListItem } from './childListItem.component'
-import { SettingsIcon } from './icon.component'
+import { CloseOutlineIcon } from './icon.component'
 
 const colors = ['primary', 'success', 'info', 'warning', 'danger']
 
@@ -79,8 +79,8 @@ export const Children = () => {
 
   useEffect(() => {
     navigation.setOptions({
-      headerRight: () => {
-        return <TopNavigationAction icon={SettingsIcon} onPress={settings} />
+      headerLeft: () => {
+        return <TopNavigationAction icon={CloseOutlineIcon} onPress={settings} />
       },
     })
   }, [navigation, settings])
diff --git a/packages/app/ios/Podfile.lock b/packages/app/ios/Podfile.lock
index ac064445..5f879c74 100644
--- a/packages/app/ios/Podfile.lock
+++ b/packages/app/ios/Podfile.lock
@@ -580,7 +580,7 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
   FBLazyVector: 7b423f9e248eae65987838148c36eec1dbfe0b53
-  FBReactNativeSpec: f792ea65d58b0e9219f7d4b52d887ee1141647ff
+  FBReactNativeSpec: 313b66e17294041415f72c26996e9670a9f07a59
   Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
   Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
   Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c
diff --git a/packages/app/ios/app.xcodeproj/project.pbxproj b/packages/app/ios/app.xcodeproj/project.pbxproj
index 9fdff74c..7a330a65 100644
--- a/packages/app/ios/app.xcodeproj/project.pbxproj
+++ b/packages/app/ios/app.xcodeproj/project.pbxproj
@@ -975,7 +975,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1036,7 +1036,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
diff --git a/packages/app/ios/app/LaunchScreen.storyboard b/packages/app/ios/app/LaunchScreen.storyboard
index 66a37cdb..ac805ef3 100644
--- a/packages/app/ios/app/LaunchScreen.storyboard
+++ b/packages/app/ios/app/LaunchScreen.storyboard
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina6_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -16,41 +17,30 @@
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Skolplattformen" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="MN2-I3-ftu">
-                                <rect key="frame" x="0.0" y="131" width="414" height="27.666666666666657"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="27.5" id="XcH-N0-h20"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="32"/>
-                                <color key="textColor" systemColor="darkTextColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="skolplattformen-logga-original" translatesAutoresizingMaskIntoConstraints="NO" id="TKh-fJ-S9X">
-                                <rect key="frame" x="44" y="293" width="340" height="340"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="skolplattformen-logga-original" translatesAutoresizingMaskIntoConstraints="NO" id="TKh-fJ-S9X">
+                                <rect key="frame" x="-147" y="54" width="819" height="819"/>
+                                <preferredSymbolConfiguration key="preferredSymbolConfiguration" scale="default"/>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
-                             <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstItem="MN2-I3-ftu" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" id="122-lw-Ul7"/>
                             <constraint firstItem="TKh-fJ-S9X" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="1JX-HH-pzz"/>
                             <constraint firstItem="TKh-fJ-S9X" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="44" id="6bf-fh-uS6"/>
                             <constraint firstItem="TKh-fJ-S9X" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="8Gr-KZ-pEa"/>
-                            <constraint firstItem="MN2-I3-ftu" firstAttribute="top" secondItem="Bcu-3y-fUS" secondAttribute="top" constant="87" id="PVH-eA-1yy"/>
-                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="trailing" secondItem="MN2-I3-ftu" secondAttribute="trailing" constant="14" id="TcS-As-BCG"/>
                             <constraint firstItem="Bcu-3y-fUS" firstAttribute="bottom" secondItem="TKh-fJ-S9X" secondAttribute="bottom" constant="259" id="pzW-T6-bKj"/>
                         </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="52" y="374.66266866566718"/>
+            <point key="canvasLocation" x="51.86915887850467" y="374.51403887688986"/>
         </scene>
     </scenes>
     <resources>
         <image name="skolplattformen-logga-original" width="1210" height="1182"/>
-        <systemColor name="darkTextColor">
-            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
     </resources>
 </document>