refactor(desktop): small improvements

Author: Irineu333

application/src/desktopMain/kotlin/com/neoutils/neoregex/Main.desktop.kt

@@ -107,4 +107,4 @@ private fun FrameWindowScope.Header(
                 .aspectRatio(ratio = 1f)
         )
     }
-}
+}

application/src/webMain/kotlin/com/neoutils/neoregex/Main.web.kt

@@ -45,7 +45,7 @@ fun main() {
                 sizeManager.changes.first()
             }
         ) {
-            NeoTheme(ColorTheme) {
+            NeoTheme {
 
                 body.style.backgroundColor =
                     colorScheme.background.toCss()

core/common/src/androidMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.android.kt

@@ -1,7 +1,7 @@
 /*
  * NeoRegex.
  *
- * Copyright (C) 2024 <AUTHOR>.
+ * Copyright (C) 2024 Irineu A. Silva.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,4 +43,4 @@ val Context.colorTheme
         else -> {
             ColorTheme.LIGHT
         }
-    }
+    }

core/common/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.desktop.kt

@@ -1,7 +1,7 @@
 /*
  * NeoRegex.
  *
- * Copyright (C) 2024 <AUTHOR>.
+ * Copyright (C) 2024 Irineu A. Silva.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,4 +43,4 @@ actual fun rememberColorTheme(): ColorTheme {
             }
         }
     }
-}
+}

core/common/src/webMain/kotlin/com/neoutils/neoregex/core/common/util/ColorTheme.web.kt

@@ -1,7 +1,7 @@
 /*
  * NeoRegex.
  *
- * Copyright (C) 2024 <AUTHOR>.
+ * Copyright (C) 2024 Irineu A. Silva.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,4 +30,4 @@ actual fun rememberColorTheme(): ColorTheme {
         SystemTheme.DARK -> ColorTheme.DARK
         SystemTheme.UNKNOWN -> ColorTheme.LIGHT
     }
-}
+}

core/resources/src/commonMain/composeResources/values/strings.xml

@@ -18,12 +18,15 @@
 
 <resources>
     <string name="app_name">NeoRegex</string>
-    <string name="insert_regex_hint">Enter regular expression</string>
-    <string name="error_title">Oops! Something went wrong.</string>
-    <string name="error_message">We'd love to fix this! If possible, please share what happened.</string>
-    <string name="copy_error">Copy error</string>
-    <string name="copied">Copied!</string>
-    <string name="report_error">Report error</string>
-    <string name="stack_trace">Stack trace</string>
+
+    <string name="matcher_footer_insert_regex_hint">Enter regular expression</string>
+
     <string name="fatal_error_title">Fatal error: %1$s</string>
-</resources>
+    <string name="fatal_error_subtitle">Oops! Something went wrong.</string>
+    <string name="fatal_error_message">We'd love to fix this! If possible, please share what happened.</string>
+    <string name="fatal_error_copy_btn">Copy error</string>
+    <string name="fatal_error_copied_label">Copied!</string>
+    <string name="fatal_error_report_tab">Report error</string>
+    <string name="fatal_error_report_btn">Report error</string>
+    <string name="fatal_error_stack_trace_tab">Stack trace</string>
+</resources>

core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/FatalErrorWindow.kt

@@ -20,19 +20,22 @@ package com.neoutils.neoregex.core.sharedui.component
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.twotone.Error
 import androidx.compose.material3.Tab
 import androidx.compose.material3.TabRow
 import androidx.compose.material3.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.*
 import com.neoutils.neoregex.core.resources.Res
+import com.neoutils.neoregex.core.resources.fatal_error_report_tab
+import com.neoutils.neoregex.core.resources.fatal_error_stack_trace_tab
 import com.neoutils.neoregex.core.resources.fatal_error_title
-import com.neoutils.neoregex.core.resources.report_error
-import com.neoutils.neoregex.core.resources.stack_trace
 import org.jetbrains.compose.resources.StringResource
 import org.jetbrains.compose.resources.stringResource
 
@@ -47,11 +50,12 @@ fun ApplicationScope.FatalErrorWindow(
 
     DialogWindow(
         onCloseRequest = ::exitApplication,
+        state = state,
         title = stringResource(
             Res.string.fatal_error_title,
             throwable::class.java.name
         ),
-        state = state,
+        icon = rememberVectorPainter(Icons.TwoTone.Error)
     ) {
         Column(Modifier.fillMaxSize()) {
 
@@ -93,6 +97,6 @@ fun ApplicationScope.FatalErrorWindow(
 }
 
 enum class Tab(val title: StringResource) {
-    REPORT_ERROR(title = Res.string.report_error),
-    STACK_TRACE(title = Res.string.stack_trace);
+    REPORT_ERROR(title = Res.string.fatal_error_report_tab),
+    STACK_TRACE(title = Res.string.fatal_error_stack_trace_tab);
 }

core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/component/ReportScreen.kt

@@ -73,13 +73,13 @@ fun ReportScreen(
         )
 
         Text(
-            text = stringResource(Res.string.error_title),
+            text = stringResource(Res.string.fatal_error_subtitle),
             textAlign = TextAlign.Center,
             style = MaterialTheme.typography.titleMedium
         )
 
         Text(
-            text = stringResource(Res.string.error_message),
+            text = stringResource(Res.string.fatal_error_message),
             textAlign = TextAlign.Center,
         )
     }
@@ -115,6 +115,7 @@ private fun BottomButtons(
             )
             copied = true
         },
+        enabled = !copied,
         modifier = Modifier.width(120.dp)
     ) {
         AnimatedContent(
@@ -124,9 +125,9 @@ private fun BottomButtons(
             }
         ) { copied ->
             if (copied) {
-                Text(stringResource(Res.string.copied))
+                Text(stringResource(Res.string.fatal_error_copied_label))
             } else {
-                Text(stringResource(Res.string.copy_error))
+                Text(stringResource(Res.string.fatal_error_copy_btn))
             }
         }
     }
@@ -138,6 +139,6 @@ private fun BottomButtons(
             )
         },
     ) {
-        Text(stringResource(Res.string.report_error))
+        Text(stringResource(Res.string.fatal_error_report_btn))
     }
 }

core/shared-ui/src/desktopMain/kotlin/com/neoutils/neoregex/core/sharedui/util/Padding.kt

@@ -34,4 +34,4 @@ data class Padding(
         end = end,
         bottom = bottom,
     )
-}
+}

feature/matcher/src/commonMain/kotlin/com/neoutils/neoregex/feature/matcher/MatcherScreen.kt

@@ -60,7 +60,7 @@ import com.neoutils.neoregex.feature.matcher.state.matches
 import com.neoutils.neoregex.core.resources.Res
 import com.neoutils.neoregex.core.resources.ic_redo_24
 import com.neoutils.neoregex.core.resources.ic_undo_24
-import com.neoutils.neoregex.core.resources.insert_regex_hint
+import com.neoutils.neoregex.core.resources.matcher_footer_insert_regex_hint
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
 
@@ -178,7 +178,7 @@ class MatcherScreen : Screen {
                             else -> false
                         }
                     },
-                hint = stringResource(Res.string.insert_regex_hint),
+                hint = stringResource(Res.string.matcher_footer_insert_regex_hint),
                 error = uiState.matchResult.error
             )