Merge branch 'master' of https://github.com/AppAndFlow/react-native-magic-scroll-demo

Author: EQuimper

README.md

@@ -4,7 +4,7 @@
 
 ## This is a demo app for App & Flow's <a href= "https://github.com/AppAndFlow/react-native-magic-scroll">**react-native-magic-scroll**</a> library.
 
-| Twitch  | Check Out |
+| Authentication  | Check Out |
 | ------------- | ------------- |
 | <video src="https://github.com/AppAndFlow/react-native-magic-scroll-demo/assets/129197567/c1e2b9f4-f66d-4aaf-a57d-9eb4b89400e9">  | <video src="https://github.com/AppAndFlow/react-native-magic-scroll-demo/assets/129197567/4d1a23f2-c55e-414f-a564-4883dfc2c3aa">|
 

package-lock.json

@@ -12,35 +12,35 @@
     "lint": "npx eslint --ignore-path .gitignore './src/**/*.ts[x]' './*.js' --fix"
   },
   "dependencies": {
-    "@appandflow/rn-magic-scroll": "^0.1.11",
+    "@appandflow/react-native-magic-scroll": "^0.1.14",
     "@gorhom/bottom-sheet": "^4.6.1",
-    "@react-native-community/datetimepicker": "7.7.0",
+    "@react-native-community/datetimepicker": "8.0.1",
     "@react-navigation/drawer": "^6.6.15",
     "@react-navigation/native": "^6.1.7",
     "@react-navigation/native-stack": "^6.5.0",
     "@react-navigation/stack": "^6.1.1",
+    "@types/react": "~18.0.27",
     "date-fns": "^3.6.0",
-    "expo": "51.0.2",
+    "expo": "^51.0.0",
     "expo-linear-gradient": "~13.0.2",
-    "expo-notifications": "~0.28.1",
+    "expo-notifications": "~0.28.7",
     "expo-secure-store": "~13.0.1",
-    "expo-splash-screen": "~0.27.4",
+    "expo-splash-screen": "~0.27.5",
     "expo-status-bar": "~1.12.1",
-    "expo-updates": "~0.25.11",
+    "expo-updates": "~0.25.16",
     "mobx": "^6.0.4",
     "mobx-persist": "^0.4.1",
     "mobx-react": "^7.0.5",
     "mobx-react-lite": "^3.1.6",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-native": "0.74.1",
+    "react-native": "0.74.2",
     "react-native-gesture-handler": "~2.16.1",
     "react-native-reanimated": "~3.10.1",
     "react-native-safe-area-context": "4.10.1",
     "react-native-screens": "3.31.1",
     "react-native-web": "~0.19.10",
-    "typescript": "^4.9.4",
-    "@types/react": "~18.0.27"
+    "typescript": "^4.9.4"
   },
   "devDependencies": {
     "@babel/core": "^7.24.0",

package.json

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { MagicScroll } from '@appandflow/rn-magic-scroll';
+import { MagicScroll } from '@appandflow/react-native-magic-scroll';
 import { ReturnKeyTypeOptions, TextInputProps, ViewStyle } from 'react-native';
 import Animated, { Easing, FadeInUp, FadeOutUp } from 'react-native-reanimated';
 

src/components/landing/IndependantTI.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Alert, Dimensions, Keyboard, View } from 'react-native';
-import { MagicScroll } from '@appandflow/rn-magic-scroll';
+import { MagicScroll } from '@appandflow/react-native-magic-scroll';
 
 import { Text16Asap400 } from '../common/typography';
 import IndependantTI from './IndependantTI';
@@ -71,6 +71,7 @@ const LoginScreen = () => {
           Trouble logging in?
         </Text16Asap400>
       </MagicScroll.ScrollView>
+
       <AppButton
         style={{
           width: screenWidth - 40,
@@ -91,8 +92,4 @@ const LoginScreen = () => {
   );
 };
 
-export default () => (
-  <MagicScroll.SmartScrollView>
-    <LoginScreen />
-  </MagicScroll.SmartScrollView>
-);
+export default LoginScreen;

src/components/landing/LoginScreen.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import Animated from 'react-native-reanimated';
 import { format } from 'date-fns';
 import { observer } from 'mobx-react';
-import { MagicScroll } from '@appandflow/rn-magic-scroll';
+import { MagicScroll } from '@appandflow/react-native-magic-scroll';
 import {
   Dimensions,
   Keyboard,

src/components/landing/signUp/SignUpForm.tsx

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import { MagicScroll } from '@appandflow/rn-magic-scroll';
 import { View, Dimensions, Alert } from 'react-native';
 import { observer } from 'mobx-react';
 
@@ -47,8 +46,4 @@ const SignUpScreen = observer(() => {
   );
 });
 
-export default () => (
-  <MagicScroll.SmartScrollView>
-    <SignUpScreen />
-  </MagicScroll.SmartScrollView>
-);
+export default SignUpScreen;

src/components/landing/signUp/SignUpScreen.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { MagicScroll } from '@appandflow/rn-magic-scroll';
+import { MagicScroll } from '@appandflow/react-native-magic-scroll';
 import { Alert, Keyboard, View } from 'react-native';
 
 import ShopTextInput from './ShopTextInput';
@@ -212,8 +212,4 @@ const ShopAddressView = () => {
   );
 };
 
-export default () => (
-  <MagicScroll.SmartScrollView>
-    <ShopAddressView />
-  </MagicScroll.SmartScrollView>
-);
+export default ShopAddressView;

src/components/shop/ShopAddressView.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { View } from 'react-native';
-import { MagicScroll } from '@appandflow/rn-magic-scroll';
+import { MagicScroll } from '@appandflow/react-native-magic-scroll';
 
 import OrderSummarySection from './OrderSummarySection';
 import colors from '../../constants/colors';
@@ -40,8 +40,4 @@ const ShopCheckOutScreen = () => {
   );
 };
 
-export default () => (
-  <MagicScroll.SmartScrollView>
-    <ShopCheckOutScreen />
-  </MagicScroll.SmartScrollView>
-);
+export default ShopCheckOutScreen;

src/components/shop/ShopCheckOutScreen.tsx

@@ -1,4 +1,4 @@
-import { MagicScroll } from '@appandflow/rn-magic-scroll';
+import { MagicScroll } from '@appandflow/react-native-magic-scroll';
 import * as React from 'react';
 import { Alert, Keyboard, View } from 'react-native';
 
@@ -157,8 +157,4 @@ const ShopPaymentView = () => {
   );
 };
 
-export default () => (
-  <MagicScroll.SmartScrollView>
-    <ShopPaymentView />
-  </MagicScroll.SmartScrollView>
-);
+export default ShopPaymentView;

src/components/shop/ShopPaymentView.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { MagicScroll } from '@appandflow/rn-magic-scroll';
+import { MagicScroll } from '@appandflow/react-native-magic-scroll';
 import {
   ReturnKeyTypeOptions,
   TextInputProps,