Make screens work

App/Screens/Loading/Loading.tsx

@@ -25,6 +25,13 @@ import * as theme from '../../utils/theme';
 // The variable returned by setTimeout for longWaiting
 let longWaitingTimeout: NodeJS.Timeout | null = null;
 
+function clearLongWaiting() {
+ if (longWaitingTimeout) {
+ clearTimeout(longWaitingTimeout);
+ longWaitingTimeout = null;
+ }
+}
+
 export function Loading() {
  const api = useContext(ApiContext);
  const gps = useContext(GpsLocationContext);
@@ -38,12 +45,13 @@ export function Loading() {
  console.log('<Loading> - Long waiting');
  setLongWaiting(true);
  }, 2000);
+
+ return clearLongWaiting;
  }, []);
 
  useEffect(() => {
- if (api && longWaitingTimeout) {
- clearTimeout(longWaitingTimeout);
- longWaitingTimeout = null;
+ if (api) {
+ clearLongWaiting();
  }
  }, [api]);
 

App/Screens/Screens.tsx

@@ -14,12 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Sh**t! I Smoke. If not, see <http:https://www.gnu.org/licenses/>.
 
-import React from 'react';
+import React, { useContext } from 'react';
 import { View } from 'react-native';
 import {
  createAppContainer,
  createStackNavigator,
- createSwitchNavigator,
  StackNavigatorConfig
 } from 'react-navigation';
 
@@ -29,6 +28,7 @@ import { ErrorScreen } from './ErrorScreen';
 // import { Home } from './Home';
 import { Loading } from './Loading';
 import { Search } from './Search';
+import { Api, ApiContext, ErrorContext } from '../stores';
 import * as theme from '../utils/theme';
 
 function stackNavigatorOptions(initialRouteName: string) {
@@ -84,50 +84,24 @@ const ErrorStack = createAppContainer(
  )
 );
 
-// @inject('stores')
-// @observer
-// export class Screens extends Component {
-// componentDidCatch(error) {
-// this.props.stores.setError(error.message);
-// }
-
-// render() {
-// return <View style={theme.fullScreen}>{this.renderScreen()}</View>;
-// }
+export function Screens() {
+ const api = useContext(ApiContext);
+ const { error } = useContext(ErrorContext);
 
-// renderScreen = () => {
-// const {
-// stores: { api, error, location }
-// } = this.props;
+ const stack = renderScreen(api, error);
 
-// if (error) {
-// return <ErrorStack />;
-// }
+ return <View style={theme.fullScreen}>{stack}</View>;
+}
 
-// if (!api || !location.current) {
-// return <Loading />;
-// }
+function renderScreen(api?: Api, error?: string) {
+ if (error) {
+ return <ErrorStack />;
+ }
 
-// return <RootStack />;
-// };
-// }
+ if (!api) {
+  return <Loading />;
+  }
 
-const RootNavigator = createAppContainer(
- createSwitchNavigator(
- {
- Error: ErrorStack,
- Loading: Loading
- },
- {
- initialRouteName: 'Loading'
- }
- )
-);
-
-export function Screens() {
- return (
- <View style={theme.fullScreen}>
- <RootNavigator />
- </View>
- );
+ return null;
+ // return <RootStack />;
 }