Merge branch 'dev' of https://github.com/urosran/cally into dev

components/pages/calendar/EventCalendar.tsx

@@ -95,6 +95,8 @@ export const EventCalendar: React.FC<EventCalendarProps> = React.memo(
             [profileData]
         );
 
+        console.log({memoizedWeekStartsOn, profileData: profileData?.firstDayOfWeek})
+
         const isSameDate = useCallback((date1: Date, date2: Date) => {
             return (
                 date1.getDate() === date2.getDate() &&

components/pages/calendar/ManuallyAddEventModal.tsx

@@ -343,7 +343,6 @@ export const ManuallyAddEventModal = () => {
                     <TextField
                         placeholder="Add event title"
                         value={title}
-                        autoFocus
                         onChangeText={(text) => {
                             setTitle(text);
                         }}
@@ -555,14 +554,15 @@ export const ManuallyAddEventModal = () => {
                     </View>
                     <View style={styles.divider}/>
                     <View marginH-30 marginB-0 row spread centerV>
-                        <View row centerH>
+                        <View row center>
                             <LockIcon/>
                             <Text
                                 style={{
                                     fontFamily: "PlusJakartaSans_500Medium",
                                     fontSize: 16,
                                 }}
-                                marginL-10
+                                marginL-12
+                                center
                             >
                                 Mark as Private
                             </Text>

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 (
         <View padding-10 centerV height={"100%%"} style={{justifyContent: "center"}}>
             <KeyboardAvoidingView
-                contentContainerStyle={{ justifyContent:"center"}}
+                contentContainerStyle={{justifyContent: "center"}}
                 keyboardVerticalOffset={50}
                 behavior={Platform.OS === "ios" ? "padding" : "height"}
             >
                 <TextField
-                placeholder="Email"
-                keyboardType={"email-address"}
-                returnKeyType={"next"}
-                textContentType={"emailAddress"}
-                defaultValue={email}
-                onChangeText={setEmail}
-                style={styles.textfield}
-                autoComplete={"email"}
-                autoCorrect={false}
-                onSubmitEditing={() => {
-                    // Move focus to the description field
-                    passwordRef.current?.focus();
-                }}
-            />
-            <TextField
-                ref={passwordRef}
-                placeholder="Password"
-                textContentType={"oneTimeCode"}
-                value={password}
-                onChangeText={setPassword}
-                secureTextEntry
-                style={styles.textfield}
-                autoCorrect={false}
-            />
-            <Button
-                label="Log in"
-                marginT-50
-                labelStyle={{
-                    fontFamily: "PlusJakartaSans_600SemiBold",
-                    fontSize: 16,
-                }}
-                onPress={handleSignIn}
-                style={{marginBottom: 20, height: 50}}
-                backgroundColor="#fd1775"
-            />
+                    placeholder="Email"
+                    keyboardType={"email-address"}
+                    returnKeyType={"next"}
+                    textContentType={"emailAddress"}
+                    defaultValue={email}
+                    onChangeText={setEmail}
+                    style={styles.textfield}
+                    autoComplete={"email"}
+                    autoCorrect={false}
+                    onSubmitEditing={() => {
+                        // Move focus to the description field
+                        passwordRef.current?.focus();
+                    }}
+                />
+                <TextField
+                    ref={passwordRef}
+                    placeholder="Password"
+                    textContentType={"oneTimeCode"}
+                    value={password}
+                    onChangeText={setPassword}
+                    secureTextEntry
+                    style={styles.textfield}
+                    autoCorrect={false}
+                />
+                <Button
+                    label="Log in"
+                    marginT-50
+                    labelStyle={{
+                        fontFamily: "PlusJakartaSans_600SemiBold",
+                        fontSize: 16,
+                    }}
+                    onPress={handleSignIn}
+                    style={{marginBottom: 20, height: 50}}
+                    backgroundColor="#fd1775"
+                />
                 <Button
                     label="Log in with a QR Code"
                     labelStyle={{

components/pages/main/SignUpPage.tsx

@@ -12,6 +12,9 @@ import {
 import {useSignUp} from "@/hooks/firebase/useSignUp";
 import {StyleSheet} from "react-native";
 import {AntDesign} from "@expo/vector-icons";
+import KeyboardManager from "react-native-keyboard-manager";
+
+KeyboardManager.setEnableAutoToolbar(true);
 
 const SignUpPage = ({
                         setTab,

components/pages/settings/CalendarSettingsPage.tsx

@@ -322,9 +322,7 @@ const CalendarSettingsPage = () => {
 
     const handleChangeFirstDayOfWeek = (firstDayOfWeek: string) => {
         setFirstDayOfWeek(firstDayOfWeek);
-        debouncedUpdateFirstDayOfWeek(
-            firstDayOfWeek === "Sundays" ? "Mondays" : "Sundays"
-        );
+        debouncedUpdateFirstDayOfWeek(firstDayOfWeek);
     };
 
     const handleChangeColor = (color: string) => {
@@ -610,7 +608,7 @@ const CalendarSettingsPage = () => {
                             Connected Calendars
                         </Text>
 
-                        <View style={styles.noPaddingCard}>
+                        <View style={[styles.noPaddingCard, {marginBottom: 100}]}>
                             <View style={{marginTop: 20}}>
                                 {profileData?.googleAccounts &&
                                     Object.keys(profileData?.googleAccounts)?.map(

components/pages/settings/user_settings_views/MyProfile.tsx

@@ -59,7 +59,7 @@ const MyProfile = () => {
       return;
     }
     debouncedUserDataUpdate();
-  }, [timeZone, lastName, firstName, profileImage]);
+  }, [timeZone, lastName, firstName]);
 
   useEffect(() => {
     if (profileData) {
@@ -89,7 +89,7 @@ const MyProfile = () => {
 
     if (!result.canceled) {
       setProfileImage(result.assets[0].uri);
-      changeProfilePicture(result.assets[0]);
+      await changeProfilePicture(result.assets[0]);
     }
   };
 

components/shared/HeaderTemplate.tsx

@@ -9,6 +9,7 @@ import { useGetChildrenByParentId } from "@/hooks/firebase/useGetChildrenByParen
 import { useGetFamilyMembers } from "@/hooks/firebase/useGetFamilyMembers";
 import { UserProfile } from "@/hooks/firebase/types/profileTypes";
 import { child } from "@react-native-firebase/storage";
+import CachedImage from 'expo-cached-image'
 
 const HeaderTemplate = (props: {
   message: string;
@@ -80,7 +81,7 @@ const HeaderTemplate = (props: {
     <View row centerV marginV-15 style={styles.bottomMarg}>
       {profileData?.pfp ? (
         <View>
-          <Image source={{ uri: profileData.pfp }} style={styles.pfp} />
+          <CachedImage source={{ uri: profileData.pfp,  }} style={styles.pfp}  cacheKey={profileData.pfp}/>
           {isFamilyView && props.isCalendar && (
             <View style={styles.childrenPfpArr} row>
               {children?.slice(0, 3).map((child, index) => {