Skip to content

Commit 2fe1cd9

Browse files
committedFeb 9, 2025·
Detekt cleanup
1 parent 66952fe commit 2fe1cd9

File tree

11 files changed

+18
-17
lines changed

11 files changed

+18
-17
lines changed
 

‎app-backup/src/test/java/xyz.aprildown.timer.backup/BaseBackupViewModelTest.kt ‎app-backup/src/test/java/xyz/aprildown/timer/app/backup/BaseBackupViewModelTest.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package xyz.aprildown.timer.backup
1+
package xyz.aprildown.timer.app.backup
22

33
import androidx.lifecycle.ViewModel
44
import androidx.lifecycle.ViewModelProvider
@@ -9,7 +9,6 @@ import org.junit.Assert.assertFalse
99
import org.junit.Assert.assertNull
1010
import org.junit.Assert.assertTrue
1111
import org.junit.Test
12-
import xyz.aprildown.timer.app.backup.BaseBackupViewModel
1312

1413
internal abstract class BaseBackupViewModelTest {
1514

‎app-backup/src/test/java/xyz.aprildown.timer.backup/ExportViewModelTest.kt ‎app-backup/src/test/java/xyz/aprildown/timer/app/backup/ExportViewModelTest.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package xyz.aprildown.timer.backup
1+
package xyz.aprildown.timer.app.backup
22

33
import androidx.lifecycle.SavedStateHandle
44
import kotlinx.coroutines.test.StandardTestDispatcher
@@ -17,7 +17,6 @@ import org.mockito.kotlin.mock
1717
import org.mockito.kotlin.verify
1818
import org.mockito.kotlin.verifyNoMoreInteractions
1919
import org.mockito.kotlin.whenever
20-
import xyz.aprildown.timer.app.backup.ExportViewModel
2120
import xyz.aprildown.timer.domain.usecases.Fruit
2221
import xyz.aprildown.timer.domain.usecases.data.ExportAppData
2322

‎app-backup/src/test/java/xyz.aprildown.timer.backup/ImportViewModelTest.kt ‎app-backup/src/test/java/xyz/aprildown/timer/app/backup/ImportViewModelTest.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package xyz.aprildown.timer.backup
1+
package xyz.aprildown.timer.app.backup
22

33
import kotlinx.coroutines.test.StandardTestDispatcher
44
import kotlinx.coroutines.test.TestScope
@@ -13,7 +13,6 @@ import org.junit.Test
1313
import org.mockito.kotlin.mock
1414
import org.mockito.kotlin.verify
1515
import org.mockito.kotlin.verifyNoMoreInteractions
16-
import xyz.aprildown.timer.app.backup.ImportViewModel
1716
import xyz.aprildown.timer.domain.usecases.Fruit
1817
import xyz.aprildown.timer.domain.usecases.data.ImportAppData
1918
import xyz.aprildown.timer.domain.usecases.data.NotifyDataChanged

‎baselineProfile/src/main/java/io/github/deweyreed/timer/baselineprofile/StartupBenchmarks.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import org.junit.runner.RunWith
2929
* You should run the benchmarks on a physical device, not an Android emulator, because the
3030
* emulator doesn't represent real world performance and shares system resources with its host.
3131
*
32-
* For more information, see the [Macrobenchmark documentation](https://d.android.com/macrobenchmark#create-macrobenchmark)
33-
* and the [instrumentation arguments documentation](https://d.android.com/topic/performance/benchmarking/macrobenchmark-instrumentation-args).
32+
* For more information, see the https://d.android.com/macrobenchmark#create-macrobenchmark
33+
* and the https://d.android.com/topic/performance/benchmarking/macrobenchmark-instrumentation-args.
3434
**/
3535
@RunWith(AndroidJUnit4::class)
3636
@LargeTest

‎component-key/src/main/java/xyz/aprildown/timer/component/key/behaviour/BehaviourLayout.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ class BehaviourLayout @JvmOverloads constructor(
6666
binding.layoutImage.isVisible = true
6767
val imageView = if (binding.layoutImage.isEmpty()) {
6868
LayoutEditableBehaviourImageBinding.inflate(
69-
LayoutInflater.from(context), binding.layoutImage, true
69+
LayoutInflater.from(context),
70+
binding.layoutImage,
71+
true
7072
).root
7173
} else {
7274
LayoutEditableBehaviourImageBinding.bind(binding.layoutImage.getChildAt(0)).root

‎component-key/src/main/java/xyz/aprildown/timer/component/key/behaviour/EditableBehaviourLayout.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@ class EditableBehaviourLayout(
134134
if (imageAction != null) {
135135
val imageView = if (binding.layoutImage.isEmpty()) {
136136
LayoutEditableBehaviourImageBinding.inflate(
137-
LayoutInflater.from(context), binding.layoutImage, true
137+
LayoutInflater.from(context),
138+
binding.layoutImage,
139+
true
138140
).root
139141
} else {
140142
LayoutEditableBehaviourImageBinding.bind(binding.layoutImage.getChildAt(0)).root

‎data/src/androidTest/java/xyz/aprildown/timer/data/repositories/SchedulerRepositoryImplTest.kt

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ class SchedulerRepositoryImplTest {
2828
private val context = ApplicationProvider.getApplicationContext<Context>()
2929
private val database = MachineDatabase.createInMemoryDatabase(context)
3030
private val timerRepository: TimerRepository = TimerRepositoryImpl(
31-
context = context,
3231
timerDao = database.timerDao(),
3332
timerMapper = TimerMapper(StepMapper(StepOnlyMapper(BehaviourMapper())), TimerMoreMapper()),
3433
timerInfoMapper = TimerInfoMapper(),

‎data/src/androidTest/java/xyz/aprildown/timer/data/repositories/TimerRepositoryImplTest.kt

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class TimerRepositoryImplTest {
2424
private val context = ApplicationProvider.getApplicationContext<Context>()
2525
private val database = MachineDatabase.createInMemoryDatabase(context)
2626
private val timerRepository: TimerRepository = TimerRepositoryImpl(
27-
context = context,
2827
timerDao = database.timerDao(),
2928
timerMapper = TimerMapper(StepMapper(StepOnlyMapper(BehaviourMapper())), TimerMoreMapper()),
3029
timerInfoMapper = TimerInfoMapper(),

‎data/src/main/java/xyz/aprildown/timer/data/repositories/TimerRepositoryImpl.kt

-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package xyz.aprildown.timer.data.repositories
22

3-
import android.content.Context
43
import dagger.Reusable
5-
import dagger.hilt.android.qualifiers.ApplicationContext
64
import kotlinx.coroutines.flow.Flow
75
import kotlinx.coroutines.flow.map
86
import xyz.aprildown.timer.data.db.TimerDao
@@ -16,7 +14,6 @@ import javax.inject.Inject
1614

1715
@Reusable
1816
internal class TimerRepositoryImpl @Inject constructor(
19-
@ApplicationContext context: Context,
2017
private val timerDao: TimerDao,
2118
private val timerMapper: TimerMapper,
2219
private val timerInfoMapper: TimerInfoMapper,

‎detekt-config.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ complexity:
44
CyclomaticComplexMethod:
55
active: false
66
LargeClass:
7-
threshold: 1000
7+
threshold: 2000
88
LongMethod:
99
active: false
1010
LongParameterList:
@@ -21,6 +21,11 @@ exceptions:
2121
TooGenericExceptionThrown:
2222
active: false
2323

24+
naming:
25+
FunctionNaming:
26+
ignoreAnnotated:
27+
- "Composable"
28+
2429
style:
2530
LoopWithTooManyJumpStatements:
2631
maxJumpCount: 2

‎gradle/libs.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ kotlin = "1.9.25"
1313
dagger = "2.52"
1414
composeCompiler = "1.5.15"
1515

16-
detekt = "1.23.6"
16+
detekt = "1.23.7"
1717

1818
[plugins]
1919
android-application = { id = "com.android.application", version.ref = "agp" }

0 commit comments

Comments
 (0)