Stolen destkop UI

composeApp/build.gradle.kts

@@ -90,13 +90,17 @@ kotlin {
 
             // Ktor serialization with JSON support
             implementation(libs.ktor.serialization.kotlinx.json)
+            implementation(compose.materialIconsExtended)
+
         }
         desktopMain.dependencies {
-            implementation(compose.desktop.currentOs)
+            implementation(libs.notify)
 
+            implementation(compose.desktop.currentOs)
             //SQLDelight Desktop
             implementation(libs.sqldelight.jvm)
-
+            implementation(libs.java.jwt)
+            implementation (libs.json)
             //Auth Desktop
             implementation(libs.google.auth.desktop)
             implementation(libs.ktor.client.core)
@@ -153,3 +157,4 @@ compose.desktop {
         }
     }
 }
+

composeApp/src/androidMain/kotlin/com/project/lifeos/ui/screen/AddTaskScreen.android.kt

@@ -52,8 +52,12 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
+import cafe.adriel.voyager.navigator.Navigator
 import co.touchlab.kermit.Logger
 import com.project.lifeos.R
+import com.project.lifeos.data.Priority
+import com.project.lifeos.data.Reminder
+import com.project.lifeos.data.Task
 import com.project.lifeos.viewmodel.AddTaskViewModel
 import java.text.SimpleDateFormat
 import java.time.Instant
@@ -62,7 +66,16 @@ import java.util.Locale
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-actual fun AddTaskScreenContent(viewModel: AddTaskViewModel, logger: Logger) {
+actual fun AddTaskScreenContent(navigator: Navigator?,
+                                viewModel: AddTaskViewModel?, task: Task?, logger: Logger?, onDone: (
+    title: String,
+    description: String?,
+    time: Long?,
+    dates: List<String>,
+    checkItems: List<String>,
+    reminder: Reminder,
+    priority: Priority,
+) -> Unit){
     ModalBottomSheet(
         onDismissRequest = {},
 
@@ -148,10 +161,10 @@ actual fun AddTaskScreenContent(viewModel: AddTaskViewModel, logger: Logger) {
         Spacer(modifier = Modifier.height(60.dp))
 
         EnableSaveButton(taskDate, taskDescription, taskTime, taskTitle) {
-            logger.i(
+            logger?.i(
                 "Save task with title: ${taskTitle.value}, description: ${taskDescription.value}, time: ${taskTime.value}, date: ${taskDate.value}"
             )
-            viewModel.saveTask(
+            viewModel?.saveTask(
                 title = taskTitle.value,
                 description = taskDescription.value,
                 time = taskTime.value,

composeApp/src/androidMain/kotlin/com/project/lifeos/ui/screen/HomeScreen.android.kt

@@ -50,6 +50,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
@@ -216,7 +217,6 @@ fun TaskExpandedSection(
     }
 }
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun TasksContent(
     tasks: List<Task>,

composeApp/src/androidMain/kotlin/com/project/lifeos/ui/screen/ProfileScreen.android.kt

@@ -106,7 +106,7 @@ actual fun ProfileScreenContent(
                                 )
                                 val credential = result.credential
                                 val userCred = GoogleIdTokenCredential.createFrom(credential.data)
-
+                                println(userCred)
                                 User(
                                     name = userCred.displayName ?: "Unknown name",
                                     mail = if (userCred.id.contains("@")) userCred.id else "Unknown email",

composeApp/src/androidMain/kotlin/com/project/lifeos/ui/screen/addTask/BottomSheetView.kt

@@ -5,21 +5,7 @@ import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.ime
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.wrapContentHeight
-import androidx.compose.foundation.layout.wrapContentSize
-import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items

composeApp/src/commonMain/kotlin/com/project/lifeos/notification/NotificationScheduler.kt

@@ -39,6 +39,7 @@ abstract class NotificationScheduler {
         }
 
         schedulePlatformNotification(task, user, validatedTimeForNotification)
+
     }
 
     private fun isReminderStillValid(dateTime: Long, reminder: Reminder): Pair<Boolean, Long> {

composeApp/src/commonMain/kotlin/com/project/lifeos/ui/bottomNavigation/BottomBarItems.kt

@@ -1,16 +1,8 @@
 package com.project.lifeos.ui.bottomNavigation
 
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Favorite
-import androidx.compose.material.icons.filled.Home
-import androidx.compose.material.icons.filled.Person
-import androidx.compose.material.icons.filled.Star
-import androidx.compose.material.icons.outlined.Add
-import androidx.compose.material.icons.outlined.Favorite
-import androidx.compose.material.icons.outlined.Home
-import androidx.compose.material.icons.outlined.Person
-import androidx.compose.material.icons.outlined.Star
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.ui.graphics.vector.ImageVector
 
 enum class BottomBarItems(
@@ -25,8 +17,8 @@ enum class BottomBarItems(
     ),
     GOALS(
         title = "Goals",
-        selectedIcon = Icons.Filled.Favorite,
-        unSelectedIcon = Icons.Outlined.Favorite
+        selectedIcon = Icons.Filled.Assistant,
+        unSelectedIcon = Icons.Outlined.Assistant
     ),
     ADD_TASK(
         title = "Add Task",
@@ -35,8 +27,8 @@ enum class BottomBarItems(
     ),
     STATS(
         title = "Stats",
-        selectedIcon = Icons.Filled.Star,
-        unSelectedIcon = Icons.Outlined.Star
+        selectedIcon = Icons.Filled.AlignVerticalBottom,
+        unSelectedIcon = Icons.Outlined.AlignVerticalBottom
     ),
     PROFILE(
         title = "Profile",

composeApp/src/commonMain/kotlin/com/project/lifeos/ui/screen/AddTaskScreen.kt

@@ -3,20 +3,45 @@ package com.project.lifeos.ui.screen
 import androidx.compose.runtime.Composable
 import cafe.adriel.voyager.core.model.rememberScreenModel
 import cafe.adriel.voyager.core.screen.Screen
+import cafe.adriel.voyager.navigator.LocalNavigator
+import cafe.adriel.voyager.navigator.Navigator
+import cafe.adriel.voyager.navigator.currentOrThrow
 import co.touchlab.kermit.Logger
+import com.project.lifeos.data.Priority
+import com.project.lifeos.data.Reminder
+import com.project.lifeos.data.Task
 import com.project.lifeos.di.AppModuleProvider
 import com.project.lifeos.viewmodel.AddTaskViewModel
 
 @Composable
-expect fun AddTaskScreenContent(viewModel: AddTaskViewModel, logger: Logger)
+expect fun AddTaskScreenContent(navigator: Navigator?=null,
+                                viewModel: AddTaskViewModel?, task: Task?, logger: Logger?, onDone: (
+    title: String,
+    description: String?,
+    time: Long?,
+    dates: List<String>,
+    checkItems: List<String>,
+    reminder: Reminder,
+    priority: Priority,
+) -> Unit)
 
 private const val TAG = "AddTaskScreen"
 private val logger = Logger.withTag(TAG)
 
-class AddTaskScreen : Screen {
+data class AddTaskScreen(private val task:Task? = null, val onDone: (
+    title: String,
+    description: String?,
+    time: Long?,
+    dates: List<String>,
+    checkItems: List<String>,
+    reminder: Reminder,
+    priority: Priority,
+) -> Unit ={ _, _, _, _, _, _, _, -> }) : Screen {
     @Composable
     override fun Content() {
+        val navigator = LocalNavigator.currentOrThrow
+
         val taskViewModel = rememberScreenModel { AppModuleProvider.getAppModule().addTaskViewModel }
-        AddTaskScreenContent(taskViewModel, logger)
+        AddTaskScreenContent(navigator,taskViewModel,task, logger,onDone)
     }
 }

composeApp/src/commonMain/kotlin/com/project/lifeos/ui/screen/HomeScreen.kt

@@ -14,10 +14,7 @@ import com.project.lifeos.viewmodel.HomeScreenViewModel
 expect fun HomeScreenContent(viewModel: HomeScreenViewModel, navigator: Navigator? = null)
 
 
-/**
-not serializable objects should be outside of class
-otherwise there would be an exception after onPause()
- */
+
 private val logger = Logger.withTag("HomeScreen")
 
 class HomeScreen : Screen {

composeApp/src/commonMain/kotlin/com/project/lifeos/utils/NavigatorExtension.kt

@@ -11,7 +11,6 @@ fun Navigator.safePush(screen: Screen) {
     if (items.isNotEmpty()) logger.d("last: ${items.last().key}")
     if (items.isNotEmpty() && items.last().key  == screen.key) {
         logger.d("return")
-//    if (items.isNotEmpty() && items.firstOrNull { it.key == screen.key } != null) {
        return
     }
     logger.d("push")

composeApp/src/commonMain/kotlin/com/project/lifeos/viewmodel/HomeScreenViewModel.kt

@@ -60,7 +60,7 @@ class HomeScreenViewModel(
         val newStatus = task.dateStatuses.first { it.date.contains(currentDate) }.copy(status = !status)
 
         logger.d("newStatus: $newStatus")
-        val updateJob = screenModelScope.async {
+        val updateJob = screenModelScope.async(Dispatchers.IO) {
             taskRepository.onTaskStatusChanged(newStatus, task)
         }
 
@@ -75,7 +75,7 @@ class HomeScreenViewModel(
         return Pair(completedTasks, uncompletedTasks)
     }
 
-    private fun updateTasksState(changeJob: Deferred<Unit>? = null) = screenModelScope.launch {
+    private fun updateTasksState(changeJob: Deferred<Unit>? = null) = screenModelScope.launch(context = Dispatchers.IO){
         changeJob?.onAwait
         val updatedList = taskRepository.getTasksForDay(
             day = currentDate, userMail = userRepository.getLastUser()?.mail
@@ -130,7 +130,7 @@ class HomeScreenViewModel(
         logger.i("deleteForToday $task")
         screenModelScope.launch(Dispatchers.IO) {
             task?.let { taskToDelete ->
-                val updateJob = screenModelScope.async {
+                val updateJob = screenModelScope.async(Dispatchers.IO) {
                     val updatedDates = task.dateStatuses.toMutableList().apply {
                         removeIf { it.date.contains(currentDate) }
                     }
@@ -146,7 +146,7 @@ class HomeScreenViewModel(
         logger.i("deleteCompletely $task")
         screenModelScope.launch(Dispatchers.IO) {
             task?.let { taskToDelete ->
-                val updateJob = screenModelScope.async {
+                val updateJob = screenModelScope.async(Dispatchers.IO) {
                     taskRepository.deleteCompletely(taskToDelete.id!!)
                 }
 
@@ -173,7 +173,7 @@ class HomeScreenViewModel(
             )
 
             screenModelScope.launch(Dispatchers.IO) {
-                val updateJob = screenModelScope.async {
+                val updateJob = screenModelScope.async(Dispatchers.IO) {
                     taskRepository.updateTask(taskId, title, description, time, dates, checkItems, reminder, priority)
                 }
 

composeApp/src/commonMain/kotlin/com/project/lifeos/viewmodel/UserViewModel.kt

@@ -27,7 +27,7 @@ class UserViewModel(
     val user = _user.asStateFlow()
     fun signIn(
         signInPerform: suspend () -> User?
-    ) = screenModelScope.launch {
+    ) = screenModelScope.launch(Dispatchers.IO) {
         logger.d("Init")
         signInPerform()?.let { user ->
             logger.d("User founded: $user")
@@ -40,14 +40,14 @@ class UserViewModel(
         _uiState.emit(ProfileUiState.NoUsers)
     }
 
-    fun signOut() = screenModelScope.launch {
+    fun signOut() = screenModelScope.launch(Dispatchers.IO) {
         _uiState.emit(ProfileUiState.NoUsers)
         userRepository.signOut()
         _user.emit(null)
     }
 
     fun deleteAllDataForUser(userMail: String) {
-        screenModelScope.launch {
+        screenModelScope.launch(Dispatchers.IO) {
             logger.d("deleteAllDataForUser: $userMail")
             taskRepository.deleteAllForUser(userMail)
             goalRepository.deleteAllForUser(userMail)

composeApp/src/desktopMain/kotlin/com/project/lifeos/main.kt

@@ -0,0 +1,19 @@
+package com.project.lifeos
+
+import androidx.compose.ui.window.Window
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.unit.DpSize
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.application
+import androidx.compose.ui.window.rememberWindowState
+import androidx.compose.ui.window.WindowPosition
+
+
+fun main() = application {
+    val state = rememberWindowState(position = WindowPosition(Alignment.Center), size = DpSize(1120.dp, 900.dp))
+    Window(onCloseRequest = ::exitApplication, title = "Should", state = state)
+    {
+        App()
+    }
+}
+

composeApp/src/desktopMain/kotlin/com/project/lifeos/notification/DesktopNotificationScheduler.kt

@@ -1,10 +1,58 @@
 package com.project.lifeos.notification
-
 import com.project.lifeos.data.Task
 import com.project.lifeos.data.User
+import java.awt.*
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
 
 class DesktopNotificationScheduler : NotificationScheduler() {
     override fun schedulePlatformNotification(task: Task, user: User?, validatedTimeForNotification: List<Long>) {
+        task.description?.let { scheduleNotificationWithExecutor(task.title, it, validatedTimeForNotification) }
+    }
+
+    private fun showDesktopNotification(title: String, message: String) {
+        if (!SystemTray.isSupported()) {
+            println("SystemTray is not supported")
+            return
+        }
+
+        val tray = SystemTray.getSystemTray()
+        val image = Toolkit.getDefaultToolkit().createImage("on_time.png") // Provide a small icon here
+
+        val trayIcon = TrayIcon(image, "Notification Example")
+        trayIcon.isImageAutoSize = true
+        trayIcon.toolTip = "Notification Example"
+
+        try {
+            tray.add(trayIcon)
+            trayIcon.displayMessage(title, message, TrayIcon.MessageType.INFO)
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    private fun scheduleNotificationWithExecutor(
+        title: String,
+        message: String,
+        targetDateTime: List<Long>
+    ) {
+        val scheduler = Executors.newSingleThreadScheduledExecutor()
+        targetDateTime.forEach {
+            val delay = it - System.currentTimeMillis()
+            if (delay <= 0) {
+                return
+            }
+            scheduler.schedule({
+                showDesktopNotification(title, message)
+                scheduler.shutdown()
+            }, delay, TimeUnit.MILLISECONDS)
+        }
 
     }
+
+
+
+
+
+
 }