Merge branch 'main' of github.com:prof18/feed-flow

Author: prof18

core/src/jvmMain/kotlin/com/prof18/feedflow/core/utils/DesktopOS.kt

@@ -20,3 +20,5 @@ fun DesktopOS.isMacOs() = this == DesktopOS.MAC
 fun DesktopOS.isNotMacOs() = !isMacOs()
 
 fun DesktopOS.isLinux() = this == DesktopOS.LINUX
+
+fun DesktopOS.isWindows() = this == DesktopOS.WINDOWS

desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/home/menubar/FileMenu.kt

@@ -5,6 +5,8 @@ import androidx.compose.ui.input.key.Key
 import androidx.compose.ui.input.key.KeyShortcut
 import androidx.compose.ui.window.MenuBarScope
 import androidx.compose.ui.window.MenuScope
+import com.prof18.feedflow.core.utils.getDesktopOS
+import com.prof18.feedflow.core.utils.isWindows
 import com.prof18.feedflow.shared.ui.utils.LocalFeedFlowStrings
 
 @Composable
@@ -81,6 +83,15 @@ internal fun MenuBarScope.FileMenu(
             },
         )
 
+        if (getDesktopOS().isWindows()) {
+            Separator()
+
+            Item(
+                text = LocalFeedFlowStrings.current.exitMenu,
+                onClick = actions.onExitClick,
+            )
+        }
+
         DebugMenu(
             showDebugMenu = state.showDebugMenu,
             deleteFeeds = actions.deleteFeeds,

desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/home/menubar/MenuBar.kt

@@ -279,6 +279,7 @@ data class MenuBarActions(
     val onFeedFontScaleClick: () -> Unit,
     val deleteFeeds: () -> Unit,
     val onBackupClick: () -> Unit,
+    val onExitClick: () -> Unit,
 )
 
 data class MenuBarState(

desktopApp/src/jvmMain/kotlin/com/prof18/feedflow/desktop/main/MainWindow.kt

@@ -367,6 +367,9 @@ private fun FrameWindowScope.MainWindowContent(
                         onBackupClick = {
                             homeViewModel.enqueueBackup()
                         },
+                        onExitClick = {
+                            window.dispatchEvent(WindowEvent(window, WindowEvent.WINDOW_CLOSING))
+                        },
                     ),
                 )
 

feedSync/googledrive/src/jvmMain/kotlin/com/prof18/feedflow/feedsync/googledrive/GoogleDriveDataSourceJvmImpl.kt

@@ -36,9 +36,7 @@ class GoogleDriveDataSourceJvmImpl(
     override suspend fun startAuthFlow(): Boolean = withContext(dispatcherProvider.io) {
         try {
             val flow = buildAuthFlow()
-
-            @Suppress("MagicNumber")
-            val receiver = LocalServerReceiver.Builder().setPort(8888).build()
+            val receiver = buildLocalServerReceiver()
             val credential = AuthorizationCodeInstalledApp(flow, receiver).authorize("user")
 
             driveService = Drive.Builder(httpTransport, jsonFactory, credential)
@@ -183,3 +181,5 @@ internal fun requireGoogleDriveBackupFileId(
 ): String = fileId ?: throw GoogleDriveDownloadException(
     errorMessage = "No Google Drive backup file found for '$fileName'",
 )
+
+internal fun buildLocalServerReceiver(): LocalServerReceiver = LocalServerReceiver.Builder().build()

feedSync/googledrive/src/jvmTest/kotlin/com/prof18/feedflow/feedsync/googledrive/GoogleDriveDataSourceJvmImplTest.kt

@@ -30,4 +30,11 @@ class GoogleDriveDataSourceJvmImplTest {
             exception.message,
         )
     }
+
+    @Test
+    fun `buildLocalServerReceiver uses dynamic free port`() {
+        val receiver = buildLocalServerReceiver()
+
+        assertEquals(-1, receiver.port)
+    }
 }

i18n/src/commonMain/resources/locale/values/strings.xml

@@ -261,6 +261,7 @@
     <string name="widget_background_opacity_title">Background opacity: %s%%</string>
     <string name="widget_font_size_title">Font size</string>
     <string name="file_menu">File</string>
+    <string name="exit_menu">Exit</string>
     <string name="menu_view">View</string>
     <string name="settings_left_swipe_action">Left swipe</string>
     <string name="settings_right_swipe_action">Right swipe</string>