feature: Rework

Author: TEYSSANDIER Raphael

FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/core/data/settings/DI.kt

@@ -1,9 +1,11 @@
 package io.github.openflocon.flocondesktop.core.data.settings
 
 import io.github.openflocon.flocondesktop.core.data.settings.usecase.ObserveNetworkSettingsUseCase
+import io.github.openflocon.flocondesktop.core.data.settings.usecase.SaveNetworkSettingsUseCase
 import org.koin.core.module.dsl.factoryOf
 import org.koin.dsl.module
 
 internal val settingsModule = module {
     factoryOf(::ObserveNetworkSettingsUseCase)
+    factoryOf(::SaveNetworkSettingsUseCase)
 }

FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/core/data/settings/usecase/SaveNetworkSettingsUseCase.kt

@@ -0,0 +1,15 @@
+package io.github.openflocon.flocondesktop.core.data.settings.usecase
+
+import io.github.openflocon.domain.models.settings.NetworkSettings
+import io.github.openflocon.domain.settings.repository.SettingsRepository
+
+class SaveNetworkSettingsUseCase(
+    private val settingsRepository: SettingsRepository
+) {
+    operator fun invoke(
+        settings: NetworkSettings
+    ): Result<Unit> = runCatching {
+        settingsRepository.networkSettings = settings
+    }
+
+}

FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/features/analytics/Navigation.kt

@@ -1,8 +1,8 @@
 package io.github.openflocon.flocondesktop.features.analytics
 
-import androidx.navigation3.runtime.EntryProviderBuilder
+import androidx.navigation3.runtime.EntryProviderScope
 import io.github.openflocon.navigation.FloconRoute
 
-fun EntryProviderBuilder<FloconRoute>.analyticsRoutes() {
+fun EntryProviderScope<FloconRoute>.analyticsRoutes() {
     // TODO
 }

FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/features/deeplinks/view/DeeplinkItemView.kt

@@ -17,8 +17,8 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Send
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExposedDropdownMenuAnchorType.Companion.PrimaryEditable
 import androidx.compose.material3.ExposedDropdownMenuBox
-import androidx.compose.material3.MenuAnchorType.Companion.PrimaryEditable
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect

FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/features/network/Navigation.kt

@@ -1,6 +1,6 @@
 package io.github.openflocon.flocondesktop.features.network
 
-import androidx.navigation3.runtime.EntryProviderBuilder
+import androidx.navigation3.runtime.EntryProviderScope
 import io.github.openflocon.domain.settings.repository.SettingsRepository
 import io.github.openflocon.flocondesktop.features.network.detail.view.NetworkDetailScreen
 import io.github.openflocon.navigation.FloconRoute
@@ -15,7 +15,7 @@ internal sealed interface NetworkRoutes : FloconRoute {
 
 }
 
-fun EntryProviderBuilder<FloconRoute>.networkRoutes() {
+fun EntryProviderScope<FloconRoute>.networkRoutes() {
     entry<NetworkRoutes.Panel>(
         metadata = PanelSceneStrategy.panel(
             pinnable = true,

FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/features/network/body/model/ContentUiState.kt

@@ -11,6 +11,9 @@ data class ContentUiState(
     val mocksDisplayed: MockDisplayed?,
     val websocketMocksDisplayed: Boolean,
     val badNetworkQualityDisplayed: Boolean,
+    val invertList: Boolean,
+    val autoScroll: Boolean,
+    val pinPanel: Boolean
 )
 
 @Immutable
@@ -24,5 +27,7 @@ fun previewContentUiState() = ContentUiState(
     detailJsons = emptySet(),
     mocksDisplayed = null,
     badNetworkQualityDisplayed = false,
-    websocketMocksDisplayed = false,
+    invertList = false,
+    autoScroll = false,
+    pinPanel = false
 )

FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/features/network/detail/view/components/DetailHeadersView.kt

@@ -64,6 +64,7 @@ fun DetailHeadersView(
                     label = item.name,
                     value = item.value,
                     labelWidth = labelWidth,
+                    contentColor = FloconTheme.colorPalette.onPrimary,
                     modifier = Modifier.fillMaxWidth()
                 )
             }

FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/features/network/list/NetworkViewModel.kt

@@ -13,6 +13,7 @@ import io.github.openflocon.domain.common.DispatcherProvider
 import io.github.openflocon.domain.common.combines
 import io.github.openflocon.domain.device.usecase.ObserveCurrentDeviceIdAndPackageNameUseCase
 import io.github.openflocon.domain.feedback.FeedbackDisplayer
+import io.github.openflocon.domain.models.settings.NetworkSettings
 import io.github.openflocon.domain.network.models.BadQualityConfigDomainModel
 import io.github.openflocon.domain.network.models.MockNetworkDomainModel
 import io.github.openflocon.domain.network.models.NetworkFilterDomainModel
@@ -33,6 +34,7 @@ import io.github.openflocon.domain.network.usecase.badquality.ObserveAllNetworkB
 import io.github.openflocon.domain.network.usecase.mocks.ObserveNetworkMocksUseCase
 import io.github.openflocon.flocondesktop.common.utils.stateInWhileSubscribed
 import io.github.openflocon.flocondesktop.core.data.settings.usecase.ObserveNetworkSettingsUseCase
+import io.github.openflocon.flocondesktop.core.data.settings.usecase.SaveNetworkSettingsUseCase
 import io.github.openflocon.flocondesktop.features.network.NetworkRoutes
 import io.github.openflocon.domain.network.usecase.mocks.ObserveNetworkWebsocketIdsUseCase
 import io.github.openflocon.domain.network.usecase.settings.ObserveNetworkSettingsUseCase
@@ -93,6 +95,8 @@ class NetworkViewModel(
     private val updateNetworkSettingsUseCase: UpdateNetworkSettingsUseCase,
     private val observeNetworkWebsocketIdsUseCase: ObserveNetworkWebsocketIdsUseCase,
     private val openBodyDelegate: OpenBodyDelegate,
+    private val observeNetworkSettingsUseCase: ObserveNetworkSettingsUseCase,
+    private val saveNetworkSettingsUseCase: SaveNetworkSettingsUseCase
 ) : ViewModel(headerDelegate) {
 
     private val contentState = MutableStateFlow(
@@ -146,6 +150,9 @@ class NetworkViewModel(
         )
     )
 
+    private val settings = observeNetworkSettingsUseCase()
+        .stateInWhileSubscribed(NetworkSettings(pinnedDetails = false))
+
     private val filter = combines(
         snapshotFlow { _filterText.value }.map { it.takeIf { it.isNotBlank() } }
             .distinctUntilChanged(),
@@ -191,7 +198,7 @@ class NetworkViewModel(
     private val detailState = combine(
         detailDelegate.uiState,
         contentState,
-        observeNetworkSettingsUseCase()
+        settings
     ) { state, content, settings ->
         state.takeIf { settings.pinnedDetails && content.selectedRequestId != null }
     }
@@ -205,7 +212,9 @@ class NetworkViewModel(
         settings.map { it.toUi() },
     ) { content, detail, filter, header, settings ->
         NetworkUiState(
-            contentState = content,
+            contentState = content.copy(
+                pinPanel = settings.pinnedDetails
+            ),
             detailState = detail,
             filterState = filter,
             headerState = header,
@@ -217,7 +226,7 @@ class NetworkViewModel(
             scope = viewModelScope,
             started = SharingStarted.WhileSubscribed(5_000),
             initialValue = NetworkUiState(
-                detailState = detailDelegate.uiState.value,
+                detailState = detailState.value,
                 contentState = contentState.value,
                 filterState = filterUiState.value,
                 headerState = headerDelegate.headerUiState.value,
@@ -270,6 +279,16 @@ class NetworkViewModel(
         }
     }
 
+    private fun onPinned(action: NetworkAction.Pinned) {
+        viewModelScope.launch {
+            saveNetworkSettingsUseCase(
+                settings.value.copy(
+                    pinnedDetails = action.value
+                )
+            )
+        }
+    }
+
     private fun onClearSession() {
         viewModelScope.launch(dispatcherProvider.viewModel) {
             removeOldSessionsNetworkRequestUseCase()

FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/features/network/list/model/NetworkAction.kt

@@ -46,7 +46,9 @@ sealed interface NetworkAction {
 
     data class InvertList(val value: Boolean) : NetworkAction
 
-    data class ToggleAutoScroll(val value: Boolean) : NetworkAction
+    data class Pinned(val value: Boolean) : NetworkAction
+
+    data object ToggleAutoScroll : NetworkAction
 
     data object ClearOldSession : NetworkAction
 

FloconDesktop/composeApp/src/commonMain/kotlin/io/github/openflocon/flocondesktop/features/network/list/view/NetworkScreen.kt

@@ -1,6 +1,5 @@
 package io.github.openflocon.flocondesktop.features.network.list.view
 
-import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
@@ -21,33 +20,32 @@ import androidx.compose.material.icons.outlined.CleaningServices
 import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material.icons.outlined.History
 import androidx.compose.material.icons.outlined.ImportExport
-import androidx.compose.material.icons.outlined.PinEnd
 import androidx.compose.material.icons.outlined.PlayCircle
 import androidx.compose.material.icons.outlined.Podcasts
 import androidx.compose.material.icons.outlined.SignalWifiStatusbarConnectedNoInternet4
 import androidx.compose.material.icons.outlined.WifiTethering
+import androidx.compose.material.icons.sharp.PushPin
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.State
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateMapOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.input.key.Key
 import androidx.compose.ui.input.key.KeyEventType
 import androidx.compose.ui.input.key.key
 import androidx.compose.ui.input.key.onPreviewKeyEvent
 import androidx.compose.ui.input.key.type
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.paging.PagingData
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemKey
-import io.github.openflocon.domain.settings.repository.SettingsRepository
 import io.github.openflocon.flocondesktop.common.ui.window.FloconWindowState
 import io.github.openflocon.flocondesktop.common.ui.window.createFloconWindowState
 import io.github.openflocon.flocondesktop.features.network.badquality.list.view.BadNetworkQualityWindow
@@ -75,15 +73,13 @@ import io.github.openflocon.library.designsystem.components.FloconHorizontalDivi
 import io.github.openflocon.library.designsystem.components.FloconIcon
 import io.github.openflocon.library.designsystem.components.FloconIconButton
 import io.github.openflocon.library.designsystem.components.FloconIconToggleButton
-import io.github.openflocon.library.designsystem.components.FloconIconTonalButton
 import io.github.openflocon.library.designsystem.components.FloconOverflow
 import io.github.openflocon.library.designsystem.components.FloconPageTopBar
 import io.github.openflocon.library.designsystem.components.FloconVerticalScrollbar
 import io.github.openflocon.library.designsystem.components.panel.PanelWidth
 import io.github.openflocon.library.designsystem.components.rememberFloconScrollbarAdapter
 import kotlinx.coroutines.flow.MutableStateFlow
 import org.koin.compose.viewmodel.koinViewModel
-import org.koin.mp.KoinPlatform
 
 @Composable
 fun NetworkScreen(
@@ -254,7 +250,13 @@ fun NetworkScreen(
                             checked = uiState.contentState.invertList,
                             text = "Invert list",
                             leadingIcon = Icons.AutoMirrored.Outlined.List,
-                            onCheckedChange = { onAction(NetworkAction.InvertList(it)) }
+                            onCheckedChange = { checked -> onAction(NetworkAction.InvertList(checked)) }
+                        )
+                        FloconDropdownMenuItem(
+                            checked = uiState.contentState.pinPanel,
+                            text = "Pin panel",
+                            leadingIcon = Icons.Sharp.PushPin,
+                            onCheckedChange = { checked -> onAction(NetworkAction.Pinned(checked)); it() }
                         )
                         FloconDropdownSeparator()
                         FloconDropdownMenuItem(
@@ -339,25 +341,6 @@ fun NetworkScreen(
         }
     }
 
-    // TODO Change
-    Box(
-        contentAlignment = Alignment.TopEnd,
-        modifier = Modifier.fillMaxSize()
-    ) {
-        FloconIconTonalButton(
-            onClick = {
-                val repository = KoinPlatform.getKoin().get<SettingsRepository>()
-
-                repository.networkSettings = repository.networkSettings.copy(pinnedDetails = false)
-            },
-            modifier = Modifier.align(Alignment.BottomStart)
-        ) {
-            FloconIcon(
-                Icons.Outlined.PinEnd
-            )
-        }
-    }
-
     val states = remember { mutableStateMapOf<NetworkBodyDetailUi, FloconWindowState>() }
 
     LaunchedEffect(uiState.contentState.detailJsons) {