Fix gradient, splash screens
|
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 29 KiB |
@ -1,5 +1,5 @@
|
|||||||
<resources>
|
<resources>
|
||||||
<string name="app_name">Cally.</string>
|
<string name="app_name">"Cally "</string>
|
||||||
<string name="expo_splash_screen_resize_mode" translatable="false">contain</string>
|
<string name="expo_splash_screen_resize_mode" translatable="false">contain</string>
|
||||||
<string name="expo_splash_screen_status_bar_translucent" translatable="false">false</string>
|
<string name="expo_splash_screen_status_bar_translucent" translatable="false">false</string>
|
||||||
<string name="expo_system_ui_user_interface_style" translatable="false">light</string>
|
<string name="expo_system_ui_user_interface_style" translatable="false">light</string>
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
rootProject.name = 'Cally.'
|
rootProject.name = 'Cally '
|
||||||
|
|
||||||
dependencyResolutionManagement {
|
dependencyResolutionManagement {
|
||||||
versionCatalogs {
|
versionCatalogs {
|
||||||
|
|||||||
@ -6,13 +6,12 @@ import LinearGradient from "react-native-linear-gradient";
|
|||||||
import AddChoreDialog from "./AddChoreDialog";
|
import AddChoreDialog from "./AddChoreDialog";
|
||||||
|
|
||||||
const AddChore = () => {
|
const AddChore = () => {
|
||||||
|
|
||||||
const [isVisible, setIsVisible] = useState<boolean>(false);
|
const [isVisible, setIsVisible] = useState<boolean>(false);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<LinearGradient
|
<LinearGradient
|
||||||
colors={["transparent", "#f9f8f7"]}
|
colors={["#f9f8f700", "#f9f8f7", "#f9f8f700"]}
|
||||||
locations={[0, 0.5]}
|
locations={[0, 0.5, 1]}
|
||||||
style={styles.gradient}
|
style={styles.gradient}
|
||||||
>
|
>
|
||||||
<View style={styles.buttonContainer}>
|
<View style={styles.buttonContainer}>
|
||||||
@ -24,7 +23,7 @@ const AddChore = () => {
|
|||||||
>
|
>
|
||||||
<AntDesign name="plus" size={24} color="white"/>
|
<AntDesign name="plus" size={24} color="white"/>
|
||||||
<Text white text60R marginL-10>
|
<Text white text60R marginL-10>
|
||||||
Add To Do
|
Create new to do
|
||||||
</Text>
|
</Text>
|
||||||
</Button>
|
</Button>
|
||||||
</View>
|
</View>
|
||||||
@ -36,29 +35,22 @@ const AddChore = () => {
|
|||||||
export default AddChore;
|
export default AddChore;
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
const styles = StyleSheet.create({
|
||||||
divider: { height: 1, backgroundColor: "#e4e4e4", marginVertical: 15 },
|
|
||||||
gradient: {
|
gradient: {
|
||||||
height: "25%",
|
height: 150,
|
||||||
position: "absolute",
|
position: "absolute",
|
||||||
bottom: 0,
|
bottom: 0,
|
||||||
width: "100%",
|
width: "100%",
|
||||||
|
justifyContent: "center",
|
||||||
|
alignItems: "center",
|
||||||
},
|
},
|
||||||
buttonContainer: {
|
buttonContainer: {
|
||||||
position: "absolute",
|
|
||||||
bottom: 25,
|
|
||||||
width: "100%",
|
width: "100%",
|
||||||
|
alignItems: "center",
|
||||||
},
|
},
|
||||||
button: {
|
button: {
|
||||||
backgroundColor: "rgb(253, 23, 117)",
|
backgroundColor: "rgb(253, 23, 117)",
|
||||||
paddingVertical: 20,
|
paddingVertical: 15,
|
||||||
},
|
paddingHorizontal: 30,
|
||||||
topBtn: {
|
borderRadius: 30,
|
||||||
backgroundColor: "white",
|
|
||||||
color: "#05a8b6",
|
|
||||||
},
|
|
||||||
rotateSwitch: {
|
|
||||||
marginLeft: 35,
|
|
||||||
marginBottom: 10,
|
|
||||||
marginTop: 25,
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@ -1,11 +1,10 @@
|
|||||||
import { View, Text, Button, ButtonSize } from "react-native-ui-lib";
|
import {Button, Text, View} from "react-native-ui-lib";
|
||||||
import React, {useState} from "react";
|
import React, {useState} from "react";
|
||||||
import HeaderTemplate from "@/components/shared/HeaderTemplate";
|
import HeaderTemplate from "@/components/shared/HeaderTemplate";
|
||||||
import AddChore from "./AddChore";
|
import AddChore from "./AddChore";
|
||||||
import ProgressCard from "./ProgressCard";
|
import ProgressCard from "./ProgressCard";
|
||||||
import ToDosList from "./ToDosList";
|
import ToDosList from "./ToDosList";
|
||||||
import { Dimensions, ScrollView } from "react-native";
|
import {Dimensions, ScrollView, StyleSheet} from "react-native";
|
||||||
import { StyleSheet } from "react-native";
|
|
||||||
import {TouchableOpacity} from "react-native-gesture-handler";
|
import {TouchableOpacity} from "react-native-gesture-handler";
|
||||||
import {ProfileType, useAuthContext} from "@/contexts/AuthContext";
|
import {ProfileType, useAuthContext} from "@/contexts/AuthContext";
|
||||||
import FamilyChoresProgress from "./family-chores/FamilyChoresProgress";
|
import FamilyChoresProgress from "./family-chores/FamilyChoresProgress";
|
||||||
@ -23,6 +22,7 @@ const ToDosPage = () => {
|
|||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
);
|
);
|
||||||
return (
|
return (
|
||||||
|
<>
|
||||||
<View paddingH-25 backgroundColor="#f9f8f7" height={"100%"} width={width}>
|
<View paddingH-25 backgroundColor="#f9f8f7" height={"100%"} width={width}>
|
||||||
{pageIndex == 0 && (
|
{pageIndex == 0 && (
|
||||||
<View>
|
<View>
|
||||||
@ -60,13 +60,17 @@ const ToDosPage = () => {
|
|||||||
<ToDosList/>
|
<ToDosList/>
|
||||||
</View>
|
</View>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
{profileData?.userType == ProfileType.PARENT && <AddChore />}
|
|
||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
{pageIndex == 1 && <FamilyChoresProgress setPageIndex={setPageIndex}/>}
|
{pageIndex == 1 && <FamilyChoresProgress setPageIndex={setPageIndex}/>}
|
||||||
{pageIndex == 2 && <UserChoresProgress setPageIndex={setPageIndex}/>}
|
{pageIndex == 2 && <UserChoresProgress setPageIndex={setPageIndex}/>}
|
||||||
</View>
|
</View>
|
||||||
);
|
{
|
||||||
|
profileData?.userType == ProfileType.PARENT && <AddChore/>
|
||||||
|
}
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
;
|
||||||
};
|
};
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
const styles = StyleSheet.create({
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 29 KiB |
@ -9,7 +9,7 @@
|
|||||||
<key>CFBundleDevelopmentRegion</key>
|
<key>CFBundleDevelopmentRegion</key>
|
||||||
<string>$(DEVELOPMENT_LANGUAGE)</string>
|
<string>$(DEVELOPMENT_LANGUAGE)</string>
|
||||||
<key>CFBundleDisplayName</key>
|
<key>CFBundleDisplayName</key>
|
||||||
<string>Cally.</string>
|
<string>Cally </string>
|
||||||
<key>CFBundleExecutable</key>
|
<key>CFBundleExecutable</key>
|
||||||
<string>$(EXECUTABLE_NAME)</string>
|
<string>$(EXECUTABLE_NAME)</string>
|
||||||
<key>CFBundleIdentifier</key>
|
<key>CFBundleIdentifier</key>
|
||||||
@ -112,6 +112,7 @@
|
|||||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
|
<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
|
||||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
|
<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
|
||||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
|
<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
|
||||||
|
<string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
|
||||||
</array>
|
</array>
|
||||||
<key>UILaunchStoryboardName</key>
|
<key>UILaunchStoryboardName</key>
|
||||||
<string>SplashScreen</string>
|
<string>SplashScreen</string>
|
||||||
|
|||||||
@ -8884,7 +8884,7 @@ react-native-linear-gradient@^2.8.3:
|
|||||||
|
|
||||||
react-native-onboarding-swiper@^1.3.0:
|
react-native-onboarding-swiper@^1.3.0:
|
||||||
version "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==
|
integrity sha512-2ZPMrZrJFgR5dmVWIj60x/vTBWrm0BZPuc2w7Cz2Sq/8ChypCi3oL8F7GYMrzky1fmknCS6Z0WPphfZVpnLUnQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
tinycolor2 "^1.4.1"
|
tinycolor2 "^1.4.1"
|
||||||
|
|||||||