diff --git a/ios/app/app.xcodeproj/project.pbxproj b/ios/app/app.xcodeproj/project.pbxproj index 002fa3eda..e742a1362 100644 --- a/ios/app/app.xcodeproj/project.pbxproj +++ b/ios/app/app.xcodeproj/project.pbxproj @@ -13,12 +13,37 @@ 0B412F211EDEE95300B1A0A6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0B412F201EDEE95300B1A0A6 /* Main.storyboard */; }; 0BD6B4371EF82A6B00D1F4CD /* WebRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0BD6B4361EF82A6B00D1F4CD /* WebRTC.framework */; }; 0BD6B4381EF82A6B00D1F4CD /* WebRTC.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0BD6B4361EF82A6B00D1F4CD /* WebRTC.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 0BEA5C291F7B8F73000D0AB4 /* Interface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0BEA5C271F7B8F73000D0AB4 /* Interface.storyboard */; }; + 0BEA5C2B1F7B8F73000D0AB4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0BEA5C2A1F7B8F73000D0AB4 /* Assets.xcassets */; }; + 0BEA5C321F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 0BEA5C311F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + 0BEA5C371F7B8F73000D0AB4 /* InterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BEA5C361F7B8F73000D0AB4 /* InterfaceController.swift */; }; + 0BEA5C391F7B8F73000D0AB4 /* ExtensionDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BEA5C381F7B8F73000D0AB4 /* ExtensionDelegate.swift */; }; + 0BEA5C3B1F7B8F73000D0AB4 /* ComplicationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BEA5C3A1F7B8F73000D0AB4 /* ComplicationController.swift */; }; + 0BEA5C3D1F7B8F73000D0AB4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0BEA5C3C1F7B8F73000D0AB4 /* Assets.xcassets */; }; + 0BEA5C411F7B8F73000D0AB4 /* JitsiMeetCompanion.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 0BEA5C251F7B8F73000D0AB4 /* JitsiMeetCompanion.app */; }; 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 */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 0BEA5C331F7B8F73000D0AB4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 0BEA5C301F7B8F73000D0AB4; + remoteInfo = "JitsiMeetCompanion Extension"; + }; + 0BEA5C3F1F7B8F73000D0AB4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 0BEA5C241F7B8F73000D0AB4; + remoteInfo = JitsiMeetCompanion; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ 0B26BE701EC5BC3C00EEFB41 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; @@ -32,6 +57,28 @@ name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; + 0BEA5C471F7B8F73000D0AB4 /* Embed App Extensions */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 13; + files = ( + 0BEA5C321F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex in Embed App Extensions */, + ); + name = "Embed App Extensions"; + runOnlyForDeploymentPostprocessing = 0; + }; + 0BEA5C491F7B8F73000D0AB4 /* Embed Watch Content */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = "$(CONTENTS_FOLDER_PATH)/Watch"; + dstSubfolderSpec = 16; + files = ( + 0BEA5C411F7B8F73000D0AB4 /* JitsiMeetCompanion.app in Embed Watch Content */, + ); + name = "Embed Watch Content"; + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -40,6 +87,16 @@ 0B412F1E1EDEE6E800B1A0A6 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; 0B412F201EDEE95300B1A0A6 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 0BD6B4361EF82A6B00D1F4CD /* WebRTC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebRTC.framework; path = "../../node_modules/react-native-webrtc/ios/WebRTC.framework"; sourceTree = ""; }; + 0BEA5C251F7B8F73000D0AB4 /* JitsiMeetCompanion.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JitsiMeetCompanion.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 0BEA5C281F7B8F73000D0AB4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Interface.storyboard; sourceTree = ""; }; + 0BEA5C2A1F7B8F73000D0AB4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 0BEA5C2C1F7B8F73000D0AB4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 0BEA5C311F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "JitsiMeetCompanion Extension.appex"; sourceTree = BUILT_PRODUCTS_DIR; }; + 0BEA5C361F7B8F73000D0AB4 /* InterfaceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InterfaceController.swift; sourceTree = ""; }; + 0BEA5C381F7B8F73000D0AB4 /* ExtensionDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionDelegate.swift; sourceTree = ""; }; + 0BEA5C3A1F7B8F73000D0AB4 /* ComplicationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComplicationController.swift; sourceTree = ""; }; + 0BEA5C3C1F7B8F73000D0AB4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 0BEA5C3E1F7B8F73000D0AB4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* jitsi-meet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "jitsi-meet.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; @@ -51,6 +108,13 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 0BEA5C2E1F7B8F73000D0AB4 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 13B07F8C1A680F5B00A75B9A /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -72,6 +136,30 @@ name = Frameworks; sourceTree = ""; }; + 0BEA5C261F7B8F73000D0AB4 /* Watch app */ = { + isa = PBXGroup; + children = ( + 0BEA5C271F7B8F73000D0AB4 /* Interface.storyboard */, + 0BEA5C2A1F7B8F73000D0AB4 /* Assets.xcassets */, + 0BEA5C2C1F7B8F73000D0AB4 /* Info.plist */, + ); + name = "Watch app"; + path = watchos/app; + sourceTree = ""; + }; + 0BEA5C351F7B8F73000D0AB4 /* WatchKit extension */ = { + isa = PBXGroup; + children = ( + 0BEA5C361F7B8F73000D0AB4 /* InterfaceController.swift */, + 0BEA5C381F7B8F73000D0AB4 /* ExtensionDelegate.swift */, + 0BEA5C3A1F7B8F73000D0AB4 /* ComplicationController.swift */, + 0BEA5C3C1F7B8F73000D0AB4 /* Assets.xcassets */, + 0BEA5C3E1F7B8F73000D0AB4 /* Info.plist */, + ); + name = "WatchKit extension"; + path = watchos/extension; + sourceTree = ""; + }; 13B07FAE1A68108700A75B9A /* src */ = { isa = PBXGroup; children = ( @@ -95,6 +183,8 @@ 0B26BE711EC5BC4D00EEFB41 /* Frameworks */, 83CBBA001A601CBA00E9B192 /* Products */, 13B07FAE1A68108700A75B9A /* src */, + 0BEA5C261F7B8F73000D0AB4 /* Watch app */, + 0BEA5C351F7B8F73000D0AB4 /* WatchKit extension */, ); indentWidth = 2; sourceTree = ""; @@ -104,6 +194,8 @@ isa = PBXGroup; children = ( 13B07F961A680F5B00A75B9A /* jitsi-meet.app */, + 0BEA5C251F7B8F73000D0AB4 /* JitsiMeetCompanion.app */, + 0BEA5C311F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex */, ); name = Products; sourceTree = ""; @@ -111,6 +203,40 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 0BEA5C241F7B8F73000D0AB4 /* JitsiMeetCompanion */ = { + isa = PBXNativeTarget; + buildConfigurationList = 0BEA5C481F7B8F73000D0AB4 /* Build configuration list for PBXNativeTarget "JitsiMeetCompanion" */; + buildPhases = ( + 0BEA5C231F7B8F73000D0AB4 /* Resources */, + 0BEA5C471F7B8F73000D0AB4 /* Embed App Extensions */, + ); + buildRules = ( + ); + dependencies = ( + 0BEA5C341F7B8F73000D0AB4 /* PBXTargetDependency */, + ); + name = JitsiMeetCompanion; + productName = JitsiMeetCompanion; + productReference = 0BEA5C251F7B8F73000D0AB4 /* JitsiMeetCompanion.app */; + productType = "com.apple.product-type.application.watchapp2"; + }; + 0BEA5C301F7B8F73000D0AB4 /* JitsiMeetCompanion Extension */ = { + isa = PBXNativeTarget; + buildConfigurationList = 0BEA5C461F7B8F73000D0AB4 /* Build configuration list for PBXNativeTarget "JitsiMeetCompanion Extension" */; + buildPhases = ( + 0BEA5C2D1F7B8F73000D0AB4 /* Sources */, + 0BEA5C2E1F7B8F73000D0AB4 /* Frameworks */, + 0BEA5C2F1F7B8F73000D0AB4 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "JitsiMeetCompanion Extension"; + productName = "JitsiMeetCompanion Extension"; + productReference = 0BEA5C311F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex */; + productType = "com.apple.product-type.watchkit2-extension"; + }; 13B07F861A680F5B00A75B9A /* jitsi-meet */ = { isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "jitsi-meet" */; @@ -122,10 +248,12 @@ 0B26BE701EC5BC3C00EEFB41 /* Embed Frameworks */, B35383AD1DDA0083008F406A /* Adjust embedded framework architectures */, 0BB7DA181EC9E695007AAE98 /* Adjust ATS */, + 0BEA5C491F7B8F73000D0AB4 /* Embed Watch Content */, ); buildRules = ( ); dependencies = ( + 0BEA5C401F7B8F73000D0AB4 /* PBXTargetDependency */, ); name = "jitsi-meet"; productName = "Jitsi Meet"; @@ -138,9 +266,20 @@ 83CBB9F71A601CBA00E9B192 /* Project object */ = { isa = PBXProject; attributes = { + LastSwiftUpdateCheck = 0900; LastUpgradeCheck = 0820; ORGANIZATIONNAME = Facebook; TargetAttributes = { + 0BEA5C241F7B8F73000D0AB4 = { + CreatedOnToolsVersion = 9.0; + DevelopmentTeam = BQNXB4G3KQ; + ProvisioningStyle = Automatic; + }; + 0BEA5C301F7B8F73000D0AB4 = { + CreatedOnToolsVersion = 9.0; + DevelopmentTeam = BQNXB4G3KQ; + ProvisioningStyle = Automatic; + }; 13B07F861A680F5B00A75B9A = { DevelopmentTeam = BQNXB4G3KQ; SystemCapabilities = { @@ -165,11 +304,30 @@ projectRoot = ""; targets = ( 13B07F861A680F5B00A75B9A /* jitsi-meet */, + 0BEA5C241F7B8F73000D0AB4 /* JitsiMeetCompanion */, + 0BEA5C301F7B8F73000D0AB4 /* JitsiMeetCompanion Extension */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + 0BEA5C231F7B8F73000D0AB4 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 0BEA5C2B1F7B8F73000D0AB4 /* Assets.xcassets in Resources */, + 0BEA5C291F7B8F73000D0AB4 /* Interface.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 0BEA5C2F1F7B8F73000D0AB4 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 0BEA5C3D1F7B8F73000D0AB4 /* Assets.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 13B07F8E1A680F5B00A75B9A /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -228,6 +386,16 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 0BEA5C2D1F7B8F73000D0AB4 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 0BEA5C391F7B8F73000D0AB4 /* ExtensionDelegate.swift in Sources */, + 0BEA5C371F7B8F73000D0AB4 /* InterfaceController.swift in Sources */, + 0BEA5C3B1F7B8F73000D0AB4 /* ComplicationController.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 13B07F871A680F5B00A75B9A /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -240,7 +408,28 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 0BEA5C341F7B8F73000D0AB4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 0BEA5C301F7B8F73000D0AB4 /* JitsiMeetCompanion Extension */; + targetProxy = 0BEA5C331F7B8F73000D0AB4 /* PBXContainerItemProxy */; + }; + 0BEA5C401F7B8F73000D0AB4 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 0BEA5C241F7B8F73000D0AB4 /* JitsiMeetCompanion */; + targetProxy = 0BEA5C3F1F7B8F73000D0AB4 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ + 0BEA5C271F7B8F73000D0AB4 /* Interface.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 0BEA5C281F7B8F73000D0AB4 /* Base */, + ); + name = Interface.storyboard; + sourceTree = ""; + }; 13B07FB11A68108700A75B9A /* LaunchScreen.xib */ = { isa = PBXVariantGroup; children = ( @@ -252,6 +441,140 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 0BEA5C421F7B8F73000D0AB4 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + DEBUG_INFORMATION_FORMAT = dwarf; + DEVELOPMENT_TEAM = BQNXB4G3KQ; + GCC_C_LANGUAGE_STANDARD = gnu11; + IBSC_MODULE = JitsiMeetCompanion_Extension; + INFOPLIST_FILE = watchos/app/Info.plist; + PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeet.ios.watchkitapp; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = watchos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = 4; + WATCHOS_DEPLOYMENT_TARGET = 4.0; + }; + name = Debug; + }; + 0BEA5C431F7B8F73000D0AB4 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = BQNXB4G3KQ; + GCC_C_LANGUAGE_STANDARD = gnu11; + IBSC_MODULE = JitsiMeetCompanion_Extension; + INFOPLIST_FILE = watchos/app/Info.plist; + PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeet.ios.watchkitapp; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = watchos; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = 4; + WATCHOS_DEPLOYMENT_TARGET = 4.0; + }; + name = Release; + }; + 0BEA5C441F7B8F73000D0AB4 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + DEBUG_INFORMATION_FORMAT = dwarf; + DEVELOPMENT_TEAM = BQNXB4G3KQ; + GCC_C_LANGUAGE_STANDARD = gnu11; + INFOPLIST_FILE = watchos/extension/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeet.ios.watchkitapp.watchkitextension; + PRODUCT_NAME = "${TARGET_NAME}"; + SDKROOT = watchos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = 4; + WATCHOS_DEPLOYMENT_TARGET = 4.0; + }; + name = Debug; + }; + 0BEA5C451F7B8F73000D0AB4 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = BQNXB4G3KQ; + GCC_C_LANGUAGE_STANDARD = gnu11; + INFOPLIST_FILE = watchos/extension/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeet.ios.watchkitapp.watchkitextension; + PRODUCT_NAME = "${TARGET_NAME}"; + SDKROOT = watchos; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = 4; + WATCHOS_DEPLOYMENT_TARGET = 4.0; + }; + name = Release; + }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -409,6 +732,24 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 0BEA5C461F7B8F73000D0AB4 /* Build configuration list for PBXNativeTarget "JitsiMeetCompanion Extension" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 0BEA5C441F7B8F73000D0AB4 /* Debug */, + 0BEA5C451F7B8F73000D0AB4 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 0BEA5C481F7B8F73000D0AB4 /* Build configuration list for PBXNativeTarget "JitsiMeetCompanion" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 0BEA5C421F7B8F73000D0AB4 /* Debug */, + 0BEA5C431F7B8F73000D0AB4 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "jitsi-meet" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 000000000..bd251be8f --- /dev/null +++ b/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,75 @@ +{ + "images" : [ + { + "size" : "24x24", + "idiom" : "watch", + "filename" : "Icon-24@2x.png", + "scale" : "2x", + "role" : "notificationCenter", + "subtype" : "38mm" + }, + { + "size" : "27.5x27.5", + "idiom" : "watch", + "filename" : "Icon-27.5@2x.png", + "scale" : "2x", + "role" : "notificationCenter", + "subtype" : "42mm" + }, + { + "size" : "29x29", + "idiom" : "watch", + "filename" : "Icon-29@2x.png", + "role" : "companionSettings", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "watch", + "filename" : "Icon-29@3x.png", + "role" : "companionSettings", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "watch", + "filename" : "Icon-40@2x.png", + "scale" : "2x", + "role" : "appLauncher", + "subtype" : "38mm" + }, + { + "size" : "44x44", + "idiom" : "watch", + "filename" : "Icon-44@2x.png", + "scale" : "2x", + "role" : "longLook", + "subtype" : "42mm" + }, + { + "size" : "86x86", + "idiom" : "watch", + "filename" : "Icon-86@2x.png", + "scale" : "2x", + "role" : "quickLook", + "subtype" : "38mm" + }, + { + "size" : "98x98", + "idiom" : "watch", + "filename" : "Icon-98@2x.png", + "scale" : "2x", + "role" : "quickLook", + "subtype" : "42mm" + }, + { + "idiom" : "watch-marketing", + "size" : "1024x1024", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-24@2x.png b/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-24@2x.png new file mode 100644 index 000000000..b1d4b0e33 Binary files /dev/null and b/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-24@2x.png differ diff --git a/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-27.5@2x.png b/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-27.5@2x.png new file mode 100644 index 000000000..d911a3cca Binary files /dev/null and b/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-27.5@2x.png differ diff --git a/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png b/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png new file mode 100644 index 000000000..ea457cdc2 Binary files /dev/null and b/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png differ diff --git a/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png b/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png new file mode 100644 index 000000000..4024e4af0 Binary files /dev/null and b/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png differ diff --git a/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png b/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png new file mode 100644 index 000000000..f35c5387f Binary files /dev/null and b/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png differ diff --git a/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-44@2x.png b/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-44@2x.png new file mode 100644 index 000000000..68f944496 Binary files /dev/null and b/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-44@2x.png differ diff --git a/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-86@2x.png b/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-86@2x.png new file mode 100644 index 000000000..ee7b4ea8c Binary files /dev/null and b/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-86@2x.png differ diff --git a/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-98@2x.png b/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-98@2x.png new file mode 100644 index 000000000..ca29e9261 Binary files /dev/null and b/ios/app/watchos/app/Assets.xcassets/AppIcon.appiconset/Icon-98@2x.png differ diff --git a/ios/app/watchos/app/Base.lproj/Interface.storyboard b/ios/app/watchos/app/Base.lproj/Interface.storyboard new file mode 100644 index 000000000..0f0f677d9 --- /dev/null +++ b/ios/app/watchos/app/Base.lproj/Interface.storyboard @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/app/watchos/app/Info.plist b/ios/app/watchos/app/Info.plist new file mode 100644 index 000000000..9580d6810 --- /dev/null +++ b/ios/app/watchos/app/Info.plist @@ -0,0 +1,33 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Jitsi Meet + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.9 + CFBundleVersion + 1 + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + + WKCompanionAppBundleIdentifier + org.jitsi.JitsiMeet.ios + WKWatchKitApp + + + diff --git a/ios/app/watchos/extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json b/ios/app/watchos/extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json new file mode 100644 index 000000000..9be9adbf7 --- /dev/null +++ b/ios/app/watchos/extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "watch", + "screenWidth" : "{130,145}", + "scale" : "2x" + }, + { + "idiom" : "watch", + "screenWidth" : "{146,165}", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/app/watchos/extension/Assets.xcassets/Complication.complicationset/Contents.json b/ios/app/watchos/extension/Assets.xcassets/Complication.complicationset/Contents.json new file mode 100644 index 000000000..2eca9a1f4 --- /dev/null +++ b/ios/app/watchos/extension/Assets.xcassets/Complication.complicationset/Contents.json @@ -0,0 +1,28 @@ +{ + "assets" : [ + { + "idiom" : "watch", + "filename" : "Circular.imageset", + "role" : "circular" + }, + { + "idiom" : "watch", + "filename" : "Extra Large.imageset", + "role" : "extra-large" + }, + { + "idiom" : "watch", + "filename" : "Modular.imageset", + "role" : "modular" + }, + { + "idiom" : "watch", + "filename" : "Utilitarian.imageset", + "role" : "utilitarian" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/ios/app/watchos/extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json b/ios/app/watchos/extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json new file mode 100644 index 000000000..9be9adbf7 --- /dev/null +++ b/ios/app/watchos/extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "watch", + "screenWidth" : "{130,145}", + "scale" : "2x" + }, + { + "idiom" : "watch", + "screenWidth" : "{146,165}", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/app/watchos/extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json b/ios/app/watchos/extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json new file mode 100644 index 000000000..9be9adbf7 --- /dev/null +++ b/ios/app/watchos/extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "watch", + "screenWidth" : "{130,145}", + "scale" : "2x" + }, + { + "idiom" : "watch", + "screenWidth" : "{146,165}", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/app/watchos/extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json b/ios/app/watchos/extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json new file mode 100644 index 000000000..9be9adbf7 --- /dev/null +++ b/ios/app/watchos/extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "idiom" : "watch", + "screenWidth" : "{130,145}", + "scale" : "2x" + }, + { + "idiom" : "watch", + "screenWidth" : "{146,165}", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/app/watchos/extension/ComplicationController.swift b/ios/app/watchos/extension/ComplicationController.swift new file mode 100644 index 000000000..3ac728bd9 --- /dev/null +++ b/ios/app/watchos/extension/ComplicationController.swift @@ -0,0 +1,56 @@ +// +// ComplicationController.swift +// JitsiMeetCompanion Extension +// +// Created by Saul Corretge on 9/27/17. +// Copyright © 2017 Facebook. All rights reserved. +// + +import ClockKit + + +class ComplicationController: NSObject, CLKComplicationDataSource { + + // MARK: - Timeline Configuration + + func getSupportedTimeTravelDirections(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationTimeTravelDirections) -> Void) { + handler([.forward, .backward]) + } + + func getTimelineStartDate(for complication: CLKComplication, withHandler handler: @escaping (Date?) -> Void) { + handler(nil) + } + + func getTimelineEndDate(for complication: CLKComplication, withHandler handler: @escaping (Date?) -> Void) { + handler(nil) + } + + func getPrivacyBehavior(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationPrivacyBehavior) -> Void) { + handler(.showOnLockScreen) + } + + // MARK: - Timeline Population + + func getCurrentTimelineEntry(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationTimelineEntry?) -> Void) { + // Call the handler with the current timeline entry + handler(nil) + } + + func getTimelineEntries(for complication: CLKComplication, before date: Date, limit: Int, withHandler handler: @escaping ([CLKComplicationTimelineEntry]?) -> Void) { + // Call the handler with the timeline entries prior to the given date + handler(nil) + } + + func getTimelineEntries(for complication: CLKComplication, after date: Date, limit: Int, withHandler handler: @escaping ([CLKComplicationTimelineEntry]?) -> Void) { + // Call the handler with the timeline entries after to the given date + handler(nil) + } + + // MARK: - Placeholder Templates + + func getLocalizableSampleTemplate(for complication: CLKComplication, withHandler handler: @escaping (CLKComplicationTemplate?) -> Void) { + // This method will be called once per supported complication, and the results will be cached + handler(nil) + } + +} diff --git a/ios/app/watchos/extension/ExtensionDelegate.swift b/ios/app/watchos/extension/ExtensionDelegate.swift new file mode 100644 index 000000000..d25ffc208 --- /dev/null +++ b/ios/app/watchos/extension/ExtensionDelegate.swift @@ -0,0 +1,50 @@ +// +// ExtensionDelegate.swift +// JitsiMeetCompanion Extension +// +// Created by Saul Corretge on 9/27/17. +// Copyright © 2017 Facebook. All rights reserved. +// + +import WatchKit + +class ExtensionDelegate: NSObject, WKExtensionDelegate { + + func applicationDidFinishLaunching() { + // Perform any final initialization of your application. + } + + func applicationDidBecomeActive() { + // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. + } + + func applicationWillResignActive() { + // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. + // Use this method to pause ongoing tasks, disable timers, etc. + } + + func handle(_ backgroundTasks: Set) { + // Sent when the system needs to launch the application in the background to process tasks. Tasks arrive in a set, so loop through and process each one. + for task in backgroundTasks { + // Use a switch statement to check the task type + switch task { + case let backgroundTask as WKApplicationRefreshBackgroundTask: + // Be sure to complete the background task once you’re done. + backgroundTask.setTaskCompletedWithSnapshot(false) + case let snapshotTask as WKSnapshotRefreshBackgroundTask: + // Snapshot tasks have a unique completion call, make sure to set your expiration date + snapshotTask.setTaskCompleted(restoredDefaultState: true, estimatedSnapshotExpiration: Date.distantFuture, userInfo: nil) + case let connectivityTask as WKWatchConnectivityRefreshBackgroundTask: + // Be sure to complete the connectivity task once you’re done. + connectivityTask.setTaskCompletedWithSnapshot(false) + case let urlSessionTask as WKURLSessionRefreshBackgroundTask: + // Be sure to complete the URL session task once you’re done. + urlSessionTask.setTaskCompletedWithSnapshot(false) + default: + // make sure to complete unhandled task types + task.setTaskCompletedWithSnapshot(false) + } + } + } + +} diff --git a/ios/app/watchos/extension/Info.plist b/ios/app/watchos/extension/Info.plist new file mode 100644 index 000000000..50797705a --- /dev/null +++ b/ios/app/watchos/extension/Info.plist @@ -0,0 +1,48 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Jitsi Meet Companion Extension + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + XPC! + CFBundleShortVersionString + 1.9 + CFBundleVersion + 1 + CLKComplicationPrincipalClass + $(PRODUCT_MODULE_NAME).ComplicationController + CLKComplicationSupportedFamilies + + CLKComplicationFamilyModularSmall + CLKComplicationFamilyModularLarge + CLKComplicationFamilyUtilitarianSmall + CLKComplicationFamilyUtilitarianSmallFlat + CLKComplicationFamilyUtilitarianLarge + CLKComplicationFamilyCircularSmall + CLKComplicationFamilyExtraLarge + + NSExtension + + NSExtensionAttributes + + WKAppBundleIdentifier + org.jitsi.JitsiMeet.ios.watchkitapp + + NSExtensionPointIdentifier + com.apple.watchkit + + WKExtensionDelegateClassName + $(PRODUCT_MODULE_NAME).ExtensionDelegate + + diff --git a/ios/app/watchos/extension/InterfaceController.swift b/ios/app/watchos/extension/InterfaceController.swift new file mode 100644 index 000000000..fe581a199 --- /dev/null +++ b/ios/app/watchos/extension/InterfaceController.swift @@ -0,0 +1,31 @@ +// +// InterfaceController.swift +// JitsiMeetCompanion Extension +// +// Created by Saul Corretge on 9/27/17. +// Copyright © 2017 Facebook. All rights reserved. +// + +import WatchKit +import Foundation + + +class InterfaceController: WKInterfaceController { + + override func awake(withContext context: Any?) { + super.awake(withContext: context) + + // Configure interface objects here. + } + + override func willActivate() { + // This method is called when watch view controller is about to be visible to user + super.willActivate() + } + + override func didDeactivate() { + // This method is called when watch view controller is no longer visible + super.didDeactivate() + } + +}