Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import {
Image,
Modal,
PanResponder,
SafeAreaView,
StyleSheet,
Text,
TouchableOpacity,
Expand All @@ -22,6 +21,7 @@ import {
View,
} from 'react-native';
import { BOTTOM_CONTROLS_HEIGHT } from '../constants';
import { SafeAreaView } from 'react-native-safe-area-context';

type DrawerProps = {
isVisible: boolean;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React, { useMemo } from 'react';
import { ActivityIndicator, SafeAreaView, StyleSheet } from 'react-native';
import { ActivityIndicator, StyleSheet, View } from 'react-native';
import { useTheme } from '@stream-io/video-react-native-sdk';

export const AuthenticationProgress = () => {
const styles = useStyles();
return (
<SafeAreaView style={styles.container}>
<View style={styles.container}>
<ActivityIndicator size={'large'} style={StyleSheet.absoluteFill} />
</SafeAreaView>
</View>
);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import {
FlatList,
Modal,
PanResponder,
SafeAreaView,
StyleSheet,
Text,
TouchableOpacity,
Expand All @@ -24,6 +23,7 @@ import { BOTTOM_CONTROLS_HEIGHT } from '../constants';
import RaiseHand from '../assets/RaiseHand';
import { CallStats } from './CallStats';
import { VideoFilters } from './VideoEffects';
import { SafeAreaProvider, SafeAreaView } from 'react-native-safe-area-context';

export type DrawerOption = {
id: string;
Expand Down Expand Up @@ -207,8 +207,8 @@ export const BottomControlsDrawer: React.FC<DrawerProps> = ({
supportedOrientations={['portrait', 'landscape']}
>
<TouchableWithoutFeedback onPress={onClose}>
<View style={styles.overlay}>
<SafeAreaView style={styles.safeArea}>
<SafeAreaProvider>
<SafeAreaView style={styles.overlay} edges={['bottom']}>
<Animated.View
style={[styles.container, { transform: [{ translateY }] }]}
>
Expand All @@ -217,7 +217,7 @@ export const BottomControlsDrawer: React.FC<DrawerProps> = ({
{showCallStats && <CallStats showCodecInfo />}
</Animated.View>
</SafeAreaView>
</View>
</SafeAreaProvider>
</TouchableWithoutFeedback>
</Modal>
);
Expand All @@ -234,10 +234,6 @@ const useStyles = () => {
flex: 1,
justifyContent: 'flex-end',
},
safeArea: {
flex: 1,
justifyContent: 'flex-end',
},
container: {
backgroundColor: colors.sheetPrimary,
borderTopLeftRadius: variants.borderRadiusSizes.lg,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {
FlatList,
Modal,
Pressable,
SafeAreaView,
Share,
StyleSheet,
Text,
Expand All @@ -34,6 +33,7 @@ import { generateParticipantTitle } from '../utils';
import { Z_INDEX } from '../constants';
import { ButtonTestIds } from '../constants/TestIds';
import { useAppGlobalStoreValue } from '../contexts/AppContext';
import { SafeAreaView } from 'react-native-safe-area-context';

export interface ParticipantsInfoListProps {
/**
Expand Down Expand Up @@ -272,6 +272,7 @@ const useStyles = () => {
borderRadius: 15,
marginHorizontal: 16,
marginTop: 65,
flexShrink: 1,
},
header: {
flexDirection: 'row',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
import React, { useEffect, useMemo, useState } from 'react';
import {
Pressable,
SafeAreaView,
StatusBar,
StyleSheet,
Text,
View,
} from 'react-native';
import { Pressable, StatusBar, StyleSheet, Text, View } from 'react-native';
import {
Channel,
MessageInput,
Expand Down Expand Up @@ -60,6 +53,7 @@ const ChannelHeader = () => {
};

export const ChatScreen = ({ route }: ChatScreenProps) => {
const styles = useStyles();
const [channel, setChannel] = useState<ChannelType>();
const { client } = useChatContext();
const {
Expand All @@ -77,14 +71,14 @@ export const ChatScreen = ({ route }: ChatScreenProps) => {
}

return (
<SafeAreaView>
<View style={styles.container}>
<StatusBar barStyle="default" />
<Channel channel={channel} keyboardVerticalOffset={120}>
<ChannelHeader />
<MessageList />
<MessageInput />
</Channel>
</SafeAreaView>
</View>
);
};

Expand All @@ -93,6 +87,10 @@ const useStyles = () => {
return useMemo(
() =>
StyleSheet.create({
container: {
flex: 1,
backgroundColor: theme.colors.sheetSecondary,
},
header: {
padding: 10,
flexDirection: 'row',
Expand Down