Skip to content

Commit d94d18a

Browse files
committed
fix: try removing the sdk
1 parent e44a305 commit d94d18a

File tree

89 files changed

+219
-3464
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+219
-3464
lines changed

examples/SampleApp/App.tsx

Lines changed: 5 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
import React, { useEffect } from 'react';
2-
import { DevSettings, LogBox, Platform, useColorScheme } from 'react-native';
2+
import { DevSettings, LogBox, Platform, Text, useColorScheme, View } from 'react-native';
33
import { createDrawerNavigator } from '@react-navigation/drawer';
44
import { DarkTheme, DefaultTheme, NavigationContainer } from '@react-navigation/native';
55
import { createStackNavigator } from '@react-navigation/stack';
66
import { SafeAreaProvider, useSafeAreaInsets } from 'react-native-safe-area-context';
7-
import {
8-
Chat,
9-
OverlayProvider,
10-
SqliteClient,
11-
ThemeProvider,
12-
useOverlayContext,
13-
} from 'stream-chat-react-native';
147
import { getMessaging } from '@react-native-firebase/messaging';
158
import notifee, { EventType } from '@notifee/react-native';
169
import { AppContext } from './src/context/AppContext';
@@ -35,11 +28,8 @@ import { SharedGroupsScreen } from './src/screens/SharedGroupsScreen';
3528
import { ThreadScreen } from './src/screens/ThreadScreen';
3629
import { UserSelectorScreen } from './src/screens/UserSelectorScreen';
3730

38-
import type { LocalMessage, StreamChat } from 'stream-chat';
39-
4031
if (__DEV__) {
4132
DevSettings.addMenuItem('Reset local DB (offline storage)', () => {
42-
SqliteClient.resetDB();
4333
console.info('Local DB reset');
4434
});
4535
}
@@ -121,97 +111,16 @@ const App = () => {
121111
return (
122112
<SafeAreaProvider
123113
style={{
124-
backgroundColor: streamChatTheme.colors?.white_snow || '#FCFCFC',
114+
backgroundColor: '#FCFCFC',
125115
}}
126116
>
127-
<ThemeProvider style={streamChatTheme}>
128-
<NavigationContainer
129-
ref={RootNavigationRef}
130-
theme={{
131-
colors: {
132-
...(colorScheme === 'dark' ? DarkTheme : DefaultTheme).colors,
133-
background: streamChatTheme.colors?.white_snow || '#FCFCFC',
134-
},
135-
fonts: (colorScheme === 'dark' ? DarkTheme : DefaultTheme).fonts,
136-
dark: colorScheme === 'dark',
137-
}}
138-
>
139-
<AppContext.Provider value={{ chatClient, loginUser, logout, switchUser }}>
140-
{isConnecting && !chatClient ? (
141-
<LoadingScreen />
142-
) : chatClient ? (
143-
<DrawerNavigatorWrapper chatClient={chatClient} />
144-
) : (
145-
<UserSelector />
146-
)}
147-
</AppContext.Provider>
148-
</NavigationContainer>
149-
</ThemeProvider>
117+
<View><Text>This is a test build, please disregard it.</Text></View>
150118
</SafeAreaProvider>
151119
);
152120
};
153121

154-
const DrawerNavigator: React.FC = () => (
155-
<Drawer.Navigator
156-
drawerContent={MenuDrawer}
157-
screenOptions={{
158-
drawerStyle: {
159-
width: 300,
160-
},
161-
}}
162-
>
163-
<Drawer.Screen component={HomeScreen} name='HomeScreen' options={{ headerShown: false }} />
164-
</Drawer.Navigator>
165-
);
166-
167-
const isMessageAIGenerated = (message: LocalMessage) => !!message.ai_generated;
168-
169-
const DrawerNavigatorWrapper: React.FC<{
170-
chatClient: StreamChat;
171-
}> = ({ chatClient }) => {
172-
const { bottom } = useSafeAreaInsets();
173-
const streamChatTheme = useStreamChatTheme();
174-
175-
return (
176-
<GestureHandlerRootView style={{ flex: 1 }}>
177-
<OverlayProvider bottomInset={bottom} value={{ style: streamChatTheme }}>
178-
<Chat
179-
client={chatClient}
180-
enableOfflineSupport
181-
// @ts-expect-error - the `ImageComponent` prop is generic, meaning we can expect an error
182-
ImageComponent={FastImage}
183-
isMessageAIGenerated={isMessageAIGenerated}
184-
>
185-
<AppOverlayProvider>
186-
<UserSearchProvider>
187-
<DrawerNavigator />
188-
</UserSearchProvider>
189-
</AppOverlayProvider>
190-
</Chat>
191-
</OverlayProvider>
192-
</GestureHandlerRootView>
193-
);
194-
};
195-
196-
const UserSelector = () => (
197-
<UserSelectorStack.Navigator initialRouteName='UserSelectorScreen'>
198-
<UserSelectorStack.Screen
199-
component={AdvancedUserSelectorScreen}
200-
name='AdvancedUserSelectorScreen'
201-
options={{ gestureEnabled: false }}
202-
/>
203-
<UserSelectorStack.Screen
204-
component={UserSelectorScreen}
205-
name='UserSelectorScreen'
206-
options={{ gestureEnabled: false, headerShown: false }}
207-
/>
208-
</UserSelectorStack.Navigator>
209-
);
210-
211122
// TODO: Split the stack into multiple stacks - ChannelStack, CreateChannelStack etc.
212123
const HomeScreen = () => {
213-
const { overlay } = useOverlayContext();
214-
215124
return (
216125
<Stack.Navigator
217126
initialRouteName={initialChannelIdGlobalRef.current ? 'ChannelScreen' : 'MessagingScreen'}
@@ -230,7 +139,7 @@ const HomeScreen = () => {
230139
}
231140
name='ChannelScreen'
232141
options={{
233-
gestureEnabled: Platform.OS === 'ios' && overlay === 'none',
142+
gestureEnabled: Platform.OS === 'ios',
234143
headerShown: false,
235144
}}
236145
/>
@@ -285,7 +194,7 @@ const HomeScreen = () => {
285194
component={ThreadScreen}
286195
name='ThreadScreen'
287196
options={{
288-
gestureEnabled: Platform.OS === 'ios' && overlay === 'none',
197+
gestureEnabled: Platform.OS === 'ios',
289198
headerShown: false,
290199
}}
291200
/>

examples/SampleApp/ios/Podfile.lock

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ PODS:
223223
- React-RCTText (= 0.79.3)
224224
- React-RCTVibration (= 0.79.3)
225225
- React-callinvoker (0.79.3)
226-
- React-Codegen (0.1.0)
227226
- React-Core (0.79.3):
228227
- glog
229228
- hermes-engine
@@ -2425,31 +2424,6 @@ PODS:
24252424
- libwebp (~> 1.0)
24262425
- SDWebImage/Core (~> 5.10)
24272426
- SocketRocket (0.7.1)
2428-
- stream-chat-react-native (7.1.1):
2429-
- DoubleConversion
2430-
- glog
2431-
- hermes-engine
2432-
- RCT-Folly (= 2024.11.18.00)
2433-
- RCTRequired
2434-
- RCTTypeSafety
2435-
- React-Codegen
2436-
- React-Core
2437-
- React-debug
2438-
- React-Fabric
2439-
- React-featureflags
2440-
- React-graphics
2441-
- React-hermes
2442-
- React-ImageManager
2443-
- React-jsi
2444-
- React-NativeModulesApple
2445-
- React-RCTFabric
2446-
- React-renderercss
2447-
- React-rendererdebug
2448-
- React-utils
2449-
- ReactCodegen
2450-
- ReactCommon/turbomodule/bridging
2451-
- ReactCommon/turbomodule/core
2452-
- Yoga
24532427
- Yoga (0.0.0)
24542428

24552429
DEPENDENCIES:
@@ -2547,7 +2521,6 @@ DEPENDENCIES:
25472521
- RNScreens (from `../node_modules/react-native-screens`)
25482522
- RNShare (from `../node_modules/react-native-share`)
25492523
- RNSVG (from `../node_modules/react-native-svg`)
2550-
- stream-chat-react-native (from `../node_modules/stream-chat-react-native`)
25512524
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
25522525

25532526
SPEC REPOS:
@@ -2570,7 +2543,6 @@ SPEC REPOS:
25702543
- nanopb
25712544
- PromisesObjC
25722545
- PromisesSwift
2573-
- React-Codegen
25742546
- SDWebImage
25752547
- SDWebImageWebPCoder
25762548
- SocketRocket
@@ -2755,8 +2727,6 @@ EXTERNAL SOURCES:
27552727
:path: "../node_modules/react-native-share"
27562728
RNSVG:
27572729
:path: "../node_modules/react-native-svg"
2758-
stream-chat-react-native:
2759-
:path: "../node_modules/stream-chat-react-native"
27602730
Yoga:
27612731
:path: "../node_modules/react-native/ReactCommon/yoga"
27622732

@@ -2793,7 +2763,6 @@ SPEC CHECKSUMS:
27932763
RCTTypeSafety: fe728195791e1a0222aa83596a570cf377cd475e
27942764
React: 114ee161feb204412580928b743e6716aebac987
27952765
React-callinvoker: d175cf3640a993f6cd960044a7657543157f0ba9
2796-
React-Codegen: 4b8b4817cea7a54b83851d4c1f91f79aa73de30a
27972766
React-Core: e84d47ce3df8dde567f5b9668f6103f8e562d72a
27982767
React-CoreModules: ce8e588dca54cd790e2d424d0e678924e62b41b1
27992768
React-cxxreact: 2c10954abacc35e876adf46e25ebfd74a0106521
@@ -2872,7 +2841,6 @@ SPEC CHECKSUMS:
28722841
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
28732842
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
28742843
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
2875-
stream-chat-react-native: 963e1146ba5f092aa8f6c59f4e20e431a9265a69
28762844
Yoga: b2eaabf17044cd4273a661b14eb83f9fd2c90491
28772845

28782846
PODFILE CHECKSUM: 4f662370295f8f9cee909f1a4c59a614999a209d

examples/SampleApp/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@
4848
"react-native-screens": "^4.11.1",
4949
"react-native-share": "^12.0.11",
5050
"react-native-svg": "^15.12.0",
51-
"react-native-video": "^6.14.1",
52-
"stream-chat-react-native": "^7.1.2-beta.5"
51+
"react-native-video": "^6.14.1"
5352
},
5453
"devDependencies": {
5554
"@babel/core": "^7.27.4",

examples/SampleApp/src/ChatUsers.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { UserResponse } from 'stream-chat';
21

32
export const USER_TOKENS: Record<string, string> = {
43
e2etest1:
@@ -26,7 +25,7 @@ export const USER_TOKENS: Record<string, string> = {
2625
rodolphe:
2726
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoicm9kb2xwaGUifQ.tLl-I8ADBhTKB-x5FB9jK4-am0dELLXgydM6VN9rTL8',
2827
};
29-
export const USERS: Record<string, UserResponse> = {
28+
export const USERS: Record<string, unknown> = {
3029
neil: {
3130
id: 'neil',
3231
image: 'https://ca.slack-edge.com/T02RM6X6B-U01173D1D5J-0dead6eea6ea-512',

examples/SampleApp/src/components/AddMemberBottomSheet.tsx

Lines changed: 1 addition & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
View,
99
} from 'react-native';
1010
import { useSafeAreaInsets } from 'react-native-safe-area-context';
11-
import { CircleClose, Search, useTheme } from 'stream-chat-react-native';
1211

1312
import { UserSearchResultsGrid } from './UserSearch/UserSearchResultsGrid';
1413

@@ -19,8 +18,6 @@ import {
1918
} from '../context/BottomSheetOverlayContext';
2019
import { usePaginatedUsers } from '../hooks/usePaginatedUsers';
2120

22-
import type { UserResponse } from 'stream-chat';
23-
2421
const styles = StyleSheet.create({
2522
container: {
2623
height: 300,
@@ -69,12 +66,6 @@ export const AddMemberBottomSheet: React.FC = () => {
6966
const channel = data && isAddMemberBottomSheetData(data) ? data.channel : undefined;
7067

7168
const insets = useSafeAreaInsets();
72-
73-
const {
74-
theme: {
75-
colors: { accent_red, black, grey, grey_whisper, white, white_smoke },
76-
},
77-
} = useTheme();
7869
const {
7970
clearText,
8071
loading: loadingResults,
@@ -92,20 +83,6 @@ export const AddMemberBottomSheet: React.FC = () => {
9283
return null;
9384
}
9485

95-
const addMember = async (user: UserResponse) => {
96-
setAddMemberQueryInProgress(true);
97-
98-
try {
99-
await channel.addMembers([user.id]);
100-
reset();
101-
setOverlay('none');
102-
} catch (err) {
103-
console.warn('An error has occurred while adding members: ', err);
104-
setError(true);
105-
}
106-
setAddMemberQueryInProgress(false);
107-
};
108-
10986
return (
11087
<View
11188
style={[
@@ -114,80 +91,6 @@ export const AddMemberBottomSheet: React.FC = () => {
11491
marginBottom: insets.bottom,
11592
},
11693
]}
117-
>
118-
<View style={styles.inputRow}>
119-
<View
120-
style={[
121-
styles.inputBoxContainer,
122-
{
123-
backgroundColor: white,
124-
borderColor: grey_whisper,
125-
},
126-
]}
127-
>
128-
<Search pathFill={black} />
129-
<TextInput
130-
onChangeText={onChangeSearchText}
131-
onFocus={onFocusInput}
132-
placeholder='Search'
133-
placeholderTextColor={grey}
134-
style={[
135-
styles.inputBox,
136-
{
137-
color: black,
138-
},
139-
]}
140-
value={searchText}
141-
/>
142-
<TouchableOpacity onPress={clearText}>
143-
<CircleClose pathFill={grey} />
144-
</TouchableOpacity>
145-
</View>
146-
</View>
147-
<View style={styles.flex}>
148-
{addMemberQueryInProgress && (
149-
<View
150-
style={[
151-
styles.textContainer,
152-
{
153-
backgroundColor: white_smoke,
154-
},
155-
]}
156-
>
157-
<ActivityIndicator size='small' />
158-
<Text style={styles.text}>Adding user to channel</Text>
159-
</View>
160-
)}
161-
{error && (
162-
<View
163-
style={[
164-
styles.textContainer,
165-
{
166-
backgroundColor: accent_red,
167-
},
168-
]}
169-
>
170-
<Text
171-
style={[
172-
styles.text,
173-
{
174-
color: white,
175-
},
176-
]}
177-
>
178-
Error adding user to channel
179-
</Text>
180-
</View>
181-
)}
182-
183-
<UserSearchResultsGrid
184-
loading={loadingResults}
185-
loadMore={loadMore}
186-
onPress={addMember}
187-
results={results}
188-
searchText={searchText}
189-
/>
190-
</View>
191-
</View>
94+
/>
19295
);
19396
};

0 commit comments

Comments
 (0)