From 5ccb8ce9983081e0d068c7a0be7d0d0920435b9c Mon Sep 17 00:00:00 2001 From: Nek-12 Date: Wed, 11 Sep 2024 22:59:34 +0200 Subject: [PATCH] chore: fix lint --- buildSrc/src/main/kotlin/ConfigureMultiplatform.kt | 3 +-- .../flowmvi/plugins/AwaitSubscribersPlugin.kt | 2 +- .../pro/respawn/flowmvi/plugins/NoOpPlugin.kt | 4 ++-- .../flowmvi/debugger/client/DebugClientStore.kt | 3 --- .../flowmvi/debugger/serializers/UUIDSerializer.kt | 3 +++ .../flowmvi/ideplugin/rememberIntelliJTheme.kt | 4 +++- .../arch/configuration/DefaultStoreConfiguration.kt | 2 +- .../respawn/flowmvi/debugger/server/di/AppModule.kt | 2 +- .../flowmvi/debugger/server/di/{koin.kt => Koin.kt} | 0 .../debugger/server/navigation/AppContent.kt | 1 - .../server/navigation/component/RootComponent.kt | 6 ------ .../server/navigation/util/DestinationLocals.kt | 2 +- .../{ConnectStore.kt => ConnectContainer.kt} | 4 ++-- .../server/ui/screens/connect/ConnectScreen.kt | 7 +++---- .../ui/screens/storedetails/StoreDetailsScreen.kt | 10 ++++++---- .../server/ui/screens/timeline/TimelineScreen.kt | 5 +---- .../flowmvi/debugger/server/ui/theme/Type.kt | 1 - .../server/ui/widgets/FocusedEventLayout.kt | 4 ++-- .../debugger/server/ui/widgets/RDropDownMenu.kt | 2 +- .../flowmvi/debugger/server/ui/widgets/RScaffold.kt | 13 +++++++------ .../flowmvi/debugger/server/ui/widgets/RTopBar.kt | 8 ++++---- .../ui/widgets/StoreEventListDetailsLayout.kt | 2 +- .../respawn/flowmvi/debugger/server/util/Util.kt | 2 +- detekt.yml | 6 +++--- 24 files changed, 44 insertions(+), 52 deletions(-) rename debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/di/{koin.kt => Koin.kt} (100%) rename debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/connect/{ConnectStore.kt => ConnectContainer.kt} (100%) diff --git a/buildSrc/src/main/kotlin/ConfigureMultiplatform.kt b/buildSrc/src/main/kotlin/ConfigureMultiplatform.kt index 72346229..36394c66 100644 --- a/buildSrc/src/main/kotlin/ConfigureMultiplatform.kt +++ b/buildSrc/src/main/kotlin/ConfigureMultiplatform.kt @@ -1,7 +1,6 @@ @file:Suppress("MissingPackageDeclaration", "unused", "UndocumentedPublicFunction", "LongMethod", "UnusedImports") import org.gradle.api.Project -import org.gradle.kotlin.dsl.assign import org.gradle.kotlin.dsl.getValue import org.gradle.kotlin.dsl.getting import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi @@ -117,7 +116,7 @@ fun Project.configureMultiplatform( compilerOptions { freeCompilerArgs.addAll(Config.compilerArgs) optIn.addAll(Config.optIns) - progressiveMode = true + progressiveMode.set(true) } } } diff --git a/core/src/commonMain/kotlin/pro/respawn/flowmvi/plugins/AwaitSubscribersPlugin.kt b/core/src/commonMain/kotlin/pro/respawn/flowmvi/plugins/AwaitSubscribersPlugin.kt index 8cbce8a5..7a449405 100644 --- a/core/src/commonMain/kotlin/pro/respawn/flowmvi/plugins/AwaitSubscribersPlugin.kt +++ b/core/src/commonMain/kotlin/pro/respawn/flowmvi/plugins/AwaitSubscribersPlugin.kt @@ -42,7 +42,7 @@ public class SubscriberManager { /** * Complete the wait period, freeing the store and coroutines that called [await] to continue. */ - public fun complete() { + public fun complete() { subscriber.getAndSet(null)?.cancel() } diff --git a/core/src/commonMain/kotlin/pro/respawn/flowmvi/plugins/NoOpPlugin.kt b/core/src/commonMain/kotlin/pro/respawn/flowmvi/plugins/NoOpPlugin.kt index bd2ed343..1409bd0b 100644 --- a/core/src/commonMain/kotlin/pro/respawn/flowmvi/plugins/NoOpPlugin.kt +++ b/core/src/commonMain/kotlin/pro/respawn/flowmvi/plugins/NoOpPlugin.kt @@ -14,5 +14,5 @@ private data object NoOpPlugin : StorePlugin { * A plugin that does nothing. Useful for testing or mocking */ @Suppress("UNCHECKED_CAST") -public fun NoOpPlugin( -): StorePlugin = NoOpPlugin as StorePlugin +public fun NoOpPlugin(): StorePlugin = + NoOpPlugin as StorePlugin diff --git a/debugger/debugger-client/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/client/DebugClientStore.kt b/debugger/debugger-client/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/client/DebugClientStore.kt index 1488cd4c..e4995dc7 100644 --- a/debugger/debugger-client/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/client/DebugClientStore.kt +++ b/debugger/debugger-client/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/client/DebugClientStore.kt @@ -23,9 +23,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.supervisorScope import kotlinx.coroutines.withTimeoutOrNull import pro.respawn.flowmvi.api.ActionShareBehavior -import pro.respawn.flowmvi.api.ActionShareBehavior.Disabled import pro.respawn.flowmvi.api.EmptyState -import pro.respawn.flowmvi.api.MVIState import pro.respawn.flowmvi.api.Store import pro.respawn.flowmvi.debugger.model.ClientEvent import pro.respawn.flowmvi.debugger.model.ClientEvent.StoreConnected @@ -33,7 +31,6 @@ import pro.respawn.flowmvi.debugger.model.ServerEvent import pro.respawn.flowmvi.dsl.store import pro.respawn.flowmvi.logging.StoreLogLevel import pro.respawn.flowmvi.logging.log -import pro.respawn.flowmvi.plugins.TimeTravel import pro.respawn.flowmvi.plugins.enableLogging import pro.respawn.flowmvi.plugins.init import pro.respawn.flowmvi.plugins.recover diff --git a/debugger/debugger-common/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/serializers/UUIDSerializer.kt b/debugger/debugger-common/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/serializers/UUIDSerializer.kt index 25c1361b..d31f1777 100644 --- a/debugger/debugger-common/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/serializers/UUIDSerializer.kt +++ b/debugger/debugger-common/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/serializers/UUIDSerializer.kt @@ -9,6 +9,9 @@ import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.encoding.Decoder import kotlinx.serialization.encoding.Encoder +/** + * Serializer for the internal flowmvi UUID type + */ public object UUIDSerializer : KSerializer { override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor( diff --git a/debugger/ideplugin/src/main/kotlin/pro/respawn/flowmvi/ideplugin/rememberIntelliJTheme.kt b/debugger/ideplugin/src/main/kotlin/pro/respawn/flowmvi/ideplugin/rememberIntelliJTheme.kt index 50ab1aec..b2c65e31 100644 --- a/debugger/ideplugin/src/main/kotlin/pro/respawn/flowmvi/ideplugin/rememberIntelliJTheme.kt +++ b/debugger/ideplugin/src/main/kotlin/pro/respawn/flowmvi/ideplugin/rememberIntelliJTheme.kt @@ -1,3 +1,5 @@ +@file:Suppress("Filename") + package pro.respawn.flowmvi.ideplugin import androidx.compose.runtime.Composable @@ -10,8 +12,8 @@ import androidx.compose.ui.graphics.Color import com.intellij.ide.ui.LafManager import com.intellij.ide.ui.LafManagerListener import com.intellij.openapi.application.ApplicationManager -import java.awt.Color as AwtColor import javax.swing.UIManager +import java.awt.Color as AwtColor @Composable fun rememberIntelliJTheme(): IntelliJTheme { diff --git a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/arch/configuration/DefaultStoreConfiguration.kt b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/arch/configuration/DefaultStoreConfiguration.kt index 95f4ace2..b6f32792 100644 --- a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/arch/configuration/DefaultStoreConfiguration.kt +++ b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/arch/configuration/DefaultStoreConfiguration.kt @@ -25,7 +25,7 @@ internal class DefaultStoreConfiguration( serializer: KSerializer, fileName: String, ) = CompressedFileSaver( - // STOPSHIP: Abstract away + // TODO: Abstract away path = File("states").apply { mkdirs() }.resolve("$fileName.json").absolutePath, recover = NullRecover ).let { JsonSaver(json, serializer, it) } diff --git a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/di/AppModule.kt b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/di/AppModule.kt index 7bbe6f97..278b422a 100644 --- a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/di/AppModule.kt +++ b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/di/AppModule.kt @@ -3,8 +3,8 @@ package pro.respawn.flowmvi.debugger.server.di import io.ktor.serialization.kotlinx.json.DefaultJson import org.koin.core.module.dsl.new import org.koin.dsl.module -import pro.respawn.flowmvi.debugger.server.arch.configuration.StoreConfiguration import pro.respawn.flowmvi.debugger.server.arch.configuration.DefaultStoreConfiguration +import pro.respawn.flowmvi.debugger.server.arch.configuration.StoreConfiguration import pro.respawn.flowmvi.debugger.server.ui.screens.connect.ConnectContainer import pro.respawn.flowmvi.debugger.server.ui.screens.storedetails.StoreDetailsContainer import pro.respawn.flowmvi.debugger.server.ui.screens.timeline.TimelineContainer diff --git a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/di/koin.kt b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/di/Koin.kt similarity index 100% rename from debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/di/koin.kt rename to debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/di/Koin.kt diff --git a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/navigation/AppContent.kt b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/navigation/AppContent.kt index f860fc8f..03479db9 100644 --- a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/navigation/AppContent.kt +++ b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/navigation/AppContent.kt @@ -51,5 +51,4 @@ fun AppContent( }, ) } - } diff --git a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/navigation/component/RootComponent.kt b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/navigation/component/RootComponent.kt index e8e2885b..af8f2920 100644 --- a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/navigation/component/RootComponent.kt +++ b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/navigation/component/RootComponent.kt @@ -1,13 +1,7 @@ package pro.respawn.flowmvi.debugger.server.navigation.component import com.arkivanov.decompose.ComponentContext -import com.arkivanov.decompose.ExperimentalDecomposeApi import com.arkivanov.decompose.childContext -import com.arkivanov.decompose.router.stack.webhistory.WebHistoryController -import pro.respawn.flowmvi.debugger.server.navigation.component.DestinationComponent -import pro.respawn.flowmvi.debugger.server.navigation.component.StackComponent -import pro.respawn.flowmvi.debugger.server.navigation.component.destinationComponent -import pro.respawn.flowmvi.debugger.server.navigation.destination.Destination import pro.respawn.flowmvi.debugger.server.navigation.details.DetailsComponent class RootComponent( diff --git a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/navigation/util/DestinationLocals.kt b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/navigation/util/DestinationLocals.kt index ec3bfbf5..5a534113 100644 --- a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/navigation/util/DestinationLocals.kt +++ b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/navigation/util/DestinationLocals.kt @@ -6,8 +6,8 @@ import org.koin.compose.LocalKoinScope import pro.respawn.flowmvi.compose.dsl.LocalSubscriberLifecycle import pro.respawn.flowmvi.compose.dsl.rememberSubscriberLifecycle import pro.respawn.flowmvi.debugger.server.di.LocalDestinationScope -import pro.respawn.flowmvi.essenty.lifecycle.asSubscriberLifecycle import pro.respawn.flowmvi.debugger.server.navigation.component.DestinationComponent +import pro.respawn.flowmvi.essenty.lifecycle.asSubscriberLifecycle @Composable internal fun ProvideDestinationLocals( diff --git a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/connect/ConnectStore.kt b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/connect/ConnectContainer.kt similarity index 100% rename from debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/connect/ConnectStore.kt rename to debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/connect/ConnectContainer.kt index 0e7bacb0..2b7a9857 100644 --- a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/connect/ConnectStore.kt +++ b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/connect/ConnectContainer.kt @@ -6,11 +6,11 @@ import pro.respawn.flowmvi.api.PipelineContext import pro.respawn.flowmvi.debugger.server.DebugServer import pro.respawn.flowmvi.debugger.server.arch.configuration.StoreConfiguration import pro.respawn.flowmvi.debugger.server.arch.configuration.configure -import pro.respawn.flowmvi.debugger.server.ui.util.HostForm -import pro.respawn.flowmvi.debugger.server.ui.util.PortForm import pro.respawn.flowmvi.debugger.server.ui.screens.connect.ConnectAction.GoToTimeline import pro.respawn.flowmvi.debugger.server.ui.screens.connect.ConnectIntent.HostChanged import pro.respawn.flowmvi.debugger.server.ui.screens.connect.ConnectState.ConfiguringServer +import pro.respawn.flowmvi.debugger.server.ui.util.HostForm +import pro.respawn.flowmvi.debugger.server.ui.util.PortForm import pro.respawn.flowmvi.dsl.store import pro.respawn.flowmvi.dsl.updateState import pro.respawn.flowmvi.plugins.recover diff --git a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/connect/ConnectScreen.kt b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/connect/ConnectScreen.kt index 8fa87699..6cd68967 100644 --- a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/connect/ConnectScreen.kt +++ b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/connect/ConnectScreen.kt @@ -11,15 +11,15 @@ import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable -import pro.respawn.flowmvi.compose.dsl.requireLifecycle -import pro.respawn.flowmvi.compose.dsl.subscribe -import pro.respawn.flowmvi.compose.preview.EmptyReceiver import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import org.jetbrains.compose.resources.painterResource import pro.respawn.flowmvi.api.IntentReceiver +import pro.respawn.flowmvi.compose.dsl.requireLifecycle +import pro.respawn.flowmvi.compose.dsl.subscribe +import pro.respawn.flowmvi.compose.preview.EmptyReceiver import pro.respawn.flowmvi.debugger.server.di.container import pro.respawn.flowmvi.debugger.server.navigation.AppNavigator import pro.respawn.flowmvi.debugger.server.ui.screens.connect.ConnectIntent.HostChanged @@ -37,7 +37,6 @@ import pro.respawn.flowmvi.server.generated.resources.icon_nobg_32 fun ConnectScreen( navigator: AppNavigator, ) = with(container()) { - val state by subscribe(requireLifecycle()) { when (it) { is ConnectAction.GoToTimeline -> navigator.timeline() diff --git a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/storedetails/StoreDetailsScreen.kt b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/storedetails/StoreDetailsScreen.kt index 7b19b6de..71b6234c 100644 --- a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/storedetails/StoreDetailsScreen.kt +++ b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/storedetails/StoreDetailsScreen.kt @@ -1,5 +1,6 @@ package pro.respawn.flowmvi.debugger.server.ui.screens.storedetails +import androidx.compose.desktop.ui.tooling.preview.Preview import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ExperimentalLayoutApi @@ -15,9 +16,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import pro.respawn.flowmvi.compose.dsl.requireLifecycle -import pro.respawn.flowmvi.compose.dsl.subscribe -import pro.respawn.flowmvi.compose.preview.EmptyReceiver import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -30,6 +28,9 @@ import com.benasher44.uuid.uuid4 import kotlinx.collections.immutable.toImmutableList import org.koin.core.parameter.parametersOf import pro.respawn.flowmvi.api.IntentReceiver +import pro.respawn.flowmvi.compose.dsl.requireLifecycle +import pro.respawn.flowmvi.compose.dsl.subscribe +import pro.respawn.flowmvi.compose.preview.EmptyReceiver import pro.respawn.flowmvi.debugger.model.ClientEvent import pro.respawn.flowmvi.debugger.server.ServerEventEntry import pro.respawn.flowmvi.debugger.server.StoreCommand @@ -41,10 +42,10 @@ import pro.respawn.flowmvi.debugger.server.ui.screens.storedetails.StoreDetailsI import pro.respawn.flowmvi.debugger.server.ui.screens.storedetails.StoreDetailsIntent.CopyEventClicked import pro.respawn.flowmvi.debugger.server.ui.screens.storedetails.StoreDetailsIntent.EventClicked import pro.respawn.flowmvi.debugger.server.ui.screens.storedetails.StoreDetailsState.DisplayingStore -import pro.respawn.flowmvi.debugger.server.ui.widgets.StoreEventListDetailsLayout import pro.respawn.flowmvi.debugger.server.ui.theme.RespawnTheme import pro.respawn.flowmvi.debugger.server.ui.widgets.RErrorView import pro.respawn.flowmvi.debugger.server.ui.widgets.RScaffold +import pro.respawn.flowmvi.debugger.server.ui.widgets.StoreEventListDetailsLayout import pro.respawn.flowmvi.debugger.server.ui.widgets.TypeCrossfade import pro.respawn.flowmvi.util.typed import pro.respawn.kmmutils.common.copies @@ -124,6 +125,7 @@ private val StoreCommand.label: String } @Composable +@Preview private fun StoreDetailsScreenPreview() = RespawnTheme { EmptyReceiver { StoreDetailsScreenContent( diff --git a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/timeline/TimelineScreen.kt b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/timeline/TimelineScreen.kt index a7ba30ed..45d38abe 100644 --- a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/timeline/TimelineScreen.kt +++ b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/screens/timeline/TimelineScreen.kt @@ -10,8 +10,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalClipboardManager -import androidx.compose.ui.text.AnnotatedString -import androidx.compose.ui.text.ParagraphStyle import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp @@ -28,12 +26,11 @@ import pro.respawn.flowmvi.debugger.server.ui.screens.timeline.TimelineIntent.Cl import pro.respawn.flowmvi.debugger.server.ui.screens.timeline.TimelineIntent.CopyEventClicked import pro.respawn.flowmvi.debugger.server.ui.screens.timeline.TimelineIntent.EventClicked import pro.respawn.flowmvi.debugger.server.ui.screens.timeline.TimelineState.DisplayingTimeline -import pro.respawn.flowmvi.debugger.server.ui.widgets.StoreEventListDetailsLayout import pro.respawn.flowmvi.debugger.server.ui.widgets.RErrorView import pro.respawn.flowmvi.debugger.server.ui.widgets.RScaffold +import pro.respawn.flowmvi.debugger.server.ui.widgets.StoreEventListDetailsLayout import pro.respawn.flowmvi.debugger.server.ui.widgets.TypeCrossfade import pro.respawn.kmmutils.compose.annotate -import pro.respawn.kmmutils.compose.style /** * The Timeline (Main) screen of the debugger. diff --git a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/theme/Type.kt b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/theme/Type.kt index ccb70639..0bbd47f3 100644 --- a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/theme/Type.kt +++ b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/theme/Type.kt @@ -16,7 +16,6 @@ import androidx.compose.ui.text.font.toFontFamily import androidx.compose.ui.text.style.Hyphens import androidx.compose.ui.text.style.LineBreak import androidx.compose.ui.unit.sp -import org.jetbrains.compose.resources.ExperimentalResourceApi import org.jetbrains.compose.resources.Font import pro.respawn.flowmvi.server.generated.resources.Res import pro.respawn.flowmvi.server.generated.resources.comfortaa diff --git a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/FocusedEventLayout.kt b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/FocusedEventLayout.kt index 8b0fa8e8..9319130c 100644 --- a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/FocusedEventLayout.kt +++ b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/FocusedEventLayout.kt @@ -33,9 +33,9 @@ import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import kotlinx.datetime.LocalDateTime -import pro.respawn.flowmvi.debugger.server.util.representation import pro.respawn.flowmvi.debugger.server.ui.screens.timeline.FocusedEvent import pro.respawn.flowmvi.debugger.server.ui.theme.Opacity +import pro.respawn.flowmvi.debugger.server.util.representation import pro.respawn.flowmvi.debugger.server.util.type @Composable @@ -76,7 +76,7 @@ internal fun FocusedEventLayout( Row { val colors = IconButtonDefaults.filledIconButtonColors(MaterialTheme.colorScheme.surfaceVariant) IconButton( - onClick =onCopy, + onClick = onCopy, colors = colors, ) { Icon(Icons.Rounded.ContentCopy, contentDescription = null) diff --git a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/RDropDownMenu.kt b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/RDropDownMenu.kt index 46a7c895..58d06db2 100644 --- a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/RDropDownMenu.kt +++ b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/RDropDownMenu.kt @@ -47,9 +47,9 @@ class DropDownMenuState internal constructor( */ @Composable fun RDropDownMenu( - button: @Composable DropDownMenuState.() -> Unit, modifier: Modifier = Modifier, state: DropDownMenuState = rememberDropDownMenuState(), + button: @Composable DropDownMenuState.() -> Unit, actions: @Composable DropDownMenuState.() -> Unit, ) { // box needed for popup anchoring diff --git a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/RScaffold.kt b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/RScaffold.kt index 940ee990..f27242b5 100644 --- a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/RScaffold.kt +++ b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/RScaffold.kt @@ -53,15 +53,16 @@ fun RScaffold( title: String? = null, onBack: (() -> Unit)? = null, topBarScrollBehavior: TopAppBarScrollBehavior? = TopAppBarDefaults.enterAlwaysScrollBehavior(), - actions: @Composable RowScope.() -> Unit = {}, - bottomBar: @Composable () -> Unit = {}, - fab: @Composable () -> Unit = {}, + snackbarHostState: SnackbarHostState? = null, containerColor: Color = MaterialTheme.colorScheme.background, contentColor: Color = MaterialTheme.colorScheme.onBackground, fabPosition: FabPosition = RScaffoldDefaults.FabPosition, contentWindowInsets: WindowInsets? = RScaffoldDefaults.partialWindowInsets, fadeContent: Boolean = true, + actions: @Composable RowScope.() -> Unit = {}, + bottomBar: @Composable () -> Unit = {}, + fab: @Composable () -> Unit = {}, content: @Composable (BoxScope.() -> Unit), ) = RScaffold( modifier = modifier, @@ -89,9 +90,6 @@ fun RScaffold( @Composable fun RScaffold( modifier: Modifier = Modifier, - topBar: @Composable () -> Unit = {}, - bottomBar: @Composable () -> Unit = {}, - fab: @Composable () -> Unit = {}, snackbarHostState: SnackbarHostState? = null, containerColor: Color = MaterialTheme.colorScheme.background, contentColor: Color = MaterialTheme.colorScheme.onBackground, @@ -99,6 +97,9 @@ fun RScaffold( contentWindowInsets: WindowInsets? = RScaffoldDefaults.partialWindowInsets, nestedScrollConnection: NestedScrollConnection? = null, fadeContent: Boolean = true, + topBar: @Composable () -> Unit = {}, + bottomBar: @Composable () -> Unit = {}, + fab: @Composable () -> Unit = {}, content: @Composable BoxScope.() -> Unit, ) { Scaffold( diff --git a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/RTopBar.kt b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/RTopBar.kt index c9c1b71e..a219ed53 100644 --- a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/RTopBar.kt +++ b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/RTopBar.kt @@ -44,12 +44,12 @@ val TopBarTextStyle fun RTopBar( modifier: Modifier = Modifier, onNavigationIconClick: (() -> Unit)? = null, - actions: @Composable (RowScope.() -> Unit) = {}, windowInsets: WindowInsets = TopAppBarDefaults.windowInsets, title: AnnotatedString? = Res.string.app_name.string().annotate(), navigationIcon: ImageVector = Icons.Rounded.ArrowBackIosNew, scrollBehavior: TopAppBarScrollBehavior? = null, style: TextStyle = TopBarTextStyle, + actions: @Composable (RowScope.() -> Unit) = {}, ) = RTopBar( modifier = modifier, title = { RTopBarTitle(title, style = style) }, @@ -62,12 +62,12 @@ fun RTopBar( @OptIn(ExperimentalMaterial3Api::class) @Composable fun RTopBar( - title: @Composable () -> Unit, - navigationIcon: @Composable () -> Unit, modifier: Modifier = Modifier, - actions: @Composable (RowScope.() -> Unit) = {}, windowInsets: WindowInsets = TopAppBarDefaults.windowInsets, scrollBehavior: TopAppBarScrollBehavior? = null, + actions: @Composable (RowScope.() -> Unit) = {}, + navigationIcon: @Composable () -> Unit, + title: @Composable () -> Unit, ) = CenterAlignedTopAppBar( windowInsets = windowInsets, modifier = modifier, diff --git a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/StoreEventListDetailsLayout.kt b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/StoreEventListDetailsLayout.kt index d23bb7b3..64baa54f 100644 --- a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/StoreEventListDetailsLayout.kt +++ b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/ui/widgets/StoreEventListDetailsLayout.kt @@ -22,8 +22,8 @@ internal fun StoreEventListDetailsLayout( onClick: (ServerEventEntry) -> Unit, onCopy: () -> Unit, onClose: () -> Unit, - listState: LazyListState = rememberLazyListState(), modifier: Modifier = Modifier, + listState: LazyListState = rememberLazyListState(), ) = DynamicTwoPaneLayout( modifier = modifier, secondPaneVisible = focusedEvent != null, diff --git a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/util/Util.kt b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/util/Util.kt index 8e680e79..9573f232 100644 --- a/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/util/Util.kt +++ b/debugger/server/src/commonMain/kotlin/pro/respawn/flowmvi/debugger/server/util/Util.kt @@ -38,5 +38,5 @@ ${from.body.prettyPrintToString()} <--- ${to.name} ${to.body.prettyPrintToString()} -""".trimIndent() + """.trimIndent() } diff --git a/detekt.yml b/detekt.yml index 56ba5276..58287972 100644 --- a/detekt.yml +++ b/detekt.yml @@ -68,17 +68,17 @@ comments: endOfSentenceFormat: '([.?!][ \t\n\r\f<])|([.?!:]$)' UndocumentedPublicClass: active: true - excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**.kts', '**/kotestTest/**', '**/sample/**','**/app/**' ] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**.kts', '**/kotestTest/**', '**/sample/**','**/app/**', '**/debugger/server/**', '**/ideplugin/**' ] searchInNestedClass: true searchInInnerClass: true searchInInnerObject: true searchInInnerInterface: true UndocumentedPublicFunction: active: true - excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**.kts', '**/kotestTest/**', '**/sample/**', '**/app/**' ] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**.kts', '**/kotestTest/**', '**/sample/**', '**/app/**', '**/debugger/server/**', '**/ideplugin/**' ] UndocumentedPublicProperty: active: true - excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**.kts', '**/kotestTest/**', '**/sample/**', '**/app/**' ] + excludes: [ '**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**.kts', '**/kotestTest/**', '**/sample/**', '**/app/**', '**/debugger/server/**', '**/ideplugin/**' ] complexity: active: true