diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle index 9655ca4404..e17903d60b 100644 --- a/android/sdk/build.gradle +++ b/android/sdk/build.gradle @@ -73,7 +73,6 @@ dependencies { } implementation project(':react-native-gesture-handler') implementation project(':react-native-get-random-values') - implementation project(':react-native-immersive-mode') implementation project(':react-native-keep-awake') implementation project(':react-native-orientation-locker') implementation project(':react-native-pager-view') diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java index 3de592cd49..cac5e7832a 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java @@ -101,7 +101,6 @@ class ReactInstanceManagerHolder { new com.oney.WebRTCModule.WebRTCModulePackage(), new com.swmansion.gesturehandler.RNGestureHandlerPackage(), new org.linusu.RNGetRandomValuesPackage(), - new com.rnimmersivemode.RNImmersiveModePackage(), new com.swmansion.rnscreens.RNScreensPackage(), new com.zmxv.RNSound.RNSoundPackage(), new com.th3rdwave.safeareacontext.SafeAreaContextPackage(), diff --git a/android/settings.gradle b/android/settings.gradle index a9ad548369..da189dff74 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -24,8 +24,6 @@ include ':react-native-giphy' project(':react-native-giphy').projectDir = new File(rootProject.projectDir, '../node_modules/@giphy/react-native-sdk/android') include ':react-native-google-signin' project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-google-signin/google-signin/android') -include ':react-native-immersive-mode' -project(':react-native-immersive-mode').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-immersive-mode/android') include ':react-native-keep-awake' project(':react-native-keep-awake').projectDir = new File(rootProject.projectDir, '../node_modules/@sayem314/react-native-keep-awake/android') include ':react-native-orientation-locker' diff --git a/package-lock.json b/package-lock.json index 410963abc6..e747f8a129 100644 --- a/package-lock.json +++ b/package-lock.json @@ -87,7 +87,6 @@ "react-native-dialog": "https://github.com/jitsi/react-native-dialog/releases/download/v9.2.2-jitsi.1/react-native-dialog-9.2.2.tgz", "react-native-gesture-handler": "2.24.0", "react-native-get-random-values": "1.11.0", - "react-native-immersive-mode": "https://github.com/jitsi/react-native-immersive-mode.git#38cc9001db24618bc0c61800f81e889bcfb6ff2c", "react-native-orientation-locker": "https://github.com/jitsi/react-native-orientation-locker.git#fe095651d819cf134624f786b61fc8667862178a", "react-native-pager-view": "6.8.1", "react-native-paper": "5.10.3", @@ -21870,14 +21869,6 @@ "react-native": ">=0.56" } }, - "node_modules/react-native-immersive-mode": { - "version": "2.0.2", - "resolved": "git+ssh://git@github.com/jitsi/react-native-immersive-mode.git#38cc9001db24618bc0c61800f81e889bcfb6ff2c", - "license": "MIT", - "peerDependencies": { - "react-native": ">=0.60.5" - } - }, "node_modules/react-native-is-edge-to-edge": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/react-native-is-edge-to-edge/-/react-native-is-edge-to-edge-1.2.1.tgz", @@ -42365,10 +42356,6 @@ "fast-base64-decode": "^1.0.0" } }, - "react-native-immersive-mode": { - "version": "git+ssh://git@github.com/jitsi/react-native-immersive-mode.git#38cc9001db24618bc0c61800f81e889bcfb6ff2c", - "from": "react-native-immersive-mode@https://github.com/jitsi/react-native-immersive-mode.git#38cc9001db24618bc0c61800f81e889bcfb6ff2c" - }, "react-native-is-edge-to-edge": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/react-native-is-edge-to-edge/-/react-native-is-edge-to-edge-1.2.1.tgz", diff --git a/package.json b/package.json index 542dddca33..0ac50fd810 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,6 @@ "react-native-dialog": "https://github.com/jitsi/react-native-dialog/releases/download/v9.2.2-jitsi.1/react-native-dialog-9.2.2.tgz", "react-native-gesture-handler": "2.24.0", "react-native-get-random-values": "1.11.0", - "react-native-immersive-mode": "https://github.com/jitsi/react-native-immersive-mode.git#38cc9001db24618bc0c61800f81e889bcfb6ff2c", "react-native-orientation-locker": "https://github.com/jitsi/react-native-orientation-locker.git#fe095651d819cf134624f786b61fc8667862178a", "react-native-pager-view": "6.8.1", "react-native-paper": "5.10.3", diff --git a/react-native-sdk/package.json b/react-native-sdk/package.json index 149581d746..c2219de23b 100644 --- a/react-native-sdk/package.json +++ b/react-native-sdk/package.json @@ -73,7 +73,6 @@ "react-native-device-info": "0.0.0", "react-native-get-random-values": "0.0.0", "react-native-gesture-handler": "0.0.0", - "react-native-immersive-mode": "0.0.0", "react-native-pager-view": "0.0.0", "react-native-performance": "0.0.0", "react-native-orientation-locker": "0.0.0", diff --git a/react/features/app/middlewares.native.ts b/react/features/app/middlewares.native.ts index 15b72b4bd7..01dcab5561 100644 --- a/react/features/app/middlewares.native.ts +++ b/react/features/app/middlewares.native.ts @@ -4,7 +4,6 @@ import '../mobile/audio-mode/middleware'; import '../mobile/background/middleware'; import '../mobile/call-integration/middleware'; import '../mobile/external-api/middleware'; -import '../mobile/full-screen/middleware'; import '../mobile/navigation/middleware'; import '../mobile/permissions/middleware'; import '../mobile/proximity/middleware'; diff --git a/react/features/app/reducers.native.ts b/react/features/app/reducers.native.ts index 0ffc5800b7..9e9915241d 100644 --- a/react/features/app/reducers.native.ts +++ b/react/features/app/reducers.native.ts @@ -2,7 +2,6 @@ import '../mobile/audio-mode/reducer'; import '../mobile/background/reducer'; import '../mobile/call-integration/reducer'; import '../mobile/external-api/reducer'; -import '../mobile/full-screen/reducer'; import '../mobile/watchos/reducer'; import '../share-room/reducer'; diff --git a/react/features/app/types.ts b/react/features/app/types.ts index c24445b92c..65ae235733 100644 --- a/react/features/app/types.ts +++ b/react/features/app/types.ts @@ -52,7 +52,6 @@ import { IMobileAudioModeState } from '../mobile/audio-mode/reducer'; import { IMobileBackgroundState } from '../mobile/background/reducer'; import { ICallIntegrationState } from '../mobile/call-integration/reducer'; import { IMobileExternalApiState } from '../mobile/external-api/reducer'; -import { IFullScreenState } from '../mobile/full-screen/reducer'; import { IMobileWatchOSState } from '../mobile/watchos/reducer'; import { INoAudioSignalState } from '../no-audio-signal/reducer'; import { INoiseDetectionState } from '../noise-detection/reducer'; @@ -132,7 +131,6 @@ export interface IReduxState { 'features/file-sharing': IFileSharingState; 'features/filmstrip': IFilmstripState; 'features/follow-me': IFollowMeState; - 'features/full-screen': IFullScreenState; 'features/gifs': IGifsState; 'features/google-api': IGoogleApiState; 'features/invite': IInviteState; diff --git a/react/features/base/flags/constants.ts b/react/features/base/flags/constants.ts index a5d9442115..c6abc476bb 100644 --- a/react/features/base/flags/constants.ts +++ b/react/features/base/flags/constants.ts @@ -78,12 +78,6 @@ export const CHAT_ENABLED = 'chat.enabled'; */ export const FILMSTRIP_ENABLED = 'filmstrip.enabled'; -/** - * Flag indicating if fullscreen (immersive) mode should be enabled. - * Default: enabled (true). - */ -export const FULLSCREEN_ENABLED = 'fullscreen.enabled'; - /** * Flag indicating if the Help button should be enabled. * Default: enabled (true). diff --git a/react/features/conference/components/native/Conference.tsx b/react/features/conference/components/native/Conference.tsx index 85282a2da8..1701d639eb 100644 --- a/react/features/conference/components/native/Conference.tsx +++ b/react/features/conference/components/native/Conference.tsx @@ -3,9 +3,7 @@ import React, { useCallback } from 'react'; import { BackHandler, NativeModules, - Platform, SafeAreaView, - StatusBar, View, ViewStyle } from 'react-native'; @@ -16,8 +14,6 @@ import { appNavigate } from '../../../app/actions.native'; import { IReduxState, IStore } from '../../../app/types'; import { CONFERENCE_BLURRED, CONFERENCE_FOCUSED } from '../../../base/conference/actionTypes'; import { isDisplayNameVisible } from '../../../base/config/functions.native'; -import { FULLSCREEN_ENABLED } from '../../../base/flags/constants'; -import { getFeatureFlag } from '../../../base/flags/functions'; import Container from '../../../base/react/components/native/Container'; import LoadingIndicator from '../../../base/react/components/native/LoadingIndicator'; import TintedView from '../../../base/react/components/native/TintedView'; @@ -96,11 +92,6 @@ interface IProps extends AbstractProps { */ _filmstripVisible: boolean; - /** - * The indicator which determines whether fullscreen (immersive) mode is enabled. - */ - _fullscreenEnabled: boolean; - /** * The indicator which determines if the display name is visible. */ @@ -277,7 +268,6 @@ class Conference extends AbstractConference { override render() { const { _brandingStyles, - _fullscreenEnabled } = this.props; return ( @@ -287,13 +277,6 @@ class Conference extends AbstractConference { _brandingStyles ] }> - { - Platform.OS === 'android' - &&