fix storyboard on iOS

This commit is contained in:
Michael Zanetti 2021-03-24 10:55:22 +01:00
parent b5c1b52e15
commit eeb68a9bc7
9 changed files with 20 additions and 16 deletions

View File

@ -145,7 +145,6 @@ ios: {
QMAKE_BUNDLE = nymeaApp QMAKE_BUNDLE = nymeaApp
# Configure generated xcode project to have our bundle id # Configure generated xcode project to have our bundle id
xcode_product_bundle_identifier_setting.value = $${QMAKE_TARGET_BUNDLE_PREFIX}.$${QMAKE_BUNDLE} xcode_product_bundle_identifier_setting.value = $${QMAKE_TARGET_BUNDLE_PREFIX}.$${QMAKE_BUNDLE}
QMAKE_ASSET_CATALOGS += ../packaging/ios/AppIcons.xcassets
plist.input = ../packaging/ios/Info.plist.in plist.input = ../packaging/ios/Info.plist.in
plist.output = $$OUT_PWD/Info.plist plist.output = $$OUT_PWD/Info.plist
QMAKE_SUBSTITUTES += plist QMAKE_SUBSTITUTES += plist
@ -154,10 +153,10 @@ ios: {
../packaging/ios/pushnotifications.entitlements \ ../packaging/ios/pushnotifications.entitlements \
../packaging/ios/GoogleService-Info.plist ../packaging/ios/GoogleService-Info.plist
ios_icon_files.files += $$files(../packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon*.png) QMAKE_ASSET_CATALOGS += ../packaging/ios/AppIcons.xcassets
ios_launch_images.files += $$files(../packaging/ios/AppIcons.xcassets/LaunchScreen.imageset/*.png) \
../packaging/ios/NymeaLaunchScreen.storyboard ios_launch_images.files += ../packaging/ios/NymeaLaunchScreen.storyboard
QMAKE_BUNDLE_DATA += ios_icon_files ios_launch_images QMAKE_BUNDLE_DATA += ios_launch_images
IOS_DEVELOPMENT_TEAM.name = DEVELOPMENT_TEAM IOS_DEVELOPMENT_TEAM.name = DEVELOPMENT_TEAM
IOS_DEVELOPMENT_TEAM.value = Z45PLKLTHM IOS_DEVELOPMENT_TEAM.value = Z45PLKLTHM

View File

@ -1,7 +1,7 @@
{ {
"images" : [ "images" : [
{ {
"filename" : "LuanchScreen-light-1x.png", "filename" : "LaunchScreenL@1x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
@ -12,12 +12,12 @@
"value" : "dark" "value" : "dark"
} }
], ],
"filename" : "LuanchScreen-dark-1x.png", "filename" : "LaunchScreenD@1x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "LuanchScreen-light-2x.png", "filename" : "LaunchScreenL@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
@ -28,12 +28,12 @@
"value" : "dark" "value" : "dark"
} }
], ],
"filename" : "LuanchScreen-dark-2x.png", "filename" : "LaunchScreenD@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "LuanchScreen-light-3x.png", "filename" : "LaunchScreenL@3x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
}, },
@ -44,7 +44,7 @@
"value" : "dark" "value" : "dark"
} }
], ],
"filename" : "LuanchScreen-dark-3x.png", "filename" : "LaunchScreenD@3x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }

View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 54 KiB

View File

@ -13,17 +13,22 @@
<scene sceneID="EHf-IW-A2E"> <scene sceneID="EHf-IW-A2E">
<objects> <objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController"> <viewController id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3"> <view key="view" contentMode="center" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="Launchscreen" translatesAutoresizingMaskIntoConstraints="NO" id="AgK-H9-Prn"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="LaunchImage" adjustsImageSizeForAccessibilityContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AgK-H9-Prn">
<rect key="frame" x="0.0" y="234" width="414" height="429"/> <rect key="frame" x="47" y="192" width="320" height="480"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView> </imageView>
</subviews> </subviews>
<viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/> <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/> <color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="Bcu-3y-fUS" firstAttribute="trailing" secondItem="AgK-H9-Prn" secondAttribute="trailing" constant="1" id="Ma5-cb-44O"/>
<constraint firstItem="Bcu-3y-fUS" firstAttribute="bottom" secondItem="AgK-H9-Prn" secondAttribute="bottom" constant="1" id="NeI-Sx-Hje"/>
<constraint firstItem="AgK-H9-Prn" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="1" id="rj1-09-4zk"/>
<constraint firstItem="AgK-H9-Prn" firstAttribute="top" secondItem="Bcu-3y-fUS" secondAttribute="top" constant="1" id="siK-lK-Ip4"/>
</constraints>
</view> </view>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@ -32,7 +37,7 @@
</scene> </scene>
</scenes> </scenes>
<resources> <resources>
<image name="Launchscreen" width="320" height="480"/> <image name="LaunchImage" width="320" height="480"/>
<systemColor name="systemBackgroundColor"> <systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor> </systemColor>