Skip to content

new code. hopefully it works ;) #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wootzappcom wants to merge 1 commit into
base: master
Choose a base branch
from
Open

new code. hopefully it works ;) #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 35 additions & 0 deletions App.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions App.js.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

144 changes: 124 additions & 20 deletions App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,131 @@
import React from "react";
import { Provider } from 'react-redux';
import { store } from './src/store/store';
import { BrowserViewControllerConnected } from "./src/browser/BrowserViewController";
import { SafeAreaProvider } from "react-native-safe-area-context";
import React from 'react';
import {Provider} from 'react-redux';
import {View, Text} from 'react-native';
import {store} from './src/store/store';
import {BrowserViewControllerConnected} from './src/browser/BrowserViewController.tsx';
import {SafeAreaProvider} from 'react-native-safe-area-context';
import {NavigationContainer} from '@react-navigation/native';
import {createNativeStackNavigator} from '@react-navigation/native-stack';

interface Props {
}
import {Blog} from './src/browser/Blog.tsx';
import {About} from './src/browser/About.tsx';
import {Games} from './src/browser/Games.tsx';
import {Experiments} from './src/browser/Experiments.tsx';
import {Music} from './src/browser/Music.tsx';
// import Blog from '../screens/Blog.tsx';
// import Experiments from '../screens/Experiments.tsx';
// import Games from '../screens/Games.tsx';
// import Music from '../screens/Music.tsx';

interface State {
}
interface Props {}

interface State {}
class AppContainer extends React.Component<Props, State> {
render(){
const { } = this.props;
render() {
const {} = this.props;
const Stack = createNativeStackNavigator();

const NavigationContainer1 = () => {
return (
<Stack.Navigator
initialRouteName="Home"
screenOptions={{
headerShown: false,
}}>
{/* <Stack.Screen name="Home" component={Home} /> */}
{/* <Stack.Screen name="Home">
{props => (
<Home
{...props}
webView={barAwareWebView({
headerConfig: config.header,
scrollY: this.scrollY,
scrollEndDragVelocity: this.scrollEndDragVelocity,
navigation: props.navigation,
})}
/>
)}
</Stack.Screen> */}
<Stack.Screen
name="Home"
component={BrowserViewControllerConnected}
/>
<Stack.Screen name="About" component={About} />
<Stack.Screen name="Music" component={Music} />
<Stack.Screen name="Experiments" component={Experiments} />
<Stack.Screen name="Games" component={Games} />
<Stack.Screen name="Blog" component={Blog} />
{/* <Stack.Screen name="About">
{props => (
<About
{...props}
webView={barAwareWebView({
headerConfig: config.header,
scrollY: this.scrollY,
scrollEndDragVelocity: this.scrollEndDragVelocity,
navigation: props.navigation,
})}
/>
)}
</Stack.Screen> */}
{/* <Stack.Screen name="Blog">
{props => (
<Blog
{...props}
webView={barAwareWebView({
headerConfig: config.header,
scrollY: this.scrollY,
scrollEndDragVelocity: this.scrollEndDragVelocity,
navigation: props.navigation,
})}
/>
)}
</Stack.Screen>
<Stack.Screen name="Experiments">
{props => (
<Experiments
{...props}
webView={barAwareWebView({
headerConfig: config.header,
scrollY: this.scrollY,
scrollEndDragVelocity: this.scrollEndDragVelocity,
navigation: props.navigation,
})}
/>
)}
</Stack.Screen>
<Stack.Screen name="Games">
{props => <Games {...props} webView={mainWebView} />}
</Stack.Screen>
<Stack.Screen name="Music">
{props => (
<Music
{...props}
webView={barAwareWebView({
headerConfig: config.header,
scrollY: this.scrollY,
scrollEndDragVelocity: this.scrollEndDragVelocity,
navigation: props.navigation,
})}
/>
)}
</Stack.Screen> */}
{/* <Stack.Screen name="Details" component={DetailsScreen} /> */}
</Stack.Navigator>
);
};

return (
<SafeAreaProvider>
<Provider store={store}>
<BrowserViewControllerConnected/>
</Provider>
</SafeAreaProvider>
);
}
return (
<SafeAreaProvider>
<Provider store={store}>
<NavigationContainer>
{/* <BrowserViewControllerConnected /> */}
<NavigationContainer1 />
</NavigationContainer>
</Provider>
</SafeAreaProvider>
);
}
}

export default AppContainer;
export default AppContainer;
Loading