ammar/cally
1
0
Fork 0
mirror of https://github.com/urosran/cally.git synced 2025-11-26 16:34:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Dejan
2024-11-20 23:58:21 +01:00
parent 4f80525f13 830c1bf8ea
commit edea14b32c
13 changed files with 137 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/pages/(tablet_pages)/chores/TabletChoresPage.tsx
View File

@ -38,7 +38,14 @@ const TabletChoresPage = () => {
{user.pfp ? (
<ImageBackground
source={{ uri: user.pfp }}
style={styles.pfp}
style={[
styles.pfp,
(user.eventColor && {
borderWidth: 2,
borderColor: user.eventColor,
}) ||
undefined,
]}
borderRadius={13.33}
/>
) : (

9
components/pages/(tablet_pages)/tablet_components/UsersList.tsx
View File

@ -20,7 +20,14 @@ const UsersList = () => {
<ImageBackground
key={index}
source={{ uri: member.pfp }}
style={styles.pfp}
style={[
styles.pfp,
(member.eventColor && {
borderWidth: 2,
borderColor: member.eventColor,
}) ||
undefined,
]}
borderRadius={100}
/>
) : (

6
components/pages/calendar/CalendarPage.tsx
View File

@ -8,13 +8,13 @@ export default function CalendarPage() {
<View
style={{ flex: 1, height: "100%", padding: 10 }}
paddingH-22
paddingT-0
paddingT-22
>
<HeaderTemplate
{/*<HeaderTemplate
message={"Let's get your week started !"}
isWelcome
isCalendar={true}
/>
/>*/}
<InnerCalendar />
</View>
);

2
components/pages/calendar/EventCalendar.tsx
View File

@ -324,6 +324,7 @@ export const EventCalendar: React.FC<EventCalendarProps> = React.memo(
ampm
// renderCustomDateForMonth={renderCustomDateForMonth}
/>
<View style={{backgroundColor: 'white', height: 50, width: '100%'}} />
</>
);
@ -337,6 +338,7 @@ const styles = StyleSheet.create({
},
calHeader: {
borderWidth: 0,
paddingBottom: 60,
},
dayModeHeader: {
alignSelf: "flex-start",

2
components/pages/calendar/InnerCalendar.tsx
View File

@ -25,7 +25,7 @@ export const InnerCalendar = () => {
return (
<>
<View
style={{flex: 1, backgroundColor: "#fff", borderRadius: 30, marginBottom: 60, overflow: "hidden"}}
style={{flex: 1, backgroundColor: "#fff", borderRadius: 30, marginBottom: 10, overflow: "hidden"}}
ref={calendarContainerRef}
onLayout={onLayout}
>

1
components/pages/grocery/EditGroceryItem.tsx
View File

@ -59,7 +59,6 @@ const EditGroceryItem = ({
const handleSubmit = () => {
inputRef?.current?.blur();
console.log("CALLLLLL");
if (editGrocery.setSubmit) {
editGrocery.setSubmit(true);
}

2
components/pages/grocery/GroceryItem.tsx
View File

@ -190,6 +190,8 @@ const GroceryItem = ({
aspectRatio: 1,
borderRadius: 22,
overflow: "hidden",
borderWidth: 2,
borderColor: profileData.eventColor
}}
/>
) : (

9
components/pages/settings/user_settings_views/MyGroup.tsx
View File

@ -170,7 +170,14 @@ const MyGroup: React.FC<MyGroupProps> = ({
>
{member.pfp ? (
<ImageBackground
style={styles.pfp}
style={[
styles.pfp,
(member.eventColor && {
borderWidth: 2,
borderColor: member.eventColor,
}) ||
undefined,
]}
borderRadius={10.56}
source={{ uri: member.pfp || undefined }}
/>

9
components/pages/settings/user_settings_views/MyProfile.tsx
View File

@ -173,7 +173,14 @@ const MyProfile = () => {
{pfpUri ? (
<Image
key={pfpUri}
style={styles.pfp}
style={[
styles.pfp,
(profileData?.eventColor && {
borderWidth: 2,
borderColor: profileData.eventColor,
}) ||
undefined,
]}
source={pfpUri ? { uri: pfpUri } : null}
/>
) : (

5
components/pages/todos/ToDoItem.tsx
View File

@ -179,6 +179,8 @@ const ToDoItem = (props: {
aspectRatio: 1,
borderRadius: 22,
overflow: "hidden",
borderWidth: 2,
borderColor: member.eventColor || 'transparent'
}}
/>
) : (
@ -187,6 +189,9 @@ const ToDoItem = (props: {
position: "relative",
width: 24.64,
aspectRatio: 1,
borderWidth: 2,
borderRadius: 100,
borderColor: member.eventColor || 'transparent'
}}
>
<View