Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature: Pin Tasks #479

Merged
merged 8 commits into from
Feb 24, 2024
Merged

Feature: Pin Tasks #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7cafaee
Add new isPinned to Task model
serbelga Feb 22, 2024
1de97a5
Update Strings
serbelga Feb 22, 2024
af26975
Update Pinned/Others title separator
serbelga Feb 23, 2024
a1320a2
Update :common:database tests
serbelga Feb 23, 2024
0386287
Update app-desktop and app-ios implementation
serbelga Feb 23, 2024
26a9b96
Update HomeScreen
serbelga Feb 24, 2024
0444b78
Pin multiple task items
serbelga Feb 24, 2024
960dc2e
Apply spotless
serbelga Feb 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app-android/src/main/java/dev/sergiobelda/todometer/app/android/ui/home/HomeRoute.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ internal fun HomeRoute(
homeViewModel.clearSelectedTasks()
},
onSelectTaskItem = { homeViewModel.toggleSelectTask(it) },
onToggleSelectedTasksPinnedValueClick = { homeViewModel.toggleSelectedTasksPinnedValue() },
homeUiState = homeViewModel.homeUiState
)
}
3 changes: 3 additions & 0 deletions ...id/src/main/java/dev/sergiobelda/todometer/app/android/ui/taskdetails/TaskDetailsRoute.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ internal fun TaskDetailsRoute(
},
onAddTaskCheckListItem = { text ->
taskDetailsViewModel.insertTaskChecklistItem(text)
},
toggleTaskPinnedValueClick = {
taskDetailsViewModel.toggleTaskPinnedValueUseCase()
}
)
}
1 change: 1 addition & 0 deletions app-desktop/src/jvmMain/kotlin/dev/sergiobelda/todometer/app/desktop/ui/home/HomeRoute.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ internal fun HomeRoute(
homeViewModel.clearSelectedTasks()
},
onSelectTaskItem = { homeViewModel.toggleSelectTask(it) },
onToggleSelectedTasksPinnedValueClick = { homeViewModel.toggleSelectedTasksPinnedValue() },
homeUiState = homeViewModel.homeUiState
)
}
3 changes: 3 additions & 0 deletions ...c/jvmMain/kotlin/dev/sergiobelda/todometer/app/desktop/ui/taskdetails/TaskDetailsRoute.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ internal fun TaskDetailsRoute(
},
onAddTaskCheckListItem = { text ->
taskDetailsViewModel.insertTaskChecklistItem(text)
},
toggleTaskPinnedValueClick = {
taskDetailsViewModel.toggleTaskPinnedValueUseCase()
}
)
}
1 change: 1 addition & 0 deletions app-ios/src/iosMain/kotlin/dev/sergiobelda/todometer/app/ios/ui/home/HomeRoute.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ internal fun HomeRoute(
homeViewModel.clearSelectedTasks()
},
onSelectTaskItem = { homeViewModel.toggleSelectTask(it) },
onToggleSelectedTasksPinnedValueClick = { homeViewModel.toggleSelectedTasksPinnedValue() },
homeUiState = homeViewModel.homeUiState
)
}
3 changes: 3 additions & 0 deletions ...s/src/iosMain/kotlin/dev/sergiobelda/todometer/app/ios/ui/taskdetails/TaskDetailsRoute.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ internal fun TaskDetailsRoute(
},
onAddTaskCheckListItem = { text ->
taskDetailsViewModel.insertTaskChecklistItem(text)
},
toggleTaskPinnedValueClick = {
taskDetailsViewModel.toggleTaskPinnedValueUseCase()
}
)
}
32 changes: 14 additions & 18 deletions ...n/ui/src/commonMain/kotlin/dev/sergiobelda/todometer/app/common/ui/components/TaskItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ import dev.sergiobelda.todometer.common.resources.TodometerResources
@Composable
fun TaskItem(
taskItem: TaskItem,
onDoingClick: (String) -> Unit,
onDoneClick: (String) -> Unit,
onTaskItemClick: (String) -> Unit,
onTaskItemLongClick: (String) -> Unit,
onDoingClick: () -> Unit,
onDoneClick: () -> Unit,
onTaskItemClick: () -> Unit,
onTaskItemLongClick: () -> Unit,
onSwipeToDismiss: () -> Unit,
modifier: Modifier = Modifier,
swipeable: Boolean = false,
Expand Down Expand Up @@ -158,10 +158,10 @@ internal expect fun TaskItemBackgroundIcon(
@Composable
private fun TaskItemContent(
taskItem: TaskItem,
onDoingClick: (String) -> Unit,
onDoneClick: (String) -> Unit,
onClick: (String) -> Unit,
onLongClick: (String) -> Unit,
onDoingClick: () -> Unit,
onDoneClick: () -> Unit,
onClick: () -> Unit,
onLongClick: () -> Unit,
checkEnabled: Boolean,
selected: Boolean,
modifier: Modifier = Modifier,
Expand All @@ -179,12 +179,8 @@ private fun TaskItemContent(
) {
Column(
modifier = Modifier.combinedClickable(
onClick = {
onClick(taskItem.id)
},
onLongClick = {
onLongClick(taskItem.id)
}
onClick = onClick,
onLongClick = onLongClick
)
) {
TaskItemHeadlineContent(
Expand Down Expand Up @@ -224,8 +220,8 @@ private fun TaskItemContent(
@Composable
private fun TaskItemHeadlineContent(
taskItem: TaskItem,
onDoingClick: (String) -> Unit,
onDoneClick: (String) -> Unit,
onDoingClick: () -> Unit,
onDoneClick: () -> Unit,
checkEnabled: Boolean = true
) {
Row(
Expand All @@ -249,9 +245,9 @@ private fun TaskItemHeadlineContent(
IconButton(
onClick = {
if (taskItem.state == TaskState.DONE) {
onDoingClick(taskItem.id)
onDoingClick()
} else {
onDoneClick(taskItem.id)
onDoneClick()
}
},
modifier = Modifier.alpha(if (checkEnabled) Alpha.Disabled else Alpha.High),
Expand Down
Loading