Expand detekt configuration

Author: vmadalin

.detekt/config.yml

@@ -1,7 +1,13 @@
-# http://editorconfig.org
+# EditorConfig: http://editorconfig.org
 root = true
 
 [*]
-indent_size=4
-insert_final_newline=true
-max_line_length=100
+insert_final_newline = true
+
+[*.{yml, json}]
+indent_style = space
+indent_size = 2
+
+[*.{kt, kts, java}]
+indent_size = 4
+max_line_length = 100

.editorconfig

@@ -44,7 +44,7 @@ class SampleApp : Application() {
          */
         @JvmStatic
         fun coreComponent(context: Context) =
-            (context.applicationContext as SampleApp).coreComponent
+            (context.applicationContext as? SampleApp)?.coreComponent
     }
 
     /**

app/src/main/kotlin/com/vmadalin/android/SampleApp.kt

@@ -22,7 +22,7 @@ import io.gitlab.arturbosch.detekt.extensions.DetektExtension
 apply<DetektPlugin>()
 
 configure<DetektExtension> {
-    input = project.files("src/main/java")
+    input = project.files("src/main/kotlin")
     config = files("$rootDir/.detekt/config.yml")
     filters = ".*build.*,.*/resources/.*,.*/tmp/.*"
     reports {

buildSrc/src/main/kotlin/plugins/detekt.gradle.kts

@@ -32,28 +32,24 @@ class DatabaseModule {
 
     @Singleton
     @Provides
-    fun provideMarvelDatabase(context: Context): MarvelDatabase {
-        return Room.databaseBuilder(
+    fun provideMarvelDatabase(context: Context) =
+        Room.databaseBuilder(
             context,
             MarvelDatabase::class.java,
             BuildConfig.MARVEL_DATABASE_NAME
         ).addMigrations(MIGRATION_1_2)
             .build()
-    }
 
     @Singleton
     @Provides
-    fun provideCharacterFavoriteDao(marvelDatabase: MarvelDatabase): CharacterFavoriteDao {
-        return marvelDatabase.characterFavoriteDao()
-    }
+    fun provideCharacterFavoriteDao(marvelDatabase: MarvelDatabase) =
+        marvelDatabase.characterFavoriteDao()
 
     @Singleton
     @Provides
     fun provideCharacterFavoriteRepository(
         characterFavoriteDao: CharacterFavoriteDao
-    ): CharacterFavoriteRepository {
-        return CharacterFavoriteRepository(
+    ) = CharacterFavoriteRepository(
             characterFavoriteDao
         )
-    }
 }

core/src/main/kotlin/com/vmadalin/core/di/modules/DatabaseModule.kt

@@ -50,22 +50,17 @@ class NetworkModule {
 
     @Singleton
     @Provides
-    fun provideRetrofitBuilder(): Retrofit {
-        return Retrofit.Builder()
+    fun provideRetrofitBuilder() =
+        Retrofit.Builder()
             .baseUrl(BuildConfig.MARVEL_API_BASE_URL)
             .addConverterFactory(GsonConverterFactory.create())
             .build()
-    }
 
     @Singleton
     @Provides
-    fun provideMarvelService(retrofit: Retrofit): MarvelService {
-        return retrofit.create(MarvelService::class.java)
-    }
+    fun provideMarvelService(retrofit: Retrofit) = retrofit.create(MarvelService::class.java)
 
     @Singleton
     @Provides
-    fun provideMarvelRepository(service: MarvelService): MarvelRepository {
-        return MarvelRepository(service)
-    }
+    fun provideMarvelRepository(service: MarvelService) = MarvelRepository(service)
 }

core/src/main/kotlin/com/vmadalin/core/di/modules/NetworkModule.kt

@@ -16,6 +16,6 @@
 
 package com.vmadalin.core.extensions
 
-fun ByteArray.toHex(): String {
-    return joinToString("") { "%02x".format(it) }
+fun ByteArray.toHex() = joinToString("") {
+    "%02x".format(it)
 }

core/src/main/kotlin/com/vmadalin/core/extensions/ByteArrayExtensions.kt

@@ -33,6 +33,7 @@ import com.vmadalin.core.R
  * Issue tracking: https://issuetracker.google.com/issues/127932815
  * Issue github: https://github.com/android/architecture-components-samples/issues/530
  */
+@Suppress("UnsafeCast", "UnsafeCallOnNullableType", "LongMethod", "ComplexMethod")
 fun BottomNavigationView.setupWithNavController(
     navGraphIds: List<Int>,
     fragmentManager: FragmentManager,
@@ -155,6 +156,7 @@ fun BottomNavigationView.setupWithNavController(
     return selectedNavController
 }
 
+@Suppress("UnsafeCast")
 private fun BottomNavigationView.setupDeepLinks(
     navGraphIds: List<Int>,
     fragmentManager: FragmentManager,
@@ -179,6 +181,7 @@ private fun BottomNavigationView.setupDeepLinks(
     }
 }
 
+@Suppress("UnsafeCast")
 private fun BottomNavigationView.setupItemReselected(
     graphIdToTagMap: SparseArray<String>,
     fragmentManager: FragmentManager
@@ -219,6 +222,7 @@ private fun attachNavHostFragment(
         .commitNow()
 }
 
+@Suppress("UnsafeCast")
 private fun obtainNavHostFragment(
     fragmentManager: FragmentManager,
     fragmentTag: String,

core/src/main/kotlin/com/vmadalin/core/extensions/NavigationExtensions.kt

@@ -21,21 +21,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 
 val RecyclerView.gridLayoutManager: GridLayoutManager?
-    get() {
-        val layoutManager = this.layoutManager
-        return if (layoutManager is GridLayoutManager) {
-            layoutManager
-        } else {
-            null
-        }
-    }
+    get() = layoutManager as? GridLayoutManager
 
 val RecyclerView.linearLayoutManager: LinearLayoutManager?
-    get() {
-        val layoutManager = this.layoutManager
-        return if (layoutManager is LinearLayoutManager) {
-            layoutManager
-        } else {
-            null
-        }
-    }
+    get() = layoutManager as? LinearLayoutManager

core/src/main/kotlin/com/vmadalin/core/extensions/RecyclerViewExtensions.kt

@@ -18,9 +18,8 @@ package com.vmadalin.core.extensions
 
 import java.security.MessageDigest
 
-fun String.toMD5(): String {
-    return MessageDigest
+fun String.toMD5() =
+    MessageDigest
         .getInstance("MD5")
         .digest(toByteArray())
         .toHex()
-}

core/src/main/kotlin/com/vmadalin/core/extensions/StringExtensions.kt

@@ -56,7 +56,6 @@ class MarvelRepository(
     //  Private methods
     // ============================================================================================
 
-    private fun generateApiHash(timestamp: String): String {
-        return HASH_FORMAT.format(timestamp, API_PRIVATE_KEY, API_PUBLIC_KEY).toMD5()
-    }
+    private fun generateApiHash(timestamp: String) =
+        HASH_FORMAT.format(timestamp, API_PRIVATE_KEY, API_PUBLIC_KEY).toMD5()
 }

core/src/main/kotlin/com/vmadalin/core/network/repositiories/MarvelRepository.kt

@@ -20,8 +20,8 @@ import com.vmadalin.core.annotations.OpenForTesting
 
 @OpenForTesting
 data class BaseResponse<T>(
-    var code: Any,
-    var status: String,
+    val code: Any,
+    val status: String,
     val message: String,
-    var data: DataResponse<T>
+    val data: DataResponse<T>
 )

core/src/main/kotlin/com/vmadalin/core/network/responses/BaseResponse.kt

@@ -20,8 +20,8 @@ import com.vmadalin.core.annotations.OpenForTesting
 
 @OpenForTesting
 data class CharacterResponse(
-    var id: Long,
-    var name: String,
-    var description: String,
-    var thumbnail: CharacterThumbnailResponse
+    val id: Long,
+    val name: String,
+    val description: String,
+    val thumbnail: CharacterThumbnailResponse
 )

core/src/main/kotlin/com/vmadalin/core/network/responses/CharacterResponse.kt

@@ -20,6 +20,6 @@ import com.vmadalin.core.annotations.OpenForTesting
 
 @OpenForTesting
 data class CharacterThumbnailResponse(
-    var path: String,
-    var extension: String
+    val path: String,
+    val extension: String
 )

core/src/main/kotlin/com/vmadalin/core/network/responses/CharacterThumbnailResponse.kt

@@ -20,9 +20,9 @@ import com.vmadalin.core.annotations.OpenForTesting
 
 @OpenForTesting
 data class DataResponse<T>(
-    var offset: Int,
-    var limit: Int,
-    var total: Int,
-    var count: Int,
-    var results: List<T>
+    val offset: Int,
+    val limit: Int,
+    val total: Int,
+    val count: Int,
+    val results: List<T>
 )

core/src/main/kotlin/com/vmadalin/core/network/responses/DataResponse.kt

@@ -21,6 +21,7 @@ import android.view.View
 import androidx.annotation.VisibleForTesting
 import androidx.annotation.VisibleForTesting.PRIVATE
 import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 
 class RecyclerViewItemDecoration(
@@ -34,44 +35,55 @@ class RecyclerViewItemDecoration(
         parent: RecyclerView,
         state: RecyclerView.State
     ) {
-        setSpacingForDirection(
-            outRect = outRect,
-            layoutManager = parent.layoutManager,
-            position = parent.getChildViewHolder(view).adapterPosition,
-            itemCount = state.itemCount
-        )
+        when (val layoutManager = parent.layoutManager) {
+            is GridLayoutManager -> configSpacingForGridLayoutManager(
+                outRect = outRect,
+                layoutManager = layoutManager,
+                position = parent.getChildViewHolder(view).adapterPosition,
+                itemCount = state.itemCount
+            )
+            is LinearLayoutManager -> configSpacingForLinearLayoutManager(
+                outRect = outRect,
+                layoutManager = layoutManager,
+                position = parent.getChildViewHolder(view).adapterPosition,
+                itemCount = state.itemCount
+            )
+        }
     }
 
     // ============================================================================================
     //  Private methods
     // ============================================================================================
 
-    private fun setSpacingForDirection(
+    private fun configSpacingForGridLayoutManager(
         outRect: Rect,
-        layoutManager: RecyclerView.LayoutManager?,
+        layoutManager: GridLayoutManager,
         position: Int,
         itemCount: Int
     ) {
-        outRect.left = spacingPx
-        outRect.top = spacingPx
+        val cols = layoutManager.spanCount
+        val rows = if (itemCount % 2 == 0) itemCount / cols else itemCount / cols + 1
 
-        when (layoutManager) {
-            is GridLayoutManager -> {
-                val cols = layoutManager.spanCount
-                val rows = if (itemCount % 2 == 0) itemCount / cols else (itemCount / cols) + 1
+        outRect.top = spacingPx
+        outRect.left = spacingPx
+        outRect.right = if (position % cols == cols - 1) spacingPx else 0
+        outRect.bottom = if (position / cols == rows - 1) spacingPx else 0
+    }
 
-                outRect.right = if (position % cols == cols - 1) spacingPx else 0
-                outRect.bottom = if (position / cols == rows - 1) spacingPx else 0
-            }
-            is RecyclerView.LayoutManager -> {
-                if (layoutManager.canScrollHorizontally()) {
-                    outRect.right = if (position == itemCount - 1) spacingPx else 0
-                    outRect.bottom = spacingPx
-                } else if (layoutManager.canScrollVertically()) {
-                    outRect.right = spacingPx
-                    outRect.bottom = if (position == itemCount - 1) spacingPx else 0
-                }
-            }
+    private fun configSpacingForLinearLayoutManager(
+        outRect: Rect,
+        layoutManager: LinearLayoutManager,
+        position: Int,
+        itemCount: Int
+    ) {
+        outRect.top = spacingPx
+        outRect.left = spacingPx
+        if (layoutManager.canScrollHorizontally()) {
+            outRect.right = if (position == itemCount - 1) spacingPx else 0
+            outRect.bottom = spacingPx
+        } else if (layoutManager.canScrollVertically()) {
+            outRect.right = spacingPx
+            outRect.bottom = if (position == itemCount - 1) spacingPx else 0
         }
     }
 }

core/src/main/kotlin/com/vmadalin/core/ui/recyclerview/RecyclerViewItemDecoration.kt

@@ -26,17 +26,13 @@ object ThemeUtils {
     /**
      * Whether the current configuration is a dark theme i.e. in Night configuration.
      */
-    fun isDarkTheme(context: Context): Boolean {
-        return context.resources.configuration.uiMode and
+    fun isDarkTheme(context: Context) = context.resources.configuration.uiMode and
             Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
-    }
 
     /**
      * Whether the current configuration is a light theme i.e. in Day configuration.
      */
-    fun isLightTheme(context: Context): Boolean {
-        return !isDarkTheme(context)
-    }
+    fun isLightTheme(context: Context) = !isDarkTheme(context)
 
     /**
      * Force [AppCompatDelegate] mode to night/notnight
@@ -47,10 +43,11 @@ object ThemeUtils {
     fun setNightMode(forceNight: Boolean, delay: Long = 0L) {
         Handler().postDelayed({
             AppCompatDelegate.setDefaultNightMode(
-                if (forceNight)
+                if (forceNight) {
                     AppCompatDelegate.MODE_NIGHT_YES
-                else
+                } else {
                     AppCompatDelegate.MODE_NIGHT_NO
+                }
             )
         }, delay)
     }

core/src/main/kotlin/com/vmadalin/core/ui/utils/ThemeUtils.kt

@@ -34,13 +34,11 @@ class CharactersFavoriteModule(private val fragment: CharactersFavoriteFragment)
     @FeatureScope
     fun providesCharactersFavoriteViewModel(
         characterFavoriteRepository: CharacterFavoriteRepository
-    ): CharactersFavoriteViewModel {
-        return fragment.viewModel {
-            CharactersFavoriteViewModel(
-                characterFavoriteRepository = characterFavoriteRepository,
-                coroutineScope = CoroutineScope(Dispatchers.IO)
-            )
-        }
+    ) = fragment.viewModel {
+        CharactersFavoriteViewModel(
+            characterFavoriteRepository = characterFavoriteRepository,
+            coroutineScope = CoroutineScope(Dispatchers.IO)
+        )
     }
 
     @Provides

features/characters_favorites/src/main/kotlin/com/vmadalin/dynamicfeatures/charactersfavorites/ui/favorite/di/CharactersFavoriteModule.kt

@@ -72,9 +72,8 @@ class CharacterDetailFragment :
                     R.string.character_detail_added_to_favorite_message,
                     Snackbar.LENGTH_LONG
                 ).show()
-            is CharacterDetailViewState.Dismiss -> {
+            is CharacterDetailViewState.Dismiss ->
                 findNavController().navigateUp()
-            }
             else -> progressDialog.dismiss()
         }
     }