Skip to content

Refactor/enhance home screen #152

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

Open
abdelrhman1002 wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Refactor/enhance home screen #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c254b6
fix : when section empty remove all header and use padding top better…
abdelrhman1002 Jun 30, 2025
35c17a1
fix : add cursor brush to be more clear in dark theme and set default…
abdelrhman1002 Jun 30, 2025
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
2 changes: 2 additions & 0 deletions app/src/main/java/com/london/tudee/presentation/components/TudeeTextField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
Expand Down Expand Up @@ -125,6 +126,7 @@ fun TudeeTextField(
.fillMaxWidth()
.focusRequester(focusRequester)
.padding(end = 12.dp),
cursorBrush = SolidColor(TudeeTheme.colors.primary)
)
}
if (readOnly && onClick != null) {
Expand Down
106 changes: 45 additions & 61 deletions app/src/main/java/com/london/tudee/presentation/screens/home/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ import com.london.tudee.presentation.components.StatusCard
import com.london.tudee.presentation.components.buttons.TudeeFloatingActionButton
import com.london.tudee.presentation.components.date.DateBadge
import com.london.tudee.presentation.components.date.DateBadgeStyleValues
import com.london.tudee.presentation.components.task.EmptyTasksScreen
import com.london.tudee.presentation.components.task.TaskItem
import com.london.tudee.presentation.design_system.theme.ThemePreviews
import com.london.tudee.presentation.design_system.theme.TudeeTheme
Expand Down Expand Up @@ -143,57 +142,50 @@ private fun HomeScreenContent(
)
}"
)
if (state.allTasks.isEmpty()) {
EmptyTasksScreen()
} else {
InProgressSection(
inProgressTasks = state.inProgressTasks,
onInProgressTasksArrowClicked = onArrowClicked,
categoryIcons = taskUiState.categoryIcons,
onTaskClicked = interactions::showTaskDetailsBottomSheet,
loadTask = interactions::loadTask
)
Spacer(Modifier.height(24.dp))
ToDoSection(
toDoTasks = state.toDoTasks,
onTodoTasksArrowClicked = onArrowClicked,
categoryIcons = taskUiState.categoryIcons,
onTaskClicked = interactions::showTaskDetailsBottomSheet,
loadTask = interactions::loadTask
)
Spacer(Modifier.height(24.dp))
DoneSection(
doneTasks = state.doneTasks,
onDoneTasksArrowClicked = onArrowClicked,
categoryIcons = taskUiState.categoryIcons,
onTaskClicked = interactions::showTaskDetailsBottomSheet,
loadTask = interactions::loadTask
)
}

InProgressSection(
inProgressTasks = state.inProgressTasks,
onInProgressTasksArrowClicked = onArrowClicked,
categoryIcons = taskUiState.categoryIcons,
onTaskClicked = interactions::showTaskDetailsBottomSheet,
loadTask = interactions::loadTask
)

ToDoSection(
toDoTasks = state.toDoTasks,
onTodoTasksArrowClicked = onArrowClicked,
categoryIcons = taskUiState.categoryIcons,
onTaskClicked = interactions::showTaskDetailsBottomSheet,
loadTask = interactions::loadTask
)

DoneSection(
doneTasks = state.doneTasks,
onDoneTasksArrowClicked = onArrowClicked,
categoryIcons = taskUiState.categoryIcons,
onTaskClicked = interactions::showTaskDetailsBottomSheet,
loadTask = interactions::loadTask
)
}
}

if (state.isTaskDetailsBottomSheetVisible)
TaskDetailsBottomSheet(
uiState = state.taskDetailBottomSheetUiState,
onDismissRequest = interactions::hideTaskDetailsBottomSheet,
onMoveClick = interactions::onClickMove,
onEditClick = {
interactions.hideTaskDetailsBottomSheet()
val taskId = state.taskDetailBottomSheetUiState.task.id
interactions.onEditTask(taskId)
}
)
if (state.isTaskDetailsBottomSheetVisible) TaskDetailsBottomSheet(
uiState = state.taskDetailBottomSheetUiState,
onDismissRequest = interactions::hideTaskDetailsBottomSheet,
onMoveClick = interactions::onClickMove,
onEditClick = {
interactions.hideTaskDetailsBottomSheet()
val taskId = state.taskDetailBottomSheetUiState.task.id
interactions.onEditTask(taskId)
})


if (taskUiState.showBottomSheet)
TaskModifyBottomSheet(
uiState = taskUiState,
interactions = interactions,
onShowDatePicker = interactions::showDatePicker,
onHideDatePicker = interactions::hideDatePicker,
onDismissRequest = { interactions.toggleBottomSheet(false) }
)
if (taskUiState.showBottomSheet) TaskModifyBottomSheet(
uiState = taskUiState,
interactions = interactions,
onShowDatePicker = interactions::showDatePicker,
onHideDatePicker = interactions::hideDatePicker,
onDismissRequest = { interactions.toggleBottomSheet(false) })

Box(
modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.TopCenter
Expand Down Expand Up @@ -356,18 +348,15 @@ private fun ToDoSection(
onTaskClicked: () -> Unit,
loadTask: (Task) -> Unit
) {

if (toDoTasks.isNotEmpty() && categoryIcons.isEmpty()) {
return
}
if (toDoTasks.isEmpty() || categoryIcons.isEmpty()) return

Row(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp)
.padding(bottom = 8.dp)
.padding(bottom = 8.dp, top = 24.dp)
) {
Text(
text = stringResource(R.string.To_Do),
Expand Down Expand Up @@ -446,18 +435,15 @@ private fun InProgressSection(
onTaskClicked: () -> Unit,
loadTask: (Task) -> Unit
) {

if (inProgressTasks.isNotEmpty() && categoryIcons.isEmpty()) {
return
}
if (inProgressTasks.isEmpty() || categoryIcons.isEmpty()) return

Row(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp)
.padding(bottom = 8.dp)
.padding(bottom = 8.dp, top = 24.dp)
) {
Text(
text = stringResource(R.string.In_Progress),
Expand Down Expand Up @@ -535,17 +521,15 @@ private fun DoneSection(
loadTask: (Task) -> Unit
) {

if (doneTasks.isNotEmpty() && categoryIcons.isEmpty()) {
return
}
if (doneTasks.isEmpty() || categoryIcons.isEmpty()) return

Row(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp)
.padding(bottom = 8.dp)
.padding(bottom = 8.dp, top = 24.dp)
) {
Text(
text = stringResource(R.string.Done),
Expand Down
2 changes: 2 additions & 0 deletions ...src/main/java/com/london/tudee/presentation/screens/task/task_modify/TaskModifyDetails.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ fun TaskModifyDetails(
.weight(1f, fill = false)
.verticalScroll(rememberScrollState())
) {
if(uiState.selectedDate == null)
interactions.updateDate( System.currentTimeMillis())
TaskDetailsContent(
title = title,
uiState = uiState,
Expand Down