iOS: toggle audio mute & leave meeting lock screen widgets (#12581)

conference.js

@@ -44,7 +44,6 @@ import {
     conferenceUniqueIdSet,
     conferenceWillJoin,
     conferenceWillLeave,
-    dataChannelClosed,
     dataChannelOpened,
     e2eRttChanged,
     getConferenceOptions,
@@ -135,12 +134,9 @@ import {
 import { maybeSetLobbyChatMessageListener } from './react/features/lobby/actions.any';
 import { setNoiseSuppressionEnabled } from './react/features/noise-suppression/actions';
 import {
-    DATA_CHANNEL_CLOSED_NOTIFICATION_ID,
     NOTIFICATION_TIMEOUT_TYPE,
-    hideNotification,
     isModerationNotificationDisplayed,
-    showNotification,
-    showWarningNotification
+    showNotification
 } from './react/features/notifications';
 import { mediaPermissionPromptVisibilityChanged } from './react/features/overlay';
 import { suspendDetected } from './react/features/power-monitor';
@@ -2071,18 +2067,6 @@ export default {
         room.on(
             JitsiConferenceEvents.DATA_CHANNEL_OPENED, () => {
                 APP.store.dispatch(dataChannelOpened());
-                APP.store.dispatch(hideNotification(DATA_CHANNEL_CLOSED_NOTIFICATION_ID));
-            }
-        );
-
-        room.on(
-            JitsiConferenceEvents.DATA_CHANNEL_CLOSED, ev => {
-                APP.store.dispatch(dataChannelClosed(ev.code, ev.reason));
-                APP.store.dispatch(showWarningNotification({
-                    descriptionKey: 'notify.dataChannelClosedDescription',
-                    titleKey: 'notify.dataChannelClosed',
-                    uid: DATA_CHANNEL_CLOSED_NOTIFICATION_ID
-                }, NOTIFICATION_TIMEOUT_TYPE.STICKY));
             }
         );
 

ios/app/Widgets Extension/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/app/Widgets Extension/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1,13 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/app/Widgets Extension/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/app/Widgets Extension/Assets.xcassets/WidgetBackground.colorset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/app/Widgets Extension/Assets.xcassets/leave_meeting.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "end_call_button.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/app/Widgets Extension/Assets.xcassets/microphone_off.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "microphone_off_button.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/app/Widgets Extension/Assets.xcassets/microphone_on.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "microphone_on_button.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/app/Widgets Extension/DarwinNotificationsObserver.swift

@@ -0,0 +1,101 @@
+//
+//  DarwinNotificationsObserver.swift
+//  WidgetsExtension
+//
+//  Created by Alex Bumbu on 17.10.2022.
+//
+
+import Foundation
+
+enum DarwinNotification: String {
+    case meetingMutedChanged = "iOS_MeetingMutedChanged"
+}
+
+extension DarwinNotification {
+    
+    var name: String { rawValue }
+}
+
+class DarwinNotificationsObserver {
+    
+    private static var observers = Array<ProxyObserver>()
+    
+    private let queue = DispatchQueue(label: "org.jitsi.meet.darwinNotificationObserver", qos: .default, autoreleaseFrequency: .workItem)
+    private var notificationCenter: CFNotificationCenter
+    
+    init() {
+        notificationCenter = CFNotificationCenterGetDarwinNotifyCenter()
+    }
+    
+    func observe(notification: DarwinNotification, handler: @escaping () -> Void) {
+        let proxyObserver = ProxyObserver(observer: self, notificationName: notification.name, handler: handler)
+        queue.async {
+            DarwinNotificationsObserver.observers.append(proxyObserver)
+        }
+        
+        let callback: CFNotificationCallback = { _, observer, name, _, _ in
+            guard let observer = observer else {
+                return
+            }
+            
+            // Extract pointer to `observer` from void pointer:
+            let proxyObserver = Unmanaged<ProxyObserver>.fromOpaque(observer).takeUnretainedValue()
+            var observers = DarwinNotificationsObserver.observers
+            if !proxyObserver.forwardNotification(), let index = observers.firstIndex(of: proxyObserver) {
+                // cleanup if `forwardNotification` fails
+                observers.remove(at: index)
+            }
+        }
+        
+        CFNotificationCenterAddObserver(notificationCenter,
+                                        Unmanaged.passUnretained(proxyObserver).toOpaque(),
+                                        callback,
+                                        notification.name as CFString,
+                                        nil,
+                                        .deliverImmediately)
+    }
+    
+    func stopObserving(notification: DarwinNotification) {
+        queue.sync {
+            DarwinNotificationsObserver.observers.removeAll { $0.observer == nil }
+        }
+        
+        if let index = DarwinNotificationsObserver.observers.firstIndex(where: { $0.observer === self && $0.notificationName == notification.name }) {
+            let proxyObserver = DarwinNotificationsObserver.observers[index]
+            CFNotificationCenterRemoveObserver(notificationCenter,
+                                               Unmanaged.passUnretained(proxyObserver).toOpaque(),
+                                               CFNotificationName(notification.name as CFString),
+                                               nil)
+            queue.async {
+                DarwinNotificationsObserver.observers.remove(at: index)
+            }
+        }
+    }
+}
+
+private class ProxyObserver: Equatable {
+    
+    let notificationName: String
+    weak var observer: AnyObject?
+    
+    private let handler: () -> (Void)
+    
+    static func == (lhs: ProxyObserver, rhs: ProxyObserver) -> Bool {
+        lhs.observer === rhs.observer && lhs.notificationName == rhs.notificationName
+    }
+    
+    init(observer: AnyObject? = nil, notificationName: String, handler: @escaping () -> Void) {
+        self.notificationName = notificationName
+        self.handler = handler
+        self.observer = observer
+    }
+    
+    func forwardNotification() -> Bool {
+        guard observer != nil else {
+            return false
+        }
+        
+        handler()
+        return true
+    }
+}

ios/app/Widgets Extension/Info.plist

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSExtension</key>
+	<dict>
+		<key>NSExtensionPointIdentifier</key>
+		<string>com.apple.widgetkit-extension</string>
+	</dict>
+</dict>
+</plist>

ios/app/Widgets Extension/LockScreenLeaveMeetingWidget.swift

@@ -0,0 +1,54 @@
+//
+//  LockScreenLeaveMeetingWidget.swift
+//  WidgetsExtension
+//
+//  Created by Alex Bumbu on 31.10.2022.
+//
+
+import SwiftUI
+import WidgetKit
+
+struct LockScreenLeaveMeetingWidget: Widget {
+    let kind: String = "LockScreenLeaveMeetingWidget"
+    
+    var body: some WidgetConfiguration {
+        StaticConfiguration(kind: kind, provider: Provider()) { entry in
+            WidgetsEntryView(entry: entry)
+        }
+        .configurationDisplayName("Leave Jitsi Meeting Widget")
+        .description("This is a lockscreen widget for leaving the ongoing Jitsi meeting.")
+        .supportedFamilies([.accessoryCircular])
+    }
+}
+
+//struct LockScreenLeaveMeetingWidget_Preview: PreviewProvider {
+//    static var previews: some View {
+//        let meetingState = MeetingState(audioMuted: true)
+//
+//        WidgetsEntryView(entry: CurrentMeetingEntry(date: Date(), meetingState: meetingState))
+//            .previewContext(WidgetPreviewContext(family: .accessoryCircular))
+//            .previewDisplayName("Circular")
+//    }
+//}
+
+private struct WidgetsEntryView: View {
+    @Environment(\.widgetFamily) var widgetFamily
+    var entry: Provider.Entry
+        
+    var body: some View {
+        if entry.meetingState != nil, widgetFamily == .accessoryCircular {
+            AccessoryCircularWidgetView()
+        } else {
+            EmptyView()
+        }
+    }
+}
+
+private struct AccessoryCircularWidgetView: View {
+    var body: some View {
+        Image("leave_meeting")
+            .resizable()
+            .aspectRatio(contentMode: .fit)
+            .widgetURL(URL(string: "meet/leaveMeeting")!)
+    }
+}

ios/app/Widgets Extension/LockScreenMuteAudioWidget.swift

@@ -0,0 +1,89 @@
+//
+//  LockScreenMuteAudioWidget.swift
+//  WidgetsExtension
+//
+//  Created by Alex Bumbu on 31.10.2022.
+//
+
+import SwiftUI
+import WidgetKit
+
+struct LockScreenMuteAudioWidget: Widget {
+    let kind: String = "LockScreenMuteAudioWidget"
+    
+    var body: some WidgetConfiguration {
+        StaticConfiguration(kind: kind, provider: Provider()) { entry in
+            WidgetsEntryView(entry: entry)
+        }
+        .configurationDisplayName("Mute Jitsi Audio Widget")
+        .description("This is a lockscreen widget for muting or unmuting the audio for the ongoing Jitsi meeting.")
+        .supportedFamilies([.accessoryCircular])
+    }
+}
+
+//struct LockScreenMuteAudioWidget_Preview: PreviewProvider {
+//    static var previews: some View {
+//        let meetingState = MeetingState(audioMuted: true)
+//        
+//        WidgetsEntryView(entry: CurrentMeetingEntry(date: Date(), meetingState: meetingState))
+//            .previewContext(WidgetPreviewContext(family: .accessoryInline))
+//            .previewDisplayName("Inline")
+//        
+//        WidgetsEntryView(entry: CurrentMeetingEntry(date: Date(), meetingState: meetingState))
+//            .previewContext(WidgetPreviewContext(family: .accessoryCircular))
+//            .previewDisplayName("Circular")
+//        
+//        WidgetsEntryView(entry: CurrentMeetingEntry(date: Date(), meetingState: meetingState))
+//            .previewContext(WidgetPreviewContext(family: .accessoryRectangular))
+//            .previewDisplayName("Rectangular")
+//    }
+//}
+
+private struct WidgetsEntryView: View {
+    @Environment(\.widgetFamily) var widgetFamily
+    var entry: Provider.Entry
+        
+    var body: some View {
+        if let meetingState = entry.meetingState {
+            switch widgetFamily {
+            case .accessoryInline:
+                Text("Some meeting name")
+            case .accessoryRectangular:
+                AccessoryCircularWidgetView(audioMuted: meetingState.audioMuted)
+            case .accessoryCircular:
+                AccessoryCircularWidgetView(audioMuted: meetingState.audioMuted)
+            default:
+                EmptyView()
+            }
+        } else {
+            EmptyView()
+        }
+    }
+}
+
+private struct AccessoryRectangularWidgetView: View {
+    var audioMuted: Bool
+    
+    var body: some View {
+        let imageName: String = audioMuted ? "microphone_on" : "microphone_off"
+        let caption: String = audioMuted ? "Unmute \naudio" : "Mute \naudio"
+        HStack {
+            Image(imageName)
+                .resizable()
+                .aspectRatio(contentMode: .fit)
+            Text(caption)
+        }.widgetURL(URL(string: "meet/toggleAudioMute")!)
+    }
+}
+
+private struct AccessoryCircularWidgetView: View {
+    var audioMuted: Bool
+    
+    var body: some View {
+        let imageName: String = audioMuted ? "microphone_on" : "microphone_off"
+        Image(imageName)
+            .resizable()
+            .aspectRatio(contentMode: .fit)
+            .widgetURL(URL(string: "meet/toggleAudioMute")!)
+    }
+}

ios/app/Widgets Extension/MeetingState.swift

@@ -0,0 +1,30 @@
+//
+//  MeetingState.swift
+//  WidgetsExtension
+//
+//  Created by Alex Bumbu on 28.10.2022.
+//
+
+import Foundation
+
+struct MeetingState: Decodable {
+    var audioMuted: Bool
+}
+
+extension MeetingState {
+    private static var stateFileURL: URL? {
+        return FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.org.jitsi.meet.appgroup")?.appending(component: "widgetState")
+    }
+        
+    static func load() -> MeetingState? {
+        guard
+            let stateFileURL = stateFileURL,
+            let data = try? Data(contentsOf: stateFileURL)
+        else {
+            return nil
+        }
+        
+        let decoder = PropertyListDecoder()
+        return try? decoder.decode(MeetingState.self, from: data)
+    }
+}

ios/app/Widgets Extension/Provider.swift

@@ -0,0 +1,44 @@
+//
+//  Provider.swift
+//  WidgetsExtension
+//
+//  Created by Alex Bumbu on 31.10.2022.
+//
+
+import WidgetKit
+import SwiftUI
+
+struct CurrentMeetingEntry: TimelineEntry {
+    let date: Date
+    var meetingState: MeetingState?
+}
+
+class Provider: TimelineProvider { 
+    private var currentMeetingState: MeetingState? {
+        return MeetingState.load()
+    }
+    
+    func placeholder(in context: Context) -> CurrentMeetingEntry {
+        CurrentMeetingEntry(date: Date(),
+                            meetingState: MeetingState(audioMuted: false))
+    }
+    
+    func getSnapshot(in context: Context, completion: @escaping (CurrentMeetingEntry) -> ()) {
+        var meetingState = currentMeetingState
+        if context.isPreview {
+            meetingState = MeetingState(audioMuted: false)
+        }
+        
+        let entry = CurrentMeetingEntry(date: Date(), meetingState: meetingState)
+        completion(entry)
+    }
+
+    func getTimeline(in context: Context, completion: @escaping (Timeline<CurrentMeetingEntry>) -> ()) {
+        var entries: [CurrentMeetingEntry] = []
+        let entry = CurrentMeetingEntry(date: Date(), meetingState: currentMeetingState)
+        entries.append(entry)
+        
+        let timeline = Timeline(entries: entries, policy: .atEnd)
+        completion(timeline)
+    }
+}

ios/app/Widgets Extension/Widgets.swift

@@ -0,0 +1,19 @@
+//
+//  Widgets.swift
+//  Widgets
+//
+//  Created by Alex Bumbu on 17.10.2022.
+//  Copyright © 2022 Facebook. All rights reserved.
+//
+
+import WidgetKit
+import SwiftUI
+
+@main
+struct Widgets: WidgetBundle {
+    @WidgetBundleBuilder
+    var body: some Widget {
+        LockScreenMuteAudioWidget()
+        LockScreenLeaveMeetingWidget()
+    }
+}

ios/app/WidgetsExtension.entitlements

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.org.jitsi.meet.appgroup</string>
+	</array>
+</dict>
+</plist>

ios/app/app.xcodeproj/project.pbxproj

@@ -23,14 +23,26 @@
 		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 */; };
-		2681BB562C7A0B42CFBA6719 /* libPods-JitsiMeet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D6152FF9E9F7B0E86F70A21D /* libPods-JitsiMeet.a */; };
+		4E46D952290FF39E00761DEF /* LockScreenMuteAudioWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E46D951290FF39E00761DEF /* LockScreenMuteAudioWidget.swift */; };
+		4E46D954290FF55600761DEF /* LockScreenLeaveMeetingWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E46D953290FF55600761DEF /* LockScreenLeaveMeetingWidget.swift */; };
+		4E6920B828FD84D700645D9E /* DarwinNotificationsObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E6920B728FD84D700645D9E /* DarwinNotificationsObserver.swift */; };
+		4E6A3E17291024B900E6B0B5 /* Provider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E6A3E16291024B900E6B0B5 /* Provider.swift */; };
 		4E90F9402632D1AB001102D4 /* Atomic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E90F93F2632D1AB001102D4 /* Atomic.swift */; };
+		4EA73DA3290C1D6C00A16FF8 /* MeetingState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EA73DA2290C1D6C00A16FF8 /* MeetingState.swift */; };
 		4EB06024260E026600F524C5 /* ReplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4EC49B8625BED71300E76218 /* ReplayKit.framework */; };
 		4EB06027260E026600F524C5 /* SampleHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB06026260E026600F524C5 /* SampleHandler.swift */; };
 		4EB0602B260E026600F524C5 /* JitsiMeetBroadcastExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 4EB06023260E026600F524C5 /* JitsiMeetBroadcastExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		4EB0603C260E09D000F524C5 /* SocketConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB06039260E09D000F524C5 /* SocketConnection.swift */; };
 		4EB0603D260E09D000F524C5 /* DarwinNotificationCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB0603A260E09D000F524C5 /* DarwinNotificationCenter.swift */; };
 		4EB0603E260E09D000F524C5 /* SampleUploader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB0603B260E09D000F524C5 /* SampleUploader.swift */; };
+		4EBB458A28FFFD4100855769 /* RoutesHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EBB458928FFFD4100855769 /* RoutesHandler.m */; };
+		4EBB458E2902E85B00855769 /* WidgetKitHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EBB458D2902E85B00855769 /* WidgetKitHelper.swift */; };
+		4ECA496628FD590000085365 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4ECA496528FD590000085365 /* WidgetKit.framework */; };
+		4ECA496828FD590000085365 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4ECA496728FD590000085365 /* SwiftUI.framework */; };
+		4ECA496B28FD590000085365 /* Widgets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4ECA496A28FD590000085365 /* Widgets.swift */; };
+		4ECA496D28FD590000085365 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4ECA496C28FD590000085365 /* Assets.xcassets */; };
+		4ECA497128FD590000085365 /* WidgetsExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 4ECA496428FD590000085365 /* WidgetsExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		C2116A7673E01A1CCD5DC1F4 /* libPods-JitsiMeet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0BF9FEBA4DEAB800AD735681 /* libPods-JitsiMeet.a */; };
 		DE4C456121DE1E4E00EA0709 /* FIRUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */; };
 		DEA9F289258A6EA800D4CD74 /* JitsiMeetSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */; };
 		DEA9F28A258A6EA800D4CD74 /* JitsiMeetSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -64,6 +76,13 @@
 			remoteGlobalIDString = 4EB06022260E026600F524C5;
 			remoteInfo = "JitsiMeetBroadcast Extension";
 		};
+		4ECA496F28FD590000085365 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 4ECA496328FD590000085365;
+			remoteInfo = WidgetsExtension;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -108,6 +127,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 13;
 			files = (
+				4ECA497128FD590000085365 /* WidgetsExtension.appex in Embed App Extensions */,
 				4EB0602B260E026600F524C5 /* JitsiMeetBroadcastExtension.appex in Embed App Extensions */,
 			);
 			name = "Embed App Extensions";
@@ -134,6 +154,7 @@
 		0BEA5C3A1F7B8F73000D0AB4 /* ComplicationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComplicationController.swift; sourceTree = "<group>"; };
 		0BEA5C3C1F7B8F73000D0AB4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		0BEA5C3E1F7B8F73000D0AB4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		0BF9FEBA4DEAB800AD735681 /* libPods-JitsiMeet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeet.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		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 = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -141,8 +162,12 @@
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		3E0F4ED943C0B12BE77F6B45 /* Pods-JitsiMeet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.release.xcconfig"; path = "Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.release.xcconfig"; sourceTree = "<group>"; };
+		4E46D951290FF39E00761DEF /* LockScreenMuteAudioWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LockScreenMuteAudioWidget.swift; sourceTree = "<group>"; };
+		4E46D953290FF55600761DEF /* LockScreenLeaveMeetingWidget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LockScreenLeaveMeetingWidget.swift; sourceTree = "<group>"; };
+		4E6920B728FD84D700645D9E /* DarwinNotificationsObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DarwinNotificationsObserver.swift; sourceTree = "<group>"; };
+		4E6A3E16291024B900E6B0B5 /* Provider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Provider.swift; sourceTree = "<group>"; };
 		4E90F93F2632D1AB001102D4 /* Atomic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Atomic.swift; sourceTree = "<group>"; };
+		4EA73DA2290C1D6C00A16FF8 /* MeetingState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeetingState.swift; sourceTree = "<group>"; };
 		4EB06023260E026600F524C5 /* JitsiMeetBroadcastExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = JitsiMeetBroadcastExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		4EB06026260E026600F524C5 /* SampleHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleHandler.swift; sourceTree = "<group>"; };
 		4EB06028260E026600F524C5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -150,10 +175,21 @@
 		4EB06039260E09D000F524C5 /* SocketConnection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketConnection.swift; sourceTree = "<group>"; };
 		4EB0603A260E09D000F524C5 /* DarwinNotificationCenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DarwinNotificationCenter.swift; sourceTree = "<group>"; };
 		4EB0603B260E09D000F524C5 /* SampleUploader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SampleUploader.swift; sourceTree = "<group>"; };
+		4EBB458828FFFD4100855769 /* RoutesHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoutesHandler.h; sourceTree = "<group>"; };
+		4EBB458928FFFD4100855769 /* RoutesHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoutesHandler.m; sourceTree = "<group>"; };
+		4EBB458B2902A94700855769 /* WidgetsExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WidgetsExtension.entitlements; sourceTree = "<group>"; };
+		4EBB458C2902E85B00855769 /* JitsiMeet-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeet-Bridging-Header.h"; sourceTree = "<group>"; };
+		4EBB458D2902E85B00855769 /* WidgetKitHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetKitHelper.swift; sourceTree = "<group>"; };
 		4EC49B8625BED71300E76218 /* ReplayKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReplayKit.framework; path = System/Library/Frameworks/ReplayKit.framework; sourceTree = SDKROOT; };
-		756FCE06C08D9B947653C98A /* Pods-JitsiMeet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.debug.xcconfig"; path = "Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.debug.xcconfig"; sourceTree = "<group>"; };
+		4ECA496428FD590000085365 /* WidgetsExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WidgetsExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
+		4ECA496528FD590000085365 /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; };
+		4ECA496728FD590000085365 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
+		4ECA496A28FD590000085365 /* Widgets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Widgets.swift; sourceTree = "<group>"; };
+		4ECA496C28FD590000085365 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		4ECA496E28FD590000085365 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		7052390E12D7319D36D8E4CA /* Pods-JitsiMeet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.debug.xcconfig"; path = "Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.debug.xcconfig"; sourceTree = "<group>"; };
+		8CAA3C5A38E868335D1C1EC1 /* Pods-JitsiMeet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.release.xcconfig"; path = "Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.release.xcconfig"; sourceTree = "<group>"; };
 		B3B083EB1D4955FF0069CEE7 /* app.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = app.entitlements; sourceTree = "<group>"; };
-		D6152FF9E9F7B0E86F70A21D /* libPods-JitsiMeet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeet.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		DE050388256E904600DEE3A5 /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = "../../node_modules/react-native-webrtc/apple/WebRTC.xcframework"; sourceTree = "<group>"; };
 		DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRUtilities.m; sourceTree = "<group>"; };
 		DE4C456021DE1E4E00EA0709 /* FIRUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRUtilities.h; sourceTree = "<group>"; };
@@ -180,7 +216,7 @@
 				DED016F128ECBC9D009D5E8D /* WebRTC.xcframework in Frameworks */,
 				DEA9F289258A6EA800D4CD74 /* JitsiMeetSDK.framework in Frameworks */,
 				FD572B9827EDF32300A800FB /* GiphyUISDK.xcframework in Frameworks */,
-				2681BB562C7A0B42CFBA6719 /* libPods-JitsiMeet.a in Frameworks */,
+				C2116A7673E01A1CCD5DC1F4 /* libPods-JitsiMeet.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -199,6 +235,15 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		4ECA496128FD590000085365 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4ECA496828FD590000085365 /* SwiftUI.framework in Frameworks */,
+				4ECA496628FD590000085365 /* WidgetKit.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -213,7 +258,9 @@
 				DEFDBBDB25656E3B00344B23 /* WebRTC.xcframework */,
 				0BD6B4361EF82A6B00D1F4CD /* WebRTC.framework */,
 				4EC49B8625BED71300E76218 /* ReplayKit.framework */,
-				D6152FF9E9F7B0E86F70A21D /* libPods-JitsiMeet.a */,
+				4ECA496528FD590000085365 /* WidgetKit.framework */,
+				4ECA496728FD590000085365 /* SwiftUI.framework */,
+				0BF9FEBA4DEAB800AD735681 /* libPods-JitsiMeet.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -261,6 +308,10 @@
 				0BBD021F212EB69D00CCB19F /* Types.h */,
 				0B412F1D1EDEE6E800B1A0A6 /* ViewController.h */,
 				0B412F1E1EDEE6E800B1A0A6 /* ViewController.m */,
+				4EBB458828FFFD4100855769 /* RoutesHandler.h */,
+				4EBB458928FFFD4100855769 /* RoutesHandler.m */,
+				4EBB458D2902E85B00855769 /* WidgetKitHelper.swift */,
+				4EBB458C2902E85B00855769 /* JitsiMeet-Bridging-Header.h */,
 			);
 			path = src;
 			sourceTree = "<group>";
@@ -282,9 +333,25 @@
 			sourceTree = "<group>";
 			tabWidth = 4;
 		};
+		4ECA496928FD590000085365 /* Widgets Extension */ = {
+			isa = PBXGroup;
+			children = (
+				4ECA496A28FD590000085365 /* Widgets.swift */,
+				4E46D951290FF39E00761DEF /* LockScreenMuteAudioWidget.swift */,
+				4E46D953290FF55600761DEF /* LockScreenLeaveMeetingWidget.swift */,
+				4E6A3E16291024B900E6B0B5 /* Provider.swift */,
+				4EA73DA2290C1D6C00A16FF8 /* MeetingState.swift */,
+				4E6920B728FD84D700645D9E /* DarwinNotificationsObserver.swift */,
+				4ECA496C28FD590000085365 /* Assets.xcassets */,
+				4ECA496E28FD590000085365 /* Info.plist */,
+			);
+			path = "Widgets Extension";
+			sourceTree = "<group>";
+		};
 		83CBB9F61A601CBA00E9B192 = {
 			isa = PBXGroup;
 			children = (
+				4EBB458B2902A94700855769 /* WidgetsExtension.entitlements */,
 				B3B083EB1D4955FF0069CEE7 /* app.entitlements */,
 				0B26BE711EC5BC4D00EEFB41 /* Frameworks */,
 				83CBBA001A601CBA00E9B192 /* Products */,
@@ -292,11 +359,12 @@
 				0BEA5C261F7B8F73000D0AB4 /* Watch app */,
 				0BEA5C351F7B8F73000D0AB4 /* WatchKit extension */,
 				4EB06025260E026600F524C5 /* JitsiMeetBroadcast Extension */,
-				CDD71F5E1157E9F283DF92A8 /* Pods */,
+				4ECA496928FD590000085365 /* Widgets Extension */,
+				BD4E28FA984EA7018FD927DF /* Pods */,
 			);
-			indentWidth = 2;
+			indentWidth = 4;
 			sourceTree = "<group>";
-			tabWidth = 2;
+			tabWidth = 4;
 		};
 		83CBBA001A601CBA00E9B192 /* Products */ = {
 			isa = PBXGroup;
@@ -305,15 +373,16 @@
 				0BEA5C251F7B8F73000D0AB4 /* JitsiMeetCompanion.app */,
 				0BEA5C311F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex */,
 				4EB06023260E026600F524C5 /* JitsiMeetBroadcastExtension.appex */,
+				4ECA496428FD590000085365 /* WidgetsExtension.appex */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		CDD71F5E1157E9F283DF92A8 /* Pods */ = {
+		BD4E28FA984EA7018FD927DF /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				756FCE06C08D9B947653C98A /* Pods-JitsiMeet.debug.xcconfig */,
-				3E0F4ED943C0B12BE77F6B45 /* Pods-JitsiMeet.release.xcconfig */,
+				7052390E12D7319D36D8E4CA /* Pods-JitsiMeet.debug.xcconfig */,
+				8CAA3C5A38E868335D1C1EC1 /* Pods-JitsiMeet.release.xcconfig */,
 			);
 			name = Pods;
 			path = ../Pods;
@@ -361,7 +430,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "JitsiMeet" */;
 			buildPhases = (
-				69BC5020DBE393B56BD76636 /* [CP] Check Pods Manifest.lock */,
+				58E2CB346F2C2A873294F481 /* [CP] Check Pods Manifest.lock */,
 				0BBA83C41EC9F7600075A103 /* Run React packager */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
@@ -380,6 +449,7 @@
 			dependencies = (
 				0BEA5C401F7B8F73000D0AB4 /* PBXTargetDependency */,
 				4EB0602A260E026600F524C5 /* PBXTargetDependency */,
+				4ECA497028FD590000085365 /* PBXTargetDependency */,
 			);
 			name = JitsiMeet;
 			productName = "Jitsi Meet";
@@ -403,15 +473,32 @@
 			productReference = 4EB06023260E026600F524C5 /* JitsiMeetBroadcastExtension.appex */;
 			productType = "com.apple.product-type.app-extension";
 		};
+		4ECA496328FD590000085365 /* WidgetsExtension */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 4ECA497428FD590100085365 /* Build configuration list for PBXNativeTarget "WidgetsExtension" */;
+			buildPhases = (
+				4ECA496028FD590000085365 /* Sources */,
+				4ECA496128FD590000085365 /* Frameworks */,
+				4ECA496228FD590000085365 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = WidgetsExtension;
+			productName = WidgetsExtension;
+			productReference = 4ECA496428FD590000085365 /* WidgetsExtension.appex */;
+			productType = "com.apple.product-type.app-extension";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 1240;
+				LastSwiftUpdateCheck = 1400;
 				LastUpgradeCheck = 1020;
-				ORGANIZATIONNAME = Facebook;
+				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					0BEA5C241F7B8F73000D0AB4 = {
 						CreatedOnToolsVersion = 9.0;
@@ -424,6 +511,7 @@
 						ProvisioningStyle = Automatic;
 					};
 					13B07F861A680F5B00A75B9A = {
+						LastSwiftMigration = 1400;
 						SystemCapabilities = {
 							com.apple.SafariKeychain = {
 								enabled = 1;
@@ -436,6 +524,9 @@
 					4EB06022260E026600F524C5 = {
 						CreatedOnToolsVersion = 12.4;
 					};
+					4ECA496328FD590000085365 = {
+						CreatedOnToolsVersion = 14.0.1;
+					};
 				};
 			};
 			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "app" */;
@@ -455,6 +546,7 @@
 				0BEA5C241F7B8F73000D0AB4 /* JitsiMeetCompanion */,
 				0BEA5C301F7B8F73000D0AB4 /* JitsiMeetCompanion Extension */,
 				4EB06022260E026600F524C5 /* JitsiMeetBroadcastExtension */,
+				4ECA496328FD590000085365 /* WidgetsExtension */,
 			);
 		};
 /* End PBXProject section */
@@ -494,6 +586,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		4ECA496228FD590000085365 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4ECA496D28FD590000085365 /* Assets.xcassets in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
@@ -543,7 +643,7 @@
 			shellPath = /bin/sh;
 			shellScript = "if test \"$PRODUCT_BUNDLE_IDENTIFIER\" = \"com.atlassian.JitsiMeet.ios\"; then\n    ENTITLEMENTS_PLIST=\"$PROJECT_DIR/app.entitlements\"\n    \n    /usr/libexec/PlistBuddy -c \"Add :com.apple.developer.avfoundation.multitasking-camera-access bool 1\" $ENTITLEMENTS_PLIST\nfi\n";
 		};
-		69BC5020DBE393B56BD76636 /* [CP] Check Pods Manifest.lock */ = {
+		58E2CB346F2C2A873294F481 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -642,8 +742,10 @@
 			files = (
 				0B412F1F1EDEE6E800B1A0A6 /* ViewController.m in Sources */,
 				13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
+				4EBB458E2902E85B00855769 /* WidgetKitHelper.swift in Sources */,
 				DE4C456121DE1E4E00EA0709 /* FIRUtilities.m in Sources */,
 				13B07FC11A68108700A75B9A /* main.m in Sources */,
+				4EBB458A28FFFD4100855769 /* RoutesHandler.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -659,6 +761,19 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		4ECA496028FD590000085365 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4ECA496B28FD590000085365 /* Widgets.swift in Sources */,
+				4E6920B828FD84D700645D9E /* DarwinNotificationsObserver.swift in Sources */,
+				4E46D954290FF55600761DEF /* LockScreenLeaveMeetingWidget.swift in Sources */,
+				4EA73DA3290C1D6C00A16FF8 /* MeetingState.swift in Sources */,
+				4E6A3E17291024B900E6B0B5 /* Provider.swift in Sources */,
+				4E46D952290FF39E00761DEF /* LockScreenMuteAudioWidget.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
@@ -677,6 +792,11 @@
 			target = 4EB06022260E026600F524C5 /* JitsiMeetBroadcastExtension */;
 			targetProxy = 4EB06029260E026600F524C5 /* PBXContainerItemProxy */;
 		};
+		4ECA497028FD590000085365 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 4ECA496328FD590000085365 /* WidgetsExtension */;
+			targetProxy = 4ECA496F28FD590000085365 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -845,11 +965,12 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 756FCE06C08D9B947653C98A /* Pods-JitsiMeet.debug.xcconfig */;
+			baseConfigurationReference = 7052390E12D7319D36D8E4CA /* Pods-JitsiMeet.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug;
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
@@ -871,16 +992,20 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet;
 				PRODUCT_NAME = "jitsi-meet";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_OBJC_BRIDGING_HEADER = "src/JitsiMeet-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 3E0F4ED943C0B12BE77F6B45 /* Pods-JitsiMeet.release.xcconfig */;
+			baseConfigurationReference = 8CAA3C5A38E868335D1C1EC1 /* Pods-JitsiMeet.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconRelease;
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = app.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
@@ -901,6 +1026,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet;
 				PRODUCT_NAME = "jitsi-meet";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_OBJC_BRIDGING_HEADER = "src/JitsiMeet-Bridging-Header.h";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -973,6 +1100,91 @@
 			};
 			name = Release;
 		};
+		4ECA497228FD590100085365 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = WidgetsExtension.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = FC967L3QRG;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = "Widgets Extension/Info.plist";
+				INFOPLIST_KEY_CFBundleDisplayName = Widgets;
+				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Facebook. All rights reserved.";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
+				MARKETING_VERSION = 1.0;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet.widgets.extension;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		4ECA497328FD590100085365 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_ENTITLEMENTS = WidgetsExtension.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 1;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = FC967L3QRG;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = "Widgets Extension/Info.plist";
+				INFOPLIST_KEY_CFBundleDisplayName = Widgets;
+				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Facebook. All rights reserved.";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
+				MARKETING_VERSION = 1.0;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.meet.widgets.extension;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
 		83CBBA201A601CBA00E9B192 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -1126,6 +1338,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		4ECA497428FD590100085365 /* Build configuration list for PBXNativeTarget "WidgetsExtension" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4ECA497228FD590100085365 /* Debug */,
+				4ECA497328FD590100085365 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "app" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

ios/app/app.xcodeproj/xcshareddata/xcschemes/WidgetsExtension.xcscheme

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1400"
+   wasCreatedForAppExtension = "YES"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4ECA496328FD590000085365"
+               BuildableName = "WidgetsExtension.appex"
+               BlueprintName = "WidgetsExtension"
+               ReferencedContainer = "container:app.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+               BuildableName = "jitsi-meet.app"
+               BlueprintName = "JitsiMeet"
+               ReferencedContainer = "container:app.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      launchStyle = "0"
+      askForAppToLaunch = "Yes"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.springboard">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "4ECA496328FD590000085365"
+            BuildableName = "WidgetsExtension.appex"
+            BlueprintName = "WidgetsExtension"
+            ReferencedContainer = "container:app.xcodeproj">
+         </BuildableReference>
+      </RemoteRunnable>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "jitsi-meet.app"
+            BlueprintName = "JitsiMeet"
+            ReferencedContainer = "container:app.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "_XCWidgetKind"
+            value = "LockScreenLeaveMeetingWidget"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "_XCWidgetDefaultView"
+            value = "timeline"
+            isEnabled = "NO">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "_XCWidgetFamily"
+            value = "medium"
+            isEnabled = "NO">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "jitsi-meet.app"
+            BlueprintName = "JitsiMeet"
+            ReferencedContainer = "container:app.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

ios/app/src/AppDelegate.m

@@ -17,6 +17,7 @@
 
 #import "AppDelegate.h"
 #import "FIRUtilities.h"
+#import "RoutesHandler.h"
 #import "Types.h"
 #import "ViewController.h"
 
@@ -69,7 +70,7 @@
 -    (BOOL)application:(UIApplication *)application
   continueUserActivity:(NSUserActivity *)userActivity
     restorationHandler:(void (^)(NSArray<id<UIUserActivityRestoring>> *restorableObjects))restorationHandler {
-
+    
     if ([FIRUtilities appContainsRealServiceInfoPlist]) {
         // 1. Attempt to handle Universal Links through Firebase in order to support
         //    its Dynamic Links (which we utilize for the purposes of deferred deep
@@ -107,6 +108,10 @@
     if ([[url absoluteString] containsString:@"google/link/?dismiss=1&is_weak_match=1"]) {
         return NO;
     }
+    
+    if ([[RoutesHandler sharedInstance] routeURL:url]) {
+        return YES;
+    }
 
     NSURL *openUrl = url;
 

ios/app/src/Images.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

ios/app/src/JitsiMeet-Bridging-Header.h

@@ -0,0 +1,4 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+

ios/app/src/RoutesHandler.h

@@ -0,0 +1,27 @@
+//
+//  RoutesHandler.h
+//  JitsiMeet
+//
+//  Created by Alex Bumbu on 19.10.2022.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol RouteObserving <NSObject>
+
+@property (nonatomic, readonly) void (^didRouteCallback)(NSString *route);
+
+@end
+
+@interface RoutesHandler : NSObject
+
++ (instancetype)sharedInstance;
+- (void)registerObserver:(id<RouteObserving>)observer forRoute:(NSString *)route;
+- (void)unregisterObserver:(id<RouteObserving>)observer;
+- (BOOL)routeURL:(NSURL *)url;
+
+@end
+
+NS_ASSUME_NONNULL_END

ios/app/src/RoutesHandler.m

@@ -0,0 +1,123 @@
+//
+//  RoutesHandler.m
+//  JitsiMeet
+//
+//  Created by Alex Bumbu on 19.10.2022.
+//
+
+#import "RoutesHandler.h"
+
+@protocol Routing <NSObject>
+
+@property (nonatomic, readonly) NSString *route;
+@property (nonatomic, readonly) id<RouteObserving> observer;
+
+@end
+
+@interface Route: NSObject <Routing>
+
+@property (nonatomic, readonly) NSString *route;
+@property (nonatomic, readonly, weak) id<RouteObserving> observer;
+
++ (instancetype)routeWithString:(nonnull NSString *)route observer:(id<RouteObserving>)observer;
+
+@end
+
+#pragma mark -
+
+@implementation RoutesHandler {
+    NSMutableArray *routes;
+}
+
++ (instancetype)sharedInstance {
+    static RoutesHandler *sharedInstance = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        sharedInstance = [[self alloc] init];
+    });
+    
+    return sharedInstance;
+}
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        routes = [[NSMutableArray alloc] init];
+    }
+    
+    return self;
+}
+
+- (void)registerObserver:(id<RouteObserving>)observer forRoute:(NSString *)route {
+    [routes addObject:[Route routeWithString:route observer:observer]];
+}
+
+- (void)unregisterObserver:(id<RouteObserving>)observer {
+    NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(id<Routing> _Nullable evaluatedObject, NSDictionary<NSString *,id> * _Nullable bindings) {
+        return evaluatedObject.observer == nil || evaluatedObject.observer == observer;
+    }];
+    NSArray *routesToClear = [routes filteredArrayUsingPredicate:predicate];
+    [routes removeObjectsInArray:routesToClear];
+}
+
+- (BOOL)routeURL:(NSURL *)url {
+    [self clearRoutes];
+    
+    NSURLComponents *components = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:false];
+    if (!components) {
+        return false;
+    }
+        
+    NSString *route = components.path;
+    NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(id<Routing> _Nullable evaluatedObject, NSDictionary<NSString *,id> * _Nullable bindings) {
+        return [evaluatedObject.route isEqualToString:route];
+    }];
+    NSArray *routesToHandle = [routes filteredArrayUsingPredicate:predicate];
+    if ([routesToHandle count] == 0) {
+        return false;
+    }
+    
+    for (id<Routing> route in routesToHandle) {
+        route.observer.didRouteCallback(route.route);
+    }
+    
+    return true;
+}
+
+- (void)clearRoutes {
+    NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(id<Routing> _Nullable evaluatedObject, NSDictionary<NSString *,id> * _Nullable bindings) {
+        return evaluatedObject.observer == nil;
+    }];
+    NSArray *routesToClear = [routes filteredArrayUsingPredicate:predicate];
+    [routes removeObjectsInArray:routesToClear];
+}
+
+@end
+
+
+#pragma mark -
+
+@interface Route()
+
+@property (nonatomic, nonnull, copy) NSString *route;
+@property (nonatomic, weak) id<RouteObserving> observer;
+
+@end
+
+@implementation Route
+
++ (instancetype)routeWithString:(nonnull NSString *)route observer:(nonnull id<RouteObserving>)observer {
+    return [[Route alloc] initWithString:route observer:observer];
+}
+
+- (instancetype)initWithString:(nonnull NSString *)route observer:(nonnull id<RouteObserving>)observer {
+    self = [super init];
+    if (self) {
+        self.route = route;
+        self.observer = observer;
+    }
+    
+    return self;
+}
+
+@end

ios/app/src/ViewController.m

@@ -21,8 +21,16 @@
 @import JitsiMeetSDK;
 
 #import "Types.h"
+#import "RoutesHandler.h"
 #import "ViewController.h"
+#import "jitsi_meet-Swift.h"
 
+@interface ViewController() <RouteObserving>
+
+@property (nonatomic, nonnull, copy) void (^didRouteCallback)(NSString *);
+@property (nonatomic, assign) BOOL audioMuted;
+
+@end
 
 @implementation ViewController
 
@@ -33,6 +41,8 @@
     view.delegate = self;
 
     [view join:[[JitsiMeet sharedInstance] getInitialConferenceOptions]];
+
+    [self registerRouteObserver];
 }
 
 // JitsiMeetViewDelegate
@@ -53,6 +63,10 @@
 
 - (void)conferenceJoined:(NSDictionary *)data {
     [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_JOINED" withData:data];
+    
+    self.audioMuted = [[data objectForKey:@"isAudioMuted"] boolValue];
+    
+    [self refreshWidgetState:self.audioMuted];
 
     // Register a NSUserActivity for this conference so it can be invoked as a
     // Siri shortcut.
@@ -82,6 +96,12 @@
 
 - (void)conferenceTerminated:(NSDictionary *)data {
     [self _onJitsiMeetViewDelegateEvent:@"CONFERENCE_TERMINATED" withData:data];
+    
+    NSURL *sharedContainer = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:@"group.org.jitsi.meet.appgroup"];
+    NSURL *widgetStateFileURL = [sharedContainer URLByAppendingPathComponent:@"widgetState"];
+    [[NSFileManager defaultManager] removeItemAtURL:widgetStateFileURL error:nil];
+    
+    [WidgetKitHelper reloadAllWidgets];
 }
 
 - (void)conferenceWillJoin:(NSDictionary *)data {
@@ -107,7 +127,16 @@
 }
 
 - (void)audioMutedChanged:(NSDictionary *)data {
-  NSLog(@"%@%@", @"Audio muted changed: ", data[@"muted"]);
+    NSLog(@"%@%@", @"Audio muted changed: ", data[@"muted"]);
+//    CFNotificationCenterRef notificationCenter = CFNotificationCenterGetDarwinNotifyCenter();
+//    CFNotificationCenterPostNotification(notificationCenter,
+//                                         (__bridge CFStringRef)@"iOS_MeetingMutedChanged",
+//                                         NULL,
+//                                         NULL,
+//                                         true);
+    
+    self.audioMuted = [[data objectForKey:@"muted"] boolValue];
+    [self refreshWidgetState:self.audioMuted];
 }
 
 - (void)endpointTextMessageReceived:(NSDictionary *)data {
@@ -132,9 +161,40 @@
 
 #pragma mark - Helpers
 
+- (void)registerRouteObserver {
+    __weak typeof(self) weakSelf = self;
+    __weak JitsiMeetView *view = (JitsiMeetView *)self.view;
+    self.didRouteCallback = ^(NSString *route) {
+        if ([route isEqual:@"meet/toggleAudioMute"]) {
+            weakSelf.audioMuted = !weakSelf.audioMuted;
+            [view setAudioMuted:weakSelf.audioMuted];
+        } else if ([route isEqualToString:@"meet/leaveMeeting"]) {
+            [weakSelf terminate];
+        }
+    };
+    
+    [[RoutesHandler sharedInstance] registerObserver:self forRoute:@"meet/toggleAudioMute"];
+    [[RoutesHandler sharedInstance] registerObserver:self forRoute:@"meet/leaveMeeting"];
+}
+
 - (void)terminate {
     JitsiMeetView *view = (JitsiMeetView *) self.view;
     [view leave];
 }
 
+- (void)refreshWidgetState:(BOOL)audioMuted {
+//    let sharedContainer = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: Constants.appGroupIdentifier)
+//    return sharedContainer?.appendingPathComponent("rtc_SSFD").path ?? ""
+    
+    NSURL *sharedContainer = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:@"group.org.jitsi.meet.appgroup"];
+    NSURL *widgetStateFileURL = [sharedContainer URLByAppendingPathComponent:@"widgetState"];
+    
+    NSDictionary *meetingState = @{@"audioMuted": @(audioMuted)};
+    if (![meetingState writeToURL:widgetStateFileURL atomically:true]) {
+        NSLog(@"error saving state file");
+    }
+    
+    [WidgetKitHelper reloadAllWidgets];
+}
+
 @end

ios/app/src/WidgetKitHelper.swift

@@ -0,0 +1,20 @@
+//
+//  WidgetKitHelper.swift
+//  JitsiMeet
+//
+//  Created by Alex Bumbu on 21.10.2022.
+//
+
+import WidgetKit
+
+@available(iOS 14.0, *)
+@objcMembers final class WidgetKitHelper: NSObject {
+
+    class func reloadAllWidgets(){
+
+        #if arch(arm64) || arch(i386) || arch(x86_64)
+        WidgetCenter.shared.reloadAllTimelines()
+        #endif
+
+    }
+}

lang/main-hu.json

@@ -657,7 +657,7 @@
         "login": "Bejelentkezés",
         "logout": "Kijelentkezés",
         "lowerYourHand": "Kéz leengedése",
-        "moreActions": "További műveletek",
+        "moreActions": "További műveltek",
         "moreOptions": "További beállítások",
         "mute": "Némítás / Visszahangosítás",
         "muteEveryone": "Mindenki elnémítása",

lang/main.json

@@ -649,8 +649,6 @@
         "connectedOneMember": "{{name}} joined the meeting",
         "connectedThreePlusMembers": "{{name}} and many others joined the meeting",
         "connectedTwoMembers": "{{first}} and {{second}} joined the meeting",
-        "dataChannelClosed": "Video quality impaired",
-        "dataChannelClosedDescription": "The bridge channel has been disconnected and thus video quality is limited to its lowest setting.",
         "disconnected": "disconnected",
         "displayNotifications": "Display notifications for",
         "focus": "Conference focus",

modules/API/API.js

@@ -1450,22 +1450,6 @@ class API {
         });
     }
 
-    /**
-     * Notify external application that the data channel has been closed.
-     *
-     * @param {number} code - The close code.
-     * @param {string} reason - The close reason.
-     *
-     * @returns {void}
-     */
-    notifyDataChannelClosed(code: number, reason: string) {
-        this._sendEvent({
-            name: 'data-channel-closed',
-            code,
-            reason
-        });
-    }
-
     /**
      * Notify external application that the data channel has been opened.
      *

modules/API/external/external_api.js

@@ -106,7 +106,6 @@ const events = {
     'camera-error': 'cameraError',
     'chat-updated': 'chatUpdated',
     'content-sharing-participants-changed': 'contentSharingParticipantsChanged',
-    'data-channel-closed': 'dataChannelClosed',
     'data-channel-opened': 'dataChannelOpened',
     'device-list-changed': 'deviceListChanged',
     'display-name-change': 'displayNameChange',

package-lock.json

@@ -74,7 +74,7 @@
         "js-md5": "0.6.1",
         "js-sha512": "0.8.0",
         "jwt-decode": "2.2.0",
-        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1538.0.0+871968af/lib-jitsi-meet.tgz",
+        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1535.0.0+e6263e7c/lib-jitsi-meet.tgz",
         "lodash": "4.17.21",
         "moment": "2.29.4",
         "moment-duration-format": "2.2.2",
@@ -13497,8 +13497,8 @@
     },
     "node_modules/lib-jitsi-meet": {
       "version": "0.0.0",
-      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1538.0.0+871968af/lib-jitsi-meet.tgz",
-      "integrity": "sha512-Nd6r6BWQXUE46lnXCtIa/kZoROBQN1Cbn5FEswrFBxhZ0/+JFpsMAwrNa/HThaNsGYkgN7fPoP4Xlq5r/M2o4Q==",
+      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1535.0.0+e6263e7c/lib-jitsi-meet.tgz",
+      "integrity": "sha512-RgMoesoWyscWi2fL9Hxp8PUwDlUtHbo+GhXosD3GeKR0zmihu/kxTONMUifGQnF8XdtcjaZfL2jCJynLwYKlkw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@jitsi/js-utils": "2.0.0",
@@ -30510,8 +30510,8 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1538.0.0+871968af/lib-jitsi-meet.tgz",
-      "integrity": "sha512-Nd6r6BWQXUE46lnXCtIa/kZoROBQN1Cbn5FEswrFBxhZ0/+JFpsMAwrNa/HThaNsGYkgN7fPoP4Xlq5r/M2o4Q==",
+      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1535.0.0+e6263e7c/lib-jitsi-meet.tgz",
+      "integrity": "sha512-RgMoesoWyscWi2fL9Hxp8PUwDlUtHbo+GhXosD3GeKR0zmihu/kxTONMUifGQnF8XdtcjaZfL2jCJynLwYKlkw==",
       "requires": {
         "@jitsi/js-utils": "2.0.0",
         "@jitsi/logger": "2.0.0",

package.json

@@ -79,7 +79,7 @@
     "js-md5": "0.6.1",
     "js-sha512": "0.8.0",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1538.0.0+871968af/lib-jitsi-meet.tgz",
+    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1535.0.0+e6263e7c/lib-jitsi-meet.tgz",
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "moment-duration-format": "2.2.2",

react/features/base/color-scheme/defaultScheme.js

@@ -1,3 +1,5 @@
+// @flow
+
 import { ColorPalette, getRGBAFormat } from '../styles';
 
 /**
@@ -12,6 +14,21 @@ export default {
         icon: 'rgb(28, 32, 37)',
         text: 'rgb(28, 32, 37)'
     },
+    'Chat': {
+        displayName: 'rgb(94, 109, 121)',
+        localMsgBackground: 'rgb(215, 230, 249)',
+        lobbyMsgBackground: 'rgb(106, 80, 211)',
+        lobbyMsgNotice: 'rgb(16, 10, 41)',
+        privateMsgBackground: 'rgb(250, 219, 219)',
+        privateMsgNotice: 'rgb(186, 39, 58)',
+        remoteMsgBackground: 'rgb(241, 242, 246)',
+        replyBorder: 'rgb(219, 197, 200)',
+        replyIcon: 'rgb(94, 109, 121)'
+    },
+    'Conference': {
+        inviteButtonBackground: 'rgb(0, 119, 225)',
+        onVideoText: 'white'
+    },
     'Dialog': {},
     'Header': {
         background: ColorPalette.blue,

react/features/base/conference/actionTypes.ts

@@ -138,18 +138,6 @@ export const CONFERENCE_WILL_LEAVE = 'CONFERENCE_WILL_LEAVE';
  */
 export const DATA_CHANNEL_OPENED = 'DATA_CHANNEL_OPENED';
 
-/**
- * The type of (redux) action which signals that the data channel with the
- * bridge has been closed.
- *
- * {
- *     type: DATA_CHANNEL_CLOSED,
- *     code: number,
- *     reason: string
- * }
- */
-export const DATA_CHANNEL_CLOSED = 'DATA_CHANNEL_CLOSED';
-
 /**
  * The type of action which signals that the user has been kicked out from
  * the conference.

react/features/base/conference/actions.ts

@@ -41,7 +41,6 @@ import {
     CONFERENCE_UNIQUE_ID_SET,
     CONFERENCE_WILL_JOIN,
     CONFERENCE_WILL_LEAVE,
-    DATA_CHANNEL_CLOSED,
     DATA_CHANNEL_OPENED,
     E2E_RTT_CHANGED,
     KICKED_OUT,
@@ -582,26 +581,6 @@ export function dataChannelOpened() {
     };
 }
 
-/**
- * Signals the data channel with the bridge was abruptly closed.
- *
- * @param {number} code - Close code.
- * @param {string} reason - Close reason.
- *
- * @returns {{
- *     type: DATA_CHANNEL_CLOSED,
- *     code: number,
- *     reason: string
- * }}
- */
-export function dataChannelClosed(code: number, reason: string) {
-    return {
-        type: DATA_CHANNEL_CLOSED,
-        code,
-        reason
-    };
-}
-
 /**
  * Action to end a conference for all participants.
  *

react/features/base/react/components/native/Linkify.js

@@ -19,12 +19,7 @@ type Props = {
     /**
      * The extra styles to be applied to links.
      */
-    linkStyle: StyleType,
-
-    /**
-     * The extra styles to be applied to text.
-     */
-    style?: StyleType
+    linkStyle: StyleType
 };
 
 /**
@@ -51,9 +46,7 @@ export default class Linkify extends Component<Props> {
         return (
             <ReactLinkify
                 componentDecorator = { this._componentDecorator }>
-                <Text
-                    selectable = { true }
-                    style = { this.props.style }>
+                <Text selectable = { true }>
                     { this.props.children }
                 </Text>
             </ReactLinkify>

react/features/base/ui/components/web/Dialog.tsx

@@ -67,7 +67,7 @@ const useStyles = makeStyles()(theme => {
             flexDirection: 'column',
             height: 'auto',
             minHeight: '200px',
-            maxHeight: '660px',
+            maxHeight: '560px',
             marginTop: '64px',
             animation: `${keyframes`
                 0% {

react/features/chat/components/native/Chat.js

@@ -1,4 +1,4 @@
-/* eslint-disable react/no-multi-comp */
+// @flow
 
 import { useIsFocused } from '@react-navigation/native';
 import React, { useEffect } from 'react';
@@ -6,8 +6,7 @@ import React, { useEffect } from 'react';
 import { translate } from '../../../base/i18n';
 import JitsiScreen from '../../../base/modal/components/JitsiScreen';
 import { connect } from '../../../base/redux';
-import { TabBarLabelCounter } from '../../../mobile/navigation/components/TabBarLabelCounter';
-import { closeChat } from '../../actions.native';
+import { closeChat } from '../../actions.any';
 import AbstractChat, {
     type Props as AbstractProps,
     _mapStateToProps
@@ -18,8 +17,14 @@ import MessageContainer from './MessageContainer';
 import MessageRecipient from './MessageRecipient';
 import styles from './styles';
 
+
 type Props = AbstractProps & {
 
+    /**
+     * Is this screen focused or not(React Navigation).
+     */
+    isChatScreenFocused: boolean,
+
     /**
      * Default prop for navigating between screen components(React Navigation).
      */
@@ -36,6 +41,7 @@ type Props = AbstractProps & {
  * the mobile client.
  */
 class Chat extends AbstractChat<Props> {
+
     /**
      * Implements React's {@link Component#render()}.
      *
@@ -43,7 +49,7 @@ class Chat extends AbstractChat<Props> {
      */
     render() {
         const { _messages, route } = this.props;
-        const privateMessageRecipient = route?.params?.privateMessageRecipient;
+        const privateMessageRecipient = route.params?.privateMessageRecipient;
 
         return (
             <JitsiScreen
@@ -62,26 +68,28 @@ class Chat extends AbstractChat<Props> {
 }
 
 export default translate(connect(_mapStateToProps)(props => {
-    const { _nbUnreadMessages, dispatch, navigation, t } = props;
-    const unreadMessagesNr = _nbUnreadMessages > 0;
+    const {
+        _nbUnreadMessages,
+        navigation,
+        t
+    } = props;
+    const isChatScreenFocused = useIsFocused();
 
-    const isFocused = useIsFocused();
+    const nrUnreadMessages
+        = !isChatScreenFocused && _nbUnreadMessages > 0
+            ? `(${_nbUnreadMessages})` : '';
 
     useEffect(() => {
-        navigation?.setOptions({
-            tabBarLabel: () => (
-                <TabBarLabelCounter
-                    activeUnreadNr = { unreadMessagesNr }
-                    isFocused = { isFocused }
-                    label = { t('chat.tabs.chat') }
-                    nbUnread = { _nbUnreadMessages } />
-            )
+        navigation.setOptions({
+            tabBarLabel: `${t('chat.tabs.chat')} ${nrUnreadMessages}`
         });
 
-        return () => isFocused && dispatch(closeChat());
-    }, [ isFocused, _nbUnreadMessages ]);
+        return () => props.dispatch(closeChat());
+    }, [ nrUnreadMessages ]);
 
     return (
-        <Chat { ...props } />
+        <Chat
+            { ...props }
+            isChatScreenFocused = { isChatScreenFocused } />
     );
 }));

react/features/chat/components/native/ChatButton.js

@@ -1,3 +1,5 @@
+// @flow
+
 import { CHAT_ENABLED, getFeatureFlag } from '../../../base/flags';
 import { translate } from '../../../base/i18n';
 import { IconChatUnread, IconMessage } from '../../../base/icons';
@@ -8,9 +10,9 @@ import {
 } from '../../../base/toolbox/components';
 import { navigate } from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 import { screen } from '../../../mobile/navigation/routes';
-import { getUnreadPollCount } from '../../../polls/functions';
 import { getUnreadCount } from '../../functions';
 
+
 type Props = AbstractButtonProps & {
 
     /**
@@ -70,9 +72,7 @@ function _mapStateToProps(state, ownProps) {
 
     return {
         _isPollsDisabled: disablePolls,
-
-        // The toggled icon should also be available for new polls
-        _unreadMessageCount: getUnreadCount(state) || getUnreadPollCount(state),
+        _unreadMessageCount: getUnreadCount(state),
         visible
     };
 }

react/features/chat/components/native/ChatMessage.js

@@ -1,19 +1,30 @@
+// @flow
+
 import React from 'react';
 import { Text, View } from 'react-native';
 
 import { Avatar } from '../../../base/avatar';
+import { ColorSchemeRegistry } from '../../../base/color-scheme';
 import { translate } from '../../../base/i18n';
 import { Linkify } from '../../../base/react';
 import { connect } from '../../../base/redux';
+import { type StyleType } from '../../../base/styles';
 import { isGifMessage } from '../../../gifs/functions';
 import { MESSAGE_TYPE_ERROR, MESSAGE_TYPE_LOCAL } from '../../constants';
 import { replaceNonUnicodeEmojis } from '../../functions';
-import AbstractChatMessage, { type Props } from '../AbstractChatMessage';
+import AbstractChatMessage, { type Props as AbstractProps } from '../AbstractChatMessage';
 
 import GifMessage from './GifMessage';
 import PrivateMessageButton from './PrivateMessageButton';
 import styles from './styles';
 
+type Props = AbstractProps & {
+
+    /**
+     * The color-schemed stylesheet of the feature.
+     */
+    _styles: StyleType
+};
 
 /**
  * Renders a single chat message.
@@ -25,7 +36,7 @@ class ChatMessage extends AbstractChatMessage<Props> {
      * @inheritdoc
      */
     render() {
-        const { message, knocking } = this.props;
+        const { _styles, message, knocking } = this.props;
         const localMessage = message.messageType === MESSAGE_TYPE_LOCAL;
         const { privateMessage, lobbyChat } = message;
 
@@ -45,7 +56,7 @@ class ChatMessage extends AbstractChatMessage<Props> {
             detailsWrapperStyle.push(styles.ownMessageDetailsWrapper);
 
             // The bubble needs some additional styling
-            messageBubbleStyle.push(styles.localMessageBubble);
+            messageBubbleStyle.push(_styles.localMessageBubble);
         } else if (message.messageType === MESSAGE_TYPE_ERROR) {
             // This is a system message.
 
@@ -55,15 +66,15 @@ class ChatMessage extends AbstractChatMessage<Props> {
             // This is a remote message sent by a remote participant.
 
             // The bubble needs some additional styling
-            messageBubbleStyle.push(styles.remoteMessageBubble);
+            messageBubbleStyle.push(_styles.remoteMessageBubble);
         }
 
         if (privateMessage) {
-            messageBubbleStyle.push(styles.privateMessageBubble);
+            messageBubbleStyle.push(_styles.privateMessageBubble);
         }
 
         if (lobbyChat && !knocking) {
-            messageBubbleStyle.push(styles.lobbyMessageBubble);
+            messageBubbleStyle.push(_styles.lobbyMessageBubble);
         }
 
         const messageText = replaceNonUnicodeEmojis(this._getMessageText());
@@ -75,13 +86,11 @@ class ChatMessage extends AbstractChatMessage<Props> {
                     <View style = { messageBubbleStyle }>
                         <View style = { styles.textWrapper } >
                             { this._renderDisplayName() }
-                            { isGifMessage(messageText)
+                            {isGifMessage(messageText)
                                 ? <GifMessage message = { messageText } />
                                 : (
-                                    <Linkify
-                                        linkStyle = { styles.chatLink }
-                                        style = { styles.chatMessage }>
-                                        { messageText }
+                                    <Linkify linkStyle = { styles.chatLink }>
+                                        {messageText}
                                     </Linkify>
                                 )}
                             { this._renderPrivateNotice() }
@@ -125,14 +134,14 @@ class ChatMessage extends AbstractChatMessage<Props> {
      * @returns {React$Element<*> | null}
      */
     _renderDisplayName() {
-        const { message, showDisplayName } = this.props;
+        const { _styles, message, showDisplayName } = this.props;
 
         if (!showDisplayName) {
             return null;
         }
 
         return (
-            <Text style = { styles.senderDisplayName }>
+            <Text style = { _styles.displayName }>
                 { message.displayName }
             </Text>
         );
@@ -144,14 +153,14 @@ class ChatMessage extends AbstractChatMessage<Props> {
      * @returns {React$Element<*> | null}
      */
     _renderPrivateNotice() {
-        const { message, knocking } = this.props;
+        const { _styles, message, knocking } = this.props;
 
         if (!(message.privateMessage || (message.lobbyChat && !knocking))) {
             return null;
         }
 
         return (
-            <Text style = { message.lobbyChat ? styles.lobbyMsgNotice : styles.privateNotice }>
+            <Text style = { message.lobbyChat ? _styles.lobbyMsgNotice : _styles.privateNotice }>
                 { this._getPrivateNoticeMessage() }
             </Text>
         );
@@ -163,7 +172,7 @@ class ChatMessage extends AbstractChatMessage<Props> {
      * @returns {React$Element<*> | null}
      */
     _renderPrivateReplyButton() {
-        const { message, knocking } = this.props;
+        const { _styles, message, knocking } = this.props;
         const { messageType, privateMessage, lobbyChat } = message;
 
         if (!(privateMessage || lobbyChat) || messageType === MESSAGE_TYPE_LOCAL || knocking) {
@@ -171,13 +180,13 @@ class ChatMessage extends AbstractChatMessage<Props> {
         }
 
         return (
-            <View style = { styles.replyContainer }>
+            <View style = { _styles.replyContainer }>
                 <PrivateMessageButton
                     isLobbyMessage = { lobbyChat }
                     participantID = { message.id }
                     reply = { true }
                     showLabel = { false }
-                    toggledStyles = { styles.replyStyles } />
+                    toggledStyles = { _styles.replyStyles } />
             </View>
         );
     }
@@ -208,6 +217,7 @@ class ChatMessage extends AbstractChatMessage<Props> {
  */
 function _mapStateToProps(state) {
     return {
+        _styles: ColorSchemeRegistry.get(state, 'Chat'),
         knocking: state['features/lobby'].knocking
     };
 }

react/features/chat/components/native/ChatMessageGroup.js

@@ -1,4 +1,6 @@
-import React, { Component, ReactElement } from 'react';
+// @flow
+
+import React, { Component } from 'react';
 import { FlatList } from 'react-native';
 
 import { MESSAGE_TYPE_LOCAL, MESSAGE_TYPE_REMOTE } from '../../constants';
@@ -58,7 +60,7 @@ export default class ChatMessageGroup extends Component<Props> {
         return `key_${index}`;
     }
 
-    _renderMessage: Object => ReactElement;
+    _renderMessage: Object => React$Element<*>;
 
     /**
      * Renders a single chat message.

react/features/chat/components/native/ChatPrivacyDialog.js

@@ -1,3 +1,5 @@
+// @flow
+
 import React from 'react';
 
 import { ConfirmDialog } from '../../../base/dialog';

react/features/chat/components/native/MessageContainer.js

@@ -1,8 +1,12 @@
-import React, { ReactElement } from 'react';
+// @flow
+
+import React from 'react';
 import { FlatList, Text, View } from 'react-native';
 
+import { ColorSchemeRegistry } from '../../../base/color-scheme';
 import { translate } from '../../../base/i18n';
 import { connect } from '../../../base/redux';
+import { StyleType } from '../../../base/styles';
 import AbstractMessageContainer, { type Props as AbstractProps }
     from '../AbstractMessageContainer';
 
@@ -11,6 +15,11 @@ import styles from './styles';
 
 type Props = AbstractProps & {
 
+    /**
+     * The color-schemed stylesheet of the feature.
+     */
+    _styles: StyleType,
+
     /**
      * Function to be used to translate i18n labels.
      */
@@ -73,7 +82,7 @@ class MessageContainer extends AbstractMessageContainer<Props> {
         return `key_${index}`;
     }
 
-    _renderListEmptyComponent: () => ReactElement;
+    _renderListEmptyComponent: () => React$Element<any>;
 
     /**
      * Renders a message when there are no messages in the chat yet.
@@ -81,18 +90,18 @@ class MessageContainer extends AbstractMessageContainer<Props> {
      * @returns {React$Element<any>}
      */
     _renderListEmptyComponent() {
-        const { t } = this.props;
+        const { _styles, t } = this.props;
 
         return (
             <View style = { styles.emptyComponentWrapper }>
-                <Text style = { styles.emptyComponentText }>
+                <Text style = { _styles.emptyComponentText }>
                     { t('chat.noMessagesMessage') }
                 </Text>
             </View>
         );
     }
 
-    _renderMessageGroup: Object => ReactElement;
+    _renderMessageGroup: Object => React$Element<any>;
 
     /**
      * Renders a single chat message.
@@ -105,4 +114,16 @@ class MessageContainer extends AbstractMessageContainer<Props> {
     }
 }
 
-export default translate(connect()(MessageContainer));
+/**
+ * Maps part of the redux state to the props of this component.
+ *
+ * @param {Object} state - The Redux state.
+ * @returns {Props}
+ */
+function _mapStateToProps(state) {
+    return {
+        _styles: ColorSchemeRegistry.get(state, 'Chat')
+    };
+}
+
+export default translate(connect(_mapStateToProps)(MessageContainer));

react/features/chat/components/native/MessageRecipient.js

@@ -1,9 +1,13 @@
+// @flow
+
 import React from 'react';
 import { Text, TouchableHighlight, View } from 'react-native';
 
+import { ColorSchemeRegistry } from '../../../base/color-scheme';
 import { translate } from '../../../base/i18n';
-import { Icon, IconCloseLarge } from '../../../base/icons';
+import { Icon, IconCloseCircle } from '../../../base/icons';
 import { connect } from '../../../base/redux';
+import { type StyleType } from '../../../base/styles';
 import {
     setParams
 } from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
@@ -12,11 +16,14 @@ import AbstractMessageRecipient, {
     type Props as AbstractProps
 } from '../AbstractMessageRecipient';
 
-import styles from './styles';
-
 
 type Props = AbstractProps & {
 
+    /**
+     * The color-schemed stylesheet of the feature.
+     */
+    _styles: StyleType,
+
     /**
      * The Redux dispatch function.
      */
@@ -92,17 +99,14 @@ class MessageRecipient extends AbstractMessageRecipient<Props> {
      * @returns {ReactElement}
      */
     render() {
-        const {
-            isLobbyChatActive,
-            lobbyMessageRecipient,
-            privateMessageRecipient,
-            t
-        } = this.props;
+        const { _styles, privateMessageRecipient, t,
+            isLobbyChatActive, lobbyMessageRecipient } = this.props;
+
 
         if (isLobbyChatActive) {
             return (
-                <View style = { styles.lobbyMessageRecipientContainer }>
-                    <Text style = { styles.messageRecipientText }>
+                <View style = { _styles.lobbyMessageRecipientContainer }>
+                    <Text style = { _styles.messageRecipientText }>
                         { t('chat.lobbyChatMessageTo', {
                             recipient: lobbyMessageRecipient.name
                         }) }
@@ -110,8 +114,8 @@ class MessageRecipient extends AbstractMessageRecipient<Props> {
                     <TouchableHighlight
                         onPress = { this._onResetLobbyMessageRecipient }>
                         <Icon
-                            src = { IconCloseLarge }
-                            style = { styles.messageRecipientCancelIcon } />
+                            src = { IconCloseCircle }
+                            style = { _styles.messageRecipientCancelIcon } />
                     </TouchableHighlight>
                 </View>
             );
@@ -122,8 +126,8 @@ class MessageRecipient extends AbstractMessageRecipient<Props> {
         }
 
         return (
-            <View style = { styles.messageRecipientContainer }>
-                <Text style = { styles.messageRecipientText }>
+            <View style = { _styles.messageRecipientContainer }>
+                <Text style = { _styles.messageRecipientText }>
                     { t('chat.messageTo', {
                         recipient: privateMessageRecipient.name
                     }) }
@@ -132,8 +136,8 @@ class MessageRecipient extends AbstractMessageRecipient<Props> {
                     onPress = { this._onResetPrivateMessageRecipient }
                     underlayColor = { 'transparent' }>
                     <Icon
-                        src = { IconCloseLarge }
-                        style = { styles.messageRecipientCancelIcon } />
+                        src = { IconCloseCircle }
+                        style = { _styles.messageRecipientCancelIcon } />
                 </TouchableHighlight>
             </View>
         );
@@ -150,6 +154,7 @@ function _mapStateToProps(state) {
     const { lobbyMessageRecipient, isLobbyChatActive } = state['features/chat'];
 
     return {
+        _styles: ColorSchemeRegistry.get(state, 'Chat'),
         isLobbyChatActive,
         lobbyMessageRecipient
     };

react/features/chat/components/native/PrivateMessageButton.js

@@ -1,3 +1,5 @@
+// @flow
+
 import { CHAT_ENABLED, getFeatureFlag } from '../../../base/flags';
 import { translate } from '../../../base/i18n';
 import { IconMessage, IconReply } from '../../../base/icons';
@@ -8,6 +10,7 @@ import { handleLobbyChatInitialized, openChat } from '../../../chat/actions';
 import { navigate } from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 import { screen } from '../../../mobile/navigation/routes';
 
+
 export type Props = AbstractButtonProps & {
 
     /**
@@ -100,7 +103,7 @@ class PrivateMessageButton extends AbstractButton<Props, any> {
  * @param {Props} ownProps - The own props of the component.
  * @returns {Props}
  */
-export function _mapStateToProps(state: Object, ownProps: Props) {
+export function _mapStateToProps(state: Object, ownProps: Props): $Shape<Props> {
     const enabled = getFeatureFlag(state, CHAT_ENABLED, true);
     const { disablePolls } = state['features/base/config'];
     const { visible = enabled, isLobbyMessage, participantID } = ownProps;

react/features/chat/components/native/styles.js

@@ -1,19 +1,11 @@
-import { BoxModel } from '../../../base/styles';
+// @flow
+
+import { ColorSchemeRegistry, schemeColor } from '../../../base/color-scheme';
+import { BoxModel, ColorPalette } from '../../../base/styles';
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
 
 const BUBBLE_RADIUS = 8;
 
-const recipientContainer = {
-    alignItems: 'center',
-    backgroundColor: BaseTheme.palette.support05,
-    borderRadius: BaseTheme.shape.borderRadius,
-    flexDirection: 'row',
-    height: 48,
-    marginBottom: BaseTheme.spacing[3],
-    marginHorizontal: BaseTheme.spacing[3],
-    padding: BaseTheme.spacing[2]
-};
-
 /**
  * The styles of the feature chat.
  *
@@ -24,72 +16,16 @@ const recipientContainer = {
  */
 export default {
 
-    /**
-     * Background of the chat screen.
-     */
-    backdrop: {
-        backgroundColor: BaseTheme.palette.ui10,
-        flex: 1
-    },
-
-    emptyComponentText: {
-        color: BaseTheme.palette.text03,
-        textAlign: 'center'
-    },
-
-    lobbyMessageBubble: {
-        backgroundColor: BaseTheme.palette.support06
-    },
-
-    lobbyMsgNotice: {
-        color: BaseTheme.palette.text04,
-        fontSize: 11,
-        marginTop: 6
-    },
-
-    privateNotice: {
-        ...BaseTheme.palette.bodyShortRegular,
-        color: BaseTheme.palette.text02
-    },
-
-    privateMessageBubble: {
-        backgroundColor: BaseTheme.palette.support05
-    },
-
-    remoteMessageBubble: {
-        backgroundColor: BaseTheme.palette.ui02,
-        borderTopLeftRadius: 0
-    },
-
-    replyContainer: {
-        alignSelf: 'stretch',
-        justifyContent: 'center'
-    },
-
-    replyStyles: {
-        iconStyle: {
-            color: BaseTheme.palette.icon01,
-            fontSize: 22,
-            padding: BaseTheme.spacing[2]
-        },
-        underlayColor: 'transparent'
-    },
-
     /**
      * Wrapper View for the avatar.
      */
     avatarWrapper: {
-        marginRight: BaseTheme.spacing[2],
+        marginRight: 8,
         width: 32
     },
 
     chatLink: {
-        color: BaseTheme.palette.link01
-    },
-
-    chatMessage: {
-        ...BaseTheme.typography.bodyShortRegular,
-        color: BaseTheme.palette.text01
+        color: ColorPalette.blue
     },
 
     /**
@@ -125,7 +61,7 @@ export default {
     },
 
     customInput: {
-        width: 272
+        width: 280
     },
 
     messageBubble: {
@@ -181,7 +117,7 @@ export default {
      * Text node for the timestamp.
      */
     timeText: {
-        color: BaseTheme.palette.text03,
+        color: 'rgb(164, 184, 209)',
         fontSize: 13
     },
 
@@ -218,35 +154,97 @@ export default {
         width: 250,
         height: undefined,
         flexGrow: 1
+    }
+};
+
+ColorSchemeRegistry.register('Chat', {
+    /**
+     * Background of the chat screen.
+     */
+    backdrop: {
+        backgroundColor: schemeColor('background'),
+        flex: 1
     },
 
-    senderDisplayName: {
-        ...BaseTheme.typography.bodyShortBold,
-        color: BaseTheme.palette.text02
+    /**
+     * The text node for the display name.
+     */
+    displayName: {
+        color: schemeColor('displayName'),
+        fontSize: 13
     },
 
-    localMessageBubble: {
-        backgroundColor: BaseTheme.palette.ui04,
-        borderTopRightRadius: 0
+    emptyComponentText: {
+        color: BaseTheme.palette.text03,
+        textAlign: 'center'
+    },
+
+    lobbyMessageBubble: {
+        backgroundColor: schemeColor('lobbyMsgBackground')
+    },
+
+    lobbyMsgNotice: {
+        color: schemeColor('lobbyMsgNotice'),
+        fontSize: 11,
+        marginTop: 6
     },
 
     lobbyMessageRecipientContainer: {
-        ...recipientContainer,
-        backgroundColor: BaseTheme.palette.support06
+        alignItems: 'center',
+        backgroundColor: schemeColor('lobbyMsgBackground'),
+        flexDirection: 'row',
+        padding: BoxModel.padding
+    },
+
+    localMessageBubble: {
+        backgroundColor: schemeColor('localMsgBackground'),
+        borderTopRightRadius: 0
     },
 
     messageRecipientCancelIcon: {
-        color: BaseTheme.palette.icon01,
+        color: schemeColor('icon'),
         fontSize: 18
     },
 
     messageRecipientContainer: {
-        ...recipientContainer
+        alignItems: 'center',
+        backgroundColor: schemeColor('privateMsgBackground'),
+        flexDirection: 'row',
+        padding: BoxModel.padding
     },
 
     messageRecipientText: {
-        ...BaseTheme.typography.bodyShortRegular,
-        color: BaseTheme.palette.text01,
+        color: schemeColor('text'),
         flex: 1
+    },
+
+    privateNotice: {
+        color: schemeColor('privateMsgNotice'),
+        fontSize: 11,
+        marginTop: 6
+    },
+
+    privateMessageBubble: {
+        backgroundColor: schemeColor('privateMsgBackground')
+    },
+
+    remoteMessageBubble: {
+        backgroundColor: schemeColor('remoteMsgBackground'),
+        borderTopLeftRadius: 0
+    },
+
+    replyContainer: {
+        alignSelf: 'stretch',
+        borderLeftColor: schemeColor('replyBorder'),
+        borderLeftWidth: 1,
+        justifyContent: 'center'
+    },
+
+    replyStyles: {
+        iconStyle: {
+            color: schemeColor('replyIcon'),
+            fontSize: 22,
+            padding: 8
+        }
     }
-};
+});

react/features/chat/components/web/Chat.js

@@ -1,3 +1,5 @@
+// @flow
+
 import clsx from 'clsx';
 import React from 'react';
 

react/features/conference/components/native/carmode/styles.js

@@ -71,7 +71,8 @@ export default {
     },
 
     qualityLabelContainer: {
-        borderRadius: BaseTheme.shape.borderRadius,
+        borderBottomLeftRadius: 3,
+        borderTopLeftRadius: 3,
         flexShrink: 1,
         paddingHorizontal: 2,
         justifyContent: 'center',

react/features/external-api/middleware.ts

@@ -3,7 +3,6 @@ import { getJitsiMeetTransport } from '../../../modules/transport';
 import {
     CONFERENCE_FAILED,
     CONFERENCE_JOINED,
-    DATA_CHANNEL_CLOSED,
     DATA_CHANNEL_OPENED,
     KICKED_OUT
 } from '../base/conference/actionTypes';
@@ -125,10 +124,6 @@ MiddlewareRegistry.register(store => next => action => {
         break;
     }
 
-    case DATA_CHANNEL_CLOSED:
-        APP.API.notifyDataChannelClosed(action.code, action.reason);
-        break;
-
     case DATA_CHANNEL_OPENED:
         APP.API.notifyDataChannelOpened();
         break;

react/features/filmstrip/components/native/styles.js

@@ -1,3 +1,5 @@
+// @flow
+
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
 import { SMALL_THUMBNAIL_SIZE } from '../../constants';
 
@@ -8,7 +10,7 @@ export const AVATAR_SIZE = 50;
 
 const indicatorContainer = {
     backgroundColor: 'rgba(0, 0, 0, 0.7)',
-    borderRadius: BaseTheme.shape.borderRadius,
+    borderRadius: 4,
     margin: 2,
     padding: 2
 };
@@ -117,16 +119,7 @@ export default {
         width: SMALL_THUMBNAIL_SIZE
     },
 
-    indicatorContainer: {
-        ...indicatorContainer,
-        flexShrink: 1,
-        height: 32,
-        justifyContent: 'center',
-        marginBottom: BaseTheme.spacing[0],
-        marginHorizontal: BaseTheme.spacing[1],
-        marginTop: BaseTheme.spacing[2],
-        width: 32
-    },
+    indicatorContainer,
 
     /**
      * The thumbnails indicator container.

react/features/mobile/navigation/components/TabBarLabelCounter.tsx

@@ -1,41 +0,0 @@
-// @ts-ignore
-import React from 'react';
-import { StyleProp, Text, TextStyle, View } from 'react-native';
-
-// @ts-ignore
-import { navigationStyles } from './styles';
-
-interface ITabBarLabelCounterProps {
-    activeUnreadNr: boolean;
-    isFocused: boolean;
-    label: string;
-    nbUnread?: number;
-}
-
-export const TabBarLabelCounter = ({ activeUnreadNr, isFocused, label, nbUnread }: ITabBarLabelCounterProps) => {
-    const labelStyles = isFocused
-        ? navigationStyles.unreadCounterDescriptionFocused
-        : navigationStyles.unreadCounterDescription;
-
-    return (
-        <View
-            style = {
-                navigationStyles.unreadCounterContainer as StyleProp<TextStyle> }>
-            <Text
-                style = { labelStyles }>
-                { label && label }
-            </Text>
-            {
-                activeUnreadNr && (
-                    <View
-                        style = { navigationStyles.unreadCounterCircle as StyleProp<TextStyle> }>
-                        <Text
-                            style = { navigationStyles.unreadCounter as StyleProp<TextStyle> }>
-                            { nbUnread }
-                        </Text>
-                    </View>
-                )
-            }
-        </View>
-    );
-};

react/features/mobile/navigation/components/chat/components/ChatAndPollsNavigator.tsx

@@ -1,11 +1,9 @@
 /* eslint-disable lines-around-comment */
 
 import { createMaterialTopTabNavigator } from '@react-navigation/material-top-tabs';
-// @ts-ignore
 import React from 'react';
-import { useDispatch, useSelector } from 'react-redux';
+import { useSelector } from 'react-redux';
 
-import { IReduxState } from '../../../../../app/types';
 import {
     getClientHeight,
     getClientWidth
@@ -13,8 +11,6 @@ import {
 } from '../../../../../base/modal/components/functions';
 // @ts-ignore
 import { Chat } from '../../../../../chat';
-import { setIsPollsTabFocused } from '../../../../../chat/actions.native';
-import { resetNbUnreadPollsMessages } from '../../../../../polls/actions';
 // @ts-ignore
 import { PollsPane } from '../../../../../polls/components';
 // @ts-ignore
@@ -27,11 +23,6 @@ const ChatTab = createMaterialTopTabNavigator();
 const ChatAndPolls = () => {
     const clientHeight = useSelector(getClientHeight);
     const clientWidth = useSelector(getClientWidth);
-    const dispatch = useDispatch();
-    const { isPollsTabFocused } = useSelector((state: IReduxState) => state['features/chat']);
-    const initialRouteName = isPollsTabFocused
-        ? screen.conference.chatandpolls.tab.polls
-        : screen.conference.chatandpolls.tab.chat;
 
     return (
         // @ts-ignore
@@ -41,24 +32,12 @@ const ChatAndPolls = () => {
                 height: clientHeight,
                 width: clientWidth
             }}
-            initialRouteName = { initialRouteName }
             screenOptions = { chatTabBarOptions }>
             <ChatTab.Screen
                 component = { Chat }
-                listeners = {{
-                    tabPress: () => {
-                        dispatch(setIsPollsTabFocused(false));
-                    }
-                }}
                 name = { screen.conference.chatandpolls.tab.chat } />
             <ChatTab.Screen
                 component = { PollsPane }
-                listeners = {{
-                    tabPress: () => {
-                        dispatch(setIsPollsTabFocused(true));
-                        dispatch(resetNbUnreadPollsMessages);
-                    }
-                }}
                 name = { screen.conference.chatandpolls.tab.polls } />
         </ChatTab.Navigator>
     );

react/features/mobile/navigation/components/styles.js

@@ -1,14 +1,9 @@
 import { BoxModel } from '../../../base/styles';
-import BaseTheme from '../../../base/ui/components/BaseTheme.native';
+import BaseTheme from '../../../base/ui/components/BaseTheme';
 
 
 export const TEXT_COLOR = BaseTheme.palette.text01;
 
-const unreadCounterDescription = {
-    ...BaseTheme.typography.bodyShortBoldLarge,
-    color: BaseTheme.palette.text03
-};
-
 /**
  * Styles of the navigation feature.
  */
@@ -32,35 +27,5 @@ export const navigationStyles = {
 
     connectingScreenText: {
         color: TEXT_COLOR
-    },
-
-    unreadCounterContainer: {
-        alignItems: 'center',
-        display: 'flex',
-        flexDirection: 'row'
-    },
-
-    unreadCounterDescription: {
-        ...unreadCounterDescription
-    },
-
-    unreadCounterDescriptionFocused: {
-        ...unreadCounterDescription,
-        color: BaseTheme.palette.text01
-    },
-
-    unreadCounterCircle: {
-        backgroundColor: BaseTheme.palette.warning01,
-        borderRadius: BaseTheme.spacing[4] / 2,
-        height: BaseTheme.spacing[4],
-        justifyContent: 'center',
-        marginLeft: BaseTheme.spacing[2],
-        width: BaseTheme.spacing[4]
-    },
-
-    unreadCounter: {
-        ...BaseTheme.typography.bodyShortBold,
-        alignSelf: 'center',
-        color: BaseTheme.palette.text04
     }
 };

react/features/mobile/navigation/screenOptions.js

@@ -67,14 +67,19 @@ export const conferenceScreenOptions = fullScreenOptions;
  * Tab bar options for chat screen.
  */
 export const chatTabBarOptions = {
-    swipeEnabled: false,
+    tabBarActiveTintColor: BaseTheme.palette.field02,
+    tabBarLabelStyle: {
+        fontSize: BaseTheme.typography.labelRegular.fontSize,
+        textTransform: 'capitalize'
+    },
+    tabBarInactiveTintColor: BaseTheme.palette.text03,
     tabBarIndicatorStyle: {
-        backgroundColor: BaseTheme.palette.link01Active
+        backgroundColor: BaseTheme.palette.field02
     },
     tabBarStyle: {
         backgroundColor: BaseTheme.palette.ui01,
         borderBottomColor: BaseTheme.palette.border05,
-        borderBottomWidth: 0.4
+        borderBottomWidth: 1
     }
 };
 

react/features/notifications/constants.ts

@@ -56,13 +56,6 @@ export const NOTIFICATION_ICON = {
     PARTICIPANTS: 'participants'
 };
 
-/**
- * The identifier of the disable self view notification.
- *
- * @type {string}
- */
-export const DATA_CHANNEL_CLOSED_NOTIFICATION_ID = 'DATA_CHANNEL_CLOSED_NOTIFICATION_ID';
-
 /**
  * The identifier of the disable self view notification.
  *

react/features/polls/components/native/PollsList.js

@@ -4,7 +4,7 @@ import { FlatList, View } from 'react-native';
 import { Text } from 'react-native-paper';
 import { useSelector } from 'react-redux';
 
-import { Icon, IconMessage } from '../../../base/icons';
+import { Icon, IconChatUnread } from '../../../base/icons';
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
 
 
@@ -41,7 +41,7 @@ const PollsList = () => {
                     <Icon
                         color = { BaseTheme.palette.icon03 }
                         size = { 160 }
-                        src = { IconMessage } />
+                        src = { IconChatUnread } />
                     <Text style = { chatStyles.noPollText } >
                         {
                             t('polls.results.empty')

react/features/polls/components/native/PollsPane.js

@@ -1,14 +1,14 @@
 /* eslint-disable react-native/no-color-literals */
+// @flow
 
-import { useNavigation } from '@react-navigation/native';
+import { useIsFocused, useNavigation } from '@react-navigation/native';
 import React, { useEffect } from 'react';
 import { useSelector } from 'react-redux';
 
 import JitsiScreen from '../../../base/modal/components/JitsiScreen';
 import Button from '../../../base/ui/components/native/Button';
 import { BUTTON_TYPES } from '../../../base/ui/constants.native';
-import { TabBarLabelCounter }
-    from '../../../mobile/navigation/components/TabBarLabelCounter';
+import { getUnreadPollCount } from '../../functions';
 import AbstractPollsPane from '../AbstractPollsPane';
 import type { AbstractProps } from '../AbstractPollsPane';
 
@@ -19,25 +19,19 @@ import { chatStyles } from './styles';
 
 const PollsPane = (props: AbstractProps) => {
     const { createMode, onCreate, setCreateMode, t } = props;
+    const isPollsScreenFocused = useIsFocused();
     const navigation = useNavigation();
-    const { isPollsTabFocused } = useSelector(state => state['features/chat']);
-    const { nbUnreadPolls } = useSelector(state => state['features/polls']);
+    const nbUnreadPolls = useSelector(getUnreadPollCount);
+
+    const nrUnreadPolls = !isPollsScreenFocused && nbUnreadPolls > 0
+        ? `(${nbUnreadPolls})`
+        : '';
 
     useEffect(() => {
-        const activeUnreadPollsNr = !isPollsTabFocused && nbUnreadPolls > 0;
-
         navigation.setOptions({
-            // eslint-disable-next-line react/no-multi-comp
-            tabBarLabel: () => (
-                <TabBarLabelCounter
-                    activeUnreadNr = { activeUnreadPollsNr }
-                    isFocused = { isPollsTabFocused }
-                    label = { t('chat.tabs.polls') }
-                    nbUnread = { nbUnreadPolls } />
-            )
+            tabBarLabel: `${t('chat.tabs.polls')} ${nrUnreadPolls}`
         });
-
-    }, [ isPollsTabFocused, nbUnreadPolls ]);
+    }, [ nrUnreadPolls ]);
 
     return (
         <JitsiScreen

react/features/polls/components/native/styles.js

@@ -110,12 +110,10 @@ export const chatStyles = createStyleSheet({
 
     noPollContent: {
         alignItems: 'center',
+        flex: 1,
+        flexDirection: 'column',
         justifyContent: 'center',
-        position: 'absolute',
-        bottom: 0,
-        left: 0,
-        right: 0,
-        top: '25%'
+        paddingTop: '4%'
     },
 
     noPollText: {
@@ -151,7 +149,7 @@ export const chatStyles = createStyleSheet({
 
     pollCreateButton: {
         flex: 1,
-        marginHorizontal: BaseTheme.spacing[1]
+        marginHorizontal: BaseTheme.spacing[2]
     },
 
     pollSendLabel: {
@@ -193,8 +191,7 @@ export const chatStyles = createStyleSheet({
     },
 
     pollCreateAddButton: {
-        marginHorizontal: BaseTheme.spacing[1],
-        marginVertical: BaseTheme.spacing[2]
+        margin: BaseTheme.spacing[2]
     },
 
     toggleText: {
@@ -203,8 +200,8 @@ export const chatStyles = createStyleSheet({
     },
 
     createPollButton: {
-        marginHorizontal: BaseTheme.spacing[3],
-        marginVertical: 34
+        marginHorizontal: BaseTheme.spacing[4],
+        marginVertical: '8%'
     },
 
     pollPane: {
@@ -221,28 +218,5 @@ export const chatStyles = createStyleSheet({
         flexDirection: 'row',
         justifyContent: 'space-between',
         marginHorizontal: BaseTheme.spacing[2]
-    },
-
-    unreadPollsCounterContainer: {
-        display: 'flex',
-        flexDirection: 'row'
-    },
-
-    unreadPollsCounterDescription: {
-        color: BaseTheme.palette.text01
-    },
-
-    unreadPollsCounterCircle: {
-        backgroundColor: BaseTheme.palette.warning01,
-        borderRadius: BaseTheme.spacing[3] / 2,
-        height: BaseTheme.spacing[3],
-        justifyContent: 'center',
-        marginLeft: BaseTheme.spacing[2],
-        width: BaseTheme.spacing[3]
-    },
-
-    unreadPollsCounter: {
-        alignSelf: 'center',
-        color: BaseTheme.palette.text04
     }
 });

react/features/polls/components/web/PollsPane.tsx

@@ -1,5 +1,4 @@
 /* eslint-disable lines-around-comment */
-// @ts-ignore
 import React from 'react';
 
 import Button from '../../../base/ui/components/web/Button';

react/features/video-quality/components/styles.js

@@ -1,5 +1,6 @@
+// @flow
+
 import { ColorPalette, createStyleSheet } from '../../base/styles';
-import BaseTheme from '../../base/ui/components/BaseTheme.native';
 
 export const AUD_LABEL_COLOR = ColorPalette.green;
 
@@ -12,8 +13,6 @@ export default createStyleSheet({
      * Style for the audio-only indicator.
      */
     indicatorAudioOnly: {
-        backgroundColor: AUD_LABEL_COLOR,
-        borderRadius: BaseTheme.shape.borderRadius,
-        height: 32
+        backgroundColor: AUD_LABEL_COLOR
     }
 });