Explorar o código

code improvements

milan jurkulák %!s(int64=2) %!d(string=hai) anos
pai
achega
4dc27caea9

+ 2 - 2
src/main/kotlin/eu/mjdev/desktop/components/appsmenu/AppsMenuApp.kt

@@ -18,7 +18,7 @@ import eu.mjdev.desktop.components.text.TextAny
 import eu.mjdev.desktop.data.App
 import eu.mjdev.desktop.extensions.Compose.onLeftClick
 import eu.mjdev.desktop.extensions.Compose.onMousePress
-import eu.mjdev.desktop.extensions.Compose.onRigntClick
+import eu.mjdev.desktop.extensions.Compose.onRightClick
 import eu.mjdev.desktop.provider.DesktopScope.Companion.withDesktopScope
 
 @Suppress("FunctionName")
@@ -37,7 +37,7 @@ fun AppsMenuApp(
     Row(
         modifier = modifier.onMousePress {
             onLeftClick { onClick() }
-            onRigntClick { onContextMenuClick() }
+            onRightClick { onContextMenuClick() }
         },
         verticalAlignment = Alignment.CenterVertically,
     ) {

+ 2 - 2
src/main/kotlin/eu/mjdev/desktop/components/appsmenu/AppsMenuCategory.kt

@@ -17,7 +17,7 @@ import eu.mjdev.desktop.components.text.TextAny
 import eu.mjdev.desktop.data.Category
 import eu.mjdev.desktop.extensions.Compose.onLeftClick
 import eu.mjdev.desktop.extensions.Compose.onMousePress
-import eu.mjdev.desktop.extensions.Compose.onRigntClick
+import eu.mjdev.desktop.extensions.Compose.onRightClick
 import eu.mjdev.desktop.provider.DesktopScope.Companion.withDesktopScope
 
 @Composable
@@ -31,7 +31,7 @@ fun AppsMenuCategory(
     Row(
         modifier = modifier.onMousePress {
             onLeftClick { onClick(category) }
-            onRigntClick { onContextMenuClick(category) }
+            onRightClick { onContextMenuClick(category) }
         },
         verticalAlignment = Alignment.CenterVertically
     ) {

+ 3 - 3
src/main/kotlin/eu/mjdev/desktop/components/controlcenter/ControlCenter.kt

@@ -25,7 +25,7 @@ import eu.mjdev.desktop.components.sliding.base.VisibilityState
 import eu.mjdev.desktop.components.sliding.base.VisibilityState.Companion.rememberVisibilityState
 import eu.mjdev.desktop.extensions.Compose.onLeftClick
 import eu.mjdev.desktop.extensions.Compose.onMousePress
-import eu.mjdev.desktop.extensions.Compose.onRigntClick
+import eu.mjdev.desktop.extensions.Compose.onRightClick
 import eu.mjdev.desktop.extensions.Compose.rememberCalculated
 import eu.mjdev.desktop.extensions.Compose.rememberState
 import eu.mjdev.desktop.helpers.animation.Animations.ControlCenterEnterAnimation
@@ -91,7 +91,7 @@ fun ControlCenter(
                 Divider(
                     modifier = Modifier.fillMaxHeight()
                         .width(controlCenterDividerWidth),
-                    color = borderColor,
+                    color = Color.Transparent,
                     thickness = controlCenterDividerWidth
                 )
             } else {
@@ -140,7 +140,7 @@ fun ControlCenter(
                                                         pagerState.value = idx
                                                     }
                                                 }
-                                                onRigntClick {
+                                                onRightClick {
                                                     scope.launch {
                                                         pagerState.value = idx
                                                     }

+ 2 - 2
src/main/kotlin/eu/mjdev/desktop/components/desktoppanel/DesktopPanelIcon.kt

@@ -20,7 +20,7 @@ import eu.mjdev.desktop.extensions.Compose.onLeftClick
 import eu.mjdev.desktop.extensions.Compose.onMouseEnter
 import eu.mjdev.desktop.extensions.Compose.onMouseLeave
 import eu.mjdev.desktop.extensions.Compose.onMousePress
-import eu.mjdev.desktop.extensions.Compose.onRigntClick
+import eu.mjdev.desktop.extensions.Compose.onRightClick
 import eu.mjdev.desktop.extensions.Compose.rememberState
 import eu.mjdev.desktop.extensions.Modifier.clipRect
 import eu.mjdev.desktop.provider.DesktopScope.Companion.withDesktopScope
@@ -66,7 +66,7 @@ fun DesktopPanelIcon(
             .onMousePress {
                 iconState.value = false
                 onLeftClick { onClick() }
-                onRigntClick { onContextMenuClick() }
+                onRightClick { onContextMenuClick() }
             }
     ) {
         Button(

+ 2 - 2
src/main/kotlin/eu/mjdev/desktop/components/icon/ShapedIcon.kt

@@ -17,7 +17,7 @@ import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import eu.mjdev.desktop.extensions.Compose.onLeftClick
 import eu.mjdev.desktop.extensions.Compose.onMousePress
-import eu.mjdev.desktop.extensions.Compose.onRigntClick
+import eu.mjdev.desktop.extensions.Compose.onRightClick
 import eu.mjdev.desktop.extensions.Compose.size
 
 @Composable
@@ -42,7 +42,7 @@ fun ShapedIcon(
         .clip(iconShape)
         .onMousePress {
             onLeftClick { onClick() }
-            onRigntClick { onRightClick() }
+            onRightClick { onRightClick() }
         }
 ) {
     Box(

+ 4 - 4
src/main/kotlin/eu/mjdev/desktop/components/text/TextAny.kt

@@ -3,7 +3,7 @@ package eu.mjdev.desktop.components.text
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.LocalTextStyle
-import androidx.compose.material.Text
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -36,7 +36,7 @@ fun TextAny(
     softWrap: Boolean = true,
     minLines: Int = 1,
     maxLines: Int = Int.MAX_VALUE,
-    onTextLayout: (TextLayoutResult) -> Unit = {},
+    onTextLayout: ((TextLayoutResult) -> Unit)? = null,
     style: TextStyle = LocalTextStyle.current,
     textSelectionEnabled: Boolean = false
 ) {
@@ -45,7 +45,6 @@ fun TextAny(
             text = textFrom(text),
             modifier = modifier,
             color = color,
-            minLines = minLines,
             fontSize = fontSize,
             fontStyle = fontStyle,
             fontWeight = fontWeight,
@@ -57,8 +56,9 @@ fun TextAny(
             overflow = overflow,
             softWrap = softWrap,
             maxLines = maxLines,
+            minLines = minLines,
             onTextLayout = onTextLayout,
-            style = style
+            style = style,
         )
     }
     if (textSelectionEnabled) {

+ 2 - 2
src/main/kotlin/eu/mjdev/desktop/data/Theme.kt

@@ -99,7 +99,7 @@ class Theme(
                 backgroundColor = Color.SuperDarkGray,
 
                 panelLocation = PanelLocation.Bottom,
-                panelDividerWidth = 8.dp,
+                panelDividerWidth = 16.dp,
                 panelContentPadding = 4.dp,
                 panelHideDelay = 5000L,
 
@@ -107,7 +107,7 @@ class Theme(
                 controlPanelHideDelay = 5000L,
                 controlCenterExpandedWidth = 480.dp,
                 controlCenterDividerColor = Color.SuperDarkGray,
-                controlCenterDividerWidth = 8.dp,
+                controlCenterDividerWidth = 4.dp,
                 controlCenterIconColor = Color.White,
                 controlCenterIconSize = DpSize(32.dp, 32.dp),
                 controlCenterBackgroundAlpha = 0.8f,

+ 2 - 2
src/main/kotlin/eu/mjdev/desktop/windows/DesktopWindow.kt

@@ -10,7 +10,7 @@ import eu.mjdev.desktop.components.background.BackgroundImage
 import eu.mjdev.desktop.components.sliding.base.VisibilityState
 import eu.mjdev.desktop.extensions.Compose.onLeftClick
 import eu.mjdev.desktop.extensions.Compose.onMousePress
-import eu.mjdev.desktop.extensions.Compose.onRigntClick
+import eu.mjdev.desktop.extensions.Compose.onRightClick
 import eu.mjdev.desktop.provider.DesktopProvider
 import eu.mjdev.desktop.provider.DesktopProvider.Companion.LocalDesktop
 
@@ -64,7 +64,7 @@ fun DesktopWindow(
                         menuState.hide()
                         controlCenterState.hide()
                     }
-                    onRigntClick {
+                    onRightClick {
 //                        contextMenuState.show()
                     }
                 },