Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
package io.writeopia.commonui.buttons

actual fun verticalPaddingCommonButton(): Int = 10
actual fun sideMenuDefaultWidth(): Float = SIDE_MENU_WIDTH_MOBILE
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
package io.writeopia.commonui.buttons

const val SIDE_MENU_WIDTH_MOBILE = 500F
const val SIDE_MENU_WIDTH_DESKTOP = 280F

expect fun verticalPaddingCommonButton(): Int

expect fun sideMenuDefaultWidth(): Float
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
package io.writeopia.commonui.buttons

actual fun sideMenuDefaultWidth(): Float = SIDE_MENU_WIDTH_DESKTOP
actual fun verticalPaddingCommonButton(): Int = 6
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
package io.writeopia.commonui.buttons

actual fun verticalPaddingCommonButton(): Int = 6
actual fun sideMenuDefaultWidth(): Float = SIDE_MENU_WIDTH_MOBILE
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
package io.writeopia.commonui.buttons

actual fun verticalPaddingCommonButton(): Int = 6
actual fun sideMenuDefaultWidth(): Float = SIDE_MENU_WIDTH_DESKTOP
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ fun UiConfiguration.toEntity() = UiConfigurationEntity(
fun UiConfigurationEntity.toModel() = UiConfiguration(
userId = user_id,
colorThemeOption = ColorThemeOption.fromText(color_theme_option) ?: ColorThemeOption.SYSTEM,
sideMenuWidth = side_menu_width?.toFloat() ?: 500F,
sideMenuWidth = side_menu_width?.toFloat() ?: 280F,
font = Font.fromLabel(font_family)
)
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import io.writeopia.common.utils.download.DownloadParser
import io.writeopia.common.utils.download.DownloadState
import io.writeopia.common.utils.icons.IconChange
import io.writeopia.common.utils.toList
import io.writeopia.commonui.buttons.sideMenuDefaultWidth
import io.writeopia.commonui.dtos.MenuItemUi
import io.writeopia.commonui.extensions.toUiCard
import io.writeopia.core.folders.repository.folder.NotesUseCase
Expand Down Expand Up @@ -345,12 +346,12 @@ class GlobalShellKmpViewModel(
override fun toggleSideMenu() {
val width = showSideMenuState.value

sideMenuWidthState.value = if (width.dp < 5.dp) 500F else 0F
sideMenuWidthState.value = if (width.dp < 5.dp) sideMenuDefaultWidth() else 0F
saveMenuWidth()
}

override fun saveMenuWidth() {
val width = sideMenuWidthState.value ?: 500F
val width = sideMenuWidthState.value ?: sideMenuDefaultWidth()

viewModelScope.launch(Dispatchers.Default) {
val uiConfiguration =
Expand Down