Merge pull request #63 from NeoUtils/develop

Release v2.4.0 - Pattern highlighting

Author: Irineu333

.idea/deploymentTargetSelector.xml

@@ -9,12 +9,12 @@ A cross-platform app to validate regular expressions.
 </p>
 
 <p align="center">
-    <img src="images/linux-dark-mode.png" alt="NeoRegex desktop app"/>
+    <img src="images/linux_dark_mode.png" alt="NeoRegex desktop app"/>
 </p>
 
-<p align="center"> 
-    <a href="https://flathub.org/apps/com.neoutils.NeoRegex"><img height="80px" alt="Download on Flathub" src="https://flathub.org/assets/badges/flathub-badge-en.svg"/></a> 
-    <a href="https://play.google.com/store/apps/details?id=com.neo.regex"><img height="80px" alt="Get it on Google Play" src="images/playstore_badge.webp"/></a> 
+<p align="center">
+    <a href="https://flathub.org/apps/com.neoutils.NeoRegex"><img height="80px" alt="Download on Flathub" src="https://flathub.org/assets/badges/flathub-badge-en.svg"/></a>
+    <a href="https://play.google.com/store/apps/details?id=com.neo.regex"><img height="80px" alt="Get it on Google Play" src="images/playstore_badge.webp"/></a>
 </p>
 
 <p align="center">
@@ -34,15 +34,22 @@ A cross-platform app to validate regular expressions.
 
 ## Build
 
-To build this project, the JDK (Java Development Kit) and the Android SDK are required.
-I recommend using [Intellij IDEA](https://www.jetbrains.com/idea/download) as the IDE, with the **Android**, **Jetpack
-Compose** and **Compose Multiplatform** plugins installed.
+To build this project, the JDK 17 and the Android SDK are required.
+I recommend using [Intellij IDEA](https://www.jetbrains.com/idea/download) as the IDE, with the **Android**, **Jetpack Compose** and **Compose Multiplatform** plugins installed.
 
 > [!TIP]
 > - You can obtain the **JDK** and **Android SDK** directly from **IntelliJ IDEA**.
 > - Use **JBR** (JetBrains Runtime) for better window integration.
 > - Use run configurations to get started.
 
+## Acknowledgments
+
+NeoRegex utilizes several open-source libraries that greatly enhance its functionality. We would like to thank the authors and contributors of the following projects for their amazing work:
+
+- [**Highlight**](https://github.com/NeoUtils/Highlight):  This library provides essential syntax highlighting features, making the pattern more readable and visually appealing.
+- [**multiplatform-settings**](https://github.com/russhwolf/multiplatform-settings): A useful library for managing settings across multiple platforms, allowing us to easily persist user preferences.
+- [**dbus-java**](https://github.com/hypfvieh/dbus-java): This library enables integration with D-Bus, providing important desktop interprocess communication capabilities for Linux systems.
+
 ## License
 
 <a href="https://www.gnu.org/licenses/gpl-3.0.html">
@@ -56,3 +63,4 @@ license, in order to maintain its free software nature.
 
 You can find a copy of the license in the [LICENSE](/LICENSE)
 file of this project or access the original version at https://www.gnu.org/licenses/gpl-3.0.html.
+

.idea/gradle.xml

@@ -16,7 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import com.android.utils.jvmArchitecture
+@file:Suppress("UnstableApiUsage")
+
 import com.android.utils.osArchitecture
 import extension.catalog
 import extension.config
@@ -34,11 +35,6 @@ version = config.version.name()
 
 kotlin {
 
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
-        vendor.set(JvmVendorSpec.ORACLE) // Oracle OpenJDK
-    }
-
     sourceSets {
         commonMain.dependencies {
 
@@ -48,18 +44,26 @@ kotlin {
             implementation(projects.core.resources)
             implementation(projects.core.common)
             implementation(projects.core.sharedUi)
+            implementation(projects.core.datasource)
 
             // voyager
             implementation(catalog.voyager.navigator)
             implementation(catalog.voyager.transitions)
 
+            // lifecycle
+            implementation(catalog.androidx.multplatform.lifecycle.runtime.compose)
+
             // compose
             implementation(compose.runtime)
             implementation(compose.foundation)
             implementation(compose.ui)
             implementation(compose.material3)
             implementation(compose.materialIconsExtended)
             implementation(compose.components.resources)
+
+            // koin
+            implementation(libs.koin.core)
+            implementation(libs.koin.compose)
         }
     }
 }

.idea/misc.xml

@@ -33,20 +33,31 @@
     <screenshots>
         <screenshot type="default">
             <image>
-                https://raw.githubusercontent.com/NeoUtils/NeoRegex/521b95a1943408573ad782a2efcada1d79f78b60/images/linux-dark-mode.png
+                https://raw.githubusercontent.com/NeoUtils/NeoRegex/bf49347b87902115592e1f3899a0735f5df27903/images/linux_dark_mode.png
             </image>
             <caption>NeoRegex in Dark Mode</caption>
         </screenshot>
 
         <screenshot>
             <image>
-                https://raw.githubusercontent.com/NeoUtils/NeoRegex/521b95a1943408573ad782a2efcada1d79f78b60/images/linux-light-mode.png
+                https://raw.githubusercontent.com/NeoUtils/NeoRegex/bf49347b87902115592e1f3899a0735f5df27903/images/linux_light_mode.png
             </image>
             <caption>NeoRegex in Light Mode</caption>
         </screenshot>
     </screenshots>
 
     <releases>
+        <release version="2.4.0" date="2024-12-20">
+            <description>
+                <p>Improvements in user experience.</p>
+                <ul>
+                    <li>Change theme manually</li>
+                    <li>Persistence of preferences</li>
+                    <li>Syntax highlighting in pattern</li>
+                </ul>
+            </description>
+        </release>
+
         <release version="2.3.0" date="2024-11-09">
             <description>
                 <p>Small improvements</p>

README.md

@@ -0,0 +1,32 @@
+/*
+ * NeoRegex.
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.neoutils.neoregex
+
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.neoutils.neoregex.core.designsystem.theme.NeoTheme
+import com.neoutils.neoregex.core.sharedui.di.WithKoin
+
+@Composable
+fun AndroidApp() = WithKoin {
+    NeoTheme {
+        App(Modifier.safeDrawingPadding())
+    }
+}

application/build.gradle.kts

@@ -24,11 +24,8 @@ import androidx.activity.ComponentActivity
 import androidx.activity.SystemBarStyle
 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.ColorTheme
 import com.neoutils.neoregex.core.common.util.colorTheme
-import com.neoutils.neoregex.core.designsystem.theme.NeoTheme
 
 class MainActivity : ComponentActivity() {
 
@@ -38,23 +35,20 @@ class MainActivity : ComponentActivity() {
         setupSystemBars()
 
         setContent {
-
-            NeoTheme {
-                App(Modifier.safeDrawingPadding())
-            }
+            AndroidApp()
         }
     }
 
     private fun setupSystemBars() {
 
         val style = when (colorTheme) {
-            ColorTheme.DARK -> {
+            ColorTheme.DARK, ColorTheme.DARK_SYSTEM -> {
                 SystemBarStyle.dark(
                     Color.BLACK,
                 )
             }
 
-            ColorTheme.LIGHT -> {
+            ColorTheme.LIGHT, ColorTheme.LIGHT_SYSTEM -> {
                 SystemBarStyle.light(
                     Color.WHITE,
                     Color.BLACK,

application/installation/com.neoutils.NeoRegex.metainfo.xml

@@ -0,0 +1,162 @@
+/*
+ * NeoRegex.
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.aspectRatio
+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.collectAsState
+import androidx.compose.runtime.getValue
+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.window.ApplicationScope
+import androidx.compose.ui.window.FrameWindowScope
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.neoutils.neoregex.core.common.util.ColorTheme
+import com.neoutils.neoregex.core.common.util.rememberColorTheme
+import com.neoutils.neoregex.core.datasource.PreferencesDataSource
+import com.neoutils.neoregex.core.datasource.WindowStateDataSource
+import com.neoutils.neoregex.core.datasource.extension.observe
+import com.neoutils.neoregex.core.datasource.model.Preferences
+import com.neoutils.neoregex.core.datasource.remember.rememberWindowState
+import com.neoutils.neoregex.core.designsystem.theme.NeoTheme
+import com.neoutils.neoregex.core.designsystem.theme.NeoTheme.dimensions
+import com.neoutils.neoregex.core.resources.*
+import com.neoutils.neoregex.core.sharedui.component.NeoHeader
+import com.neoutils.neoregex.core.sharedui.component.NeoWindow
+import com.neoutils.neoregex.core.sharedui.di.WithKoin
+import org.jetbrains.compose.resources.painterResource
+import org.jetbrains.compose.resources.stringResource
+import org.koin.compose.koinInject
+
+@Composable
+fun ApplicationScope.DesktopApp() = WithKoin {
+
+    val preferencesDataSource = koinInject<PreferencesDataSource>()
+    val preferences by preferencesDataSource.flow.collectAsState()
+
+    val windowStateDataSource = koinInject<WindowStateDataSource>()
+    val windowState by windowStateDataSource.flow.collectAsState()
+
+    NeoTheme(
+        colorTheme = when (preferences.colorTheme) {
+            Preferences.ColorTheme.SYSTEM -> rememberColorTheme()
+            Preferences.ColorTheme.LIGHT -> ColorTheme.LIGHT
+            Preferences.ColorTheme.DARK -> ColorTheme.DARK
+        }
+    ) {
+        NeoWindow(
+            header = { HeaderImpl() },
+            windowState = rememberWindowState(windowState)
+        ) {
+
+            windowStateDataSource.observe(window)
+
+            App()
+        }
+    }
+}
+
+@Composable
+private fun FrameWindowScope.HeaderImpl() {
+
+    val preferencesDataSource = koinInject<PreferencesDataSource>()
+    val preferences by preferencesDataSource.flow.collectAsStateWithLifecycle()
+
+    NeoHeader(
+        colorTheme = when (preferences.colorTheme) {
+            Preferences.ColorTheme.SYSTEM -> rememberColorTheme()
+            Preferences.ColorTheme.LIGHT -> ColorTheme.LIGHT
+            Preferences.ColorTheme.DARK -> ColorTheme.DARK
+        }
+    ) { padding ->
+
+        Text(
+            text = stringResource(Res.string.app_name),
+            modifier = Modifier.align(
+                Alignment.Center
+            )
+        )
+
+        Row(
+            modifier = Modifier
+                .padding(padding)
+                .padding(horizontal = dimensions.medium)
+                .align(Alignment.CenterEnd),
+            horizontalArrangement = Arrangement.spacedBy(dimensions.medium)
+        ) {
+            val uriHandler = LocalUriHandler.current
+
+            Icon(
+                painter = painterResource(Res.drawable.github),
+                contentDescription = null,
+                tint = colorScheme.onSurface,
+                modifier = Modifier
+                    .clip(CircleShape)
+                    .clickable(
+                        onClick = {
+                            uriHandler.openUri(
+                                uri = "https://github.com/NeoUtils/NeoRegex"
+                            )
+                        }
+                    )
+                    .padding(dimensions.medium)
+                    .aspectRatio(ratio = 1f)
+            )
+
+            Icon(
+                painter = when (preferences.colorTheme) {
+                    Preferences.ColorTheme.SYSTEM -> painterResource(Res.drawable.contrast)
+                    Preferences.ColorTheme.LIGHT -> painterResource(Res.drawable.light_theme)
+                    Preferences.ColorTheme.DARK -> painterResource(Res.drawable.dark_theme)
+                },
+                contentDescription = null,
+                modifier = Modifier
+                    .clip(CircleShape)
+                    .clickable(
+                        onClick = {
+                            preferencesDataSource.update {
+                                it.copy(
+                                    colorTheme = when (it.colorTheme) {
+                                        Preferences.ColorTheme.SYSTEM -> Preferences.ColorTheme.LIGHT
+                                        Preferences.ColorTheme.LIGHT -> Preferences.ColorTheme.DARK
+                                        Preferences.ColorTheme.DARK -> Preferences.ColorTheme.SYSTEM
+                                    }
+                                )
+                            }
+                        }
+                    )
+                    .padding(dimensions.medium)
+                    .aspectRatio(ratio = 1f)
+            )
+        }
+    }
+}