refactor: simplify di, normalize strings when filtering (#41)

jcaiqueoliveira · Nov 3, 2019 · 7190f38 · 7190f38
1 parent ba441c9
commit 7190f38
Showing 7 changed files with 72 additions and 75 deletions.
diff --git a/data/src/main/java/com/jcaique/dialetus/data/di/injection.kt b/data/src/main/java/com/jcaique/dialetus/data/di/injection.kt
@@ -14,8 +14,9 @@ import org.kodein.di.generic.bind
 import org.kodein.di.generic.instance
 import org.kodein.di.generic.singleton
 
-private val interceptors =
-    listOf(HttpLoggingInterceptor().apply { level = HttpLoggingInterceptor.Level.BODY })
+private val interceptors = listOf(
+    HttpLoggingInterceptor().apply { level = HttpLoggingInterceptor.Level.BODY }
+)
 
 val dataModule = Kodein.Module(name = "network") {
 

diff --git a/data/src/main/java/com/jcaique/dialetus/data/mappers/RegionsMapper.kt b/data/src/main/java/com/jcaique/dialetus/data/mappers/RegionsMapper.kt
@@ -4,6 +4,7 @@ import com.jcaique.dialetus.data.responses.RegionResponse
 import com.jcaique.dialetus.domain.models.Region
 
 internal object RegionsMapper {
+
     fun toDomain(response: RegionResponse): Region =
         Region(response.name, response.total)
 }
diff --git a/presentation/src/main/java/com/jcaique/dialetus/presentation/di/injection.kt b/presentation/src/main/java/com/jcaique/dialetus/presentation/di/injection.kt
@@ -5,9 +5,8 @@ import com.jcaique.dialetus.presentation.dialects.DialectsViewModel
 import com.jcaique.dialetus.presentation.regions.RegionsPresentation
 import com.jcaique.dialetus.presentation.regions.RegionsViewModel
 import com.jcaique.dialetus.utils.KodeinTags
-import com.jcaique.dialetus.utils.dataflow.ConfigChangesAwareStateContainer
-import com.jcaique.dialetus.utils.dataflow.StateMachine
-import com.jcaique.dialetus.utils.dataflow.TaskExecutor
+import com.jcaique.dialetus.utils.extensions.newStateContainer
+import com.jcaique.dialetus.utils.extensions.newStateMachine
 import org.kodein.di.Kodein
 import org.kodein.di.generic.bind
 import org.kodein.di.generic.instance
@@ -16,17 +15,8 @@ import org.kodein.di.generic.provider
 val presentationModule = Kodein.Module(name = "presentation") {
 
     bind() from provider {
-        val stateContainer =
-            ConfigChangesAwareStateContainer<RegionsPresentation>(
-                host = instance(KodeinTags.hostActivity)
-            )
-        val stateMachine = StateMachine(
-            container = stateContainer,
-            executor = TaskExecutor.Concurrent(
-                scope = stateContainer.emissionScope,
-                dispatcher = instance()
-            )
-        )
+        val stateContainer = newStateContainer<RegionsPresentation>(KodeinTags.hostActivity)
+        val stateMachine = newStateMachine(stateContainer)
 
         RegionsViewModel(
             service = instance(),
@@ -35,17 +25,8 @@ val presentationModule = Kodein.Module(name = "presentation") {
     }
 
     bind() from provider {
-        val stateContainer =
-            ConfigChangesAwareStateContainer<DialectsPresentation>(
-                host = instance(KodeinTags.hostActivity)
-            )
-        val stateMachine = StateMachine(
-            container = stateContainer,
-            executor = TaskExecutor.Concurrent(
-                scope = stateContainer.emissionScope,
-                dispatcher = instance()
-            )
-        )
+        val stateContainer = newStateContainer<DialectsPresentation>(KodeinTags.hostActivity)
+        val stateMachine = newStateMachine(stateContainer)
 
         DialectsViewModel(
             machine = stateMachine,

diff --git a/presentation/src/main/java/com/jcaique/dialetus/presentation/dialects/DialectsViewModel.kt b/presentation/src/main/java/com/jcaique/dialetus/presentation/dialects/DialectsViewModel.kt
@@ -6,6 +6,7 @@ import com.jcaique.dialetus.utils.dataflow.StateMachine
 import com.jcaique.dialetus.utils.dataflow.StateTransition
 import com.jcaique.dialetus.utils.dataflow.UnsupportedUserInteraction
 import com.jcaique.dialetus.utils.dataflow.UserInteraction
+import com.jcaique.dialetus.utils.extensions.normalize
 import kotlinx.coroutines.coroutineScope
 
 internal class DialectsViewModel(
@@ -35,15 +36,13 @@ internal class DialectsViewModel(
             else -> throw UnsupportedUserInteraction
         }
 
-    // TODO get dialects from service
     private suspend fun showDialects(
         parameters: StateTransition.Parameters
     ): DialectsPresentation = coroutineScope {
         val interaction = parameters as ShowDialects
 
-        dialects = service.getDialectsBy(interaction.region.name.toLowerCase())
-
-        dialects
+        service
+            .getDialectsBy(interaction.region.name.toLowerCase())
             .let(::DialectsPresentation)
     }
 
@@ -53,7 +52,14 @@ internal class DialectsViewModel(
         val interaction = parameters as FilterDialects
 
         dialects
-            .filter { it.dialect.contains(interaction.query, ignoreCase = true) }
+            .filter { 
+                it.dialect
+                    .normalize()
+                    .contains(
+                        other = interaction.query.normalize(), 
+                        ignoreCase = true
+                    ) 
+            }
             .let(::DialectsPresentation)
     }
 }
diff --git a/utils/src/main/java/com/jcaique/dialetus/utils/extensions/dependency_injection.kt b/utils/src/main/java/com/jcaique/dialetus/utils/extensions/dependency_injection.kt
diff --git a/utils/src/main/java/com/jcaique/dialetus/utils/extensions/di_ktx.kt b/utils/src/main/java/com/jcaique/dialetus/utils/extensions/di_ktx.kt
@@ -0,0 +1,42 @@
+package com.jcaique.dialetus.utils.extensions
+
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.FragmentActivity
+import com.jcaique.dialetus.utils.KodeinTags.hostActivity
+import com.jcaique.dialetus.utils.dataflow.ConfigChangesAwareStateContainer
+import com.jcaique.dialetus.utils.dataflow.StateContainer
+import com.jcaique.dialetus.utils.dataflow.StateMachine
+import com.jcaique.dialetus.utils.dataflow.TaskExecutor
+import org.kodein.di.Kodein
+import org.kodein.di.KodeinAware
+import org.kodein.di.bindings.NoArgBindingKodein
+import org.kodein.di.generic.bind
+import org.kodein.di.generic.instance
+import org.kodein.di.generic.provider
+
+fun AppCompatActivity.selfInject(bindings: Kodein.MainBuilder.() -> Unit = {}) = Kodein.lazy {
+
+    val parentKodein = (applicationContext as KodeinAware).kodein
+
+    extend(parentKodein)
+
+    bind<FragmentActivity>(tag = hostActivity) with provider {
+        this@selfInject
+    }
+
+    bindings.invoke(this)
+}
+
+fun <T> NoArgBindingKodein<*>.newStateContainer(tag: String) =
+    ConfigChangesAwareStateContainer<T>(
+        host = instance(tag)
+    )
+
+fun <T> NoArgBindingKodein<*>.newStateMachine(stateContainer: StateContainer<T>) =
+    StateMachine(
+        container = stateContainer,
+        executor = TaskExecutor.Concurrent(
+            scope = stateContainer.emissionScope,
+            dispatcher = instance()
+        )
+    )
diff --git a/utils/src/main/java/com/jcaique/dialetus/utils/extensions/strings_ktx.kt b/utils/src/main/java/com/jcaique/dialetus/utils/extensions/strings_ktx.kt
@@ -3,10 +3,18 @@ package com.jcaique.dialetus.utils.extensions
 import android.app.Activity
 import android.content.ClipDescription
 import androidx.core.app.ShareCompat
+import java.text.Normalizer
 
-fun String.share(activity: Activity) =
+private val REGEX_NORMALIZE = "\\p{InCombiningDiacriticalMarks}+".toRegex()
+
+fun CharSequence.share(activity: Activity) =
     ShareCompat.IntentBuilder
         .from(activity)
         .setText(this)
         .setType(ClipDescription.MIMETYPE_TEXT_PLAIN)
         .startChooser()
+
+fun CharSequence.normalize(): String {
+    val temp = Normalizer.normalize(this, Normalizer.Form.NFD)
+    return REGEX_NORMALIZE.replace(temp, "")
+}