From 00583ac1150bc49d62f920c3e3b9173302cf369b Mon Sep 17 00:00:00 2001 From: Milan Paunovic Date: Sun, 20 Oct 2024 01:44:20 +0200 Subject: [PATCH] Various updates.... --- app.json | 5 +- app/_layout.tsx | 8 + .../settings/user_settings_views/MyGroup.tsx | 255 ++++++++++-------- hooks/firebase/useGetEvents.ts | 68 +++-- ios/Podfile | 1 + ios/Podfile.lock | 21 +- ios/ReactNativeKeyboardManager.swift | 7 + ios/cally.xcodeproj/project.pbxproj | 14 +- .../xcshareddata/xcschemes/cally.xcscheme | 6 +- ios/cally/Info.plist | 1 + package.json | 1 + plugins/withPodfile.js | 42 +++ yarn.lock | 5 + 13 files changed, 280 insertions(+), 154 deletions(-) create mode 100644 ios/ReactNativeKeyboardManager.swift create mode 100644 plugins/withPodfile.js diff --git a/app.json b/app.json index cc3e629..f6dccd7 100644 --- a/app.json +++ b/app.json @@ -16,7 +16,7 @@ "supportsTablet": true, "bundleIdentifier": "com.cally.app", "googleServicesFile": "./ios/GoogleService-Info.plist", - "buildNumber": "23", + "buildNumber": "30", "usesAppleSignIn": true }, "android": { @@ -74,7 +74,8 @@ "expo-apple-authentication" ], "expo-font", - "expo-localization" + "expo-localization", + "./plugins/withPodfile" ], "experiments": { "typedRoutes": true diff --git a/app/_layout.tsx b/app/_layout.tsx index 9b2e5f8..fb8d977 100644 --- a/app/_layout.tsx +++ b/app/_layout.tsx @@ -52,11 +52,19 @@ import "react-native-reanimated"; import {AuthContextProvider} from "@/contexts/AuthContext"; import {QueryClient, QueryClientProvider} from "react-query"; import {TextProps, ThemeManager, Toast, Typography,} from "react-native-ui-lib"; +import {Platform} from 'react-native'; +import KeyboardManager from 'react-native-keyboard-manager'; SplashScreen.preventAutoHideAsync(); const queryClient = new QueryClient(); + +if (Platform.OS === 'ios') { + KeyboardManager.setEnable(true); + KeyboardManager.setToolbarPreviousNextButtonEnable(true); +} + if (__DEV__) { // functions().useEmulator("localhost", 5001); // firestore().useEmulator("localhost", 5471); diff --git a/components/pages/settings/user_settings_views/MyGroup.tsx b/components/pages/settings/user_settings_views/MyGroup.tsx index de4e2e1..7164082 100644 --- a/components/pages/settings/user_settings_views/MyGroup.tsx +++ b/components/pages/settings/user_settings_views/MyGroup.tsx @@ -5,6 +5,7 @@ import { Colors, Dialog, FloatingButton, + KeyboardAwareScrollView, PanningProvider, Picker, Text, @@ -27,6 +28,7 @@ import CircledXIcon from "@/assets/svgs/CircledXIcon"; import ProfileIcon from "@/assets/svgs/ProfileIcon"; import NavToDosIcon from "@/assets/svgs/NavToDosIcon"; import Ionicons from "@expo/vector-icons/Ionicons"; +import {PreviousNextView} from "react-native-keyboard-manager"; const MyGroup = () => { const [showAddUserDialog, setShowAddUserDialog] = useState(false); @@ -299,136 +301,151 @@ const MyGroup = () => { visible={showNewUserInfoDialog} onDismiss={() => setShowNewUserInfoDialog(false)} > - - - - New User Information - - { - setShowNewUserInfoDialog(false) - }}> - - - - + + + + + + New User Information + + { + setShowNewUserInfoDialog(false) + }}> + + + + - - - } - backgroundColor={Colors.grey60} - style={{borderRadius: 25}} - center - /> - { - }}> - - Upload User Profile Photo + + + } + backgroundColor={Colors.grey60} + style={{borderRadius: 25}} + center + /> + { + }}> + + Upload User Profile Photo + + + + + Member Status + + setSelectedStatus(item)} + showSearch + floatingPlaceholder + style={styles.inViewPicker} + trailingAccessory={ + + + + } + > + + + + + + + + + {selectedStatus === ProfileType.FAMILY_DEVICE + ? "Device Name" + : "First Name"} - - - - Member Status - - setSelectedStatus(item)} - showSearch - floatingPlaceholder - style={styles.inViewPicker} - trailingAccessory={ - - - - } - > - - - - - - - - - {selectedStatus === ProfileType.FAMILY_DEVICE - ? "Device Name" - : "First Name"} - - { - lNameRef.current?.focus() - }} - blurOnSubmit={false} - /> - - {selectedStatus !== ProfileType.FAMILY_DEVICE && ( - <> - Last Name { - emailRef.current?.focus() + lNameRef.current?.focus() }} blurOnSubmit={false} + returnKeyType="next" /> - - )} - {selectedStatus !== ProfileType.FAMILY_DEVICE && ( - <> - Email Address (Optional) - + Last Name + { + emailRef.current?.focus() + }} + blurOnSubmit={false} + returnKeyType="next" + + /> + + )} + + {selectedStatus !== ProfileType.FAMILY_DEVICE && ( + <> + Email Address (Optional) + + + )} + +