mobile - Successfully logged into Android app and clicked around screens

Author: joe307bad

.merlin

@@ -1,20 +1,20 @@
 ####{BSB GENERATED: NO EDIT
-FLG -ppx '/Users/jbadaczewski/Source/other/act/node_modules/rescript/darwin/bsc.exe -as-ppx -bs-jsx 3'
-S /Users/jbadaczewski/Source/other/act/node_modules/rescript/lib/ocaml
-B /Users/jbadaczewski/Source/other/act/node_modules/rescript/lib/ocaml
+FLG -ppx '/Users/joebad/Source/act/node_modules/rescript/darwin/bsc.exe -as-ppx -bs-jsx 3'
+S /Users/joebad/Source/act/node_modules/rescript/lib/ocaml
+B /Users/joebad/Source/act/node_modules/rescript/lib/ocaml
 FLG -w +a-4-9-20-40-41-42-50-61-102
-S /Users/jbadaczewski/Source/other/act/node_modules/@mobily/stacks/lib/ocaml
-B /Users/jbadaczewski/Source/other/act/node_modules/@mobily/stacks/lib/ocaml
-S /Users/jbadaczewski/Source/other/act/node_modules/@rescript/react/lib/ocaml
-B /Users/jbadaczewski/Source/other/act/node_modules/@rescript/react/lib/ocaml
-S /Users/jbadaczewski/Source/other/act/node_modules/rescript-react-native/lib/ocaml
-B /Users/jbadaczewski/Source/other/act/node_modules/rescript-react-native/lib/ocaml
-S /Users/jbadaczewski/Source/other/act/node_modules/@rescript-react-native/paper/lib/ocaml
-B /Users/jbadaczewski/Source/other/act/node_modules/@rescript-react-native/paper/lib/ocaml
-S /Users/jbadaczewski/Source/other/act/node_modules/wonka/lib/ocaml
-B /Users/jbadaczewski/Source/other/act/node_modules/wonka/lib/ocaml
-S /Users/jbadaczewski/Source/other/act/node_modules/rescript-react-navigation/lib/ocaml
-B /Users/jbadaczewski/Source/other/act/node_modules/rescript-react-navigation/lib/ocaml
+S /Users/joebad/Source/act/node_modules/@mobily/stacks/lib/ocaml
+B /Users/joebad/Source/act/node_modules/@mobily/stacks/lib/ocaml
+S /Users/joebad/Source/act/node_modules/@rescript/react/lib/ocaml
+B /Users/joebad/Source/act/node_modules/@rescript/react/lib/ocaml
+S /Users/joebad/Source/act/node_modules/rescript-react-native/lib/ocaml
+B /Users/joebad/Source/act/node_modules/rescript-react-native/lib/ocaml
+S /Users/joebad/Source/act/node_modules/@rescript-react-native/paper/lib/ocaml
+B /Users/joebad/Source/act/node_modules/@rescript-react-native/paper/lib/ocaml
+S /Users/joebad/Source/act/node_modules/wonka/lib/ocaml
+B /Users/joebad/Source/act/node_modules/wonka/lib/ocaml
+S /Users/joebad/Source/act/node_modules/rescript-react-navigation/lib/ocaml
+B /Users/joebad/Source/act/node_modules/rescript-react-navigation/lib/ocaml
 S apps/mobile/re
 B lib/bs/apps/mobile/re
 ####BSB GENERATED: NO EDIT}

apps/mobile/babel.config.js

@@ -8,7 +8,8 @@ module.exports = function (api) {
     ],
     plugins: [
       ['@babel/plugin-proposal-decorators', { legacy: true }],
-      'babel-plugin-transform-typescript-metadata'
+      'babel-plugin-transform-typescript-metadata',
+      'react-native-reanimated/plugin'
     ]
   };
 };

apps/mobile/src/app/App.tsx

@@ -9,7 +9,8 @@ import {
 import Bugsnag from '@bugsnag/react-native';
 import Config from 'react-native-config';
 import { StacksProvider } from '@mobily/stacks';
-import {configureFonts, Provider, Title} from 'react-native-paper';
+import { configureFonts, Provider } from 'react-native-paper';
+import { Root } from '../../re/Index.bs';
 
 if (Config.ENABLE_BUGSNAG) {
   Bugsnag.start();
@@ -105,9 +106,7 @@ export default () => (
           <EnvironmentProvider>
             <SyncProvider>
               <SettingsProvider>
-                <Title style={{ alignSelf: 'center' }}>
-                 Hey
-                </Title>
+                <Root.make />
               </SettingsProvider>
             </SyncProvider>
           </EnvironmentProvider>

apps/mobile/src/app/Entry.tsx

@@ -10,6 +10,7 @@ import {
   createStackNavigator,
   StackHeaderProps
 } from '@react-navigation/stack';
+import { getHeaderTitle } from '@react-navigation/elements';
 import { Appbar, useTheme } from 'react-native-paper';
 import CheckinBuilder from './screens/CheckinBuilder';
 import Achievements from './screens/Achievements';
@@ -26,19 +27,18 @@ import {
 } from './shared/camera/camera';
 
 const Stack = createStackNavigator();
-export const HeaderContext =
-  createContext<{
-    excludedPendingApprovals: Set<string>;
-    setExcludedPendingApprovals: React.Dispatch<
-      React.SetStateAction<Set<string>>
-    >;
-    searchCriteria: string;
-    setSearchCriteria: React.Dispatch<React.SetStateAction<string>>;
-  }>(undefined);
+export const HeaderContext = createContext<{
+  excludedPendingApprovals: Set<string>;
+  setExcludedPendingApprovals: React.Dispatch<
+    React.SetStateAction<Set<string>>
+  >;
+  searchCriteria: string;
+  setSearchCriteria: React.Dispatch<React.SetStateAction<string>>;
+}>(undefined);
 
 const NavBar: (
   props: StackHeaderProps & { theme: ReactNativePaper.Theme }
-) => ReactElement = ({ scene, previous, navigation }) => {
+) => ReactElement = ({ navigation, route, options, back }) => {
   const [showSearch, setShowSearch] = useState<boolean>(false);
 
   const {
@@ -48,16 +48,10 @@ const NavBar: (
   } = useContext(HeaderContext);
   const { sync } = useSync();
 
-  const { options } = scene.descriptor;
-  const title =
-    options.headerTitle !== undefined
-      ? options.headerTitle
-      : options.title !== undefined
-      ? options.title
-      : scene.route.name;
+  const title = getHeaderTitle(options, route.name);
 
   const [showSearchBar, showSearchIcon] = ((): [boolean, boolean] => {
-    if (scene.route.name !== 'Achievements') {
+    if (route.name !== 'Achievements') {
       return [false, false];
     }
 
@@ -70,7 +64,7 @@ const NavBar: (
 
   return (
     <Appbar.Header>
-      {previous ? (
+      {back ? (
         <Appbar.BackAction onPress={navigation.goBack} />
       ) : null}
       {showSearchBar ? (
@@ -95,7 +89,7 @@ const NavBar: (
           onPress={() => setShowSearch(true)}
         />
       )}
-      {scene.route.name === 'PendingApprovals' && (
+      {route.name === 'PendingApprovals' && (
         <Appbar.Action
           icon="checkbox-multiple-marked-circle"
           onPress={() =>
@@ -105,13 +99,13 @@ const NavBar: (
           }
         />
       )}
-      {scene.route.name === 'Uploads' && (
+      {route.name === 'Uploads' && (
         <Appbar.Action
           icon="file-image-outline"
           onPress={() => launchImageLibrary(sync)}
         />
       )}
-      {scene.route.name === 'Uploads' && (
+      {route.name === 'Uploads' && (
         <Appbar.Action
           icon="camera-iris"
           onPress={() => launchCamera(sync)}
@@ -145,7 +139,6 @@ const EntryStack = () => {
       >
         <Stack.Navigator
           initialRouteName="Achievements"
-          headerMode="float"
           screenOptions={{
             header: (props) => <NavBar {...props} theme={theme} />
           }}