Squashed commit of the following:

commit 0c487ae Author: Hiroshi Horie <[email protected]> Date: Tue Mar 8 15:56:53 2022 +0900 change example ver commit e821a47 Author: Hiroshi Horie <[email protected]> Date: Tue Mar 8 15:54:33 2022 +0900 use 0.9.9 commit 5f212a7 Author: Hiroshi Horie <[email protected]> Date: Tue Mar 8 15:53:13 2022 +0900 adjustments commit 562d94a Author: Hiroshi Horie <[email protected]> Date: Fri Mar 4 13:19:03 2022 +0900 report stats commit 5f87018 Author: Hiroshi Horie <[email protected]> Date: Wed Mar 2 17:55:38 2022 +0900 param fix
livekit-examples · Mar 8, 2022 · 7201648 · 7201648
1 parent 50604dc
commit 7201648
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 20 deletions.
diff --git a/LiveKitExample.xcodeproj/project.pbxproj b/LiveKitExample.xcodeproj/project.pbxproj
@@ -678,7 +678,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = J48VV6BZV9;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
@@ -691,7 +691,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.0.4;
+				MARKETING_VERSION = 1.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.livekit.example.Multiplatform-SwiftUI";
 				PRODUCT_NAME = LiveKitExample;
 				SDKROOT = macosx;
@@ -708,7 +708,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = J48VV6BZV9;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
@@ -721,7 +721,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.0.4;
+				MARKETING_VERSION = 1.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.livekit.example.Multiplatform-SwiftUI";
 				PRODUCT_NAME = LiveKitExample;
 				SDKROOT = macosx;
@@ -792,7 +792,7 @@
 			repositoryURL = "https://github.com/livekit/client-sdk-swift";
 			requirement = {
 				kind = exactVersion;
-				version = 0.9.8;
+				version = 0.9.9;
 			};
 		};
 		68816CBF27B4D6BC00E24622 /* XCRemoteSwiftPackageReference "KeychainAccess" */ = {

diff --git a/LiveKitExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/LiveKitExample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/livekit/client-sdk-swift",
         "state": {
           "branch": null,
-          "revision": "600994caf57ebe0052e339462a3c0786bdf3f981",
-          "version": "0.9.8"
+          "revision": "dd8dc57bc53487ec4437d8b6bed3117c3495adb5",
+          "version": "0.9.9"
         }
       },
       {

diff --git a/Shared/ConnectView.swift b/Shared/ConnectView.swift
@@ -56,6 +56,9 @@ struct ConnectView: View {
                                 Toggle(isOn: $roomCtx.dynacast) {
                                     Text("Dynacast")
                                 }
+                                Toggle(isOn: $roomCtx.reportStats) {
+                                    Text("Report stats")
+                                }
                             } label: {
                                 Image(systemSymbol: .gear)
                                     .renderingMode(.original)

diff --git a/Shared/Controllers/RoomContext.swift b/Shared/Controllers/RoomContext.swift
@@ -39,6 +39,10 @@ final class RoomContext: ObservableObject {
         didSet { store.value.dynacast = dynacast }
     }
 
+    @Published var reportStats: Bool = false {
+        didSet { store.value.reportStats = reportStats }
+    }
+
     // ConnectOptions
     @Published var autoSubscribe: Bool = true {
         didSet { store.value.autoSubscribe = autoSubscribe}
@@ -58,6 +62,7 @@ final class RoomContext: ObservableObject {
             self.simulcast = preferences.simulcast
             self.adaptiveStream = preferences.adaptiveStream
             self.dynacast = preferences.dynacast
+            self.reportStats = preferences.reportStats
             self.autoSubscribe = preferences.autoSubscribe
             self.publish = preferences.publishMode
         }
@@ -72,7 +77,7 @@ final class RoomContext: ObservableObject {
 
         let connectOptions = ConnectOptions(
             autoSubscribe: !publish && autoSubscribe, // don't autosubscribe if publish mode
-            publish: publish ? "publish_\(UUID().uuidString)" : nil
+            publishOnlyMode: publish ? "publish_\(UUID().uuidString)" : nil
         )
 
         let roomOptions = RoomOptions(
@@ -81,7 +86,8 @@ final class RoomContext: ObservableObject {
                 simulcast: publish ? false : simulcast
             ),
             adaptiveStream: adaptiveStream,
-            dynacast: dynacast
+            dynacast: dynacast,
+            reportStats: reportStats
         )
 
         return room.room.connect(url,

diff --git a/Shared/ParticipantView.swift b/Shared/ParticipantView.swift
@@ -100,7 +100,7 @@ struct ParticipantView: View {
                                 .background(Color.black.opacity(0.5))
                                 .cornerRadius(8)
                             }
-                            .padding()
+                            .padding(5)
                         }
                     }
                 } else if let publication = participant.mainVideoPublication as? RemoteTrackPublication,

diff --git a/Shared/Support/SecureStore.swift b/Shared/Support/SecureStore.swift
@@ -16,6 +16,7 @@ struct Preferences: Codable, Equatable {
     var simulcast = true
     var adaptiveStream = true
     var dynacast = true
+    var reportStats = true
 
     // Settings
     var videoViewVisible = true

diff --git a/iOS/BroadcastExt/SampleHandler.swift b/iOS/BroadcastExt/SampleHandler.swift
@@ -24,7 +24,7 @@ class SampleHandler: RPBroadcastSampleHandler {
             let connectOptions = ConnectOptions(
                 // do not subscribe since this is for publish only
                 autoSubscribe: false,
-                publish: "screen_share"
+                publishOnlyMode: "screen_share"
             )
 
             let roomOptions = RoomOptions(

diff --git a/macOS/Info.plist b/macOS/Info.plist
@@ -20,6 +20,15 @@
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>livekit</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSApplicationCategoryType</key>
@@ -35,14 +44,5 @@
 	<string>uses your camera for video chat</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>uses your microphone for video chat</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>livekit</string>
-			</array>
-		</dict>
-	</array>
 </dict>
 </plist>