Merge pull request #9 from YAPP-Github/init/#8-detekt-setup

[init] Detekt 설정 #8

Author: ikseong00

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+max_line_length = 150
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{kt,kts}]
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true

.github/workflows/android-ci.yml

@@ -49,9 +49,9 @@ jobs:
 #        run: |
 #          echo '${{ secrets.GOOGLE_SERVICES }}' >> ./app/google-services.json
 
-#      - name: Code style checks
-#        run: |
-#          ./gradlew detekt --continue
+      - name: Code style checks
+        run: |
+          ./gradlew detekt --continue
 
       - name: Run build
         run: ./gradlew buildDebug --stacktrace

app/src/main/java/com/neki/android/app/MainActivity.kt

@@ -48,7 +48,7 @@ class MainActivity : ComponentActivity() {
                             currentKey = navigator.state.currentKey,
                             onTabSelected = { navigator.navigate(it.navKey) },
                         )
-                    }
+                    },
                 ) { innerPadding ->
                     NavDisplay(
                         modifier = Modifier.padding(innerPadding),

app/src/main/java/com/neki/android/app/NekiApplication.kt

@@ -5,20 +5,20 @@ import dagger.hilt.android.HiltAndroidApp
 import timber.log.Timber
 
 @HiltAndroidApp
-class NekiApplication: Application() {
+class NekiApplication : Application() {
     override fun onCreate() {
         super.onCreate()
 
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
         } else {
-            Timber.plant(object : Timber.Tree() {
-                override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
-                    // 여기는 Release일 때 로그를 남기지 않고 어딘가로 전송 ?
-
-                }
-            })
+            Timber.plant(
+                object : Timber.Tree() {
+                    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
+                        // 여기는 Release일 때 로그를 남기지 않고 어딘가로 전송 ?
+                    }
+                },
+            )
         }
-
     }
-}
+}

app/src/main/java/com/neki/android/app/navigation/TopLevelNavItem.kt

@@ -24,16 +24,17 @@ enum class TopLevelNavItem(
         selectedIcon = R.drawable.ic_nav_archive_selected,
         unselectedIcon = R.drawable.ic_nav_archive_unselected,
         iconTextId = R.string.top_level_nav_archive,
-        navKey = ArchiveNavKey.Archive
+        navKey = ArchiveNavKey.Archive,
     ),
     MAP(
         selectedIcon = R.drawable.ic_nav_map_selected,
         unselectedIcon = R.drawable.ic_nav_map_unselected,
         iconTextId = R.string.top_level_nav_map,
-        navKey = MapNavKey.Map
-    );
+        navKey = MapNavKey.Map,
+    ),
+    ;
 
     companion object {
         val startTopLevelItem = ARCHIVE
     }
-}
+}

app/src/main/java/com/neki/android/app/navigation/di/AppModule.kt

@@ -15,4 +15,4 @@ internal interface AppModule {
     fun bindsNavigator(
         impl: NavigatorImpl,
     ): Navigator
-}
+}

app/src/main/java/com/neki/android/app/navigation/di/NavigationModule.kt

@@ -21,4 +21,4 @@ internal object NavigationModule {
             topLevelKeys = TOP_LEVEL_NAV_KEYS.toSet(),
         )
     }
-}
+}

app/src/main/java/com/neki/android/app/ui/BottomNavigationBar.kt

@@ -51,14 +51,14 @@ fun BottomNavigationBar(
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(horizontal = 20.dp),
-                horizontalArrangement = Arrangement.spacedBy(2.5.dp)
+                horizontalArrangement = Arrangement.spacedBy(2.5.dp),
             ) {
                 tabs.forEach { tab ->
                     BottomNavigationBarItem(
                         modifier = Modifier.weight(1f),
                         selected = tab.navKey == currentTab,
                         tab = tab,
-                        onClick = { if (tab.navKey != currentKey) onTabSelected(tab) }
+                        onClick = { if (tab.navKey != currentKey) onTabSelected(tab) },
                     )
                 }
             }
@@ -78,7 +78,7 @@ fun BottomNavigationBarItem(
 
     Surface(
         modifier = modifier,
-        onClick = onClick
+        onClick = onClick,
     ) {
         Column(
             modifier = Modifier.padding(vertical = 8.dp),

app/src/test/java/com/neki/android/ExampleUnitTest.kt

@@ -4,10 +4,12 @@ import com.neki.android.buildlogic.const.BuildConst
 import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.Project
 import org.gradle.api.plugins.ExtensionAware
+import org.gradle.kotlin.dsl.dependencies
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
+import kotlin.text.get
 
 internal fun Project.configureAndroid(
-    commonExtension: CommonExtension<*, *, *, *, *, *>
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         compileSdk = BuildConst.COMPILE_SDK
@@ -30,6 +32,10 @@ internal fun Project.configureAndroid(
                 )
             }
         }
+
+        dependencies {
+            add("detektPlugins", libs.findLibrary("detekt.formatting").get())
+        }
     }
 }