Merge branch 'main' of github.com:leandroBorgesFerreira/Writeopia

leandroBorgesFerreira · Feb 14, 2025 · 8306b04 · 8306b04
2 parents 7fd651c + 4647923
commit 8306b04
Show file tree

Hide file tree

Showing 29 changed files with 666 additions and 320 deletions.
diff --git a/...ows/wide_screen_common/src/commonMain/kotlin/io/writeopia/notes/desktop/components/App.kt b/...ows/wide_screen_common/src/commonMain/kotlin/io/writeopia/notes/desktop/components/App.kt
@@ -14,7 +14,11 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -80,6 +84,7 @@ fun DesktopApp(
     coroutineScope: CoroutineScope,
     isUndoKeyEvent: (KeyEvent) -> Boolean,
     selectColorTheme: (ColorThemeOption) -> Unit,
+    toggleMaxScreen: () -> Unit,
     startDestination: String = startDestination(),
 ) {
     val authCoreInjection = remember { KmpAuthCoreInjection() }
@@ -107,6 +112,7 @@ fun DesktopApp(
             configurationInjector = notesInjector
         )
     }
+
     val accountInjector = remember { AccountMenuKmpInjector(authCoreInjection) }
 
     val notesMenuInjection = remember {
@@ -198,11 +204,16 @@ fun DesktopApp(
                         expandFolder = globalShellViewModel::expandFolder,
                         searchClick = globalShellViewModel::showSearch,
                         highlightContent = {},
-                        changeIcon = globalShellViewModel::changeIcons
+                        changeIcon = globalShellViewModel::changeIcons,
+                        toggleMaxScreen = toggleMaxScreen
                     )
 
                     Column {
-                        GlobalHeader(navigationController, globalShellViewModel.folderPath)
+                        GlobalHeader(
+                            navigationController,
+                            globalShellViewModel.folderPath,
+                            toggleMaxScreen
+                        )
 
                         Box(
                             modifier = Modifier
@@ -220,7 +231,8 @@ fun DesktopApp(
                                 navController = navigationController
                             ) {}
 
-                            val folderEdit = globalShellViewModel.editFolderState.collectAsState().value
+                            val folderEdit =
+                                globalShellViewModel.editFolderState.collectAsState().value
 
                             if (folderEdit != null) {
                                 EditFileScreen(

diff --git a/...screen_common/src/commonMain/kotlin/io/writeopia/notes/desktop/components/GlobalHeader.kt b/...screen_common/src/commonMain/kotlin/io/writeopia/notes/desktop/components/GlobalHeader.kt
@@ -1,5 +1,7 @@
 package io.writeopia.notes.desktop.components
 
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -12,6 +14,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
@@ -25,10 +28,18 @@ import kotlinx.coroutines.flow.StateFlow
 @Composable
 fun GlobalHeader(
     navigationController: NavHostController,
-    pathState: StateFlow<List<String>>
+    pathState: StateFlow<List<String>>,
+    toggleMaxScreen: () -> Unit,
 ) {
     Row(
-        modifier = Modifier.fillMaxWidth().padding(6.dp),
+        modifier = Modifier.fillMaxWidth()
+            .padding(6.dp)
+            .combinedClickable(
+                interactionSource = remember { MutableInteractionSource() },
+                indication = null,
+                onDoubleClick = toggleMaxScreen,
+                onClick = {}
+            ),
         verticalAlignment = Alignment.CenterVertically
     ) {
         Icon(

diff --git a/application/common_flows/wide_screen_common/src/jvmTest/kotlin/io/writeopia/menu/Utils.kt b/application/common_flows/wide_screen_common/src/jvmTest/kotlin/io/writeopia/menu/Utils.kt
@@ -33,6 +33,7 @@ suspend fun startApp(
             selectColorTheme = {},
             selectionState = MutableStateFlow(false),
             keyboardEventFlow = MutableStateFlow(KeyboardEvent.IDLE),
+            toggleMaxScreen = {}
         )
     }
 }
diff --git a/application/composeApp/src/jvmMain/kotlin/io/writeopia/desktop/KeyboardCommands.kt b/application/composeApp/src/jvmMain/kotlin/io/writeopia/desktop/KeyboardCommands.kt