diff --git a/ios/Campus.xcodeproj/project.pbxproj b/ios/Campus.xcodeproj/project.pbxproj index 834fbfb..dcd018d 100644 --- a/ios/Campus.xcodeproj/project.pbxproj +++ b/ios/Campus.xcodeproj/project.pbxproj @@ -10,10 +10,10 @@ 074F4BDC2432833400BDB9FE /* app.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 07C2E6E4243282B30028AF0A /* app.bundle */; }; 074F4BDD2432833400BDB9FE /* app.manifest in Resources */ = {isa = PBXBuildFile; fileRef = 07C2E6E3243282B30028AF0A /* app.manifest */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; - 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 3DE4DAD41476765101945408 /* libPods-Campus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D43FF9D506E70904424FA7E9 /* libPods-Campus.a */; }; + 931B380C24BF47D400D78120 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 931B380B24BF47D400D78120 /* Launch Screen.storyboard */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -23,13 +23,13 @@ 13B07F961A680F5B00A75B9A /* application.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = application.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Campus/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Campus/AppDelegate.m; sourceTree = ""; }; - 13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Campus/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Campus/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Campus/main.m; sourceTree = ""; }; 2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; }; 3B47C5AFCB8BDE514B7D1AC6 /* Pods-Campus.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Campus.debug.xcconfig"; path = "Target Support Files/Pods-Campus/Pods-Campus.debug.xcconfig"; sourceTree = ""; }; 8AC623DBF3A3E2CB072F81F2 /* Pods-Campus.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Campus.release.xcconfig"; path = "Target Support Files/Pods-Campus/Pods-Campus.release.xcconfig"; sourceTree = ""; }; + 931B380B24BF47D400D78120 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = ""; }; D43FF9D506E70904424FA7E9 /* libPods-Campus.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Campus.a"; sourceTree = BUILT_PRODUCTS_DIR; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; }; @@ -55,10 +55,10 @@ 13B07FB01A68108700A75B9A /* AppDelegate.m */, 13B07FB51A68108700A75B9A /* Images.xcassets */, 13B07FB61A68108700A75B9A /* Info.plist */, - 13B07FB11A68108700A75B9A /* LaunchScreen.xib */, 13B07FB71A68108700A75B9A /* main.m */, 07C2E6E4243282B30028AF0A /* app.bundle */, 07C2E6E3243282B30028AF0A /* app.manifest */, + 931B380B24BF47D400D78120 /* Launch Screen.storyboard */, ); name = Campus; sourceTree = ""; @@ -178,7 +178,7 @@ 074F4BDC2432833400BDB9FE /* app.bundle in Resources */, 074F4BDD2432833400BDB9FE /* app.manifest in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, - 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */, + 931B380C24BF47D400D78120 /* Launch Screen.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -304,18 +304,6 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXVariantGroup section */ - 13B07FB11A68108700A75B9A /* LaunchScreen.xib */ = { - isa = PBXVariantGroup; - children = ( - 13B07FB21A68108700A75B9A /* Base */, - ); - name = LaunchScreen.xib; - path = Campus; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - /* Begin XCBuildConfiguration section */ 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; @@ -330,7 +318,7 @@ DEVELOPMENT_TEAM = 6JA7CLNUV6; INFOPLIST_FILE = Campus/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.1.4; + MARKETING_VERSION = 4.0.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -355,7 +343,7 @@ DEVELOPMENT_TEAM = 6JA7CLNUV6; INFOPLIST_FILE = Campus/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 3.1.4; + MARKETING_VERSION = 4.0.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/ios/Campus/Base.lproj/LaunchScreen.xib b/ios/Campus/Base.lproj/LaunchScreen.xib deleted file mode 100644 index 7505051..0000000 --- a/ios/Campus/Base.lproj/LaunchScreen.xib +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ios/Campus/Images.xcassets/LaunchScreen.imageset/Contents.json b/ios/Campus/Images.xcassets/LaunchScreen.imageset/Contents.json index 84c528a..0a7134c 100644 --- a/ios/Campus/Images.xcassets/LaunchScreen.imageset/Contents.json +++ b/ios/Campus/Images.xcassets/LaunchScreen.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "splash.png", + "filename" : "launch_screen.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ios/Campus/Images.xcassets/LaunchScreen.imageset/launch_screen.png b/ios/Campus/Images.xcassets/LaunchScreen.imageset/launch_screen.png new file mode 100644 index 0000000..0156cf4 Binary files /dev/null and b/ios/Campus/Images.xcassets/LaunchScreen.imageset/launch_screen.png differ diff --git a/ios/Campus/Images.xcassets/LaunchScreen.imageset/splash.png b/ios/Campus/Images.xcassets/LaunchScreen.imageset/splash.png deleted file mode 100644 index 7629d1a..0000000 Binary files a/ios/Campus/Images.xcassets/LaunchScreen.imageset/splash.png and /dev/null differ diff --git a/ios/Campus/Info.plist b/ios/Campus/Info.plist index dbb6b47..54b1d12 100644 --- a/ios/Campus/Info.plist +++ b/ios/Campus/Info.plist @@ -59,7 +59,7 @@ MaterialCommunityIcons.ttf UILaunchStoryboardName - LaunchScreen + Launch Screen UIRequiredDeviceCapabilities armv7 diff --git a/ios/Launch Screen.storyboard b/ios/Launch Screen.storyboard new file mode 100644 index 0000000..dd2cc45 --- /dev/null +++ b/ios/Launch Screen.storyboard @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +