diff --git a/android/app/src/main/res/drawable-hdpi/splashscreen_image.png b/android/app/src/main/res/drawable-hdpi/splashscreen_image.png index c52c2c6..fbc2a87 100644 Binary files a/android/app/src/main/res/drawable-hdpi/splashscreen_image.png and b/android/app/src/main/res/drawable-hdpi/splashscreen_image.png differ diff --git a/android/app/src/main/res/drawable-mdpi/splashscreen_image.png b/android/app/src/main/res/drawable-mdpi/splashscreen_image.png index c52c2c6..fbc2a87 100644 Binary files a/android/app/src/main/res/drawable-mdpi/splashscreen_image.png and b/android/app/src/main/res/drawable-mdpi/splashscreen_image.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png b/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png index c52c2c6..fbc2a87 100644 Binary files a/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png and b/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png b/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png index c52c2c6..fbc2a87 100644 Binary files a/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png and b/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png b/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png index c52c2c6..fbc2a87 100644 Binary files a/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png and b/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png differ diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index e5e1871..22880b8 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - Cally. + "Cally " contain false light diff --git a/android/settings.gradle b/android/settings.gradle index 86a6fdf..418d91d 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = 'Cally.' +rootProject.name = 'Cally ' dependencyResolutionManagement { versionCatalogs { diff --git a/components/pages/todos/AddChore.tsx b/components/pages/todos/AddChore.tsx index 5e64af0..340de47 100644 --- a/components/pages/todos/AddChore.tsx +++ b/components/pages/todos/AddChore.tsx @@ -1,64 +1,56 @@ -import { StyleSheet } from "react-native"; -import React, { useState } from "react"; -import { Button, ButtonSize, Text, View } from "react-native-ui-lib"; -import { AntDesign } from "@expo/vector-icons"; +import {StyleSheet} from "react-native"; +import React, {useState} from "react"; +import {Button, ButtonSize, Text, View} from "react-native-ui-lib"; +import {AntDesign} from "@expo/vector-icons"; import LinearGradient from "react-native-linear-gradient"; import AddChoreDialog from "./AddChoreDialog"; const AddChore = () => { + const [isVisible, setIsVisible] = useState(false); - const [isVisible, setIsVisible] = useState(false); - - return ( - - - - - - - ); + + + + + + ); }; export default AddChore; const styles = StyleSheet.create({ - divider: { height: 1, backgroundColor: "#e4e4e4", marginVertical: 15 }, - gradient: { - height: "25%", - position: "absolute", - bottom: 0, - width: "100%", - }, - buttonContainer: { - position: "absolute", - bottom: 25, - width: "100%", - }, - button: { - backgroundColor: "rgb(253, 23, 117)", - paddingVertical: 20, - }, - topBtn: { - backgroundColor: "white", - color: "#05a8b6", - }, - rotateSwitch: { - marginLeft: 35, - marginBottom: 10, - marginTop: 25, - }, -}); + gradient: { + height: 150, + position: "absolute", + bottom: 0, + width: "100%", + justifyContent: "center", + alignItems: "center", + }, + buttonContainer: { + width: "100%", + alignItems: "center", + }, + button: { + backgroundColor: "rgb(253, 23, 117)", + paddingVertical: 15, + paddingHorizontal: 30, + borderRadius: 30, + }, +}); \ No newline at end of file diff --git a/components/pages/todos/ToDosPage.tsx b/components/pages/todos/ToDosPage.tsx index 8c3aa46..8dddfc2 100644 --- a/components/pages/todos/ToDosPage.tsx +++ b/components/pages/todos/ToDosPage.tsx @@ -1,79 +1,83 @@ -import { View, Text, Button, ButtonSize } from "react-native-ui-lib"; -import React, { useState } from "react"; +import {Button, Text, View} from "react-native-ui-lib"; +import React, {useState} from "react"; import HeaderTemplate from "@/components/shared/HeaderTemplate"; import AddChore from "./AddChore"; import ProgressCard from "./ProgressCard"; import ToDosList from "./ToDosList"; -import { Dimensions, ScrollView } from "react-native"; -import { StyleSheet } from "react-native"; -import { TouchableOpacity } from "react-native-gesture-handler"; -import { ProfileType, useAuthContext } from "@/contexts/AuthContext"; +import {Dimensions, ScrollView, StyleSheet} from "react-native"; +import {TouchableOpacity} from "react-native-gesture-handler"; +import {ProfileType, useAuthContext} from "@/contexts/AuthContext"; import FamilyChoresProgress from "./family-chores/FamilyChoresProgress"; import UserChoresProgress from "./user-chores/UserChoresProgress"; const ToDosPage = () => { - const [pageIndex, setPageIndex] = useState(0); - const { profileData } = useAuthContext(); - const { width, height } = Dimensions.get("screen"); - const pageLink = ( - setPageIndex(1)}> - - View family progress - - - ); - return ( - - {pageIndex == 0 && ( - - - - - {profileData?.userType == ProfileType.CHILD && ( - - setPageIndex(2)} - > - (0); + const {profileData} = useAuthContext(); + const {width, height} = Dimensions.get("screen"); + const pageLink = ( + setPageIndex(1)}> + + View family progress + + + ); + return ( + <> + + {pageIndex == 0 && ( + + - View your full progress report here - - - } - /> - - )} - + + + {profileData?.userType == ProfileType.CHILD && ( + + setPageIndex(2)} + > + + View your full progress report here + + + } + /> + + )} + + + + + )} + {pageIndex == 1 && } + {pageIndex == 2 && } - - {profileData?.userType == ProfileType.PARENT && } - - )} - {pageIndex == 1 && } - {pageIndex == 2 && } - - ); + { + profileData?.userType == ProfileType.PARENT && + } + + ) + ; }; const styles = StyleSheet.create({ - linkBtn: { - backgroundColor: "transparent", - padding: 0, - }, + linkBtn: { + backgroundColor: "transparent", + padding: 0, + }, }); export default ToDosPage; diff --git a/ios/cally/Images.xcassets/SplashScreen.imageset/image.png b/ios/cally/Images.xcassets/SplashScreen.imageset/image.png index c52c2c6..fbc2a87 100644 Binary files a/ios/cally/Images.xcassets/SplashScreen.imageset/image.png and b/ios/cally/Images.xcassets/SplashScreen.imageset/image.png differ diff --git a/ios/cally/Info.plist b/ios/cally/Info.plist index a202a32..504bab0 100644 --- a/ios/cally/Info.plist +++ b/ios/cally/Info.plist @@ -9,7 +9,7 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - Cally. + Cally CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -112,6 +112,7 @@ $(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route $(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route $(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route + $(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route UILaunchStoryboardName SplashScreen diff --git a/yarn.lock b/yarn.lock index 6510025..ad2f2f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8884,7 +8884,7 @@ react-native-linear-gradient@^2.8.3: react-native-onboarding-swiper@^1.3.0: version "1.3.0" - resolved "https://registry.npmjs.org/react-native-onboarding-swiper/-/react-native-onboarding-swiper-1.3.0.tgz" + resolved "https://registry.yarnpkg.com/react-native-onboarding-swiper/-/react-native-onboarding-swiper-1.3.0.tgz#a97f945f03a036845242b3e1f319c6fdb262bc2b" integrity sha512-2ZPMrZrJFgR5dmVWIj60x/vTBWrm0BZPuc2w7Cz2Sq/8ChypCi3oL8F7GYMrzky1fmknCS6Z0WPphfZVpnLUnQ== dependencies: tinycolor2 "^1.4.1"