diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml index 7f3151d30..b78bbe62a 100644 --- a/android/app/src/main/res/values/colors.xml +++ b/android/app/src/main/res/values/colors.xml @@ -1,5 +1,5 @@ #17A0DB - #1081B2 + #161618 \ No newline at end of file diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 6b7046728..f269518c1 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -2,7 +2,7 @@ diff --git a/react/features/base/modal/components/JitsiStatusBar.js b/react/features/base/modal/components/JitsiStatusBar.js deleted file mode 100644 index ee38828f2..000000000 --- a/react/features/base/modal/components/JitsiStatusBar.js +++ /dev/null @@ -1,79 +0,0 @@ -// @flow - -import React, { useCallback } from 'react'; -import { StatusBar } from 'react-native'; - -import { ColorSchemeRegistry } from '../../color-scheme'; -import { connect } from '../../redux'; -import { isDarkColor } from '../../styles'; - -// Register style -import '../../react/components/native/headerstyles'; - -/** - * Constants for the (currently) supported statusbar colors. - */ -const STATUSBAR_DARK = 'dark-content'; -const STATUSBAR_LIGHT = 'light-content'; - - -type Props = { - - /** - * The color schemed style of the component. - */ - _styles: Object -} - -const JitsiStatusBar = ({ _styles }: Props) => { - - const getStatusBarContentColor = useCallback(() => { - const { statusBarContent } = _styles; - - if (statusBarContent) { - // We have the possibility to define the statusbar color in the - // color scheme feature, but since mobile devices (at the moment) - // only support two colors (light and dark) we need to normalize - // the value. - - if (isDarkColor(statusBarContent)) { - return STATUSBAR_DARK; - } - - return STATUSBAR_LIGHT; - } - - // The statusbar color is not defined, so we need to base our choice - // on the header colors - const { statusBar, screenHeader } = _styles; - - if (isDarkColor(statusBar || screenHeader.backgroundColor)) { - return STATUSBAR_LIGHT; - } - - return STATUSBAR_DARK; - }, [ _styles ]); - - return ( - - ); -}; - -/** - * Maps part of the Redux state to the props of the component. - * - * @param {Object} state - The Redux state. - * @returns {{ - * _styles: Object - * }} - */ -function _mapStateToProps(state) { - return { - _styles: ColorSchemeRegistry.get(state, 'Header') - }; -} - -export default connect(_mapStateToProps)(JitsiStatusBar); diff --git a/react/features/conference/components/native/Conference.js b/react/features/conference/components/native/Conference.js index b921972d2..363f72c9f 100644 --- a/react/features/conference/components/native/Conference.js +++ b/react/features/conference/components/native/Conference.js @@ -2,7 +2,7 @@ import { useIsFocused } from '@react-navigation/native'; import React, { useEffect } from 'react'; -import { BackHandler, NativeModules, SafeAreaView, StatusBar, View } from 'react-native'; +import { BackHandler, NativeModules, SafeAreaView, View } from 'react-native'; import { withSafeAreaInsets } from 'react-native-safe-area-context'; import { appNavigate } from '../../../app/actions'; @@ -268,8 +268,7 @@ class Conference extends AbstractConference { */ render() { const { - _brandingStyles, - _fullscreenEnabled + _brandingStyles } = this.props; return ( @@ -279,10 +278,6 @@ class Conference extends AbstractConference { _brandingStyles ] }> -