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

Merge branch 'dev'

Browse Source
This commit is contained in:
Milan Paunovic
2025-02-15 21:08:30 +01:00
parent b804f37037 1b5024089d
commit d9ee1cd921
7 changed files with 55 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/pages/todos/AddChoreDialog.tsx
View File

@ -174,7 +174,8 @@ const AddChoreDialog = (addChoreDialogProps: IAddChoreDialog) => {
updateToDo({
...todo,
points: points,
assignees: selectedAssignees
assignees: selectedAssignees,
currentAssignee: selectedAssignees[0],
});
} else {
return;
@ -186,6 +187,7 @@ const AddChoreDialog = (addChoreDialogProps: IAddChoreDialog) => {
done: false,
points: points,
assignees: selectedAssignees,
currentAssignee: selectedAssignees[0],
repeatDays: todo.repeatDays ?? []
});
} else {

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

@ -231,6 +231,13 @@ const ToDoItem = (props: {
</View>
<View row style={{ gap: 3 }}>
{selectedMembers?.map((member) => {
let currentAssignee = props?.item?.currentAssignee;
let opacity = 1;
if (selectedMembers?.length > 1 && currentAssignee !== member?.uid) {
opacity = 0.4;
}
return member?.pfp ? (
<ImageBackground
key={member?.uid}
@ -242,6 +249,7 @@ const ToDoItem = (props: {
overflow: "hidden",
borderWidth: 2,
borderColor: member.eventColor || "transparent",
opacity: opacity
}}
/>
) : (
@ -254,6 +262,7 @@ const ToDoItem = (props: {
borderWidth: 2,
borderRadius: 100,
borderColor: member.eventColor || "#ccc",
opacity: opacity
}}
>
<View