Skip to content

Commit e7e430d

Browse files
Side menu width (#558)
1 parent 515e061 commit e7e430d

File tree

7 files changed

+13
-3
lines changed

7 files changed

+13
-3
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
package io.writeopia.commonui.buttons
22

33
actual fun verticalPaddingCommonButton(): Int = 10
4+
actual fun sideMenuDefaultWidth(): Float = SIDE_MENU_WIDTH_MOBILE
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
package io.writeopia.commonui.buttons
22

3+
const val SIDE_MENU_WIDTH_MOBILE = 500F
4+
const val SIDE_MENU_WIDTH_DESKTOP = 280F
5+
36
expect fun verticalPaddingCommonButton(): Int
7+
8+
expect fun sideMenuDefaultWidth(): Float

application/core/common_ui/src/jvmMain/java/io/writeopia/commonui/buttons/UiConstants.jvm.kt renamed to application/core/common_ui/src/jvmMain/kotlin/io/writeopia/commonui/buttons/UiConstants.jvm.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
package io.writeopia.commonui.buttons
22

3+
actual fun sideMenuDefaultWidth(): Float = SIDE_MENU_WIDTH_DESKTOP
34
actual fun verticalPaddingCommonButton(): Int = 6
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
package io.writeopia.commonui.buttons
22

33
actual fun verticalPaddingCommonButton(): Int = 6
4+
actual fun sideMenuDefaultWidth(): Float = SIDE_MENU_WIDTH_MOBILE
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
package io.writeopia.commonui.buttons
22

33
actual fun verticalPaddingCommonButton(): Int = 6
4+
actual fun sideMenuDefaultWidth(): Float = SIDE_MENU_WIDTH_DESKTOP

application/core/theme/src/commonMain/kotlin/io/writeopia/extensions/UiConfigurationExtensions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ fun UiConfiguration.toEntity() = UiConfigurationEntity(
1515
fun UiConfigurationEntity.toModel() = UiConfiguration(
1616
userId = user_id,
1717
colorThemeOption = ColorThemeOption.fromText(color_theme_option) ?: ColorThemeOption.SYSTEM,
18-
sideMenuWidth = side_menu_width?.toFloat() ?: 500F,
18+
sideMenuWidth = side_menu_width?.toFloat() ?: 280F,
1919
font = Font.fromLabel(font_family)
2020
)

application/features/global_shell/src/commonMain/kotlin/io/writeopia/global/shell/viewmodel/GlobalShellKmpViewModel.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import io.writeopia.common.utils.download.DownloadParser
1616
import io.writeopia.common.utils.download.DownloadState
1717
import io.writeopia.common.utils.icons.IconChange
1818
import io.writeopia.common.utils.toList
19+
import io.writeopia.commonui.buttons.sideMenuDefaultWidth
1920
import io.writeopia.commonui.dtos.MenuItemUi
2021
import io.writeopia.commonui.extensions.toUiCard
2122
import io.writeopia.core.folders.repository.folder.NotesUseCase
@@ -345,12 +346,12 @@ class GlobalShellKmpViewModel(
345346
override fun toggleSideMenu() {
346347
val width = showSideMenuState.value
347348

348-
sideMenuWidthState.value = if (width.dp < 5.dp) 500F else 0F
349+
sideMenuWidthState.value = if (width.dp < 5.dp) sideMenuDefaultWidth() else 0F
349350
saveMenuWidth()
350351
}
351352

352353
override fun saveMenuWidth() {
353-
val width = sideMenuWidthState.value ?: 500F
354+
val width = sideMenuWidthState.value ?: sideMenuDefaultWidth()
354355

355356
viewModelScope.launch(Dispatchers.Default) {
356357
val uiConfiguration =

0 commit comments

Comments
 (0)