feat(whiteboard/native): ui fixes

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

@@ -13,7 +13,6 @@ import { isUnsafeRoomWarningEnabled } from '../../../prejoin/functions';
 // @ts-ignore
 import WelcomePage from '../../../welcome/components/WelcomePage';
 import { isWelcomePageEnabled } from '../../../welcome/functions';
-import Whiteboard from '../../../whiteboard/components/native/Whiteboard';
 import { _ROOT_NAVIGATION_READY } from '../actionTypes';
 import { rootNavigationRef } from '../rootNavigationContainerRef';
 import { screen } from '../routes';
@@ -24,8 +23,7 @@ import {
     navigationContainerTheme,
     preJoinScreenOptions,
     unsafeMeetingScreenOptions,
-    welcomeScreenOptions,
-    whiteboardScreenOptions
+    welcomeScreenOptions
 } from '../screenOptions';
 
 import ConnectingPage from './ConnectingPage';
@@ -96,10 +94,6 @@ const RootNavigationContainer = ({ dispatch, isUnsafeRoomWarningAvailable, isWel
                     component = { ConnectingPage }
                     name = { screen.connecting }
                     options = { connectingScreenOptions } />
-                <RootStack.Screen // @ts-ignore
-                    component = { Whiteboard }
-                    name = { screen.conference.whiteboard }
-                    options = { whiteboardScreenOptions } />
                 <RootStack.Screen
                     component = { Prejoin }
                     name = { screen.preJoin }

react/features/mobile/navigation/components/conference/components/ConferenceNavigationContainer.tsx

@@ -62,7 +62,7 @@
     settingsNavigationContainerScreenOptions,
     sharedDocumentScreenOptions,
     speakerStatsScreenOptions,
-    subtitlesScreenOptions
+    subtitlesScreenOptions, whiteboardScreenOptions
     // @ts-ignore
 } from '../../../screenOptions';
 // @ts-ignore
@@ -75,6 +75,7 @@
     conferenceNavigationRef
     // @ts-ignore
 } from '../ConferenceNavigationContainerRef';
+import Whiteboard from "../../../../../whiteboard/components/native/Whiteboard";
 
 
 const ConferenceStack = createStackNavigator();
@@ -214,6 +215,14 @@
                         ...breakoutRoomsScreenOptions,
                         title: t('breakoutRooms.title')
                     }} />
+                <ConferenceStack.Screen
+                    // @ts-ignore
+                    component = { Whiteboard }
+                    name = { screen.conference.whiteboard }
+                    options = {{
+                        ...whiteboardScreenOptions,
+                        title: t('whiteboard.screenTitle')
+                    }} />
             </ConferenceStack.Navigator>
         </NavigationContainer>
     );

react/features/mobile/navigation/screenOptions.ts

@@ -191,15 +191,7 @@ export const connectingScreenOptions = {
 /**
  * Screen options for the whiteboard screen.
  */
-export const whiteboardScreenOptions = {
-    gestureEnabled: true,
-    headerStyle: {
-        backgroundColor: BaseTheme.palette.ui01
-    },
-    headerTitleStyle: {
-        color: BaseTheme.palette.text01
-    }
-};
+export const whiteboardScreenOptions = presentationScreenOptions;
 
 /**
  * Screen options for pre-join screen.

react/features/whiteboard/actions.native.ts

@@ -1,8 +1,10 @@
 import { createRestrictWhiteboardEvent } from '../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../analytics/functions';
 import { IStore } from '../app/types';
-import { navigateRoot } from '../mobile/navigation/rootNavigationContainerRef';
 import { screen } from '../mobile/navigation/routes';
+import {
+    navigate
+} from '../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
 
 import { resetWhiteboard } from './actions.any';
 
@@ -16,7 +18,7 @@
  */
 export const restrictWhiteboard = (shouldCloseWhiteboard = true) => (dispatch: IStore['dispatch']) => {
     if (shouldCloseWhiteboard) {
-        navigateRoot(screen.conference.root);
+        navigate(screen.conference.root);
     }
     dispatch(resetWhiteboard());
     sendAnalytics(createRestrictWhiteboardEvent());

react/features/whiteboard/components/native/Whiteboard.tsx

@@ -1,7 +1,7 @@
 import { Route } from '@react-navigation/native';
 import React, { PureComponent } from 'react';
 import { WithTranslation } from 'react-i18next';
-import { View, ViewStyle } from 'react-native';
+import {Platform, View, ViewStyle} from 'react-native';
 import { WebView } from 'react-native-webview';
 import { connect } from 'react-redux';
 
@@ -10,16 +10,23 @@
 import { IJitsiConference } from '../../../base/conference/reducer';
 import { openDialog } from '../../../base/dialog/actions';
 import { translate } from '../../../base/i18n/functions';
+import { IconCloseLarge } from '../../../base/icons/svg';
 import JitsiScreen from '../../../base/modal/components/JitsiScreen';
 import LoadingIndicator from '../../../base/react/components/native/LoadingIndicator';
 import { safeDecodeURIComponent } from '../../../base/util/uri';
-import { setupWhiteboard } from '../../actions.any';
+import HeaderNavigationButton
+    from '../../../mobile/navigation/components/HeaderNavigationButton';
+import {
+    goBack
+} from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef';
+import { setupWhiteboard, setWhiteboardOpen } from '../../actions.native';
 import { WHITEBOARD_ID } from '../../constants';
 import { getCollabServerUrl, getWhiteboardInfoForURIString } from '../../functions';
 
 import WhiteboardErrorDialog from './WhiteboardErrorDialog';
 import styles, { INDICATOR_COLOR } from './styles';
 
+
 interface IProps extends WithTranslation {
 
     /**
@@ -84,11 +91,30 @@
      * @returns {void}
      */
     componentDidMount() {
-        const { navigation, t } = this.props;
-
-        navigation.setOptions({
-            headerTitle: t('whiteboard.screenTitle')
-        });
+        const { dispatch, navigation, t } = this.props;
+        const headerLeft = () => {
+            if (Platform.OS === 'ios') {
+                return (
+                    <HeaderNavigationButton
+                        label = { t('dialog.close') }
+                        onPress = {() => {
+                            dispatch(setWhiteboardOpen(false));
+                            goBack();
+                        }} />
+                );
+            }
+
+            return (
+                <HeaderNavigationButton
+                    onPress = {() => {
+                        dispatch(setWhiteboardOpen(false));
+                        goBack();
+                    }}
+                    src = { IconCloseLarge } />
+            );
+        };
+
+        navigation.setOptions({ headerLeft });
     }
 
     /**

react/features/whiteboard/middleware.any.ts

@@ -45,7 +45,6 @@ MiddlewareRegistry.register((store: IStore) => next => action => {
             store.dispatch(setupWhiteboard({
                 collabDetails: metadata[WHITEBOARD_ID].collabDetails
             }));
-            store.dispatch(setWhiteboardOpen(true));
         }
 
         break;

react/features/whiteboard/middleware.native.ts

@@ -5,7 +5,6 @@ import { hideDialog, openDialog } from '../base/dialog/actions';
 import { isDialogOpen } from '../base/dialog/functions';
 import { getLocalParticipant } from '../base/participants/functions';
 import MiddlewareRegistry from '../base/redux/MiddlewareRegistry';
-import { navigateRoot } from '../mobile/navigation/rootNavigationContainerRef';
 import { screen } from '../mobile/navigation/routes';
 
 import { SET_WHITEBOARD_OPEN } from './actionTypes';
@@ -21,6 +20,9 @@ import {
     shouldNotifyUserLimit
 } from './functions';
 import './middleware.any';
+import {
+    navigate
+} from "../mobile/navigation/components/conference/ConferenceNavigationContainerRef";
 
 /**
  * Middleware which intercepts whiteboard actions to handle changes to the related state.
@@ -34,6 +36,8 @@ MiddlewareRegistry.register((store: IStore) => (next: Function) => async (action
 
     switch (action.type) {
     case SET_WHITEBOARD_OPEN: {
+        const { isOpen } = action;
+
         const enforceUserLimit = shouldEnforceUserLimit(state);
         const notifyUserLimit = shouldNotifyUserLimit(state);
 
@@ -44,7 +48,7 @@ MiddlewareRegistry.register((store: IStore) => (next: Function) => async (action
             return next(action);
         }
 
-        if (action.isOpen) {
+        if (isOpen) {
             if (enforceUserLimit) {
                 dispatch(restrictWhiteboard());
 
@@ -63,7 +67,7 @@ MiddlewareRegistry.register((store: IStore) => (next: Function) => async (action
             const collabServerUrl = getCollabServerUrl(state);
             const localParticipantName = getLocalParticipant(state)?.name;
 
-            navigateRoot(screen.conference.whiteboard, {
+            navigate(screen.conference.whiteboard, {
                 collabDetails,
                 collabServerUrl,
                 localParticipantName