wismna/donext
1
0
Fork 0
mirror of https://github.com/wismna/DoNext.git synced 2025-10-03 15:40:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some toasts

Browse Source 
Change some icons
Fix warnings
This commit is contained in:
Geoffroy Bonneville
2025-09-24 16:24:38 -04:00
parent ba2e259c7c
commit cf770ddb83
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
donextv2/src/main/java/com/wismna/geoffroy/donext/presentation/screen/MainScreen.kt
View File

@@ -11,8 +11,8 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.filled.Menu
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.DrawerState
@@ -123,7 +123,7 @@ fun AppContent(
CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onPrimaryContainer) {
if (viewModel.currentDestination.showBackButton) {
IconButton(onClick = { navController.popBackStack() }) {
Icon(Icons.Default.ArrowBack, contentDescription = "Back")
Icon(Icons.AutoMirrored.Default.ArrowBack, contentDescription = "Back")
}
} else {
IconButton(onClick = { scope.launch { drawerState.open() } }) {

2
donextv2/src/main/java/com/wismna/geoffroy/donext/presentation/screen/ManageListsScreen.kt
View File

@@ -183,7 +183,7 @@ fun ManageListsScreen(
IconButton(onClick = { isInEditMode = true }) {
Icon(Icons.Default.Edit, contentDescription = "Edit")
}
IconButton(onClick = { viewModel.deleteTaskList(list.id!!) }) {
IconButton(onClick = { viewModel.deleteTaskList(list.id) }) {
Icon(
Icons.Default.Delete,
contentDescription = "Delete"

4
donextv2/src/main/java/com/wismna/geoffroy/donext/presentation/screen/MenuScreen.kt
View File

@@ -7,10 +7,10 @@ import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.List
import androidx.compose.material.icons.filled.DateRange
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.Edit
import androidx.compose.material.icons.filled.List
import androidx.compose.material3.Badge
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
@@ -71,7 +71,7 @@ fun MenuScreen(
overflow = TextOverflow.Ellipsis
)
},
icon = { Icon(Icons.Default.List, contentDescription = list.name) },
icon = { Icon(Icons.AutoMirrored.Default.List, contentDescription = list.name) },
selected = currentDestination is AppDestination.TaskList &&
currentDestination.taskListId == list.id,
onClick = { onNavigate("taskList/${list.id}") },

7
donextv2/src/main/java/com/wismna/geoffroy/donext/presentation/screen/TaskItemScreen.kt
View File

@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Clear
import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.Done
@@ -72,7 +73,7 @@ fun TaskItemScreen(
SwipeToDismissBox(
state = dismissState,
modifier = modifier,
backgroundContent = { DismissBackground(dismissState, viewModel.isDone) },
backgroundContent = { DismissBackground(dismissState, viewModel.isDone, viewModel.isDeleted) },
content = {
Row(
modifier = modifier
@@ -148,7 +149,7 @@ fun TaskItemScreen(
}
@Composable
fun DismissBackground(dismissState: SwipeToDismissBoxState, isDone: Boolean) {
fun DismissBackground(dismissState: SwipeToDismissBoxState, isDone: Boolean, isDeleted: Boolean) {
val color = when (dismissState.dismissDirection) {
SwipeToDismissBoxValue.StartToEnd -> MaterialTheme.colorScheme.error
SwipeToDismissBoxValue.EndToStart -> Color(0xFF18590D)
@@ -164,7 +165,7 @@ fun DismissBackground(dismissState: SwipeToDismissBoxState, isDone: Boolean) {
horizontalArrangement = Arrangement.SpaceBetween
) {
Icon(
Icons.Default.Delete,
if (isDeleted) Icons.Default.Clear else Icons.Default.Delete,
tint = Color.LightGray,
contentDescription = "Delete"
)

2
donextv2/src/main/java/com/wismna/geoffroy/donext/presentation/screen/TaskListScreen.kt
View File

@@ -101,7 +101,7 @@ fun TaskListScreen(
viewModel = TaskItemViewModel(task),
onSwipeLeft = {
viewModel.updateTaskDone(task.id!!, false)
Toast.makeText(context, "Task done", Toast.LENGTH_SHORT).show()
Toast.makeText(context, "Task in progress", Toast.LENGTH_SHORT).show()
},
onSwipeRight = {
viewModel.deleteTask(task.id!!)

1
donextv2/src/main/java/com/wismna/geoffroy/donext/presentation/viewmodel/TaskItemViewModel.kt
View File

@@ -15,6 +15,7 @@ class TaskItemViewModel(task: Task) {
val name: String = task.name
val description: String? = task.description
val isDone: Boolean = task.isDone
val isDeleted: Boolean = task.isDeleted
val priority: Priority = task.priority
val today: LocalDate = LocalDate.now(ZoneOffset.UTC)