Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

BF: LaunchScreen: black box instead of the vector logo on startup #341

Browse source 
The idea is to move the logo png into "Supported files" (like suggested at http://stackoverflow.com/a/36707732).
I have also updated the LaunchScreen.xib into LaunchScreen.storyboard as it is what xcode proposes now.
This commit is contained in:
manuroe 2017-03-30 12:03:07 +02:00
parent b6bc47be58
commit 5dd2396716
5 changed files with 68 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Riot.xcodeproj/project.pbxproj
View file

@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
325072141E8C0AC900A084B6 /* LaunchScreenLogo.png in Resources */ = {isa = PBXBuildFile; fileRef = 325072131E8C0AC900A084B6 /* LaunchScreenLogo.png */; };
325E1C151E8D03950018D91E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 325E1C131E8D03950018D91E /* LaunchScreen.storyboard */; };
E2EAC1A4FBD6FE5228584591 /* libPods-Riot.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D8737F782E108CFD6908691 /* libPods-Riot.a */; };
F083BD1D1E7009ED00A9B29C /* RageShakeManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F083BB0B1E7009EC00A9B29C /* RageShakeManager.m */; };
F083BD1E1E7009ED00A9B29C /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = F083BB0D1E7009EC00A9B29C /* AppDelegate.m */; };
@ -214,7 +216,6 @@
F083BDE81E7009ED00A9B29C /* message.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = F083BBDD1E7009EC00A9B29C /* message.mp3 */; };
F083BDE91E7009ED00A9B29C /* ring.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = F083BBDE1E7009EC00A9B29C /* ring.mp3 */; };
F083BDEA1E7009ED00A9B29C /* ringback.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = F083BBDF1E7009EC00A9B29C /* ringback.mp3 */; };
F083BDEB1E7009ED00A9B29C /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = F083BBE01E7009EC00A9B29C /* LaunchScreen.xib */; };
F083BDEC1E7009ED00A9B29C /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F083BBE21E7009EC00A9B29C /* Main.storyboard */; };
F083BDED1E7009ED00A9B29C /* MXKRoomBubbleTableViewCell+Riot.m in Sources */ = {isa = PBXBuildFile; fileRef = F083BBE61E7009EC00A9B29C /* MXKRoomBubbleTableViewCell+Riot.m */; };
F083BDEE1E7009ED00A9B29C /* MXRoom+Riot.m in Sources */ = {isa = PBXBuildFile; fileRef = F083BBE81E7009EC00A9B29C /* MXRoom+Riot.m */; };
@ -413,6 +414,8 @@
/* Begin PBXFileReference section */
1129C74A281B080432B1A1A1 /* Pods-Riot.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Riot.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Riot/Pods-Riot.debug.xcconfig"; sourceTree = "<group>"; };
325072131E8C0AC900A084B6 /* LaunchScreenLogo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = LaunchScreenLogo.png; path = Assets/Images/LaunchScreenLogo.png; sourceTree = "<group>"; };
325E1C141E8D03950018D91E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
7D8737F782E108CFD6908691 /* libPods-Riot.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Riot.a"; sourceTree = BUILT_PRODUCTS_DIR; };
F083BB031E7005FD00A9B29C /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
F083BB041E7005FD00A9B29C /* RiotTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RiotTests.m; sourceTree = "<group>"; };
@ -624,7 +627,6 @@
F083BBDD1E7009EC00A9B29C /* message.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = message.mp3; sourceTree = "<group>"; };
F083BBDE1E7009EC00A9B29C /* ring.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = ring.mp3; sourceTree = "<group>"; };
F083BBDF1E7009EC00A9B29C /* ringback.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = ringback.mp3; sourceTree = "<group>"; };
F083BBE11E7009EC00A9B29C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
F083BBE31E7009EC00A9B29C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
F083BBE51E7009EC00A9B29C /* MXKRoomBubbleTableViewCell+Riot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MXKRoomBubbleTableViewCell+Riot.h"; sourceTree = "<group>"; };
F083BBE61E7009EC00A9B29C /* MXKRoomBubbleTableViewCell+Riot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MXKRoomBubbleTableViewCell+Riot.m"; sourceTree = "<group>"; };
@ -986,8 +988,8 @@
F083BC571E7009EC00A9B29C /* Views */,
F083BB0C1E7009EC00A9B29C /* AppDelegate.h */,
F083BB0D1E7009EC00A9B29C /* AppDelegate.m */,
F083BBE01E7009EC00A9B29C /* LaunchScreen.xib */,
F083BBE21E7009EC00A9B29C /* Main.storyboard */,
325E1C131E8D03950018D91E /* LaunchScreen.storyboard */,
F083BBEF1E7009EC00A9B29C /* Images.xcassets */,
F083BC0D1E7009EC00A9B29C /* Riot.entitlements */,
F083BEA41E700B2800A9B29C /* Supporting Files */,
@ -1695,6 +1697,7 @@
F083BEA41E700B2800A9B29C /* Supporting Files */ = {
isa = PBXGroup;
children = (
325072131E8C0AC900A084B6 /* LaunchScreenLogo.png */,
F083BBED1E7009EC00A9B29C /* empty.mm */,
F083BBEE1E7009EC00A9B29C /* GoogleService-Info.plist */,
F083BBF01E7009EC00A9B29C /* Info.plist */,
@ -1897,6 +1900,7 @@
F083BE7B1E7009ED00A9B29C /* RoomInputToolbarView.xib in Resources */,
F083BE751E7009ED00A9B29C /* RoomOutgoingTextMsgWithoutSenderNameBubbleCell.xib in Resources */,
F083BD261E7009ED00A9B29C /* admin_icon@2x.png in Resources */,
325072141E8C0AC900A084B6 /* LaunchScreenLogo.png in Resources */,
F083BD761E7009ED00A9B29C /* e2e_verified@3x.png in Resources */,
F083BE181E7009ED00A9B29C /* MediaPickerViewController.xib in Resources */,
F083BDCE1E7009ED00A9B29C /* selection_untick.png in Resources */,
@ -1995,7 +1999,6 @@
F083BDBB1E7009ED00A9B29C /* remove_icon_pink@3x.png in Resources */,
F083BD5C1E7009ED00A9B29C /* create_room.png in Resources */,
F083BE871E7009ED00A9B29C /* RoomTableViewCell.xib in Resources */,
F083BDEB1E7009ED00A9B29C /* LaunchScreen.xib in Resources */,
F083BD471E7009ED00A9B29C /* call_video_mute_off_icon@3x.png in Resources */,
F083BD941E7009ED00A9B29C /* group@3x.png in Resources */,
F083BD591E7009ED00A9B29C /* chevron.png in Resources */,
@ -2081,6 +2084,7 @@
F083BE471E7009ED00A9B29C /* RoomIncomingEncryptedTextMsgWithPaginationTitleBubbleCell.xib in Resources */,
F083BDA01E7009ED00A9B29C /* mod_icon@3x.png in Resources */,
F083BE491E7009ED00A9B29C /* RoomIncomingEncryptedTextMsgWithPaginationTitleWithoutSenderNameBubbleCell.xib in Resources */,
325E1C151E8D03950018D91E /* LaunchScreen.storyboard in Resources */,
F083BD721E7009ED00A9B29C /* e2e_unencrypted@2x.png in Resources */,
F083BD531E7009ED00A9B29C /* camera_switch.png in Resources */,
F083BD7C1E7009ED00A9B29C /* edit_icon@3x.png in Resources */,
@ -2293,6 +2297,14 @@
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
325E1C131E8D03950018D91E /* LaunchScreen.storyboard */ = {
isa = PBXVariantGroup;
children = (
325E1C141E8D03950018D91E /* Base */,
);
name = LaunchScreen.storyboard;
sourceTree = "<group>";
};
F083BB0F1E7009EC00A9B29C /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
@ -2317,14 +2329,6 @@
name = Vector.strings;
sourceTree = "<group>";
};
F083BBE01E7009EC00A9B29C /* LaunchScreen.xib */ = {
isa = PBXVariantGroup;
children = (
F083BBE11E7009EC00A9B29C /* Base */,
);
name = LaunchScreen.xib;
sourceTree = "<group>";
};
F083BBE21E7009EC00A9B29C /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (

BIN
Riot/Assets/Images/LaunchScreenLogo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

48
Riot/Base.lproj/LaunchScreen.storyboard Normal file
View file

@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina5_5" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LaunchScreenLogo.png" translatesAutoresizingMaskIntoConstraints="NO" id="IcW-17-3Qq">
<rect key="frame" x="122" y="192" width="170" height="170"/>
<constraints>
<constraint firstAttribute="height" constant="170" id="Lbo-ar-PiJ"/>
<constraint firstAttribute="width" constant="170" id="v1s-rq-3ay"/>
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="IcW-17-3Qq" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" multiplier="3:4" constant="1" id="F7e-z4-CXI"/>
<constraint firstItem="IcW-17-3Qq" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="nPP-aG-NuB"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="52" y="374.66266866566718"/>
</scene>
</scenes>
<resources>
<image name="LaunchScreenLogo.png" width="300" height="300"/>
</resources>
</document>

40
Riot/Base.lproj/LaunchScreen.xib
View file

@ -1,40 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="animatedLogo-4.png" translatesAutoresizingMaskIntoConstraints="NO" id="Hgr-Cr-V9J">
<rect key="frame" x="155" y="95" width="170" height="170"/>
<constraints>
<constraint firstAttribute="width" constant="170" id="5Zj-bp-AUm"/>
<constraint firstAttribute="height" constant="170" id="Tdf-bg-MD6"/>
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="Hgr-Cr-V9J" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" multiplier="3:4" id="Sam-xb-UUQ"/>
<constraint firstItem="Hgr-Cr-V9J" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="ovQ-If-NnA"/>
</constraints>
<nil key="simulatedStatusBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="548" y="455"/>
</view>
</objects>
<resources>
<image name="animatedLogo-4.png" width="300" height="300"/>
</resources>
</document>

8
Riot/Info.plist
View file

@ -43,12 +43,12 @@
</dict>
<key>NSCameraUsageDescription</key>
<string>The camera is used to take photos and videos, make video calls.</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>The photo library is used to send photos and videos.</string>
<key>NSMicrophoneUsageDescription</key>
<string>The microphone is used to take videos, make calls.</string>
<key>NSContactsUsageDescription</key>
<string>The contact book is used to send room invitation to your contacts with their emails.</string>
<key>NSMicrophoneUsageDescription</key>
<string>The microphone is used to take videos, make calls.</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>The photo library is used to send photos and videos.</string>
<key>UIBackgroundModes</key>
<array>
<string>audio</string>