haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(chat/native): moved ChatAndPollsNavigator to mobile/navigation (#12527) 

* feat(chat/native): moved ChatAndPollsNavigator to mobile/navigation
This commit is contained in:
Calinteodor 2022-11-08 17:43:02 +02:00 committed by GitHub
parent 30f3bac217
commit 74cd486232
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
react/features/chat/components/native/index.js
View File

@ -1,6 +1,5 @@
// @flow
export { default as Chat } from './Chat';
export { default as ChatAndPolls } from './ChatAndPolls';
export { default as ChatButton } from './ChatButton';
export { default as ChatPrivacyDialog } from './ChatPrivacyDialog';

18
react/features/chat/components/native/ChatAndPolls.js → react/features/mobile/navigation/components/chat/components/ChatAndPollsNavigator.tsx
View File

@ -1,17 +1,22 @@
// @flow
/* eslint-disable lines-around-comment */
import { createMaterialTopTabNavigator } from '@react-navigation/material-top-tabs';
import React from 'react';
import { useSelector } from 'react-redux';
import { Chat } from '../..';
import {
getClientHeight,
getClientWidth
} from '../../../base/modal/components/functions.native';
import { screen } from '../../../mobile/navigation/routes';
import { chatTabBarOptions } from '../../../mobile/navigation/screenOptions';
import { PollsPane } from '../../../polls/components';
// @ts-ignore
} from '../../../../../base/modal/components/functions';
// @ts-ignore
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();
@ -20,6 +25,7 @@ const ChatAndPolls = () => {
const clientWidth = useSelector(getClientWidth);
return (
// @ts-ignore
<ChatTab.Navigator
backBehavior = 'none'
initialLayout = {{

14
react/features/mobile/navigation/components/conference/components/ConferenceNavigationContainer.tsx
View File

@ -1,4 +1,5 @@
/* eslint-disable lines-around-comment */
import { NavigationContainer } from '@react-navigation/native';
import { createStackNavigator } from '@react-navigation/stack';
import React from 'react';
@ -6,9 +7,10 @@ import { useTranslation } from 'react-i18next';
import { useSelector } from 'react-redux';
// @ts-ignore
import { Chat, ChatAndPolls } from '../../../../../chat';
import { Chat } from '../../../../../chat';
// @ts-ignore
import Conference from '../../../../../conference/components/native/Conference';
// @ts-ignore
import CarMode from '../../../../../conference/components/native/carmode/CarMode';
// @ts-ignore
import { getDisablePolls } from '../../../../../conference/functions';
@ -55,12 +57,12 @@ import {
speakerStatsScreenOptions
// @ts-ignore
} from '../../../screenOptions';
import LobbyNavigationContainer
// @ts-ignore
from '../../lobby/components/LobbyNavigationContainer';
import SettingsNavigationContainer
import ChatAndPollsNavigator from '../../chat/components/ChatAndPollsNavigator';
// @ts-ignore
from '../../settings/components/SettingsNavigationContainer';
import LobbyNavigationContainer from '../../lobby/components/LobbyNavigationContainer';
// @ts-ignore
import SettingsNavigationContainer from '../../settings/components/SettingsNavigationContainer';
import {
conferenceNavigationRef
// @ts-ignore
@ -80,7 +82,7 @@ const ConferenceNavigationContainer = () => {
chatScreenName = screen.conference.chat;
chatTitleString = 'chat.title';
} else {
ChatScreen = ChatAndPolls;
ChatScreen = ChatAndPollsNavigator;
chatScreenName = screen.conference.chatandpolls.main;
chatTitleString = 'chat.titleWithPolls';
}