Merge pull request #60 from NeoUtils/develop

Release v2.3.0
NeoUtils · Nov 10, 2024 · f88fbb3 · f88fbb3
2 parents 374d405 + 0d63b6d
commit f88fbb3
Show file tree

Hide file tree

Showing 37 changed files with 1,108 additions and 258 deletions.
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/application/build.gradle.kts b/application/build.gradle.kts
@@ -16,7 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import extension.*
+import extension.catalog
+import extension.config
+import extension.distribution
+import extension.name
 
 plugins {
     alias(libs.plugins.neoutils.neoregex.android)

diff --git a/application/installation/com.neoutils.NeoRegex.metainfo.xml b/application/installation/com.neoutils.NeoRegex.metainfo.xml
@@ -10,7 +10,8 @@
 
     <description>
         <p>
-            Visualize the functioning of your regular expressions in real-time with a useful and intuitive tool. With support for capture groups, undo, and redo.
+            Visualize the functioning of your regular expressions in real-time with a useful and intuitive tool. With
+            support for capture groups, undo, and redo.
         </p>
     </description>
 
@@ -50,10 +51,9 @@
             <description>
                 <p>Improvements in user experience.</p>
                 <ul>
-                    <li>Small improvements across the application.</li>
                     <li>Customized window for a personalized experience.</li>
-                    <li>Enhanced touchscreen support for better usability on touch devices.</li>
                     <li>Improved theme detection.</li>
+                    <li>Small improvements.</li>
                 </ul>
             </description>
         </release>

diff --git a/application/src/androidMain/kotlin/com/neoutils/neoregex/Main.android.kt b/application/src/androidMain/kotlin/com/neoutils/neoregex/Main.android.kt
@@ -26,8 +26,8 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.ui.Modifier
-import com.neoutils.neoregex.core.common.util.UiMode
-import com.neoutils.neoregex.core.common.util.resolve
+import com.neoutils.neoregex.core.common.util.ColorTheme
+import com.neoutils.neoregex.core.common.util.colorTheme
 import com.neoutils.neoregex.core.designsystem.theme.NeoTheme
 
 class MainActivity : ComponentActivity() {
@@ -38,6 +38,7 @@ class MainActivity : ComponentActivity() {
         setupSystemBars()
 
         setContent {
+
             NeoTheme {
                 App(Modifier.safeDrawingPadding())
             }
@@ -46,14 +47,14 @@ class MainActivity : ComponentActivity() {
 
     private fun setupSystemBars() {
 
-        val style = when (UiMode.resolve(context = this)) {
-            UiMode.DARK -> {
+        val style = when (colorTheme) {
+            ColorTheme.DARK -> {
                 SystemBarStyle.dark(
                     Color.BLACK,
                 )
             }
 
-            UiMode.LIGHT -> {
+            ColorTheme.LIGHT -> {
                 SystemBarStyle.light(
                     Color.WHITE,
                     Color.BLACK,

diff --git a/application/src/desktopMain/kotlin/com/neoutils/neoregex/Main.desktop.kt b/application/src/desktopMain/kotlin/com/neoutils/neoregex/Main.desktop.kt
@@ -16,80 +16,95 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+@file:OptIn(ExperimentalComposeUiApi::class)
+
 package com.neoutils.neoregex
 
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme.colorScheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.FrameWindowScope
-import androidx.compose.ui.window.application
-import com.neoutils.neoregex.core.common.util.UiMode
-import com.neoutils.neoregex.core.common.util.isDark
-import com.neoutils.neoregex.core.common.util.resolve
+import androidx.compose.ui.window.launchApplication
+import com.neoutils.neoregex.core.common.util.ColorTheme
+import com.neoutils.neoregex.core.common.util.rememberColorTheme
 import com.neoutils.neoregex.core.designsystem.theme.NeoTheme
 import com.neoutils.neoregex.core.designsystem.theme.NeoTheme.dimensions
 import com.neoutils.neoregex.core.resources.Res
 import com.neoutils.neoregex.core.resources.app_name
 import com.neoutils.neoregex.core.resources.github
-import com.neoutils.neoregex.core.sharedui.component.DefaultHeader
+import com.neoutils.neoregex.core.sharedui.component.NeoHeader
 import com.neoutils.neoregex.core.sharedui.component.NeoWindow
+import kotlinx.coroutines.CoroutineScope
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
+import org.jetbrains.skiko.MainUIDispatcher
 
-fun main() = application {
-
-    val uiMode = remember { UiMode.resolve() }
-
-    NeoTheme(uiMode.isDark) {
-        NeoWindow(
-            header = {
-                TitleBar()
+fun main() {
+    with(CoroutineScope(MainUIDispatcher)) {
+        launchApplication {
+            NeoTheme {
+                NeoWindow(
+                    header = {
+                        Header()
+                    }
+                ) {
+                    App()
+                }
             }
-        ) {
-            App()
         }
     }
 }
 
 @Composable
-private fun FrameWindowScope.TitleBar(
+private fun FrameWindowScope.Header(
     title: String = stringResource(Res.string.app_name),
-    uiMode: UiMode = remember { UiMode.resolve() }
-) {
-    DefaultHeader(
-        title = title,
-        options = {
-            val uriHandler = LocalUriHandler.current
+    colorTheme: ColorTheme = rememberColorTheme()
+) = NeoHeader { padding ->
 
-            Icon(
-                painter = painterResource(Res.drawable.github),
-                contentDescription = null,
-                tint = when (uiMode) {
-                    UiMode.LIGHT -> colorScheme.onSurface
-                    UiMode.DARK -> colorScheme.onSurface
-                },
-                modifier = Modifier
-                    .clip(CircleShape)
-                    .clickable(
-                        onClick = {
-                            uriHandler.openUri(
-                                uri = "https://github.com/NeoUtils/NeoRegex"
-                            )
-                        }
-                    )
-                    .padding(dimensions.medium)
-                    .aspectRatio(ratio = 1f)
-            )
-        }
+    Text(
+        text = title,
+        modifier = Modifier.align(
+            Alignment.Center
+        )
     )
+
+    Row(
+        modifier = Modifier
+            .padding(padding)
+            .padding(horizontal = dimensions.medium)
+            .align(Alignment.CenterEnd)
+    ) {
+        val uriHandler = LocalUriHandler.current
+
+        Icon(
+            painter = painterResource(Res.drawable.github),
+            contentDescription = null,
+            tint = when (colorTheme) {
+                ColorTheme.LIGHT -> colorScheme.onSurface
+                ColorTheme.DARK -> colorScheme.onSurface
+            },
+            modifier = Modifier
+                .clip(CircleShape)
+                .clickable(
+                    onClick = {
+                        uriHandler.openUri(
+                            uri = "https://github.com/NeoUtils/NeoRegex"
+                        )
+                    }
+                )
+                .padding(dimensions.medium)
+                .aspectRatio(ratio = 1f)
+        )
+    }
 }
diff --git a/build-logic/src/main/kotlin/extension/Project.kt b/build-logic/src/main/kotlin/extension/Project.kt
@@ -26,8 +26,8 @@ import org.gradle.kotlin.dsl.the
 val config = Config(
     version = Config.Version(
         major = 2,
-        minor = 2,
-        patch = 1,
+        minor = 3,
+        patch = 0,
         phase = Config.Phase.RELEASE
     ),
     android = Config.Android(

diff --git a/...mon/src/androidMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.android.kt b/...mon/src/androidMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.android.kt
@@ -18,7 +18,4 @@
 
 package com.neoutils.neoregex.core.common.platform
 
-import com.neoutils.neoregex.core.common.platform.Platform
-
-actual val Platform.Companion.Current: Platform
-    get() = Platform.ANDROID
+actual val platform: Platform = Platform.Android
diff --git a/...oregex/core/common/util/UiMode.android.kt → ...ex/core/common/util/ColorTheme.android.kt b/...oregex/core/common/util/UiMode.android.kt → ...ex/core/common/util/ColorTheme.android.kt
@@ -21,17 +21,26 @@ package com.neoutils.neoregex.core.common.util
 import android.content.Context
 import android.content.res.Configuration.UI_MODE_NIGHT_MASK
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
-import com.neoutils.neoregex.core.common.util.UiMode
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.runtime.Composable
 
-fun UiMode.Companion.resolve(context: Context): UiMode {
+@Composable
+actual fun rememberColorTheme(): ColorTheme {
 
-    return when (context.resources.configuration.uiMode and UI_MODE_NIGHT_MASK) {
+    return if (isSystemInDarkTheme()) {
+        ColorTheme.DARK
+    } else {
+        ColorTheme.LIGHT
+    }
+}
+
+val Context.colorTheme
+    get() = when (resources.configuration.uiMode and UI_MODE_NIGHT_MASK) {
         UI_MODE_NIGHT_YES -> {
-            UiMode.DARK
+            ColorTheme.DARK
         }
 
         else -> {
-            UiMode.LIGHT
+            ColorTheme.LIGHT
         }
     }
-}
diff --git a/core/common/src/commonMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.kt b/core/common/src/commonMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.kt
@@ -18,12 +18,18 @@
 
 package com.neoutils.neoregex.core.common.platform
 
-enum class Platform {
-    DESKTOP,
-    ANDROID,
-    WEB;
+sealed class Platform {
 
-    companion object
+    sealed class Desktop : Platform() {
+        data object Windows : Desktop()
+        data object Linux : Desktop()
+        data object MacOS : Desktop()
+    }
+
+    data object Android : Platform()
+
+    // Experimental
+    data object Web : Platform()
 }
 
-expect val Platform.Companion.Current: Platform
+expect val platform: Platform
diff --git a/...utils/neoregex/core/common/util/UiMode.kt → ...s/neoregex/core/common/util/ColorTheme.kt b/...utils/neoregex/core/common/util/UiMode.kt → ...s/neoregex/core/common/util/ColorTheme.kt
@@ -18,12 +18,18 @@
 
 package com.neoutils.neoregex.core.common.util
 
-enum class UiMode {
+import androidx.compose.runtime.Composable
+
+enum class ColorTheme {
     LIGHT,
     DARK;
 
-    companion object
+    val isLight: Boolean
+        get() = this == LIGHT
+
+    val isDark: Boolean
+        get() = this == DARK
 }
 
-val UiMode.isDark: Boolean
-    get() = this == UiMode.DARK
+@Composable
+expect fun rememberColorTheme(): ColorTheme
diff --git a/...mon/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.desktop.kt b/...mon/src/desktopMain/kotlin/com/neoutils/neoregex/core/common/platform/Platform.desktop.kt
@@ -18,7 +18,12 @@
 
 package com.neoutils.neoregex.core.common.platform
 
-import com.neoutils.neoregex.core.common.platform.Platform
+import org.jetbrains.skiko.OS
+import org.jetbrains.skiko.hostOs
 
-actual val Platform.Companion.Current
-    get() = Platform.DESKTOP
+actual val platform: Platform = when (hostOs) {
+    OS.Linux -> Platform.Desktop.Linux
+    OS.Windows -> Platform.Desktop.Windows
+    OS.MacOS -> Platform.Desktop.MacOS
+    else -> error("Unsupported platform ${hostOs.name}")
+}