adapt usages

.github/workflows/pull_request.yml

@@ -10,6 +10,7 @@ concurrency:
 
 jobs:
   detekt:
+    name: Detekt review
     runs-on: ubuntu-latest
 
     steps:
@@ -23,11 +24,11 @@ jobs:
         uses: alaegin/[email protected]
         with:
           reviewdog_reporter: github-pr-review
-          fail_on_error: true
           github_token: ${{ secrets.github_token }}
           detekt_config: config/detekt-config.yml
 
   check:
+    name: Build and test
     needs: detekt
     runs-on: ubuntu-latest
     steps:

app/build.gradle.kts

@@ -36,4 +36,4 @@ dependencies {
     implementation(libs.hilt.navigation.compose)
 
     implementation(project(":core:bluetooth"))
-}
+}

build-logic/convention/build.gradle.kts

@@ -48,4 +48,4 @@ gradlePlugin {
         conventionPlugin(id = "hilt", className = "HiltConventionPlugin")
         conventionPlugin(id = "library", className = "SpeziLibraryConventionPlugin")
     }
-}
+}

build-logic/convention/src/main/kotlin/edu/stanford/spezi/build/logic/convention/extensions/DependencyHandler.kt

@@ -16,4 +16,4 @@ internal fun DependencyHandler.debugImplementation(dependency: Any) {
 
 internal fun DependencyHandler.androidTestImplementation(dependency: Any) {
     add("androidTestImplementation", dependency)
-}
+}

build-logic/convention/src/main/kotlin/edu/stanford/spezi/build/logic/convention/extensions/Project.kt

@@ -34,4 +34,4 @@ internal fun Project.commonExtensions(configBlock: CommonExtension<*,*,*,*,*,*>.
         isLibrary() -> extension<LibraryExtension>(configBlock)
         else -> error("commonExtensions was called before setting the module type plugin")
     }
-}
+}

build-logic/convention/src/main/kotlin/edu/stanford/spezi/build/logic/convention/model/PluginId.kt

@@ -7,4 +7,4 @@ enum class PluginId(val id: String) {
     HILT(id = "com.google.dagger.hilt.android"),
     KSP(id = "com.google.devtools.ksp"),
     COMPOSE_COMPILER("org.jetbrains.kotlin.plugin.compose")
-}
+}

build-logic/convention/src/main/kotlin/edu/stanford/spezi/build/logic/convention/plugins/HiltConventionPlugin.kt

@@ -29,4 +29,4 @@ class HiltConventionPlugin : Plugin<Project> {
             enableAggregatingTask = true
         }
     }
-}
+}

build-logic/convention/src/main/kotlin/edu/stanford/spezi/build/logic/convention/plugins/SpeziAbstractConfigPlugin.kt

@@ -23,4 +23,4 @@ abstract class SpeziAbstractConfigPlugin(private val modulePlugin: PluginId) : P
             testImplementation(project(":core:testing"))
         }
     }
-}
+}

build-logic/convention/src/main/kotlin/edu/stanford/spezi/build/logic/convention/plugins/SpeziApplicationConventionPlugin.kt

@@ -2,4 +2,4 @@ package edu.stanford.spezi.build.logic.convention.plugins
 
 import edu.stanford.spezi.build.logic.convention.model.PluginId
 
-class SpeziApplicationConventionPlugin : SpeziAbstractConfigPlugin(modulePlugin = PluginId.ANDROID_APPLICATION)
+class SpeziApplicationConventionPlugin : SpeziAbstractConfigPlugin(modulePlugin = PluginId.ANDROID_APPLICATION)

build-logic/convention/src/main/kotlin/edu/stanford/spezi/build/logic/convention/plugins/SpeziBaseConfigConventionPlugin.kt

@@ -59,4 +59,4 @@ class SpeziBaseConfigConventionPlugin : Plugin<Project> {
             }
         }
     }
-}
+}

build-logic/convention/src/main/kotlin/edu/stanford/spezi/build/logic/convention/plugins/SpeziComposeConventionPlugin.kt

@@ -36,4 +36,4 @@ class SpeziComposeConventionPlugin : Plugin<Project> {
             }
         }
     }
-}
+}

build-logic/convention/src/main/kotlin/edu/stanford/spezi/build/logic/convention/plugins/SpeziLibraryConventionPlugin.kt

@@ -2,4 +2,4 @@ package edu.stanford.spezi.build.logic.convention.plugins
 
 import edu.stanford.spezi.build.logic.convention.model.PluginId
 
-class SpeziLibraryConventionPlugin : SpeziAbstractConfigPlugin(modulePlugin = PluginId.ANDROID_LIBRARY)
+class SpeziLibraryConventionPlugin : SpeziAbstractConfigPlugin(modulePlugin = PluginId.ANDROID_LIBRARY)

build-logic/settings.gradle.kts

@@ -12,4 +12,4 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = "build-logic"
-include(":convention")
+include(":convention")

config/detekt-config.yml

@@ -124,7 +124,7 @@ complexity:
     active: false
     threshold: 6
   NamedArguments:
-    active: false
+    active: true
     threshold: 3
   NestedBlockDepth:
     active: true
@@ -400,12 +400,14 @@ formatting:
   StringTemplate:
     active: true
     autoCorrect: true
+  TrailingCommaOnDeclarationSite:
+    active: true
+    autoCorrect: true
 
 naming:
   active: true
   BooleanPropertyNaming:
     active: false
-    excludes: ['**/test/**', '**/androidTest/**']
     allowedPattern: '^(is|has|are)'
   ClassNaming:
     active: true
@@ -666,6 +668,8 @@ style:
     active: true
   NoTabs:
     active: false
+  NullableBooleanCheck:
+    active: true
   ObjectLiteralToLambda:
     active: false
   OptionalAbstractKeyword:

core/bluetooth/build.gradle.kts

@@ -10,4 +10,4 @@ android {
 dependencies {
     implementation(project(":core:utils"))
     implementation(project(":core:coroutines"))
-}
+}

core/bluetooth/src/main/kotlin/edu/stanford/spezi/core/bluetooth/data/model/BLEDeviceSession.kt

@@ -12,5 +12,5 @@ import android.bluetooth.BluetoothDevice
  */
 data class BLEDeviceSession(
     val device: BluetoothDevice,
-    val measurements: List<Measurement>
+    val measurements: List<Measurement>,
 )

core/bluetooth/src/main/kotlin/edu/stanford/spezi/core/bluetooth/data/model/BLEServiceType.kt

@@ -15,7 +15,7 @@ internal enum class BLEServiceType(
     /**
      * The UUID of the characteristic associated with the BLE service.
      */
-    val characteristic: UUID
+    val characteristic: UUID,
 ) {
     /**
      * Represents the Weight service.
@@ -31,5 +31,5 @@ internal enum class BLEServiceType(
     BLOOD_PRESSURE(
         service = UUID("00001810-0000-1000-8000-00805f9b34fb"),
         characteristic = UUID("00002a35-0000-1000-8000-00805f9b34fb")
-    )
+    ),
 }

core/bluetooth/src/main/kotlin/edu/stanford/spezi/core/bluetooth/data/model/Measurement.kt

@@ -23,7 +23,7 @@ sealed interface Measurement {
         val timeStampSecond: Int, // 0-59
         val pulseRate: Float, // pulse rate value bpm
         val userId: Int,
-        val measurementStatus: Status
+        val measurementStatus: Status,
     ) : Measurement {
 
         /**
@@ -34,7 +34,7 @@ sealed interface Measurement {
             val timeStampFlag: Boolean, // false: no timestamp, true: timestamp present
             val pulseRateFlag: Boolean, // false: no pulse rate, true: pulse rate present
             val userIdFlag: Boolean, // false: no user ID, true: user ID present
-            val measurementStatusFlag: Boolean // false: no measurement status, true: measurement status present
+            val measurementStatusFlag: Boolean, // false: no measurement status, true: measurement status present
         )
 
         /**
@@ -45,7 +45,7 @@ sealed interface Measurement {
             val cuffFitDetectionFlag: Boolean, // 0: fit properly, 1: too loose
             val irregularPulseDetectionFlag: Boolean, // 0: no irregular pulse detected, 1: irregular pulse detected
             val pulseRateRangeDetectionFlags: Int, // - always 0
-            val measurementPositionDetectionFlag: Boolean // false: proper, true: improper
+            val measurementPositionDetectionFlag: Boolean, // false: proper, true: improper
         )
     }
 
@@ -57,6 +57,6 @@ sealed interface Measurement {
         val zonedDateTime: ZonedDateTime?,
         val userId: Int?,
         val bmi: Double?,
-        val height: Double?
+        val height: Double?,
     ) : Measurement
 }

core/coroutines/build.gradle.kts

@@ -9,4 +9,4 @@ android {
 
 dependencies {
     api(libs.bundles.ktx.coroutines)
-}
+}

core/coroutines/src/main/kotlin/edu/stanford/spezi/core/coroutines/di/CoroutinesModule.kt

@@ -22,25 +22,12 @@ import kotlinx.coroutines.SupervisorJob
 @InstallIn(SingletonComponent::class)
 class CoroutinesModule {
 
-
-
-
-    val _thisShouldFaileWithVariableNamingMagicNumberIndentationEmptyLine    = 12345
-
-
-
-    val _thisShouldFaileWithVariableNsdamingMagicNumberIndentationEmptyLine    = 12345
-
     /**
      * Hilt module for binding the implementation of [DispatchersProvider] to its interface.
      */
     @Module
     @InstallIn(SingletonComponent::class)
 
-
-
-
-
     abstract class Bindings {
         /**
          * Binds the [DispatchersProviderImpl] implementation to the [DispatchersProvider] interface.
@@ -190,6 +177,6 @@ class CoroutinesModule {
      */
     @VisibleForTesting
     internal fun buildCoroutine(
-        dispatcher: CoroutineDispatcher
+        dispatcher: CoroutineDispatcher,
     ): CoroutineScope = CoroutineScope(context = dispatcher + SupervisorJob())
 }

core/design/build.gradle.kts

@@ -25,4 +25,4 @@ dependencies {
 
     debugImplementation(libs.compose.ui.tooling)
     debugImplementation(libs.compose.ui.test.manifest)
-}
+}

core/design/src/androidTest/kotlin/edu/stanford/spezi/core/design/SpeziButtonKtTest.kt

@@ -84,4 +84,4 @@ class SpeziButtonKtTest {
 
         assert(clicked)
     }
-}
+}

core/design/src/main/kotlin/edu/stanford/spezi/core/design/theme/SpeziKtTheme.kt

@@ -52,7 +52,7 @@ private val LightColorScheme = lightColorScheme(
 fun SpeziTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
     dynamicColor: Boolean = true,
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
     val colorScheme = when {
         dynamicColor -> {

core/logging/build.gradle.kts

@@ -11,4 +11,4 @@ android {
 dependencies {
     implementation(libs.timber)
     testImplementation(libs.bundles.unit.testing)
-}
+}

core/logging/src/main/kotlin/edu/stanford/spezi/core/logging/Api.kt

@@ -46,5 +46,5 @@ fun groupLogger(tag: String, config: LoggerConfig.() -> Unit = {}) = object : Re
  */
 fun speziLogger(
     tag: String,
-    config: LoggerConfig.() -> Unit = {}
+    config: LoggerConfig.() -> Unit = {},
 ) = lazy { SpeziLogger(tag, LoggerConfig().apply(config)) }

core/logging/src/main/kotlin/edu/stanford/spezi/core/logging/models/LoggingStrategy.kt

@@ -19,5 +19,5 @@ enum class LoggingStrategy {
     /**
      * The logging strategy that logs messages using the Log utility.
      */
-    LOG
+    LOG,
 }

core/testing/build.gradle.kts

@@ -11,4 +11,4 @@ android {
 dependencies {
     implementation(project(":core:coroutines"))
     api(libs.bundles.unit.testing)
-}
+}

core/testing/src/main/kotlin/edu/stanford/spezi/core/testing/CoroutineTestRule.kt

@@ -37,7 +37,7 @@ import org.junit.runner.Description
  *
  */
 class CoroutineTestRule(
-    private val testDispatcher: TestDispatcher = UnconfinedTestDispatcher()
+    private val testDispatcher: TestDispatcher = UnconfinedTestDispatcher(),
 ) : TestWatcher() {
 
     /**

core/testing/src/main/kotlin/edu/stanford/spezi/core/testing/Mockk.kt

@@ -33,5 +33,5 @@ fun verifyNever(verifyBlock: MockKVerificationScope.() -> Unit) = verify(exactly
  * @param verifyBlock The suspendable block of code containing the interaction to verify.
  */
 fun coVerifyNever(
-    verifyBlock: suspend MockKVerificationScope.() -> Unit
+    verifyBlock: suspend MockKVerificationScope.() -> Unit,
 ) = coVerify(exactly = 0, verifyBlock = verifyBlock)

core/testing/src/main/kotlin/edu/stanford/spezi/core/testing/TestDispatchersProvider.kt

@@ -12,7 +12,7 @@ import kotlinx.coroutines.test.UnconfinedTestDispatcher
  * @property testDispatcher The [CoroutineDispatcher] to be used for all dispatcher contexts. Defaults to [UnconfinedTestDispatcher].
  */
 class TestDispatchersProvider(
-    private val testDispatcher: CoroutineDispatcher = UnconfinedTestDispatcher()
+    private val testDispatcher: CoroutineDispatcher = UnconfinedTestDispatcher(),
 ) : DispatchersProvider {
 
     /**

core/utils/build.gradle.kts

@@ -10,4 +10,4 @@ dependencies {
     val composeBom = platform(libs.compose.bom)
     implementation(composeBom)
     implementation(libs.compose.runtime)
-}
+}

modules/contact/build.gradle.kts

@@ -10,4 +10,4 @@ android {
 dependencies {
     testImplementation(project(":core:testing"))
     androidTestImplementation(libs.bundles.compose.androidTest)
-}
+}

modules/contact/src/androidTest/kotlin/edu/stanford/spezi/modules/contact/ContactFactory.kt

@@ -18,4 +18,4 @@ object ContactFactory {
     ): Contact {
         return Contact(id, icon, name, title, description, organization, address, options)
     }
-}
+}