feat: Add detekt in the project (#1651)

Co-authored-by: Theo L.M. <[email protected]>

.github/workflows/build_pull_request.yml

@@ -39,4 +39,4 @@ jobs:
       - name: Build app and run unit tests
         uses: gradle/gradle-command-action@v3
         with:
-          arguments: ktlintCheck assembleStandardRelease testReleaseUnitTest
+          arguments: detekt assembleStandardRelease testReleaseUnitTest

.github/workflows/build_push.yml

@@ -46,7 +46,7 @@ jobs:
       - name: Build app and run unit tests
         uses: gradle/gradle-command-action@v3
         with:
-          arguments: ktlintCheck assembleStandardRelease testReleaseUnitTest
+          arguments: detekt assembleStandardRelease testReleaseUnitTest
 
       # Sign APK and create release for tags
 

app/build.gradle.kts

@@ -174,7 +174,6 @@ dependencies {
     implementation(compose.ui.util)
     implementation(compose.accompanist.webview)
     implementation(compose.accompanist.systemuicontroller)
-    lintChecks(compose.lintchecks)
 
     implementation(androidx.paging.runtime)
     implementation(androidx.paging.compose)

app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerActivity.kt

@@ -139,6 +139,8 @@ class PlayerActivity : BaseActivity() {
                 addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
             }
         }
+
+        private const val MAX_BRIGHTNESS = 255F
     }
 
     override fun onNewIntent(intent: Intent) {
@@ -756,23 +758,20 @@ class PlayerActivity : BaseActivity() {
         verticalScrollLeft(0F)
     }
 
+    @Suppress("ReturnCount")
     private fun getMaxBrightness(): Float {
-        val powerManager = getSystemService(POWER_SERVICE) as? PowerManager
-        if (powerManager != null) {
-            val fields = powerManager.javaClass.declaredFields
-            for (field in fields) {
-                // https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/core/java/android/os/PowerManager.java
-                if (field.getName().equals("BRIGHTNESS_ON")) {
-                    field.isAccessible = true
-                    return try {
-                        (field.get(powerManager) as Int).toFloat()
-                    } catch (e: IllegalAccessException) {
-                        255F
-                    }
-                }
-            }
+        val powerManager = getSystemService(POWER_SERVICE) as? PowerManager ?: return MAX_BRIGHTNESS
+        val brightnessField = powerManager.javaClass.declaredFields.find {
+            it.name == "BRIGHTNESS_ON"
+        } ?: return MAX_BRIGHTNESS
+
+        brightnessField.isAccessible = true
+        return try {
+            (brightnessField.get(powerManager) as Int).toFloat()
+        } catch (e: IllegalAccessException) {
+            logcat(LogPriority.ERROR, e) { "Unable to access BRIGHTNESS_ON field" }
+            MAX_BRIGHTNESS
         }
-        return 255F
     }
 
     private fun getCurrentBrightness(): Float {
@@ -783,11 +782,11 @@ class PlayerActivity : BaseActivity() {
         return try {
             Settings.System.getInt(resolver, Settings.System.SCREEN_BRIGHTNESS) / getMaxBrightness()
         } catch (e: Settings.SettingNotFoundException) {
+            logcat(LogPriority.ERROR, e) { "Unable to get screen brightness" }
             0.5F
         }
     }
 
-
     @Suppress("DEPRECATION")
     private fun setupMediaSession() {
         mediaSession = MediaSessionCompat(this, "Aniyomi_Player_Session").apply {

build.gradle.kts

@@ -31,7 +31,7 @@ subprojects {
     }
 
     plugins.withType<BasePlugin> {
-        plugins.apply("tachiyomi.lint")
+        plugins.apply("detekt")
         configure<BaseExtension> {
             compileSdkVersion(AndroidConfig.compileSdk)
             defaultConfig {

buildSrc/build.gradle.kts

@@ -3,10 +3,10 @@ plugins {
 }
 
 dependencies {
+    implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
     implementation(androidxLibs.gradle)
-
     implementation(kotlinLibs.gradle)
-    implementation(libs.ktlint)
+    implementation(libs.detekt.gradlePlugin)
     implementation(gradleApi())
 }
 

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

@@ -0,0 +1,47 @@
+import io.gitlab.arturbosch.detekt.Detekt
+import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
+import org.gradle.accessors.dm.LibrariesForLibs
+
+plugins {
+    id("io.gitlab.arturbosch.detekt")
+}
+
+val libs = the<LibrariesForLibs>()
+dependencies {
+    detektPlugins(libs.detekt.rules.formatting)
+    detektPlugins(libs.detekt.rules.compose)
+}
+
+private val configFile = files("$rootDir/config/detekt/detekt.yml")
+private val baselineFile = file("$rootDir/config/detekt/baseline.xml")
+private val kotlinFiles = "**/*.kt"
+private val resourceFiles = "**/resources/**"
+private val buildFiles = "**/build/**"
+private val generatedFiles = "**/generated/**"
+private val scriptsFiles = "**/*.kts"
+
+detekt {
+    buildUponDefaultConfig = true
+    parallel = true
+    autoCorrect = false
+    ignoreFailures = false
+    config.setFrom(configFile)
+    baseline = file(baselineFile)
+}
+
+tasks.withType<Detekt>().configureEach {
+    include(kotlinFiles)
+    exclude(resourceFiles, buildFiles, generatedFiles, scriptsFiles)
+    reports {
+        html.required.set(true)
+        xml.required.set(false)
+        txt.required.set(false)
+    }
+}
+
+tasks.withType<Detekt>().configureEach {
+    jvmTarget = JavaVersion.VERSION_17.toString()
+}
+tasks.withType<DetektCreateBaselineTask>().configureEach {
+    jvmTarget = JavaVersion.VERSION_17.toString()
+}