refactor(common, matcher): extract sample text

Author: Irineu333

application/src/androidMain/kotlin/com/neoutils/neoregex/NeoAndroidApp.kt

@@ -25,7 +25,6 @@ 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.di.appModule
 import com.neoutils.neoregex.feature.matcher.di.matcherModule
 import com.neoutils.neoregex.feature.saved.di.savedModule
 import com.neoutils.neoregex.feature.validator.di.validatorModule
@@ -52,7 +51,6 @@ class NeoAndroidApp : Application() {
                 matcherModule,
                 validatorModule,
                 savedModule,
-                appModule
             )
         }
     }

application/src/commonMain/kotlin/com/neoutils/neoregex/App.kt

@@ -23,13 +23,10 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import cafe.adriel.voyager.core.annotation.InternalVoyagerApi
-import cafe.adriel.voyager.koin.koinNavigatorScreenModel
 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.control.Controller
-import com.neoutils.neoregex.core.dispatcher.event.Command
 import com.neoutils.neoregex.core.dispatcher.model.Navigation
 import com.neoutils.neoregex.core.dispatcher.navigator.NavigationManager
 import com.neoutils.neoregex.feature.about.screen.AboutScreen
@@ -45,7 +42,6 @@ import org.koin.compose.koinInject
 fun App(
     modifier: Modifier = Modifier,
     navigation: NavigationManager = koinInject(),
-    controller: Controller = koinInject()
 ) = NeoBackground(modifier) {
 
     val coroutine = rememberCoroutineScope()
@@ -54,8 +50,6 @@ fun App(
         screen = MatcherScreen(),
     ) { navigator ->
 
-        val viewModel = navigator.koinNavigatorScreenModel<AppViewModel>()
-
         BackHandler(enabled = true) {
             coroutine.launch {
                 navigation.emit(
@@ -107,25 +101,6 @@ fun App(
             }
         }
 
-        LaunchedEffect(Unit) {
-            controller.event.collect { event ->
-                when (event) {
-                    Command.New -> {
-                        viewModel.clear()
-                        navigator.replaceAll(
-                            navigator.items.map {
-                                when (it) {
-                                    is MatcherScreen -> MatcherScreen()
-                                    is ValidatorScreen -> ValidatorScreen()
-                                    else -> it
-                                }
-                            }
-                        )
-                    }
-                }
-            }
-        }
-
         FadeTransition(navigator) {
             it.Content()
         }

application/src/commonMain/kotlin/com/neoutils/neoregex/AppViewModel.kt

@@ -53,8 +53,6 @@ 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.dispatcher.di.dispatcherModule
-import com.neoutils.neoregex.core.dispatcher.model.Navigation
-import com.neoutils.neoregex.core.dispatcher.navigator.NavigationManager
 import com.neoutils.neoregex.core.manager.di.managerModule
 import com.neoutils.neoregex.core.manager.salvage.SalvageManager
 import com.neoutils.neoregex.core.repository.di.repositoryModule
@@ -64,7 +62,6 @@ import com.neoutils.neoregex.core.sharedui.component.*
 import com.neoutils.neoregex.core.sharedui.di.WithKoin
 import com.neoutils.neoregex.core.sharedui.remember.WindowFocus
 import com.neoutils.neoregex.core.sharedui.remember.rememberWindowFocus
-import com.neoutils.neoregex.di.appModule
 import com.neoutils.neoregex.feature.matcher.di.matcherModule
 import com.neoutils.neoregex.feature.saved.di.savedModule
 import com.neoutils.neoregex.feature.validator.di.validatorModule
@@ -83,7 +80,6 @@ fun ApplicationScope.DesktopApp() = WithKoin(
     matcherModule,
     validatorModule,
     savedModule,
-    appModule
 ) {
 
     val preferencesDataSource = koinInject<PreferencesDataSource>()
@@ -182,6 +178,7 @@ private fun FrameWindowScope.HeaderImpl(
                                             //navigation.emit(Navigation.Event.Invalidate())
                                         }
                                     }
+
                                     SalvageAction.Update -> {
                                         coroutine.launch {
                                             salvageManager.update()

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

@@ -46,7 +46,6 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.neoutils.neoregex.feature.validator.di.validatorModule
 import com.neoutils.neoregex.core.common.extension.toCss
 import com.neoutils.neoregex.core.common.util.ColorTheme
 import com.neoutils.neoregex.core.common.util.rememberColorTheme
@@ -66,8 +65,8 @@ import com.neoutils.neoregex.core.sharedui.component.Controller
 import com.neoutils.neoregex.core.sharedui.component.Options
 import com.neoutils.neoregex.core.sharedui.di.WithKoin
 import com.neoutils.neoregex.core.sharedui.extension.surface
-import com.neoutils.neoregex.di.appModule
 import com.neoutils.neoregex.feature.matcher.di.matcherModule
+import com.neoutils.neoregex.feature.validator.di.validatorModule
 import kotlinx.browser.document
 import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.koinInject
@@ -81,13 +80,12 @@ fun WebApp() = WithKoin(
     dispatcherModule,
     matcherModule,
     validatorModule,
-    appModule
 ) {
 
     val preferencesDataSource = koinInject<PreferencesDataSource>()
 
     val preferences by preferencesDataSource.flow.collectAsStateWithLifecycle()
-    
+
     NeoTheme(
         colorTheme = when (preferences.colorTheme) {
             Preferences.ColorTheme.SYSTEM -> rememberColorTheme()
@@ -125,6 +123,7 @@ fun WebApp() = WithKoin(
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun Header(
     modifier: Modifier = Modifier,

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

@@ -18,14 +18,11 @@
 
 package com.neoutils.neoregex.core.dispatcher.di
 
-import com.neoutils.neoregex.core.dispatcher.control.Controller
-import com.neoutils.neoregex.core.dispatcher.control.ControllerImpl
 import com.neoutils.neoregex.core.dispatcher.navigator.NavigationManager
 import com.neoutils.neoregex.core.dispatcher.navigator.NavigationManagerImpl
 import org.koin.dsl.bind
 import org.koin.dsl.module
 
 actual val dispatcherModule = module {
     single { NavigationManagerImpl() } bind NavigationManager::class
-    single { ControllerImpl() } bind Controller::class
 }

core/dispatcher/src/androidMain/kotlin/com/neoutils/neoregex/core/dispatcher/di/NavigationModule.android.kt

@@ -18,14 +18,11 @@
 
 package com.neoutils.neoregex.core.dispatcher.di
 
-import com.neoutils.neoregex.core.dispatcher.control.Controller
-import com.neoutils.neoregex.core.dispatcher.control.ControllerImpl
 import com.neoutils.neoregex.core.dispatcher.navigator.NavigationManager
 import com.neoutils.neoregex.core.dispatcher.navigator.NavigationManagerImpl
 import org.koin.dsl.bind
 import org.koin.dsl.module
 
 actual val dispatcherModule = module {
     single { NavigationManagerImpl() } bind NavigationManager::class
-    single { ControllerImpl() } bind Controller::class
 }

core/dispatcher/src/commonMain/kotlin/com/neoutils/neoregex/core/dispatcher/control/ControllerImpl.kt

@@ -18,14 +18,11 @@
 
 package com.neoutils.neoregex.core.dispatcher.di
 
-import com.neoutils.neoregex.core.dispatcher.control.Controller
-import com.neoutils.neoregex.core.dispatcher.control.ControllerImpl
-import com.neoutils.neoregex.core.dispatcher.navigator.NavigationManager
 import com.neoutils.neoregex.core.dispatcher.impl.NavigationManagerWeb
+import com.neoutils.neoregex.core.dispatcher.navigator.NavigationManager
 import org.koin.dsl.bind
 import org.koin.dsl.module
 
 actual val dispatcherModule = module {
     single { NavigationManagerWeb() } bind NavigationManager::class
-    single { ControllerImpl() } bind Controller::class
 }