From ab058acf4f6582d7544a7def826985ac5da0cab8 Mon Sep 17 00:00:00 2001 From: Violet Caulfield Date: Sat, 25 Jan 2025 08:56:52 -0600 Subject: [PATCH] Launchscreen changes --- ios/Jellify.xcodeproj/project.pbxproj | 147 +++++++++++++++++++++++--- ios/Jellify/LaunchScreen.storyboard | 44 ++++---- ios/Podfile.lock | 80 +++++++------- 3 files changed, 191 insertions(+), 80 deletions(-) diff --git a/ios/Jellify.xcodeproj/project.pbxproj b/ios/Jellify.xcodeproj/project.pbxproj index de2b1c5c..1d04b3bf 100644 --- a/ios/Jellify.xcodeproj/project.pbxproj +++ b/ios/Jellify.xcodeproj/project.pbxproj @@ -9,10 +9,10 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* JellifyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* JellifyTests.m */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; - 172B159DEECEA03B59A47B38 /* Pods_Jellify.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38B09B5C902A2F3CC48BD0A0 /* Pods_Jellify.framework */; }; + 1A54BD4268E3B9223ACD0ACE /* libPods-Jellify-JellifyTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E3FC2EF41A48FB4677060580 /* libPods-Jellify-JellifyTests.a */; }; 217EBE16A3E8C5FBF476C905 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = F757EB73303E0AC21EF34F64 /* PrivacyInfo.xcprivacy */; }; + 445DD5C8B4E05137BA74B472 /* libPods-Jellify.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 35BDC69D4A828E041848E705 /* libPods-Jellify.a */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; - 881EBE3FE9362EB8E8594837 /* Pods_Jellify_JellifyTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E68D0EA500FA5AB01EC4D6E6 /* Pods_Jellify_JellifyTests.framework */; }; CF620D0C2CF2BB210045E433 /* Aileron-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF620CFC2CF2BB1F0045E433 /* Aileron-Italic.otf */; }; CF620D0D2CF2BB210045E433 /* Aileron-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF620CFD2CF2BB1F0045E433 /* Aileron-Thin.otf */; }; CF620D0E2CF2BB210045E433 /* Aileron-HeavyItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF620CFE2CF2BB1F0045E433 /* Aileron-HeavyItalic.otf */; }; @@ -29,6 +29,32 @@ CF620D192CF2BB210045E433 /* Aileron-Black.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF620D092CF2BB200045E433 /* Aileron-Black.otf */; }; CF620D1A2CF2BB210045E433 /* Aileron-ThinItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF620D0A2CF2BB200045E433 /* Aileron-ThinItalic.otf */; }; CF620D1B2CF2BB210045E433 /* Aileron-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF620D0B2CF2BB200045E433 /* Aileron-SemiBold.otf */; }; + CF68914D2D45316A00F1279C /* Aileron-Black.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF6891312D45316A00F1279C /* Aileron-Black.otf */; }; + CF68914E2D45316A00F1279C /* icon_1024pt_1x.jpg in Resources */ = {isa = PBXBuildFile; fileRef = CF68914A2D45316A00F1279C /* icon_1024pt_1x.jpg */; }; + CF68914F2D45316A00F1279C /* Aileron-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF6891382D45316A00F1279C /* Aileron-Light.otf */; }; + CF6891502D45316A00F1279C /* Aileron-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF68913A2D45316A00F1279C /* Aileron-Regular.otf */; }; + CF6891512D45316A00F1279C /* Aileron-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF6891372D45316A00F1279C /* Aileron-Italic.otf */; }; + CF6891522D45316A00F1279C /* Aileron-Heavy.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF6891352D45316A00F1279C /* Aileron-Heavy.otf */; }; + CF6891532D45316A00F1279C /* Aileron-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF6891342D45316A00F1279C /* Aileron-BoldItalic.otf */; }; + CF6891542D45316A00F1279C /* icon_20pt_2x.jpg in Resources */ = {isa = PBXBuildFile; fileRef = CF6891422D45316A00F1279C /* icon_20pt_2x.jpg */; }; + CF6891552D45316A00F1279C /* Aileron-UltraLight.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF68913F2D45316A00F1279C /* Aileron-UltraLight.otf */; }; + CF6891562D45316A00F1279C /* icon_29pt_2x.jpg in Resources */ = {isa = PBXBuildFile; fileRef = CF6891442D45316A00F1279C /* icon_29pt_2x.jpg */; }; + CF6891572D45316A00F1279C /* Aileron-HeavyItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF6891362D45316A00F1279C /* Aileron-HeavyItalic.otf */; }; + CF6891582D45316A00F1279C /* icon_40pt_3x.jpg in Resources */ = {isa = PBXBuildFile; fileRef = CF6891472D45316A00F1279C /* icon_40pt_3x.jpg */; }; + CF6891592D45316A00F1279C /* icon_40pt_2x.jpg in Resources */ = {isa = PBXBuildFile; fileRef = CF6891462D45316A00F1279C /* icon_40pt_2x.jpg */; }; + CF68915A2D45316A00F1279C /* icon_original.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = CF68914B2D45316A00F1279C /* icon_original.jpeg */; }; + CF68915B2D45316A00F1279C /* Aileron-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF68913C2D45316A00F1279C /* Aileron-SemiBoldItalic.otf */; }; + CF68915C2D45316A00F1279C /* Aileron-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF6891332D45316A00F1279C /* Aileron-Bold.otf */; }; + CF68915D2D45316A00F1279C /* icon_60pt_3x.jpg in Resources */ = {isa = PBXBuildFile; fileRef = CF6891492D45316A00F1279C /* icon_60pt_3x.jpg */; }; + CF68915E2D45316A00F1279C /* icon_60pt_2x.jpg in Resources */ = {isa = PBXBuildFile; fileRef = CF6891482D45316A00F1279C /* icon_60pt_2x.jpg */; }; + CF68915F2D45316A00F1279C /* Aileron-BlackItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF6891322D45316A00F1279C /* Aileron-BlackItalic.otf */; }; + CF6891602D45316A00F1279C /* icon_20pt_3x.jpg in Resources */ = {isa = PBXBuildFile; fileRef = CF6891432D45316A00F1279C /* icon_20pt_3x.jpg */; }; + CF6891612D45316A00F1279C /* Aileron-UltraLightItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF6891402D45316A00F1279C /* Aileron-UltraLightItalic.otf */; }; + CF6891622D45316A00F1279C /* icon_29pt_3x.jpg in Resources */ = {isa = PBXBuildFile; fileRef = CF6891452D45316A00F1279C /* icon_29pt_3x.jpg */; }; + CF6891632D45316A00F1279C /* Aileron-LightItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF6891392D45316A00F1279C /* Aileron-LightItalic.otf */; }; + CF6891642D45316A00F1279C /* Aileron-ThinItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF68913E2D45316A00F1279C /* Aileron-ThinItalic.otf */; }; + CF6891652D45316A00F1279C /* Aileron-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF68913D2D45316A00F1279C /* Aileron-Thin.otf */; }; + CF6891662D45316A00F1279C /* Aileron-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CF68913B2D45316A00F1279C /* Aileron-SemiBold.otf */; }; CF71790B2CBC486C0021BCA3 /* dummy-rntp.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF71790A2CBC486C0021BCA3 /* dummy-rntp.swift */; }; CF98CA472D3E99E0003D88B7 /* CarScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF98CA452D3E99DF003D88B7 /* CarScene.swift */; }; CF98CA482D3E99E0003D88B7 /* PhoneScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF98CA462D3E99DF003D88B7 /* PhoneScene.swift */; }; @@ -53,7 +79,7 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Jellify/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Jellify/Info.plist; sourceTree = ""; }; 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PrivacyInfo.xcprivacy; path = Jellify/PrivacyInfo.xcprivacy; sourceTree = ""; }; - 38B09B5C902A2F3CC48BD0A0 /* Pods_Jellify.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Jellify.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 35BDC69D4A828E041848E705 /* libPods-Jellify.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Jellify.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 3B6622EAB81CD73F7F18C4A4 /* Pods-Jellify.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Jellify.debug.xcconfig"; path = "Target Support Files/Pods-Jellify/Pods-Jellify.debug.xcconfig"; sourceTree = ""; }; 47F8F23DBB1E6482816F1E11 /* Pods-Jellify-JellifyTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Jellify-JellifyTests.debug.xcconfig"; path = "Target Support Files/Pods-Jellify-JellifyTests/Pods-Jellify-JellifyTests.debug.xcconfig"; sourceTree = ""; }; 61D59F7A2E3DAFA5DF396506 /* Pods-Jellify-JellifyTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Jellify-JellifyTests.release.xcconfig"; path = "Target Support Files/Pods-Jellify-JellifyTests/Pods-Jellify-JellifyTests.release.xcconfig"; sourceTree = ""; }; @@ -75,13 +101,39 @@ CF620D0A2CF2BB200045E433 /* Aileron-ThinItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Aileron-ThinItalic.otf"; path = "../assets/fonts/Aileron-ThinItalic.otf"; sourceTree = ""; }; CF620D0B2CF2BB200045E433 /* Aileron-SemiBold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Aileron-SemiBold.otf"; path = "../assets/fonts/Aileron-SemiBold.otf"; sourceTree = ""; }; CF6588752D25C12400AECE18 /* Jellify.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = Jellify.entitlements; path = Jellify/Jellify.entitlements; sourceTree = ""; }; + CF6891312D45316A00F1279C /* Aileron-Black.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Aileron-Black.otf"; sourceTree = ""; }; + CF6891322D45316A00F1279C /* Aileron-BlackItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Aileron-BlackItalic.otf"; sourceTree = ""; }; + CF6891332D45316A00F1279C /* Aileron-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Aileron-Bold.otf"; sourceTree = ""; }; + CF6891342D45316A00F1279C /* Aileron-BoldItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Aileron-BoldItalic.otf"; sourceTree = ""; }; + CF6891352D45316A00F1279C /* Aileron-Heavy.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Aileron-Heavy.otf"; sourceTree = ""; }; + CF6891362D45316A00F1279C /* Aileron-HeavyItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Aileron-HeavyItalic.otf"; sourceTree = ""; }; + CF6891372D45316A00F1279C /* Aileron-Italic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Aileron-Italic.otf"; sourceTree = ""; }; + CF6891382D45316A00F1279C /* Aileron-Light.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Aileron-Light.otf"; sourceTree = ""; }; + CF6891392D45316A00F1279C /* Aileron-LightItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Aileron-LightItalic.otf"; sourceTree = ""; }; + CF68913A2D45316A00F1279C /* Aileron-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Aileron-Regular.otf"; sourceTree = ""; }; + CF68913B2D45316A00F1279C /* Aileron-SemiBold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Aileron-SemiBold.otf"; sourceTree = ""; }; + CF68913C2D45316A00F1279C /* Aileron-SemiBoldItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Aileron-SemiBoldItalic.otf"; sourceTree = ""; }; + CF68913D2D45316A00F1279C /* Aileron-Thin.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Aileron-Thin.otf"; sourceTree = ""; }; + CF68913E2D45316A00F1279C /* Aileron-ThinItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Aileron-ThinItalic.otf"; sourceTree = ""; }; + CF68913F2D45316A00F1279C /* Aileron-UltraLight.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Aileron-UltraLight.otf"; sourceTree = ""; }; + CF6891402D45316A00F1279C /* Aileron-UltraLightItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Aileron-UltraLightItalic.otf"; sourceTree = ""; }; + CF6891422D45316A00F1279C /* icon_20pt_2x.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = icon_20pt_2x.jpg; sourceTree = ""; }; + CF6891432D45316A00F1279C /* icon_20pt_3x.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = icon_20pt_3x.jpg; sourceTree = ""; }; + CF6891442D45316A00F1279C /* icon_29pt_2x.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = icon_29pt_2x.jpg; sourceTree = ""; }; + CF6891452D45316A00F1279C /* icon_29pt_3x.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = icon_29pt_3x.jpg; sourceTree = ""; }; + CF6891462D45316A00F1279C /* icon_40pt_2x.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = icon_40pt_2x.jpg; sourceTree = ""; }; + CF6891472D45316A00F1279C /* icon_40pt_3x.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = icon_40pt_3x.jpg; sourceTree = ""; }; + CF6891482D45316A00F1279C /* icon_60pt_2x.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = icon_60pt_2x.jpg; sourceTree = ""; }; + CF6891492D45316A00F1279C /* icon_60pt_3x.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = icon_60pt_3x.jpg; sourceTree = ""; }; + CF68914A2D45316A00F1279C /* icon_1024pt_1x.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = icon_1024pt_1x.jpg; sourceTree = ""; }; + CF68914B2D45316A00F1279C /* icon_original.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = icon_original.jpeg; sourceTree = ""; }; CF7179092CBC486C0021BCA3 /* Jellify-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Jellify-Bridging-Header.h"; sourceTree = ""; }; CF71790A2CBC486C0021BCA3 /* dummy-rntp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "dummy-rntp.swift"; sourceTree = ""; }; CF98CA442D3E99DF003D88B7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; CF98CA452D3E99DF003D88B7 /* CarScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarScene.swift; sourceTree = ""; }; CF98CA462D3E99DF003D88B7 /* PhoneScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhoneScene.swift; sourceTree = ""; }; D0DF149772F72EE36A16DED9 /* Pods-Jellify.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Jellify.release.xcconfig"; path = "Target Support Files/Pods-Jellify/Pods-Jellify.release.xcconfig"; sourceTree = ""; }; - E68D0EA500FA5AB01EC4D6E6 /* Pods_Jellify_JellifyTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Jellify_JellifyTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + E3FC2EF41A48FB4677060580 /* libPods-Jellify-JellifyTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Jellify-JellifyTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; F757EB73303E0AC21EF34F64 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = Jellify/PrivacyInfo.xcprivacy; sourceTree = ""; }; /* End PBXFileReference section */ @@ -91,7 +143,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 881EBE3FE9362EB8E8594837 /* Pods_Jellify_JellifyTests.framework in Frameworks */, + 1A54BD4268E3B9223ACD0ACE /* libPods-Jellify-JellifyTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -99,7 +151,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 172B159DEECEA03B59A47B38 /* Pods_Jellify.framework in Frameworks */, + 445DD5C8B4E05137BA74B472 /* libPods-Jellify.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -145,8 +197,8 @@ isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - 38B09B5C902A2F3CC48BD0A0 /* Pods_Jellify.framework */, - E68D0EA500FA5AB01EC4D6E6 /* Pods_Jellify_JellifyTests.framework */, + 35BDC69D4A828E041848E705 /* libPods-Jellify.a */, + E3FC2EF41A48FB4677060580 /* libPods-Jellify-JellifyTests.a */, ); name = Frameworks; sourceTree = ""; @@ -161,6 +213,7 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( + CF68914C2D45316A00F1279C /* assets */, CF620D092CF2BB200045E433 /* Aileron-Black.otf */, CF620D062CF2BB200045E433 /* Aileron-BlackItalic.otf */, CF620D082CF2BB200045E433 /* Aileron-Bold.otf */, @@ -209,6 +262,48 @@ path = Pods; sourceTree = ""; }; + CF6891412D45316A00F1279C /* fonts */ = { + isa = PBXGroup; + children = ( + CF6891312D45316A00F1279C /* Aileron-Black.otf */, + CF6891322D45316A00F1279C /* Aileron-BlackItalic.otf */, + CF6891332D45316A00F1279C /* Aileron-Bold.otf */, + CF6891342D45316A00F1279C /* Aileron-BoldItalic.otf */, + CF6891352D45316A00F1279C /* Aileron-Heavy.otf */, + CF6891362D45316A00F1279C /* Aileron-HeavyItalic.otf */, + CF6891372D45316A00F1279C /* Aileron-Italic.otf */, + CF6891382D45316A00F1279C /* Aileron-Light.otf */, + CF6891392D45316A00F1279C /* Aileron-LightItalic.otf */, + CF68913A2D45316A00F1279C /* Aileron-Regular.otf */, + CF68913B2D45316A00F1279C /* Aileron-SemiBold.otf */, + CF68913C2D45316A00F1279C /* Aileron-SemiBoldItalic.otf */, + CF68913D2D45316A00F1279C /* Aileron-Thin.otf */, + CF68913E2D45316A00F1279C /* Aileron-ThinItalic.otf */, + CF68913F2D45316A00F1279C /* Aileron-UltraLight.otf */, + CF6891402D45316A00F1279C /* Aileron-UltraLightItalic.otf */, + ); + path = fonts; + sourceTree = ""; + }; + CF68914C2D45316A00F1279C /* assets */ = { + isa = PBXGroup; + children = ( + CF6891412D45316A00F1279C /* fonts */, + CF6891422D45316A00F1279C /* icon_20pt_2x.jpg */, + CF6891432D45316A00F1279C /* icon_20pt_3x.jpg */, + CF6891442D45316A00F1279C /* icon_29pt_2x.jpg */, + CF6891452D45316A00F1279C /* icon_29pt_3x.jpg */, + CF6891462D45316A00F1279C /* icon_40pt_2x.jpg */, + CF6891472D45316A00F1279C /* icon_40pt_3x.jpg */, + CF6891482D45316A00F1279C /* icon_60pt_2x.jpg */, + CF6891492D45316A00F1279C /* icon_60pt_3x.jpg */, + CF68914A2D45316A00F1279C /* icon_1024pt_1x.jpg */, + CF68914B2D45316A00F1279C /* icon_original.jpeg */, + ); + name = assets; + path = ../assets; + sourceTree = SOURCE_ROOT; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -320,6 +415,32 @@ CF620D1B2CF2BB210045E433 /* Aileron-SemiBold.otf in Resources */, 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, + CF68914D2D45316A00F1279C /* Aileron-Black.otf in Resources */, + CF68914E2D45316A00F1279C /* icon_1024pt_1x.jpg in Resources */, + CF68914F2D45316A00F1279C /* Aileron-Light.otf in Resources */, + CF6891502D45316A00F1279C /* Aileron-Regular.otf in Resources */, + CF6891512D45316A00F1279C /* Aileron-Italic.otf in Resources */, + CF6891522D45316A00F1279C /* Aileron-Heavy.otf in Resources */, + CF6891532D45316A00F1279C /* Aileron-BoldItalic.otf in Resources */, + CF6891542D45316A00F1279C /* icon_20pt_2x.jpg in Resources */, + CF6891552D45316A00F1279C /* Aileron-UltraLight.otf in Resources */, + CF6891562D45316A00F1279C /* icon_29pt_2x.jpg in Resources */, + CF6891572D45316A00F1279C /* Aileron-HeavyItalic.otf in Resources */, + CF6891582D45316A00F1279C /* icon_40pt_3x.jpg in Resources */, + CF6891592D45316A00F1279C /* icon_40pt_2x.jpg in Resources */, + CF68915A2D45316A00F1279C /* icon_original.jpeg in Resources */, + CF68915B2D45316A00F1279C /* Aileron-SemiBoldItalic.otf in Resources */, + CF68915C2D45316A00F1279C /* Aileron-Bold.otf in Resources */, + CF68915D2D45316A00F1279C /* icon_60pt_3x.jpg in Resources */, + CF68915E2D45316A00F1279C /* icon_60pt_2x.jpg in Resources */, + CF68915F2D45316A00F1279C /* Aileron-BlackItalic.otf in Resources */, + CF6891602D45316A00F1279C /* icon_20pt_3x.jpg in Resources */, + CF6891612D45316A00F1279C /* Aileron-UltraLightItalic.otf in Resources */, + CF6891622D45316A00F1279C /* icon_29pt_3x.jpg in Resources */, + CF6891632D45316A00F1279C /* Aileron-LightItalic.otf in Resources */, + CF6891642D45316A00F1279C /* Aileron-ThinItalic.otf in Resources */, + CF6891652D45316A00F1279C /* Aileron-Thin.otf in Resources */, + CF6891662D45316A00F1279C /* Aileron-SemiBold.otf in Resources */, 217EBE16A3E8C5FBF476C905 /* PrivacyInfo.xcprivacy in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -690,10 +811,7 @@ "-DFOLLY_CFG_NO_COROUTINES=1", "-DFOLLY_HAVE_CLOCK_GETTIME=1", ); - OTHER_LDFLAGS = ( - "$(inherited)", - " ", - ); + OTHER_LDFLAGS = "$(inherited) "; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG"; @@ -778,10 +896,7 @@ "-DFOLLY_CFG_NO_COROUTINES=1", "-DFOLLY_HAVE_CLOCK_GETTIME=1", ); - OTHER_LDFLAGS = ( - "$(inherited)", - " ", - ); + OTHER_LDFLAGS = "$(inherited) "; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; SWIFT_VERSION = 5.0; diff --git a/ios/Jellify/LaunchScreen.storyboard b/ios/Jellify/LaunchScreen.storyboard index 9471484e..07bf44ab 100644 --- a/ios/Jellify/LaunchScreen.storyboard +++ b/ios/Jellify/LaunchScreen.storyboard @@ -1,10 +1,11 @@ - - + + - + + @@ -13,35 +14,30 @@ - + - - + + + - - - - - - - - - + + + + + - + + + + + + + diff --git a/ios/Podfile.lock b/ios/Podfile.lock index cee60705..ec37a887 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2016,71 +2016,71 @@ SPEC CHECKSUMS: React-Core: facd883836d8d1cc1949d2053c58eab5fb22eb75 React-CoreModules: f92a2cb11d22f6066823ca547c61e900325dfe44 React-cxxreact: f5595a4cbfe5a4e9d401dffa2c1c78bbbbbe75e4 - React-debug: 153b1899b6d9e2fde855577e1cd615f7448a03ac - React-defaultsnativemodule: 34d0c4dc9d31b2feb5a4f3b573f7c491566b6e08 - React-domnativemodule: f3f516cd33070e162f1f6bb1ead5a245f0b97db7 - React-Fabric: 9be6d42b5a1f4353d9e23c2db8532d9e5ccfef4d - React-FabricComponents: 897223a1dc15b4e8fa402cba057536cb10852963 - React-FabricImage: f4aaac50854c2ef195b79d1d4315b9e32c5ca853 - React-featureflags: 357423aa521ff01107895810f8d9758f8147d64d - React-featureflagsnativemodule: 3d62c2171740d6f2f60b86f9a08c12b923817472 - React-graphics: e41a17337bf4f4dfba8f7315b8ca0a73296800d7 + React-debug: 4a91c177b5b2efcc546fb50bc2f676f3f589efab + React-defaultsnativemodule: bb94c3db425b01c760f41a253de8536b3f5497f0 + React-domnativemodule: 6c581fd39812cafb024171e091c00905b2c3a3e2 + React-Fabric: a33cc1fdc62a3085774783bb30970531589d2028 + React-FabricComponents: 98de5f94cbd35d407f4fc78855298b562d8289cb + React-FabricImage: 0ce8fd83844d9edef5825116d38f0e208b9ad786 + React-featureflags: 37a78859ad71db758e2efdcbdb7384afefa8701e + React-featureflagsnativemodule: 52b46e161a151b4653cf1762285e8e899d534e3f + React-graphics: c16f1bab97a5d473831a79360d84300e93a614e5 React-hermes: 7801f8c0e12f326524b461dc368d3e74f3d2a385 - React-idlecallbacksnativemodule: a7d8ee70043d0c42fad301768ae97997d1c5581c - React-ImageManager: d24c9e2b772504aafde31455c39585a03377dece - React-jserrorhandler: 571bbbb4569347172cc4c0985a493b7dade32634 + React-idlecallbacksnativemodule: 58de2ac968ee80947d19dc8fe20def607e5c2de8 + React-ImageManager: 98a1e5b0b05528dde47ebcd953d916ac66d46c09 + React-jserrorhandler: 08f1c3465a71a6549c27ad82809ce145ad52d4f1 React-jsi: 161428ab2c706d5fcd9878d260ff1513fdb356ab React-jsiexecutor: abfdc7526151c6755f836235bbaa53b267a0803c - React-jsinspector: 02ca2651458d686f47b0803d420fefc1b9c97213 - React-jsitracing: a63093da2909d8ee0d5a2224534cf605fa7adecc + React-jsinspector: f0786053a1a258a4d8dde859d1a820c26ee686f0 + React-jsitracing: 52b849a77d02e2dc262a3031454c23be8dabb4d9 React-logger: 8db32983d75dc2ad54f278f344ccb9b256e694fc - React-Mapbuffer: db173bede5ac5cb1c82d4a6a8597477ba87c5648 - React-microtasksnativemodule: 0c1d7b6f26fbeae097279569cf2430255fa3d3a9 - react-native-blur: 0a96a365a933508e8ee20b9b26ee3cf508d618be - react-native-blurhash: 55d78b2c257c828c0762ee865416a2e3ec6254c7 + React-Mapbuffer: 1c08607305558666fd16678b85ef135e455d5c96 + React-microtasksnativemodule: 87b8de96f937faefece8afd2cb3a518321b2ef99 + react-native-blur: a1bf334589f44658a58a859b1f3defe28e367fcf + react-native-blurhash: 7dd7f20222cda1ecaaf984345ba392169404f30f react-native-carplay: f10ee458f78957798d19d712fb57ecdbd14b5fcd - react-native-mmkv: 54f5626371820ab9385821db1bbb03b6ab62c28a + react-native-mmkv: 7d0b6c2a79e73100b933f2947a9c8741d664e18b react-native-safe-area-context: 5141f11858b033636f1788b14f32eaba92cee810 react-native-track-player: 82ef1756ffeea61140fea17519ecd6d64ec3cf3e - React-nativeconfig: 5fc2b05a590eb704128f5a4fc8ea6fa7b847e6e8 - React-NativeModulesApple: 88313414ddffd1758f76042733e8f0297acfd502 + React-nativeconfig: 57781b79e11d5af7573e6f77cbf1143b71802a6d + React-NativeModulesApple: 7ff2e2cfb2e5fa5bdedcecf28ce37e696c6ef1e1 React-perflogger: 8a360ccf603de6ddbe9ff8f54383146d26e6c936 - React-performancetimeline: 300691014905e8d25b36415fd2f248a2befcce61 + React-performancetimeline: 3cfec915adcb3653a5a633b41e711903844c35d8 React-RCTActionSheet: 1c0e26a88eec41215089cf4436e38188cfe9f01a React-RCTAnimation: d87207841b1e2ae1389e684262ea8c73c887cb04 React-RCTAppDelegate: 4ec7824c0cc9cc4b146ca8ee0fd81b10c316a440 React-RCTBlob: 79b42cb7db55f34079297687a480dbcf37f023f6 - React-RCTFabric: 5015bcf3f9aa59817ad301ead0aa451e780fdb18 + React-RCTFabric: 1dd1661db93716f8cb116e451bd9c211a8d15716 React-RCTImage: 0c10a75de59f7384a2a55545d5f36fe783e6ecda React-RCTLinking: bf08f4f655bf777af292b8d97449072c8bb196ca React-RCTNetwork: 1b690846b40fc5685af58e088720657db6814637 React-RCTSettings: 097e420926dd44153fb25174835b572aded224d6 React-RCTText: d8fe2ae9f95b2ccd03b2f534286e938254791992 React-RCTVibration: 976466dba32c0981a836e45ce38bcd4c8d6d924e - React-rendererconsistency: c6085ef7593a14a3ca07b82c533e8ce368403748 - React-rendererdebug: 945ef6d8128f429becb3769a81591c96e3802fd2 - React-rncore: 14846f4dd48ba5056b11ab89f4a5498f6f02f20f - React-RuntimeApple: 171b7b35ec9dc97ba358d691bea07fc81795ca3e - React-RuntimeCore: 7dcad4be47b656fdd67f7a6a78cf746948a11890 + React-rendererconsistency: ee0d6f1b4420e1ad5bb01c02170e7ecbd278e307 + React-rendererdebug: 7fbf02f30d1e0bb0d96d65cf2548219cb53b29b6 + React-rncore: 7ffc5be03adbf0a5cbf1b654483f487a899cff08 + React-RuntimeApple: e623f002e1871de30a443291171d3f2fb134a6ec + React-RuntimeCore: a67357d4f073b1dbe6fbefc5273072027f201e1c React-runtimeexecutor: 5bb52479abf8081086afb0397dc33dc97202a439 - React-RuntimeHermes: bfada6b4eb293117496b0b0ef6d31a8142649596 - React-runtimescheduler: 9577260c8dd7c3c97eb6f5086441784fd5241f62 - React-utils: f908da1113885e2c08b25247e0ea892c68e2eaf6 - ReactCodegen: de94475c4712a61ba0b1e1c25eb54db32f56836d - ReactCommon: 8da2bad9c1e5901f7b5484e42e59578edeece142 + React-RuntimeHermes: 860cf64708a12a2fa62366fe51fe000121fa031b + React-runtimescheduler: fff88d51ad2c8815fc75930dbac224d680593e6b + React-utils: 81a715d9c0a2a49047e77a86f3a2247408540deb + ReactCodegen: 60973d382704c793c605b9be0fc7f31cb279442f + ReactCommon: 6ef348087d250257c44c0204461c03f036650e9b ReactNativeFileAccess: 863c8952c05c0ea5f592ef3101169baaf66777bd RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489 RNDeviceInfo: b899ce37a403a4dea52b7cb85e16e49c04a5b88e - RNGestureHandler: b1bde7ef45d1472a8145a143efc097df8a9173a4 - RNReactNativeHapticFeedback: 293365e4df1faef21be8b8efe22c7b217c5e695a - RNReanimated: 4e199f8a6b287692de2ea9020db685850145b37f - RNScreens: de55b9d7de8a017d1588dcb70415492d0b0597c2 - RNVectorIcons: 7b81882e9c9369031aede0016dee0fe415cf2f43 + RNGestureHandler: 6dfe7692a191ee224748964127114edf057a1475 + RNReactNativeHapticFeedback: 0d591ea1e150f36cb96d868d4e8d77272243d78a + RNReanimated: 83a2baa5f4dc44ace7b5296ea1f3533d998dfb69 + RNScreens: 19719a9c326e925498ac3b2d35c4e50fe87afc06 + RNVectorIcons: 6382277afab3c54658e9d555ee0faa7a37827136 SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d SwiftAudioEx: f6aa653770f3a0d3851edaf8d834a30aee4a7646 - Yoga: 36d44f1d31d7c11be1067e5c7a70a12c2eed355c + Yoga: a1d7895431387402a674fd0d1c04ec85e87909b8 ZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c -PODFILE CHECKSUM: 7e468857e82df9aa02a1fa57b815c9624472b2d0 +PODFILE CHECKSUM: 26cd82b0bbb702ce92fc137036bc8c7d49e3e3d0 COCOAPODS: 1.15.2