Skip to content

Stolen destkop UI#48

Open
RossSihovsk wants to merge 38 commits intomasterfrom
stolen_destkop_ui
Open

Stolen destkop UI#48
RossSihovsk wants to merge 38 commits intomasterfrom
stolen_destkop_ui

Conversation

@RossSihovsk
Copy link
Owner

No description provided.

val result = queries.getTasksForDay(date).executeAsList().mapToTaskList()
logger.d("getForDay $date result: $result")
val result2 = queries.getAllData().executeAsList().mapToTaskList()
logger.d("getAllData result2: $result2")
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove 40 and 41 line

Column(modifier = Modifier.fillMaxWidth().verticalScroll(state = scrollState)) {

// CalendarView(
// modifier = Modifier.fillMaxWidth(),
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove all commented code if you don't neet it

# Conflicts:
#	composeApp/src/androidMain/kotlin/com/project/lifeos/ui/bottomNavigation/BottomBar.android.kt
#	composeApp/src/androidMain/kotlin/com/project/lifeos/ui/screen/AddGoalScreen.android.kt
#	composeApp/src/androidMain/kotlin/com/project/lifeos/ui/screen/AddTaskScreen.android.kt
#	composeApp/src/androidMain/kotlin/com/project/lifeos/ui/screen/GoalScreen.android.kt
#	composeApp/src/androidMain/kotlin/com/project/lifeos/ui/screen/HomeScreen.android.kt
#	composeApp/src/androidMain/kotlin/com/project/lifeos/ui/screen/addTask/BottomSheetView.kt
#	composeApp/src/commonMain/kotlin/com/project/lifeos/data/Task.kt
#	composeApp/src/commonMain/kotlin/com/project/lifeos/notification/NotificationScheduler.kt
#	composeApp/src/commonMain/kotlin/com/project/lifeos/ui/screen/AddTaskScreen.kt
#	composeApp/src/commonMain/kotlin/com/project/lifeos/viewmodel/CreateGoalScreenViewModel.kt
#	composeApp/src/commonMain/kotlin/com/project/lifeos/viewmodel/GoalScreenViewModel.kt
#	composeApp/src/commonMain/kotlin/com/project/lifeos/viewmodel/HomeScreenViewModel.kt
#	composeApp/src/commonMain/sqldelight/com/lifeos/TaskEntity.sq
#	composeApp/src/desktopMain/kotlin/com/project/lifeos/ui/screen/AddGoalScreen.desktop.kt
#	composeApp/src/desktopMain/kotlin/com/project/lifeos/ui/screen/GoalScreen.desktop.kt
#	composeApp/src/desktopMain/kotlin/com/project/lifeos/ui/screen/HomeScreen.desktop.kt
# Conflicts:
#	composeApp/src/androidMain/kotlin/com/project/lifeos/ui/screen/HomeScreen.android.kt
#	composeApp/src/commonMain/kotlin/com/project/lifeos/viewmodel/UserViewModel.kt
#	composeApp/src/desktopMain/kotlin/com/project/lifeos/ui/screen/AddGoalScreen.desktop.kt
#	gradle/libs.versions.toml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants