diff --git a/application-client/openvidu-ios/OpenViduIOS.xcodeproj/project.xcworkspace/xcuserdata/openvidu.xcuserdatad/UserInterfaceState.xcuserstate b/application-client/openvidu-ios/OpenViduIOS.xcodeproj/project.xcworkspace/xcuserdata/openvidu.xcuserdatad/UserInterfaceState.xcuserstate index 8a448fa5..95935446 100644 Binary files a/application-client/openvidu-ios/OpenViduIOS.xcodeproj/project.xcworkspace/xcuserdata/openvidu.xcuserdatad/UserInterfaceState.xcuserstate and b/application-client/openvidu-ios/OpenViduIOS.xcodeproj/project.xcworkspace/xcuserdata/openvidu.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/application-client/openvidu-ios/Shared/Custom.swift b/application-client/openvidu-ios/Shared/Custom.swift index ddf30f49..02328cb2 100644 --- a/application-client/openvidu-ios/Shared/Custom.swift +++ b/application-client/openvidu-ios/Shared/Custom.swift @@ -38,6 +38,7 @@ struct LazyView: View { struct LKButton: View { let title: String let action: () -> Void + var color: Color = Color.ovBlue // Default color var body: some View { Button(action: action, @@ -47,7 +48,7 @@ struct LKButton: View { .padding(.horizontal, 12) .padding(.vertical, 10) }) - .background(Color.ovBlue) + .background(color) .cornerRadius(8) } } diff --git a/application-client/openvidu-ios/Shared/Views/ConfigureUrlsView.swift b/application-client/openvidu-ios/Shared/Views/ConfigureUrlsView.swift index ad4aeead..6ece265d 100644 --- a/application-client/openvidu-ios/Shared/Views/ConfigureUrlsView.swift +++ b/application-client/openvidu-ios/Shared/Views/ConfigureUrlsView.swift @@ -68,8 +68,6 @@ struct ConfigureUrlsView: View { Text(errorMessage) .foregroundColor(.red) - - } .padding() .frame(width: geometry.size.width) // Make the scroll view full-width @@ -79,10 +77,7 @@ struct ConfigureUrlsView: View { #if os(macOS) .frame(minWidth: 500, minHeight: 500) #endif - .alert(isPresented: $roomCtx.shouldShowDisconnectReason) { - Alert(title: Text("Disconnected"), - message: Text("Reason: " + String(describing: roomCtx.latestError))) - } + } func isValidURL(_ urlString: String) -> Bool { diff --git a/application-client/openvidu-ios/Shared/Views/ConnectView.swift b/application-client/openvidu-ios/Shared/Views/ConnectView.swift index a2c98877..c5a9d83e 100644 --- a/application-client/openvidu-ios/Shared/Views/ConnectView.swift +++ b/application-client/openvidu-ios/Shared/Views/ConnectView.swift @@ -61,15 +61,15 @@ struct ConnectView: View { Spacer() - LKButton(title: "Reset urls") { + LKButton(title: "Reset urls", action: { Task.detached { @MainActor in roomCtx.livekitUrl = "" appCtx.applicationServerUrl = "" } - } + }, color: Color.ovYellow) - LKButton(title: "Connect") { + LKButton(title: "Join") { Task.detached { @MainActor in await connectToRoom() } diff --git a/application-client/openvidu-ios/Shared/Views/RoomView.swift b/application-client/openvidu-ios/Shared/Views/RoomView.swift index fd87aa18..28e52843 100644 --- a/application-client/openvidu-ios/Shared/Views/RoomView.swift +++ b/application-client/openvidu-ios/Shared/Views/RoomView.swift @@ -81,14 +81,8 @@ struct RoomView: View { @EnvironmentObject var room: Room @State var isCameraPublishingBusy = false - @State var isMicrophonePublishingBusy = false - @State var isScreenSharePublishingBusy = false - - @State private var screenPickerPresented = false - @State private var publishOptionsPickerPresented = false - - @State private var cameraPublishOptions = VideoPublishOptions() - + @State var isMicrophonePublishingBusy = false + #if os(macOS) @ObservedObject private var windowAccess = WindowAccess() #endif