try to fix navigation some more.
This commit is contained in:
parent
c3d543be39
commit
6f941c56d1
@ -1,16 +1,11 @@
|
||||
import * as React from 'react';
|
||||
import { NavigationContainer } from '@react-navigation/native';
|
||||
import SettingsComponent from '@/components/Settings';
|
||||
import { LanguageSelection } from '@/components/LanguageSelection';
|
||||
import { createNativeStackNavigator } from '@react-navigation/native-stack';
|
||||
import ConversationThread from '@/components/ConversationThread';
|
||||
import Home from '.';
|
||||
import TTNavStack from '@/components/TTNavStack';
|
||||
|
||||
const Stack = createNativeStackNavigator();
|
||||
import * as React from "react";
|
||||
import { NavigationContainer } from "@react-navigation/native";
|
||||
import TTNavStack from "@/components/TTNavStack";
|
||||
|
||||
export default function Layout() {
|
||||
return (
|
||||
<TTNavStack />
|
||||
<NavigationContainer>
|
||||
<TTNavStack />
|
||||
</NavigationContainer>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -17,9 +17,9 @@ const Stack = createNativeStackNavigator();
|
||||
|
||||
export default function TTNavStack() {
|
||||
|
||||
const nav = useNavigation<NativeStackNavigationProp<RootStackParamList, 'ConversationThread'>>();
|
||||
|
||||
async function onLangSelected(lang: language_matrix_entry) {
|
||||
const nav = useNavigation<NativeStackNavigationProp<RootStackParamList, 'ConversationThread'>>();
|
||||
const settings = await Settings.getDefault();
|
||||
const hostLanguage = await settings.getHostLanguage();
|
||||
const conversation = new Conversation(
|
||||
@ -31,7 +31,6 @@ export default function TTNavStack() {
|
||||
}
|
||||
|
||||
return (
|
||||
<NavigationContainer>
|
||||
<Stack.Navigator initialRouteName='LanguageSelection'>
|
||||
<Stack.Screen name="LanguageSelection" >
|
||||
{ props => <LanguageSelection {...props} onLangSelected={(l) => onLangSelected(l)} />}
|
||||
@ -39,6 +38,5 @@ export default function TTNavStack() {
|
||||
<Stack.Screen name="ConversationThread" component={ConversationThread} />
|
||||
<Stack.Screen name="Settings" component={SettingsComponent} />
|
||||
</Stack.Navigator>
|
||||
</NavigationContainer>
|
||||
);
|
||||
}
|
@ -7,5 +7,5 @@ export type RootStackParamList = {
|
||||
LanguageSelection: undefined;
|
||||
ConversationThread: undefined;
|
||||
Settings: undefined;
|
||||
Conversation: { conversation: Conversation };
|
||||
Conversation: { conversation?: Conversation };
|
||||
};
|
Loading…
x
Reference in New Issue
Block a user