Merge pull request #74 from NeoUtils/develop

Release v3.1.0 - Save sample text

Author: Irineu333

.idea/.gitignore

@@ -9,7 +9,7 @@ Create and validate regular expressions easily, anywhere.
 </p>
 
 <p align="center">
-    <img src="images/desktop/linux_matcher_dark.png" alt="NeoRegex desktop app"/>
+    <img src="images/desktop/linux_validator_email_dark.png" alt="NeoRegex desktop app"/>
 </p>
 
 <p align="center">

.idea/codeStyles/Project.xml

@@ -0,0 +1 @@
+/neoregex-db.db

.idea/gradle.xml

@@ -43,7 +43,6 @@ kotlin {
             implementation(projects.core.sharedUi)
             implementation(projects.core.datasource)
             implementation(projects.core.database)
-            implementation(projects.core.dispatcher)
             implementation(projects.core.repository)
             implementation(projects.core.manager)
 

README.md

@@ -42,27 +42,40 @@
     <screenshots>
         <screenshot type="default">
             <image>
-                https://raw.githubusercontent.com/NeoUtils/NeoRegex/97481608a77d299cc49f40d0515317dd2a28f5ae/images/desktop/linux_matcher_dark.png
+                https://raw.githubusercontent.com/NeoUtils/NeoRegex/87560d8aab8b96937c7e9031cdd9df4501de34b8/images/desktop/linux_matcher_xml_dark.png
             </image>
             <caption>Match viewer</caption>
         </screenshot>
 
         <screenshot>
             <image>
-                https://raw.githubusercontent.com/NeoUtils/NeoRegex/97481608a77d299cc49f40d0515317dd2a28f5ae/images/desktop/linux_validator_dark.png
+                https://raw.githubusercontent.com/NeoUtils/NeoRegex/87560d8aab8b96937c7e9031cdd9df4501de34b8/images/desktop/linux_validator_xml_dark.png
             </image>
             <caption>Test case validator</caption>
         </screenshot>
 
         <screenshot>
             <image>
-                https://raw.githubusercontent.com/NeoUtils/NeoRegex/97481608a77d299cc49f40d0515317dd2a28f5ae/images/desktop/linux_saved_dark.png
+                https://raw.githubusercontent.com/NeoUtils/NeoRegex/87560d8aab8b96937c7e9031cdd9df4501de34b8/images/desktop/linux_saved_dark.png
             </image>
             <caption>Local pattern storage</caption>
         </screenshot>
     </screenshots>
 
     <releases>
+        <release version="3.1.0" date="2025-04-20">
+            <description>
+                <p>Small improvements and adjustments.</p>
+                <ul>
+                    <li>Save sample text</li>
+                    <li>Typography improvements</li>
+                    <li>Dimensions improvements</li>
+                    <li>Change minimum window size</li>
+                    <li>Improve shortcuts</li>
+                    <li>Bug fixes</li>
+                </ul>
+            </description>
+        </release>
 
         <release version="3.0.0" date="2025-03-31">
             <description>
@@ -88,7 +101,7 @@
 
         <release version="2.4.0" date="2024-12-20">
             <description>
-                <p>User experience improvements.</p>
+                <p>User interface improvements.</p>
                 <ul>
                     <li>Manual theme selection</li>
                     <li>Persistence of preferences</li>
@@ -99,7 +112,7 @@
 
         <release version="2.3.0" date="2024-11-09">
             <description>
-                <p>Performance information.</p>
+                <p>Small improvements and adjustments.</p>
                 <ul>
                     <li>Performance information label</li>
                     <li>New fatal error window</li>
@@ -109,7 +122,7 @@
 
         <release version="2.2.1" date="2024-11-01">
             <description>
-                <p>User experience improvements.</p>
+                <p>User interface improvements.</p>
                 <ul>
                     <li>New visual identity for the window.</li>
                     <li>Improved theme detection.</li>
@@ -120,11 +133,11 @@
 
         <release version="2.0.0" date="2024-09-18">
             <description>
-                <p>Desktop version debuts.</p>
+                <p>First desktop version.</p>
                 <ul>
-                    <li>Match visualization in the text editor.</li>
-                    <li>Capture group visualization of the match.</li>
-                    <li>Undo and redo for the text editor and pattern editor</li>
+                    <li>Match visualization.</li>
+                    <li>Capture group visualization.</li>
+                    <li>Integrated undo and redo.</li>
                 </ul>
             </description>
         </release>

application/.gitignore

@@ -19,39 +19,40 @@
 package com.neoutils.neoregex
 
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeDrawing
-import androidx.compose.material3.CenterAlignedTopAppBar
-import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.*
 import androidx.compose.material3.MaterialTheme.colorScheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.MaterialTheme.typography
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
+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.model.Preferences
 import com.neoutils.neoregex.core.designsystem.theme.NeoTheme
 import com.neoutils.neoregex.core.designsystem.theme.NeoTheme.dimensions
-import com.neoutils.neoregex.core.sharedui.component.Context
+import com.neoutils.neoregex.core.designsystem.theme.TopBarHeight
+import com.neoutils.neoregex.core.resources.Res
+import com.neoutils.neoregex.core.resources.app_name
 import com.neoutils.neoregex.core.sharedui.component.Controller
 import com.neoutils.neoregex.core.sharedui.component.Options
 import com.neoutils.neoregex.core.sharedui.extension.surface
+import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.koinInject
 
 @Composable
 fun AndroidApp() {
 
     val preferencesDataSource = koinInject<PreferencesDataSource>()
 
-    val preferences by preferencesDataSource.flow.collectAsState()
+    val preferences by preferencesDataSource.flow.collectAsStateWithLifecycle()
 
     NeoTheme(
         colorTheme = when (preferences.colorTheme) {
@@ -73,24 +74,29 @@ fun AndroidApp() {
 @Composable
 private fun NeoAppBar(
     modifier: Modifier = Modifier,
-    shadowElevation: Dp = dimensions.tiny,
-    height: Dp = 55.dp
+    shadowElevation: Dp = dimensions.nano.m,
+    height: Dp = TopBarHeight
 ) = CenterAlignedTopAppBar(
     navigationIcon = {
         Controller(
-            modifier = Modifier.padding(
-                start = dimensions.tiny
-            )
+            modifier = Modifier
+                .padding(start = dimensions.nano.m)
+                .height(dimensions.large.x)
         )
     },
     title = {
-        Context()
+        Text(
+            text = stringResource(Res.string.app_name),
+            style = typography.titleLarge.copy(
+                fontFamily = null
+            )
+        )
     },
     actions = {
         Options(
-            modifier = Modifier.padding(
-                end = dimensions.small
-            )
+            modifier = Modifier
+                .padding(end = dimensions.small.s)
+                .height(dimensions.large.x)
         )
     },
     modifier = modifier.surface(

application/build.gradle.kts

@@ -19,35 +19,30 @@
 package com.neoutils.neoregex
 
 import android.app.Application
-import android.content.Context
+import com.neoutils.neoregex.core.common.di.commonModule
 import com.neoutils.neoregex.core.database.di.databaseModule
 import com.neoutils.neoregex.core.datasource.di.dataSourceModule
-import com.neoutils.neoregex.core.dispatcher.di.dispatcherModule
 import com.neoutils.neoregex.core.manager.di.managerModule
 import com.neoutils.neoregex.core.repository.di.repositoryModule
 import com.neoutils.neoregex.feature.matcher.di.matcherModule
 import com.neoutils.neoregex.feature.saved.di.savedModule
 import com.neoutils.neoregex.feature.validator.di.validatorModule
+import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.GlobalContext.startKoin
-import org.koin.dsl.module
 
 class NeoAndroidApp : Application() {
 
-    private val module = module {
-        single<Context> { applicationContext }
-    }
-
     override fun onCreate() {
         super.onCreate()
 
         startKoin {
+            androidContext(this@NeoAndroidApp)
             modules(
-                module,
+                commonModule,
                 managerModule,
                 dataSourceModule,
                 databaseModule,
                 repositoryModule,
-                dispatcherModule,
                 matcherModule,
                 validatorModule,
                 savedModule,

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

@@ -27,8 +27,8 @@ import cafe.adriel.voyager.navigator.Navigator
 import cafe.adriel.voyager.navigator.internal.BackHandler
 import cafe.adriel.voyager.transitions.FadeTransition
 import com.neoutils.neoregex.core.designsystem.theme.NeoBackground
-import com.neoutils.neoregex.core.dispatcher.model.Navigation
-import com.neoutils.neoregex.core.dispatcher.navigator.NavigationManager
+import com.neoutils.neoregex.core.manager.model.Navigation
+import com.neoutils.neoregex.core.manager.navigator.NavigationManager
 import com.neoutils.neoregex.feature.about.screen.AboutScreen
 import com.neoutils.neoregex.feature.about.screen.LibrariesScreen
 import com.neoutils.neoregex.feature.matcher.MatcherScreen