diff --git a/ios/Campus.xcodeproj/project.pbxproj b/ios/Campus.xcodeproj/project.pbxproj index 04d38cf..72d7acb 100644 --- a/ios/Campus.xcodeproj/project.pbxproj +++ b/ios/Campus.xcodeproj/project.pbxproj @@ -20,9 +20,9 @@ /* Begin PBXFileReference section */ 008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = ""; }; 0731D3B524204D62009CAE85 /* Expo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Expo.plist; path = Campus/Supporting/Expo.plist; sourceTree = ""; }; - 07C2E6E3243282B30028AF0A /* app.manifest */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = app.manifest; path = "Campus/Supporting/app.manifest"; sourceTree = ""; }; - 07C2E6E4243282B30028AF0A /* app.bundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = app.bundle; path = "Campus/Supporting/app.bundle"; sourceTree = ""; }; - 13B07F961A680F5B00A75B9A /* Campus.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Campus.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 07C2E6E3243282B30028AF0A /* app.manifest */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = app.manifest; path = Campus/Supporting/app.manifest; sourceTree = ""; }; + 07C2E6E4243282B30028AF0A /* app.bundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = app.bundle; path = Campus/Supporting/app.bundle; sourceTree = ""; }; + 13B07F961A680F5B00A75B9A /* Campus.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = Campus.app; 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 = ""; }; @@ -194,7 +194,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "../node_modules/expo-updates/bundle-expo-assets.sh\n"; + shellScript = "../node_modules/react-native/scripts/react-native-xcode.sh\n"; }; F8BC737F2AD7A05944D9E2A1 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; @@ -269,6 +269,7 @@ baseConfigurationReference = 3B47C5AFCB8BDE514B7D1AC6 /* Pods-Campus.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = Campus/application.entitlements; CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = NO; INFOPLIST_FILE = Campus/Info.plist; @@ -278,10 +279,9 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = "fr.amicaleinsat.application"; + PRODUCT_BUNDLE_IDENTIFIER = fr.amicaleinsat.application; PRODUCT_NAME = application; VERSIONING_SYSTEM = "apple-generic"; - CODE_SIGN_ENTITLEMENTS = Campus/application.entitlements; }; name = Debug; }; @@ -290,6 +290,7 @@ baseConfigurationReference = 8AC623DBF3A3E2CB072F81F2 /* Pods-Campus.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = Campus/application.entitlements; CURRENT_PROJECT_VERSION = 1; INFOPLIST_FILE = Campus/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -298,10 +299,9 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = "fr.amicaleinsat.application"; + PRODUCT_BUNDLE_IDENTIFIER = fr.amicaleinsat.application; PRODUCT_NAME = application; VERSIONING_SYSTEM = "apple-generic"; - CODE_SIGN_ENTITLEMENTS = Campus/application.entitlements; }; name = Release; }; @@ -332,6 +332,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_ENTITLEMENTS = Campus/application.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -354,10 +355,9 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - PRODUCT_BUNDLE_IDENTIFIER = "fr.amicaleinsat.application"; + PRODUCT_BUNDLE_IDENTIFIER = fr.amicaleinsat.application; PRODUCT_NAME = application; - CODE_SIGN_ENTITLEMENTS = Campus/application.entitlements; + SDKROOT = iphoneos; }; name = Debug; }; @@ -388,6 +388,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_ENTITLEMENTS = Campus/application.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; @@ -402,11 +403,10 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = fr.amicaleinsat.application; + PRODUCT_NAME = application; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; - PRODUCT_BUNDLE_IDENTIFIER = "fr.amicaleinsat.application"; - PRODUCT_NAME = application; - CODE_SIGN_ENTITLEMENTS = Campus/application.entitlements; }; name = Release; }; diff --git a/ios/Campus.xcodeproj/xcshareddata/xcschemes/Campus.xcscheme b/ios/Campus.xcodeproj/xcshareddata/xcschemes/Campus.xcscheme index b9c6c55..d322ee8 100644 --- a/ios/Campus.xcodeproj/xcshareddata/xcschemes/Campus.xcscheme +++ b/ios/Campus.xcodeproj/xcshareddata/xcschemes/Campus.xcscheme @@ -29,7 +29,7 @@ @@ -55,6 +55,15 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> + + + + @@ -67,17 +76,6 @@ - - - - - - - - diff --git a/ios/Campus/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/Campus/Images.xcassets/AppIcon.appiconset/Contents.json index 118c98f..8121323 100644 --- a/ios/Campus/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/Campus/Images.xcassets/AppIcon.appiconset/Contents.json @@ -2,37 +2,52 @@ "images" : [ { "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { "idiom" : "iphone", - "size" : "29x29", - "scale" : "3x" + "scale" : "3x", + "size" : "20x20" }, { "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { "idiom" : "iphone", - "size" : "40x40", - "scale" : "3x" + "scale" : "3x", + "size" : "29x29" }, { "idiom" : "iphone", - "size" : "60x60", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { "idiom" : "iphone", - "size" : "60x60", - "scale" : "3x" + "scale" : "3x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +}