From 539cbd9f101c6abdc7dce69cae626106a6ad69e5 Mon Sep 17 00:00:00 2001 From: Milan Paunovic Date: Thu, 31 Oct 2024 23:41:54 +0100 Subject: [PATCH] Minor fixes --- components/pages/calendar/EventCalendar.tsx | 2 + .../pages/calendar/ManuallyAddEventModal.tsx | 6 +- components/pages/main/SignInPage.tsx | 80 ++++--- components/pages/main/SignUpPage.tsx | 3 + .../pages/settings/CalendarSettingsPage.tsx | 6 +- .../user_settings_views/MyProfile.tsx | 4 +- components/shared/HeaderTemplate.tsx | 3 +- contexts/AuthContext.tsx | 6 +- hooks/firebase/useChangeProfilePicture.ts | 2 +- ios/cally.xcodeproj/project.pbxproj | 4 +- package.json | 1 + yarn.lock | 220 ++++++++++++++++++ 12 files changed, 283 insertions(+), 54 deletions(-) diff --git a/components/pages/calendar/EventCalendar.tsx b/components/pages/calendar/EventCalendar.tsx index e5bac28..87069fe 100644 --- a/components/pages/calendar/EventCalendar.tsx +++ b/components/pages/calendar/EventCalendar.tsx @@ -95,6 +95,8 @@ export const EventCalendar: React.FC = React.memo( [profileData] ); + console.log({memoizedWeekStartsOn, profileData: profileData?.firstDayOfWeek}) + const isSameDate = useCallback((date1: Date, date2: Date) => { return ( date1.getDate() === date2.getDate() && diff --git a/components/pages/calendar/ManuallyAddEventModal.tsx b/components/pages/calendar/ManuallyAddEventModal.tsx index 70795ed..ee9b86a 100644 --- a/components/pages/calendar/ManuallyAddEventModal.tsx +++ b/components/pages/calendar/ManuallyAddEventModal.tsx @@ -343,7 +343,6 @@ export const ManuallyAddEventModal = () => { { setTitle(text); }} @@ -555,14 +554,15 @@ export const ManuallyAddEventModal = () => { - + Mark as Private diff --git a/components/pages/main/SignInPage.tsx b/components/pages/main/SignInPage.tsx index cd4b1fa..fc70c85 100644 --- a/components/pages/main/SignInPage.tsx +++ b/components/pages/main/SignInPage.tsx @@ -1,8 +1,9 @@ import { Button, - ButtonSize, Colors, + ButtonSize, + Colors, Dialog, - KeyboardAwareScrollView, LoaderScreen, Modal, + LoaderScreen, Text, TextField, TextFieldRef, @@ -14,6 +15,9 @@ import {KeyboardAvoidingView, Platform, StyleSheet} from "react-native"; import Toast from "react-native-toast-message"; import {useLoginWithQrCode} from "@/hooks/firebase/useLoginWithQrCode"; import {Camera, CameraView} from "expo-camera"; +import KeyboardManager from "react-native-keyboard-manager"; + +KeyboardManager.setEnableAutoToolbar(true); const SignInPage = ({ setTab, @@ -77,46 +81,46 @@ const SignInPage = ({ return ( { - // Move focus to the description field - passwordRef.current?.focus(); - }} - /> - -