feat(chat/native): moved ChatAndPollsNavigator to mobile/navigation (#12527)
* feat(chat/native): moved ChatAndPollsNavigator to mobile/navigation
This commit is contained in:
parent
30f3bac217
commit
74cd486232
|
@ -1,6 +1,5 @@
|
||||||
// @flow
|
// @flow
|
||||||
|
|
||||||
export { default as Chat } from './Chat';
|
export { default as Chat } from './Chat';
|
||||||
export { default as ChatAndPolls } from './ChatAndPolls';
|
|
||||||
export { default as ChatButton } from './ChatButton';
|
export { default as ChatButton } from './ChatButton';
|
||||||
export { default as ChatPrivacyDialog } from './ChatPrivacyDialog';
|
export { default as ChatPrivacyDialog } from './ChatPrivacyDialog';
|
||||||
|
|
|
@ -1,17 +1,22 @@
|
||||||
// @flow
|
/* eslint-disable lines-around-comment */
|
||||||
|
|
||||||
import { createMaterialTopTabNavigator } from '@react-navigation/material-top-tabs';
|
import { createMaterialTopTabNavigator } from '@react-navigation/material-top-tabs';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { useSelector } from 'react-redux';
|
import { useSelector } from 'react-redux';
|
||||||
|
|
||||||
import { Chat } from '../..';
|
|
||||||
import {
|
import {
|
||||||
getClientHeight,
|
getClientHeight,
|
||||||
getClientWidth
|
getClientWidth
|
||||||
} from '../../../base/modal/components/functions.native';
|
// @ts-ignore
|
||||||
import { screen } from '../../../mobile/navigation/routes';
|
} from '../../../../../base/modal/components/functions';
|
||||||
import { chatTabBarOptions } from '../../../mobile/navigation/screenOptions';
|
// @ts-ignore
|
||||||
import { PollsPane } from '../../../polls/components';
|
import { Chat } from '../../../../../chat';
|
||||||
|
// @ts-ignore
|
||||||
|
import { PollsPane } from '../../../../../polls/components';
|
||||||
|
// @ts-ignore
|
||||||
|
import { screen } from '../../../routes';
|
||||||
|
// @ts-ignore
|
||||||
|
import { chatTabBarOptions } from '../../../screenOptions';
|
||||||
|
|
||||||
const ChatTab = createMaterialTopTabNavigator();
|
const ChatTab = createMaterialTopTabNavigator();
|
||||||
|
|
||||||
|
@ -20,6 +25,7 @@ const ChatAndPolls = () => {
|
||||||
const clientWidth = useSelector(getClientWidth);
|
const clientWidth = useSelector(getClientWidth);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
// @ts-ignore
|
||||||
<ChatTab.Navigator
|
<ChatTab.Navigator
|
||||||
backBehavior = 'none'
|
backBehavior = 'none'
|
||||||
initialLayout = {{
|
initialLayout = {{
|
|
@ -1,4 +1,5 @@
|
||||||
/* eslint-disable lines-around-comment */
|
/* eslint-disable lines-around-comment */
|
||||||
|
|
||||||
import { NavigationContainer } from '@react-navigation/native';
|
import { NavigationContainer } from '@react-navigation/native';
|
||||||
import { createStackNavigator } from '@react-navigation/stack';
|
import { createStackNavigator } from '@react-navigation/stack';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
@ -6,9 +7,10 @@ import { useTranslation } from 'react-i18next';
|
||||||
import { useSelector } from 'react-redux';
|
import { useSelector } from 'react-redux';
|
||||||
|
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
import { Chat, ChatAndPolls } from '../../../../../chat';
|
import { Chat } from '../../../../../chat';
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
import Conference from '../../../../../conference/components/native/Conference';
|
import Conference from '../../../../../conference/components/native/Conference';
|
||||||
|
// @ts-ignore
|
||||||
import CarMode from '../../../../../conference/components/native/carmode/CarMode';
|
import CarMode from '../../../../../conference/components/native/carmode/CarMode';
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
import { getDisablePolls } from '../../../../../conference/functions';
|
import { getDisablePolls } from '../../../../../conference/functions';
|
||||||
|
@ -55,12 +57,12 @@ import {
|
||||||
speakerStatsScreenOptions
|
speakerStatsScreenOptions
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
} from '../../../screenOptions';
|
} from '../../../screenOptions';
|
||||||
import LobbyNavigationContainer
|
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
from '../../lobby/components/LobbyNavigationContainer';
|
import ChatAndPollsNavigator from '../../chat/components/ChatAndPollsNavigator';
|
||||||
import SettingsNavigationContainer
|
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
from '../../settings/components/SettingsNavigationContainer';
|
import LobbyNavigationContainer from '../../lobby/components/LobbyNavigationContainer';
|
||||||
|
// @ts-ignore
|
||||||
|
import SettingsNavigationContainer from '../../settings/components/SettingsNavigationContainer';
|
||||||
import {
|
import {
|
||||||
conferenceNavigationRef
|
conferenceNavigationRef
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
|
@ -80,7 +82,7 @@ const ConferenceNavigationContainer = () => {
|
||||||
chatScreenName = screen.conference.chat;
|
chatScreenName = screen.conference.chat;
|
||||||
chatTitleString = 'chat.title';
|
chatTitleString = 'chat.title';
|
||||||
} else {
|
} else {
|
||||||
ChatScreen = ChatAndPolls;
|
ChatScreen = ChatAndPollsNavigator;
|
||||||
chatScreenName = screen.conference.chatandpolls.main;
|
chatScreenName = screen.conference.chatandpolls.main;
|
||||||
chatTitleString = 'chat.titleWithPolls';
|
chatTitleString = 'chat.titleWithPolls';
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue