IDE-251 Fix all detekt warnings

catroid/config/detekt.yml

@@ -70,11 +70,12 @@ complexity:
  threshold: 80
  LongParameterList:
  active: true
- threshold: 6
+ functionThreshold: 8
+ constructorThreshold: 8
  ignoreDefaultParameters: false
  MethodOverloading:
  active: true
- threshold: 2
+ threshold: 6
  NestedBlockDepth:
  active: true
  threshold: 4

catroid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/BrickContextMenuTest.kt

@@ -1,6 +1,6 @@
 /*
  * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2022 The Catrobat Team
+ * Copyright (C) 2010-2024 The Catrobat Team
  * (<http://developer.catrobat.org/credits>)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -100,7 +100,7 @@ class BrickContextMenuTest(
  arrayOf(WhenNfcBrick(), false, false),
  arrayOf(WhenRaspiPinChangedBrick(), false, false),
  arrayOf(WhenTouchDownBrick(), false, false)
-  )
+ )
  }
 
  @Before

catroid/src/androidTest/java/org/catrobat/catroid/test/content/sprite/DeleteImportedSpriteTest.kt

@@ -1,6 +1,6 @@
 /*
  * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2022 The Catrobat Team
+ * Copyright (C) 2010-2024 The Catrobat Team
  * (<http://developer.catrobat.org/credits>)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -79,14 +79,18 @@ class DeleteImportedSpriteTest {
  baseActivityTestRule.launchActivity()
  Intents.init()
 
- expectedIntent = AllOf.allOf(IntentMatchers.hasExtra(
- ProjectListActivity.IMPORT_LOCAL_INTENT,
- baseActivityTestRule.activity.getString(R.string.import_sprite_from_project_launcher)
- ))
+ expectedIntent = AllOf.allOf(
+ IntentMatchers.hasExtra(
+ ProjectListActivity.IMPORT_LOCAL_INTENT,
+ baseActivityTestRule.activity.getString(R.string.import_sprite_from_project_launcher)
+ )
+ )
 
  val resultData = Intent()
- resultData.putExtra(ProjectListActivity.IMPORT_LOCAL_INTENT,
- localProject.directory.absoluteFile.absolutePath)
+ resultData.putExtra(
+ ProjectListActivity.IMPORT_LOCAL_INTENT,
+ localProject.directory.absoluteFile.absolutePath
+ )
 
  val result = Instrumentation.ActivityResult(Activity.RESULT_OK, resultData)
  Intents.intending(expectedIntent).respondWith(result)

catroid/src/androidTest/java/org/catrobat/catroid/test/stage/ScreenshotSaverTest.kt

@@ -1,6 +1,6 @@
 /*
  * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2022 The Catrobat Team
+ * Copyright (C) 2010-2024 The Catrobat Team
  * (<http://developer.catrobat.org/credits>)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -52,11 +52,11 @@ class ScreenshotSaverTest(private val name: String, private val fileName: String
  @JvmStatic
  @Parameterized.Parameters(name = "{0}")
  fun data() = listOf(
-  arrayOf("VALID", "valid.png", true),
-  arrayOf("NULL", null, false),
-  arrayOf("WHITESPACES", " ", false),
-  arrayOf("ILLEGAL_CHARACTERS", "|\\?*<\":>+[]/'", false)
-  )
+ arrayOf("VALID", "valid.png", true),
+ arrayOf("NULL", null, false),
+ arrayOf("WHITESPACES", " ", false),
+ arrayOf("ILLEGAL_CHARACTERS", "|\\?*<\":>+[]/'", false)
+ )
 
  private const val NUMBER_OF_COLORS = 4
  }

catroid/src/androidTest/java/org/catrobat/catroid/test/ui/BrickSearchTest.kt

@@ -1,6 +1,6 @@
 /*
  * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2022 The Catrobat Team
+ * Copyright (C) 2010-2024 The Catrobat Team
  * (<http://developer.catrobat.org/credits>)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -103,8 +103,14 @@ class BrickSearchTest {
  InstrumentationRegistry.getInstrumentation().waitForIdleSync()
  viewMatcher.perform(pressKey(KeyEvent.KEYCODE_ENTER))
  InstrumentationRegistry.getInstrumentation().waitForIdleSync()
- Espresso.onData(Matchers.allOf(Matchers.`is`(Matchers.instanceOf
- (bricks[index] as Class<*>?))))
+ Espresso.onData(
+ Matchers.allOf(
+ Matchers.`is`(
+ Matchers.instanceOf
+ (bricks[index] as Class<*>?)
+ )
+ )
+ )
  .inAdapterView(BrickPrototypeListMatchers.isBrickPrototypeView())
  .atPosition(0)
  .check(matches(isDisplayed()))
@@ -237,13 +243,13 @@ class BrickSearchTest {
  )
  }
 
- fun ensureKeyboardIsClosed() {
+ private fun ensureKeyboardIsClosed() {
  if (isKeyboardVisible()) {
  hideKeyboard()
  }
  }
 
- fun hideKeyboard() {
+ private fun hideKeyboard() {
  Espresso.onView(ViewMatchers.isRoot()).perform(ViewActions.closeSoftKeyboard())
  }
  @Test

catroid/src/androidTest/java/org/catrobat/catroid/ui/AssertEqualsBrickTest.kt

@@ -1,6 +1,6 @@
 /*
  * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2022 The Catrobat Team
+ * Copyright (C) 2010-2024 The Catrobat Team
  * (<http://developer.catrobat.org/credits>)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -115,13 +115,9 @@ class AssertEqualsBrickTest {
 
  private fun handleConstraints(action: ViewAction, constraints: Matcher<View>): ViewAction {
  return object : ViewAction {
- override fun getConstraints(): Matcher<View> {
- return constraints
- }
+ override fun getConstraints(): Matcher<View> = constraints
 
- override fun getDescription(): String {
- return action.description
- }
+ override fun getDescription(): String = action.description
 
  override fun perform(uiController: UiController?, view: View?) {
  action.perform(uiController, view)

catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/StartListeningStageTest.kt

@@ -1,6 +1,6 @@
 /*
  * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2022 The Catrobat Team
+ * Copyright (C) 2010-2024 The Catrobat Team
  * (<http://developer.catrobat.org/credits>)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -67,12 +67,12 @@ class StartListeningStageTest {
  @Before
  fun setUp() {
  createProject(javaClass.simpleName)
- textToSpeech = TextToSpeech(ApplicationProvider.getApplicationContext(), TextToSpeech.OnInitListener
- { status ->
- if (status == TextToSpeech.SUCCESS) {
- textToSpeech.language = Locale.US
+ textToSpeech =
+ TextToSpeech(ApplicationProvider.getApplicationContext()) { status ->
+ if (status == TextToSpeech.SUCCESS) {
+ textToSpeech.language = Locale.US
+ }
  }
- })
  baseActivityTestRule.launchActivity(null)
  }
 

catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/content/brick/stage/TextDetectionResourceTest.kt

@@ -1,6 +1,6 @@
 /*
  * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2022 The Catrobat Team
+ * Copyright (C) 2010-2024 The Catrobat Team
  * (<http://developer.catrobat.org/credits>)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -111,8 +111,8 @@ class TextDetectionResourceTest {
 
  val script = UiTestUtils.createProjectAndGetStartScript("TextDetectionResourceTest")
  .also {
- it.addBrick(SetSizeToBrick(formula))
- }
+  it.addBrick(SetSizeToBrick(formula))
+  }
  lastBrickInScript = ScriptEvaluationGateBrick.appendToScript(script)
  }