Merge branch 'main' into renovate/kotlin-monorepo

Author: snappdevelopment

composeApp/build.gradle.kts

@@ -24,6 +24,7 @@ kotlin {
             implementation(libs.androidx.lifecycle.viewmodel)
             implementation(libs.androidx.lifecycle.runtime.compose)
             implementation(libs.material.icons)
+            implementation(libs.material3)
         }
         desktopMain.dependencies {
             implementation(compose.desktop.currentOs)

composeApp/src/commonMain/composeResources/values/strings.xml

@@ -11,4 +11,6 @@
     <string name="stats_filelines">Lines: %1$s</string>
     <string name="stats_filereadtime">Read time: %1$s</string>
     <string name="search_label">Search Key/Value</string>
+    <string name="display_mode_render">Render</string>
+    <string name="display_mode_edit">Edit</string>
 </resources>

composeApp/src/desktopMain/kotlin/com/sebastianneubauer/jsontreeviewer/App.kt

@@ -7,14 +7,17 @@ object Contract {
         data object InitialLoading: State
         data object Loading: State
         data class Error(val error: ErrorType): State
-        data class Content(val json: String, val stats: Stats, val searchDirection: SearchDirection?): State
+        data class Content(
+            val json: String,
+            val searchDirection: SearchDirection?,
+            val displayMode: DisplayMode
+        ): State
     }
 
     sealed class ErrorType {
         data object DataDragAndDropError: ErrorType()
         data object FileReadError: ErrorType()
         data object CopyPasteError: ErrorType()
-        data class JsonParserError(val message: String): ErrorType()
     }
 
     sealed interface SearchDirection {
@@ -24,13 +27,10 @@ object Contract {
         data class Previous(override val increment: Int): SearchDirection
     }
 
-    data class Stats(
-        val filePath: String,
-        val fileName: String,
-        val fileSize: String,
-        val fileReadTime: String,
-        val fileLines: String,
-    )
+    enum class DisplayMode {
+        Render,
+        Edit
+    }
 }
 
 val supportedFileTypes = listOf("json", "txt")

composeApp/src/desktopMain/kotlin/com/sebastianneubauer/jsontreeviewer/State.kt

@@ -13,16 +13,11 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import java.awt.Toolkit
 import java.awt.datatransfer.DataFlavor
-import kotlin.io.path.fileSize
-import kotlin.time.DurationUnit
-import kotlin.time.TimeSource
-import kotlin.time.measureTimedValue
 import androidx.compose.runtime.State as ComposeState
 
 class ViewModel(
     private val coroutineScope: CoroutineScope,
     private val ioDispatcher: CoroutineDispatcher,
-    private val timeSource: TimeSource,
 ) {
     private var viewModelState = mutableStateOf<State>(State.Initial)
     val state: ComposeState<State> = viewModelState
@@ -38,19 +33,12 @@ class ViewModel(
                     val newState = state.file
                         .takeIf { it.exists() && it.isFile && it.extension in supportedFileTypes }
                         ?.let { validFile ->
-                            val (json, time) = timeSource.measureTimedValue { validFile.readText() }
-                            val fileSize = validFile.toPath().fileSize() / 1024F
+                            val json = validFile.readText()
 
                             State.Content(
                                 json = json,
                                 searchDirection = null,
-                                stats = Contract.Stats(
-                                    filePath = validFile.path,
-                                    fileName = validFile.name,
-                                    fileSize = "%.2f".format(fileSize) + "KB",
-                                    fileReadTime = time.toString(unit = DurationUnit.MILLISECONDS, decimals = 3),
-                                    fileLines = json.lines().count().toString()
-                                )
+                                displayMode = Contract.DisplayMode.Render,
                             )
                         }
                         ?: State.Error(error = Contract.ErrorType.FileReadError)
@@ -64,8 +52,13 @@ class ViewModel(
 
     fun onKeyEvent(event: KeyEvent): Boolean {
         return if ((event.isCtrlPressed || event.isMetaPressed) && event.key == Key.V) {
-            viewModelState.value = getStateFromClipboardData()
-            true
+            val state = viewModelState.value
+            if(state is State.Content) {
+                false
+            } else {
+                viewModelState.value = getStateFromClipboardData()
+                true
+            }
         } else if(event.key == Key.DirectionDown || event.key == Key.Enter) {
             val newState = getStateFromSearchDirectionEvent(isDownEvent = true)
             viewModelState.value = newState
@@ -79,6 +72,24 @@ class ViewModel(
         }
     }
 
+    fun updateDisplayMode(displayMode: Contract.DisplayMode) {
+        val state = viewModelState.value
+        if(state is State.Content) {
+            viewModelState.value = state.copy(displayMode = displayMode)
+        }
+    }
+
+    fun updateJson(json: String) {
+        val state = viewModelState.value
+        if(state is State.Content) {
+            viewModelState.value = state.copy(json = json)
+        }
+    }
+
+    fun reset() {
+        viewModelState.value = State.Initial
+    }
+
     private fun getStateFromClipboardData(): State {
         val clipboardString = try {
             Toolkit.getDefaultToolkit()
@@ -92,13 +103,7 @@ class ViewModel(
             State.Content(
                 json = clipboardString,
                 searchDirection = null,
-                stats = Contract.Stats(
-                    filePath = "from clipboard",
-                    fileName = "n/a",
-                    fileSize = "n/a",
-                    fileReadTime = "n/a",
-                    fileLines = clipboardString.lines().count().toString()
-                )
+                displayMode = Contract.DisplayMode.Render,
             )
         } else {
             State.Error(error = Contract.ErrorType.CopyPasteError)
@@ -123,10 +128,4 @@ class ViewModel(
             currentState.copy(searchDirection = newSearchDirection)
         } else currentState
     }
-
-    fun showJsonParsingError(throwable: Throwable) {
-        viewModelState.value = State.Error(
-            error = Contract.ErrorType.JsonParserError(message = throwable.localizedMessage)
-        )
-    }
 }

composeApp/src/desktopMain/kotlin/com/sebastianneubauer/jsontreeviewer/ViewModel.kt

@@ -8,14 +8,12 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import org.jetbrains.compose.resources.stringResource
-import kotlin.time.TimeSource
 
 fun main() = application {
     val coroutineScope = CoroutineScope(Job())
     val viewModel = ViewModel(
         coroutineScope = coroutineScope,
         ioDispatcher = Dispatchers.IO,
-        timeSource = TimeSource.Monotonic
     )
 
     Window(

composeApp/src/desktopMain/kotlin/com/sebastianneubauer/jsontreeviewer/main.kt

@@ -9,19 +9,22 @@ import org.junit.Test
 import java.io.File
 import java.nio.file.Files
 import kotlin.test.assertEquals
-import kotlin.time.TestTimeSource
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class ViewModelTest {
 
     private val dispatcher = UnconfinedTestDispatcher()
-    private val timeSource = TestTimeSource()
     private val json = "{\"Hello\": \"World\"}"
 
     private val underTest = ViewModel(
         coroutineScope = TestScope(dispatcher),
         ioDispatcher = dispatcher,
-        timeSource = timeSource
+    )
+
+    private val contentState = State.Content(
+        json = json,
+        searchDirection = null,
+        displayMode = Contract.DisplayMode.Render
     )
 
     private fun getFile(): File {
@@ -42,17 +45,7 @@ class ViewModelTest {
         underTest.updateDragAndDropState(DragAndDropState.Success(file))
 
         assertEquals(
-            expected = State.Content(
-                json = json,
-                searchDirection = null,
-                stats = Contract.Stats(
-                    filePath = file.path,
-                    fileName = file.name,
-                    fileSize = "0.02KB",
-                    fileReadTime = "0.000ms",
-                    fileLines = "1"
-                )
-            ),
+            expected = contentState,
             actual = underTest.state.value
         )
     }
@@ -101,15 +94,59 @@ class ViewModelTest {
     }
 
     @Test
-    fun `jsonTree parsing error returns Error state`() {
-        val throwable = Throwable(message = "")
-        underTest.showJsonParsingError(throwable)
+    fun `updateDisplayMode updates the Content state with the new DisplayMode`() {
+        // Arrange: Start in Content state with Render mode
+        val file = getFile()
+        underTest.updateDragAndDropState(DragAndDropState.Success(file))
+        assertEquals(
+            expected = contentState,
+            actual = underTest.state.value
+        )
+
+        underTest.updateDisplayMode(Contract.DisplayMode.Edit)
 
         assertEquals(
-            expected = State.Error(
-                error = Contract.ErrorType.JsonParserError(message = throwable.localizedMessage)
+            expected = contentState.copy(
+                displayMode = Contract.DisplayMode.Edit
             ),
             actual = underTest.state.value
         )
     }
+
+    @Test
+    fun `updateJson updates the Content state with the new json`() {
+        // Arrange: Start in Content state with Render mode
+        val file = getFile()
+        underTest.updateDragAndDropState(DragAndDropState.Success(file))
+        assertEquals(
+            expected = contentState,
+            actual = underTest.state.value
+        )
+
+        underTest.updateJson("hello")
+
+        assertEquals(
+            expected = contentState.copy(json = "hello"),
+            actual = underTest.state.value
+        )
+    }
+
+    @Test
+    fun `reset updates the state to the initial state`() {
+        // Arrange: Start in Content state with Render mode
+        val file = getFile()
+        underTest.updateDragAndDropState(DragAndDropState.Success(file))
+        assertEquals(
+            expected = contentState,
+            actual = underTest.state.value
+        )
+
+        underTest.reset()
+
+        assertEquals(
+            expected = State.Initial,
+            actual = underTest.state.value
+        )
+    }
+
 }

composeApp/src/desktopTest/kotlin/com/sebastianneubauer/jsontreeviewer/ViewModelTest.kt

@@ -1,10 +1,11 @@
 [versions]
-androidx-lifecycle = "2.8.4"
+androidx-lifecycle = "2.9.1"
 compose-plugin = "1.8.2"
 junit = "4.13.2"
 kotlin = "2.2.0"
-kotlinx-coroutines = "1.10.1"
+kotlinx-coroutines = "1.10.2"
 material-icons = "1.7.3"
+material3 = "1.3.2"
 jsontree = "2.5.0"
 hotreload = "1.0.0-beta04"
 
@@ -15,6 +16,7 @@ junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-lifecycle-viewmodel = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-viewmodel", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-runtime-compose = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
 material-icons = { group = "org.jetbrains.compose.material", name = "material-icons-extended", version.ref = "material-icons" }
+material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
 kotlinx-coroutines-swing = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
 jsontree = { group = "com.sebastianneubauer.jsontree", name = "jsontree", version.ref = "jsontree" }