Fix/add bottom sheet home

app/src/main/java/com/example/tudee/presentation/components/TaskContent.kt

@@ -20,6 +20,7 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Button
 import androidx.compose.material3.DatePicker
+import androidx.compose.material3.DatePickerDefaults
 import androidx.compose.material3.DatePickerDialog
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
@@ -41,13 +42,13 @@ import com.example.tudee.designsystem.theme.TudeeTheme
 import com.example.tudee.presentation.components.buttons.ButtonState
 import com.example.tudee.presentation.components.buttons.PrimaryButton
 import com.example.tudee.presentation.components.buttons.SecondaryButton
+import com.example.tudee.presentation.screen.category.model.toUiImage
 import com.example.tudee.presentation.screen.home.viewmodel.CategoryUiState
 import com.example.tudee.presentation.screen.home.viewmodel.HomeActions
 import com.example.tudee.presentation.screen.home.viewmodel.HomeUiState
 import com.example.tudee.presentation.screen.home.viewmodel.TaskPriorityUiState
 import com.example.tudee.presentation.screen.home.viewmodel.TaskUiState
 import com.example.tudee.presentation.utils.clickWithRipple
-import com.example.tudee.presentation.utils.toCategoryIcon
 import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.TimeZone
@@ -143,7 +144,7 @@ fun TaskContent(
                     placeholder = stringResource(R.string.set_due_date),
                     leadingContent = { isFocused ->
                         DefaultLeadingContent(
-                            modifier = Modifier.clickWithRipple{ showDatePicker = true },
+                            modifier = Modifier.clickWithRipple { showDatePicker = true },
                             painter = painterResource(R.drawable.ic_add_calendar),
                             isFocused = isFocused
                         )
@@ -184,7 +185,13 @@ fun TaskContent(
                             modifier = Modifier
                                 .padding(top = 8.dp)
                                 .clip(CircleShape)
-                                .clickWithRipple { onAction(HomeActions.OnEditTaskPriorityChanged(priority)) }
+                                .clickWithRipple {
+                                    onAction(
+                                        HomeActions.OnEditTaskPriorityChanged(
+                                            priority
+                                        )
+                                    )
+                                }
                         )
                     }
                 }
@@ -202,7 +209,7 @@ fun TaskContent(
                     columns = GridCells.Adaptive(minSize = 104.dp),
                     verticalArrangement = Arrangement.spacedBy(24.dp),
                     horizontalArrangement = Arrangement.spacedBy(8.dp),
-                    modifier =Modifier
+                    modifier = Modifier
                         .heightIn(max = 3000.dp)
                         .fillMaxWidth()
                         .padding(bottom = 160.dp),
@@ -211,9 +218,7 @@ fun TaskContent(
                     items(categories) { categories ->
 
                         CategoryItemWithBadge(
-                            categoryPainter = painterResource(
-                                categories.image.toCategoryIcon()
-                            ),
+                            categoryPainter = categories.image.toUiImage().asPainter(),
                             showCheckedIcon = state.selectedTask.taskCategory.id == categories.id,
                             badgeBackgroundColor = TudeeTheme.color.statusColors.greenAccent,
                             categoryName = categories.title,
@@ -246,7 +251,11 @@ fun TaskContent(
         ) {
             PrimaryButton(
                 modifier = Modifier.fillMaxWidth(),
-                state = if (state.selectedTask.taskDescription.isNotBlank() == true && state.selectedTask.taskTitle.isNotBlank() == true) ButtonState.IDLE else ButtonState.DISABLED,
+                state = if (state.selectedTask.taskDescription.isNotBlank() == true &&
+                    state.selectedTask.taskTitle.isNotBlank() == true &&
+                    state.selectedTask.taskCategory.title.isNotBlank() == true
+
+                ) ButtonState.IDLE else ButtonState.DISABLED,
                 onClick = {
                     if (mode == TaskContentMode.EDIT) {
                         onAction(HomeActions.OnEditTaskButtonClicked)
@@ -283,6 +292,10 @@ fun DatePickerDialogComponent(
 
     DatePickerDialog(
         onDismissRequest = onDismiss,
+        colors = DatePickerDefaults.colors(
+            containerColor = TudeeTheme.color.surface
+            , titleContentColor = TudeeTheme.color.textColors.title
+        ),
         confirmButton = {
             Button(onClick = {
                 val selectedDateMillis = datePickerState.selectedDateMillis
@@ -306,7 +319,24 @@ fun DatePickerDialogComponent(
             }
         }
     ) {
-        DatePicker(state = datePickerState)
+        DatePicker(state = datePickerState
+,   headline = {
+
+            },
+            colors = DatePickerDefaults.colors(
+                navigationContentColor =TudeeTheme.color.textColors.title ,
+                headlineContentColor = TudeeTheme.color.textColors.title,
+                titleContentColor = TudeeTheme.color.textColors.title,
+                weekdayContentColor = TudeeTheme.color.textColors.title,
+                dayContentColor=TudeeTheme.color.textColors.title,
+                containerColor = TudeeTheme.color.statusColors.greenAccent ,
+                selectedDayContainerColor = TudeeTheme.color.primary,
+                selectedDayContentColor = TudeeTheme.color.textColors.onPrimary,
+                todayContentColor = TudeeTheme.color.primary,
+                todayDateBorderColor = TudeeTheme.color.primary,
+
+                )
+        )
     }
 }
 

app/src/main/java/com/example/tudee/presentation/components/TudeeBottomSheet.kt

@@ -4,7 +4,6 @@ import android.content.res.Configuration
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -40,12 +39,12 @@ import com.example.tudee.R
 import com.example.tudee.designsystem.theme.TudeeTheme
 import com.example.tudee.presentation.components.buttons.ButtonState
 import com.example.tudee.presentation.components.buttons.SecondaryButton
+import com.example.tudee.presentation.screen.category.model.toUiImage
 import com.example.tudee.presentation.screen.home.viewmodel.CategoryUiState
 import com.example.tudee.presentation.screen.home.viewmodel.TaskPriorityUiState
 import com.example.tudee.presentation.screen.home.viewmodel.TaskStatusUiState
 import com.example.tudee.presentation.screen.home.viewmodel.TaskUiState
 import com.example.tudee.presentation.utils.clickWithRipple
-import com.example.tudee.presentation.utils.toCategoryIcon
 import kotlinx.datetime.LocalDate
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -148,7 +147,9 @@ private fun TudeeTaskDetails(task: TaskUiState, modifier: Modifier = Modifier) {
             .padding(top = 12.dp)
             .background(color = TudeeTheme.color.surfaceHigh, shape = CircleShape)
     ) {
-        task.taskCategory.image?.let { painterResource(it.toCategoryIcon()) }?.let {
+        task.taskCategory.image?.let {
+            it.toUiImage().asPainter()
+        }?.let {
             Image(
                 modifier = Modifier.padding(15.dp), painter = it,
                 contentDescription = null

app/src/main/java/com/example/tudee/presentation/screen/category/model/UiImage.kt

@@ -5,9 +5,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
-import androidx.core.text.isDigitsOnly
 import coil3.compose.rememberAsyncImagePainter
 import coil3.imageLoader
+import com.example.tudee.presentation.utils.predefinedCategories
+import com.example.tudee.presentation.utils.toCategoryIcon
 import java.io.File
 
 sealed class UiImage {
@@ -36,8 +37,8 @@ sealed class UiImage {
 }
 
 fun String.toUiImage(): UiImage {
-    return if (isDigitsOnly()) {
-        UiImage.Drawable(toInt())
+    return if (this in predefinedCategories.map { it.image }) {
+        UiImage.Drawable(this.toCategoryIcon())
     } else {
         UiImage.External(this)
     }

app/src/main/java/com/example/tudee/presentation/screen/home/components/TaskList.kt

@@ -21,13 +21,13 @@ import com.example.tudee.designsystem.theme.TudeeTheme
 import com.example.tudee.domain.entity.TaskPriority
 import com.example.tudee.domain.entity.TaskStatus
 import com.example.tudee.presentation.components.CategoryTaskComponent
+import com.example.tudee.presentation.screen.category.model.toUiImage
 import com.example.tudee.presentation.screen.home.toTaskPriorityUiState
 import com.example.tudee.presentation.screen.home.toTaskStatusUiState
 import com.example.tudee.presentation.screen.home.viewmodel.CategoryUiState
 import com.example.tudee.presentation.screen.home.viewmodel.HomeActions
 import com.example.tudee.presentation.screen.home.viewmodel.TaskPriorityUiState
 import com.example.tudee.presentation.screen.home.viewmodel.TaskUiState
-import com.example.tudee.presentation.utils.toCategoryIcon
 import kotlinx.datetime.LocalDate
 
 @Composable
@@ -73,8 +73,9 @@ fun TaskList(
                 priorityIcon = painterResource(id = priorityIcon),
                 priorityBackgroundColor = priorityColor,
                 taskIcon = {
+
                     Image(
-                        painter = painterResource(task.taskCategory.image.toCategoryIcon()),
+                        painter = task.taskCategory.image.toUiImage().asPainter(),
                         contentDescription = "taskIcon",
                     )
                 },