chore: ktlint (#27)

* chore: setup ktlint

* refactor: move test to correct package

android-module.gradle

@@ -1,5 +1,6 @@
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: "org.jlleitschuh.gradle.ktlint"
 
 repositories {
     mavenCentral()
@@ -84,6 +85,10 @@ androidExtensions {
     experimental = true
 }
 
+ktlint {
+    android = true
+}
+
 configurations.all {
     resolutionStrategy {
         forcedModules = AndroidModule.main.toArray()

build.gradle

@@ -1,21 +1,21 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
 
     repositories {
         mavenLocal()
         google()
-        maven { url "https://kotlin.bintray.com/kotlinx" }
+        maven { url 'https://kotlin.bintray.com/kotlinx' }
         maven { url 'https://jitpack.io' }
         maven { url 'https://maven.fabric.io/public' }
         maven { url 'https://dl.bintray.com/android/android-tools' }
+        maven { url 'https://plugins.gradle.org/m2/' }
         jcenter()
     }
 
     dependencies {
         classpath BuildPlugins.androidGradlePlugin
         classpath BuildPlugins.kotlinGradlePlugin
         classpath BuildPlugins.kotlinxSerializiationPlugin
+        classpath BuildPlugins.ktlint
     }
 }
 
@@ -39,4 +39,4 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}

buildSrc/src/main/java/dependencies.kt

@@ -3,6 +3,7 @@ object Versions {
     const val kotlin = "1.3.50"
     const val androidGradleSupport = "3.5.1"
     const val gmsSupport = "4.3.2"
+    const val ktlint = "9.0.0"
 
     const val okhttp4 = "4.2.1"
     const val retrofit2 = "2.6.2"
@@ -92,8 +93,8 @@ object BuildPlugins {
 
     val androidGradlePlugin = "com.android.tools.build:gradle:${Versions.androidGradleSupport}"
     val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
-    val kotlinxSerializiationPlugin =
-        "org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}"
+    val kotlinxSerializiationPlugin = "org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}"
+    val ktlint = "org.jlleitschuh.gradle:ktlint-gradle:${Versions.ktlint}"
 
     val gmsPlugin = "com.google.gms:google-services:${Versions.gmsSupport}"
     val firebaseCrashlytics = "io.fabric.tools:gradle:${Versions.fabric}"

data/src/main/java/com/jcaique/data/di/injection.kt

@@ -14,7 +14,6 @@ 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 })
 

data/src/main/java/com/jcaique/data/networking/HttpErrorHandler.kt

@@ -5,14 +5,14 @@ import com.jcaique.domain.errors.GatewayIntegrationIssues
 import retrofit2.HttpException
 
 internal object HttpErrorHandler : ErrorTransformer {
-    override suspend fun transform(incoming: Throwable): Throwable = when(incoming){
+    override suspend fun transform(incoming: Throwable): Throwable = when (incoming) {
         is HttpException -> handleHttpError(incoming.code())
         else -> incoming
     }
 
-    private fun handleHttpError(code: Int): Throwable = when(code){
+    private fun handleHttpError(code: Int): Throwable = when (code) {
         404 -> GatewayIntegrationIssues.NotFound
-        in 400..499 ->  GatewayIntegrationIssues.ClientIssue
-        else ->  GatewayIntegrationIssues.ServerIssue
+        in 400..499 -> GatewayIntegrationIssues.ClientIssue
+        else -> GatewayIntegrationIssues.ServerIssue
     }
 }

data/src/main/java/com/jcaique/data/networking/OkHttpClientProvider.kt

@@ -11,5 +11,4 @@ internal object OkHttpClientProvider {
         }
     }
         .build()
-
 }

data/src/main/java/com/jcaique/data/responses/DialectResponse.kt

@@ -4,8 +4,8 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 internal data class DialectResponse(
-    val slug: String,
-    val dialect: String,
-    val meanings: List<String>,
-    val examples: List<String>
+  val slug: String,
+  val dialect: String,
+  val meanings: List<String>,
+  val examples: List<String>
 )

data/src/main/java/com/jcaique/data/responses/RegionResponse.kt

@@ -4,6 +4,6 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 internal data class RegionResponse(
-    val name: String,
-    val total: Int
+  val name: String,
+  val total: Int
 )

data/src/main/java/com/jcaique/data/service/DialetusGateway.kt

@@ -9,11 +9,11 @@ import retrofit2.http.Query
 internal interface DialetusGateway {
 
     @GET("regions")
-    suspend fun fetchRegions() : List<RegionResponse>
+    suspend fun fetchRegions(): List<RegionResponse>
 
     @GET("regions/{region}/dialects")
-    suspend fun getDialectsBy(@Path("region") region: String) : List<DialectResponse>
+    suspend fun getDialectsBy(@Path("region") region: String): List<DialectResponse>
 
     @GET("search")
-    suspend fun searchDialects(@Query("q") query: String) : Map<String, List<DialectResponse>>
+    suspend fun searchDialects(@Query("q") query: String): Map<String, List<DialectResponse>>
 }

data/src/main/java/com/jcaique/data/service/dialects/DialectsInfrastructure.kt

@@ -8,8 +8,7 @@ import com.jcaique.domain.models.Dialect
 import com.jcaique.domain.models.DialectSlug
 
 internal class DialectsInfrastructure(private val api: DialetusGateway) : DialectsService {
-
-
+
     override suspend fun getDialectsBy(region: String): List<Dialect> = executionHandler {
         api.getDialectsBy(region)
             .map(DialectsMapper::toDomain)

data/src/main/java/com/jcaique/data/service/regions/RegionsInfrastructure.kt

@@ -9,7 +9,6 @@ import com.jcaique.domain.regions.RegionsService
 internal class RegionsInfrastructure(private val api: DialetusGateway) : RegionsService {
 
     override suspend fun fetchRegions(): List<Region> = executionHandler {
-        api.fetchRegions() .map { RegionsMapper.toDomain(it) }
+        api.fetchRegions().map { RegionsMapper.toDomain(it) }
     }
-
 }

data/src/test/java/com/jcaique/data/regions/RegionsInfrastructureTest.kt

@@ -19,12 +19,12 @@ class RegionsInfrastructureTest {
     private lateinit var service: RegionsService
 
     @Before
-    fun setup(){
+    fun setup() {
         service = RegionsInfrastructure(scenario.api)
     }
 
     @Test
-    fun `should fetch regions`(){
+    fun `should fetch regions`() {
 
         scenario.defineScenario(
             status = 200,
@@ -48,7 +48,7 @@ class RegionsInfrastructureTest {
                 name = "paulistes",
                 total = 16
             ),
-            Region (
+            Region(
                 name = "pernambuques",
                 total = 17
             ),
@@ -59,6 +59,5 @@ class RegionsInfrastructureTest {
         )
 
         assertThat(execution).isEqualTo(expected)
-
     }
 }

domain/src/main/java/com/jcaique/domain/dialects/DialectsService.kt

@@ -4,8 +4,8 @@ import com.jcaique.domain.models.Dialect
 import com.jcaique.domain.models.DialectSlug
 
 interface DialectsService {
-    
-    suspend fun getDialectsBy(region: String) : List<Dialect>
-    
-    suspend fun searchDialects(query: String) : Map<DialectSlug, List<Dialect>>
+
+    suspend fun getDialectsBy(region: String): List<Dialect>
+
+    suspend fun searchDialects(query: String): Map<DialectSlug, List<Dialect>>
 }

domain/src/main/java/com/jcaique/domain/models/Dialect.kt

@@ -1,9 +1,8 @@
 package com.jcaique.domain.models
 
 data class Dialect(
-    val slug: String,
-    val dialect: String,
-    val meanings: List<String>,
-    val examples: List<String>
+  val slug: String,
+  val dialect: String,
+  val meanings: List<String>,
+  val examples: List<String>
 )
-

domain/src/main/java/com/jcaique/domain/regions/RegionsService.kt

@@ -4,5 +4,5 @@ import com.jcaique.domain.models.Region
 
 interface RegionsService {
 
-    suspend fun fetchRegions() : List<Region>
+    suspend fun fetchRegions(): List<Region>
 }

kotlin-module.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'kotlin'
+apply plugin: "org.jlleitschuh.gradle.ktlint"
 
 repositories {
     mavenCentral()
@@ -10,4 +11,4 @@ compileKotlin {
 }
 compileTestKotlin {
     kotlinOptions.jvmTarget = "1.8"
-}
+}

presentation/src/androidTest/java/com/jcaique/presentation/ExampleInstrumentedTest.kt

@@ -1,13 +1,11 @@
 package com.jcaique.presentation
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *

presentation/src/main/java/com/jcaique/presentation/di/injection.kt

@@ -24,7 +24,7 @@ val presentationModule = Kodein.Module(name = "presentation") {
                 dispatcher = instance()
             )
         )
-        
+
         RegionsViewModel(
             service = instance(),
             machine = stateMachine

presentation/src/main/java/com/jcaique/presentation/regions/RegionAdapter.kt

@@ -9,7 +9,7 @@ import com.jcaique.presentation.R
 import kotlinx.android.synthetic.main.item_region.view.*
 
 internal class RegionAdapter(
-    private val presentation: RegionsPresentation
+  private val presentation: RegionsPresentation
 ) : RecyclerView.Adapter<RegionHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RegionHolder {

presentation/src/main/java/com/jcaique/presentation/regions/RegionsActivity.kt

@@ -10,7 +10,9 @@ import com.jcaique.presentation.utils.DividerItemDecoration
 import com.jcaique.presentation.utils.dataflow.UserInteraction.OpenedScreen
 import com.jcaique.presentation.utils.dataflow.UserInteraction.RequestedFreshContent
 import com.jcaique.presentation.utils.dataflow.ViewState
-import com.jcaique.presentation.utils.dataflow.ViewState.*
+import com.jcaique.presentation.utils.dataflow.ViewState.Failed
+import com.jcaique.presentation.utils.dataflow.ViewState.Loading
+import com.jcaique.presentation.utils.dataflow.ViewState.Success
 import com.jcaique.presentation.utils.selfInject
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.error_state_layout.*

presentation/src/main/java/com/jcaique/presentation/regions/RegionsViewModel.kt

@@ -8,8 +8,8 @@ import com.jcaique.presentation.utils.dataflow.UnsupportedUserInteraction
 import com.jcaique.presentation.utils.dataflow.UserInteraction
 
 internal class RegionsViewModel(
-    private val service: RegionsService,
-    private val machine: StateMachine<RegionsPresentation>
+  private val service: RegionsService,
+  private val machine: StateMachine<RegionsPresentation>
 ) : ViewModel() {
 
     fun bind() = machine.states()

presentation/src/main/java/com/jcaique/presentation/utils/DividerItemDecoration.kt

@@ -36,7 +36,8 @@ internal class DividerItemDecoration(context: Context, orientation: Int = Linear
         if (mDivider == null) {
             Log.w(
                 TAG,
-                "@android:attr/listDivider was not set in the theme used for this " + "DividerItemDecoration. " +
+                "@android:attr/listDivider was not set in the theme used for this " +
+                    "DividerItemDecoration. " +
                     "Please set that attribute all call setDrawable()"
             )
         }
@@ -51,7 +52,9 @@ internal class DividerItemDecoration(context: Context, orientation: Int = Linear
      * @param orientation [.HORIZONTAL] or [.VERTICAL]
      */
     private fun setOrientation(orientation: Int) {
-        require(!(orientation != HORIZONTAL && orientation != VERTICAL)) { "Invalid orientation. It should be either HORIZONTAL or VERTICAL" }
+        require(!(orientation != HORIZONTAL && orientation != VERTICAL)) {
+            "Invalid orientation. It should be either HORIZONTAL or VERTICAL"
+        }
         mOrientation = orientation
     }
 
@@ -65,18 +68,18 @@ internal class DividerItemDecoration(context: Context, orientation: Int = Linear
     }
 
     override fun getItemOffsets(
-        outRect: Rect,
-        view: View,
-        parent: RecyclerView,
-        state: RecyclerView.State
+      outRect: Rect,
+      view: View,
+      parent: RecyclerView,
+      state: RecyclerView.State
     ) {
         if (mDivider == null) {
             outRect.set(0, 0, 0, 0)
             return
         }
-        when(mOrientation == VERTICAL) {
+        when (mOrientation == VERTICAL) {
             true -> outRect.set(0, 0, 0, mDivider!!.intrinsicHeight)
-            false-> outRect.set(0, 0, mDivider!!.intrinsicWidth, 0)
+            false -> outRect.set(0, 0, mDivider!!.intrinsicWidth, 0)
         }
     }
 
@@ -117,11 +120,11 @@ internal class DividerItemDecoration(context: Context, orientation: Int = Linear
     }
 
     private fun drawVerticalChild(
-        canvas: Canvas,
-        view: View,
-        parent: RecyclerView,
-        left: Int,
-        right: Int
+      canvas: Canvas,
+      view: View,
+      parent: RecyclerView,
+      left: Int,
+      right: Int
     ) {
         parent.getDecoratedBoundsWithMargins(view, mBounds)
 
@@ -158,11 +161,11 @@ internal class DividerItemDecoration(context: Context, orientation: Int = Linear
     }
 
     private fun drawHorizontalChild(
-        canvas: Canvas,
-        view: View,
-        parent: RecyclerView,
-        top: Int,
-        bottom: Int
+      canvas: Canvas,
+      view: View,
+      parent: RecyclerView,
+      top: Int,
+      bottom: Int
     ) {
         parent.layoutManager?.getDecoratedBoundsWithMargins(view, mBounds)
 

presentation/src/main/java/com/jcaique/presentation/utils/dataflow/CommandsProcessor.kt

@@ -4,7 +4,7 @@ import kotlinx.coroutines.channels.ConflatedBroadcastChannel
 import kotlinx.coroutines.flow.asFlow
 
 internal class CommandsProcessor(
-    private val executor: TaskExecutor
+  private val executor: TaskExecutor
 ) {
 
     private val broadcaster = ConflatedBroadcastChannel<ViewCommand>()

presentation/src/main/java/com/jcaique/presentation/utils/dataflow/StateMachine.kt

@@ -1,8 +1,8 @@
 package com.jcaique.presentation.utils.dataflow
 
 internal class StateMachine<T>(
-    private val container: StateContainer<T>,
-    private val executor: TaskExecutor
+  private val container: StateContainer<T>,
+  private val executor: TaskExecutor
 ) {
 
     fun states() = container.observableStates()