Applied linter

buildSrc/build.gradle.kts

@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 
 plugins {
     `kotlin-dsl`

buildSrc/src/main/kotlin/Library.kt

@@ -3,13 +3,11 @@ object Library {
     const val artifactId = "surveykit"
     const val version = "1.1.0"
 
-
     object Meta {
         const val gitUrl = "https://github.com/quickbirdstudios/SurveyKit"
         const val websiteUrl = "http://quickbirdstudios.com"
         const val developerId = "quickbirdstudios"
         const val developerName = "QuickBird Studios GmbH"
-
     }
 
     object Bintray {
@@ -19,4 +17,3 @@ object Library {
         val allLicenses = arrayOf("MIT")
     }
 }
-

buildSrc/src/main/kotlin/Project.kt

@@ -6,5 +6,3 @@ object Project {
         const val testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 }
-
-

buildSrc/src/main/kotlin/com/quickbirdstudios/surveykit/CheckCiTag.kt

@@ -31,4 +31,4 @@ internal open class CheckCiTagTask : DefaultTask() {
             )
         }
     }
-}
+}

buildSrc/src/main/kotlin/com/quickbirdstudios/surveykit/Publication.kt

@@ -100,4 +100,4 @@ private fun Project.bintrayKey(): String {
 
 private fun Project.environmentVariableOrPropertyOrStub(key: String): String {
     return System.getenv(key) ?: project.properties.getOrDefault(key, "stub").toString()
-}
+}

example/src/main/java/com/quickbirdstudios/example/ui/main/MainActivity.kt

@@ -12,7 +12,15 @@ import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import com.quickbirdstudios.example.R
-import com.quickbirdstudios.surveykit.*
+import com.quickbirdstudios.surveykit.AnswerFormat
+import com.quickbirdstudios.surveykit.FinishReason
+import com.quickbirdstudios.surveykit.Identifier
+import com.quickbirdstudios.surveykit.ImageChoice
+import com.quickbirdstudios.surveykit.NavigableOrderedTask
+import com.quickbirdstudios.surveykit.NavigationRule
+import com.quickbirdstudios.surveykit.StepIdentifier
+import com.quickbirdstudios.surveykit.SurveyTheme
+import com.quickbirdstudios.surveykit.TextChoice
 import com.quickbirdstudios.surveykit.backend.views.main_parts.AbortDialogConfiguration
 import com.quickbirdstudios.surveykit.backend.views.step.StepView
 import com.quickbirdstudios.surveykit.result.QuestionResult
@@ -23,9 +31,8 @@ import com.quickbirdstudios.surveykit.steps.InstructionStep
 import com.quickbirdstudios.surveykit.steps.QuestionStep
 import com.quickbirdstudios.surveykit.steps.Step
 import com.quickbirdstudios.surveykit.survey.SurveyView
+import java.util.Date
 import kotlinx.android.parcel.Parcelize
-import java.util.*
-
 
 class MainActivity : AppCompatActivity() {
 
@@ -253,7 +260,6 @@ class CustomStep : Step {
     }
 }
 
-
 @Parcelize
 data class CustomResult(
     val customData: String,

git-hook-install.gradle.kts

@@ -77,4 +77,3 @@ task("installGitHooks") {
         print("Something went wrong while installing the git hooks: $e.message")
     }
 }
-

survey/build.gradle.kts

@@ -35,12 +35,8 @@ dependencies {
     implementation(Deps.AndroidSupport.recyclerView)
     implementation(Deps.lottie)
 
-
     testImplementation(Deps.Test.jUnitJupiter)
     testImplementation(Deps.Test.jUnitPlatform)
 }
 
 project.configureLibraryPublication()
-
-
-

survey/src/main/java/com.quickbirdstudios.surveykit/AnswerFormat.kt

@@ -3,10 +3,10 @@ package com.quickbirdstudios.surveykit
 import android.os.Parcelable
 import androidx.annotation.DrawableRes
 import androidx.annotation.IntRange
-import kotlinx.android.parcel.Parcelize
-import java.util.*
-import java.util.regex.Pattern
+import java.util.Calendar
 import java.util.Date as JavaDate
+import java.util.regex.Pattern
+import kotlinx.android.parcel.Parcelize
 
 sealed class AnswerFormat {
 
@@ -15,19 +15,16 @@ sealed class AnswerFormat {
         val hint: String = ""
     ) : AnswerFormat()
 
-
     data class SingleChoiceAnswerFormat(
         val textChoices: List<TextChoice>,
         val defaultSelection: TextChoice? = null
     ) : AnswerFormat()
 
-
     data class MultipleChoiceAnswerFormat(
         val textChoices: List<TextChoice>,
         val defaultSelections: List<TextChoice> = emptyList()
     ) : AnswerFormat()
 
-
     data class ScaleAnswerFormat(
         val maximumValue: Int,
         val minimumValue: Int,
@@ -41,14 +38,12 @@ sealed class AnswerFormat {
         enum class Orientation { Horizontal }
     }
 
-
     data class TextAnswerFormat(
         val maxLines: Int,
         val hintText: String? = null,
         val isValid: ((String) -> Boolean) = { text -> text.isNotEmpty() }
     ) : AnswerFormat()
 
-
     data class BooleanAnswerFormat(
         val positiveAnswerText: String,
         val negativeAnswerText: String,
@@ -68,7 +63,6 @@ sealed class AnswerFormat {
         }
     }
 
-
     data class ValuePickerAnswerFormat(
         val choices: List<String>,
         val defaultValue: String? = null
@@ -84,7 +78,6 @@ sealed class AnswerFormat {
         }
     }
 
-
     data class DateAnswerFormat(
         val defaultValue: Date? = defaultDateValue(),
         val minDate: JavaDate? = null,
@@ -106,7 +99,6 @@ sealed class AnswerFormat {
         }
     }
 
-
     data class TimeAnswerFormat(val defaultValue: Time?) : AnswerFormat() {
         @Parcelize
         data class Time(val hour: Int, val minute: Int) : Parcelable {
@@ -125,13 +117,11 @@ sealed class AnswerFormat {
         }
     }
 
-
     data class EmailAnswerFormat(
         val hintText: String? = null,
         val isValid: (String) -> Boolean = defaultEmailValidation
     ) : AnswerFormat()
 
-
     data class ImageSelectorFormat(
         @IntRange(from = 1, to = 5) val numberOfColumns: Int = 4,
         val imageChoiceList: List<ImageChoice>,
@@ -141,10 +131,8 @@ sealed class AnswerFormat {
             require(numberOfColumns in 1..5) { "Number of columns supported: 1-5" }
         }
     }
-
 }
 
-
 @Parcelize // necessary because it is used in QuestionResults (Single and Multiple)
 data class TextChoice(
     val text: String,

survey/src/main/java/com.quickbirdstudios.surveykit/FinishReason.kt

@@ -1,6 +1,6 @@
 package com.quickbirdstudios.surveykit
 
-//TODO check if Saved can be removed
+// TODO check if Saved can be removed
 enum class FinishReason {
     Saved, Discarded, Completed, Failed;
 }

survey/src/main/java/com.quickbirdstudios.surveykit/Identifier.kt

@@ -1,8 +1,8 @@
 package com.quickbirdstudios.surveykit
 
 import android.os.Parcelable
+import java.util.UUID
 import kotlinx.android.parcel.Parcelize
-import java.util.*
 
 @Parcelize
 open class Identifier(open val id: String) : Parcelable

survey/src/main/java/com.quickbirdstudios.surveykit/backend/helpers/extensions/Dimensions.kt

@@ -6,13 +6,13 @@ import android.util.DisplayMetrics
 fun Context.dp(px: Number): Float {
     val resources = this.resources
     val metrics = resources.displayMetrics
-    return (px.toFloat()
-        / (metrics.densityDpi.toFloat() / DisplayMetrics.DENSITY_DEFAULT.toFloat()))
+    return (px.toFloat() /
+        (metrics.densityDpi.toFloat() / DisplayMetrics.DENSITY_DEFAULT.toFloat()))
 }
 
 fun Context.px(dp: Number): Float {
     val resources = this.resources
     val metrics = resources.displayMetrics
-    return (dp.toFloat()
-        * (metrics.densityDpi.toFloat() / DisplayMetrics.DENSITY_DEFAULT.toFloat()))
+    return (dp.toFloat() *
+        (metrics.densityDpi.toFloat() / DisplayMetrics.DENSITY_DEFAULT.toFloat()))
 }

survey/src/main/java/com.quickbirdstudios.surveykit/backend/navigator/NavigableOrderedTaskNavigator.kt

@@ -4,20 +4,18 @@ import com.quickbirdstudios.surveykit.NavigableOrderedTask
 import com.quickbirdstudios.surveykit.NavigationRule
 import com.quickbirdstudios.surveykit.result.StepResult
 import com.quickbirdstudios.surveykit.steps.Step
-import java.util.*
+import java.util.Stack
 
 internal class NavigableOrderedTaskNavigator(
     override val task: NavigableOrderedTask
 ) : TaskNavigator {
 
-
     //region Members
 
     override var history: Stack<Step> = Stack()
 
     //endregion
 
-
     //region Public API
 
     override fun startStep(stepResult: StepResult?): Step? {
@@ -48,7 +46,6 @@ internal class NavigableOrderedTaskNavigator(
 
     //endregion
 
-
     //region Private Helper
 
     private fun Step?.record() {
@@ -63,7 +60,8 @@ internal class NavigableOrderedTaskNavigator(
         task[this.destinationStepStepIdentifier]
 
     private fun NavigationRule.ConditionalDirectionStepNavigationRule.evaluateNextStep(
-        step: Step, stepResult: StepResult?
+        step: Step,
+        stepResult: StepResult?
     ): Step? {
         stepResult ?: return step.nextInList()
         val firstResult = stepResult.results.firstOrNull() ?: return step.nextInList()
@@ -74,6 +72,4 @@ internal class NavigableOrderedTaskNavigator(
     }
 
     //endregion
-
-
 }

survey/src/main/java/com.quickbirdstudios.surveykit/backend/navigator/OrderedTaskNavigator.kt

@@ -3,13 +3,12 @@ package com.quickbirdstudios.surveykit.backend.navigator
 import com.quickbirdstudios.surveykit.OrderedTask
 import com.quickbirdstudios.surveykit.result.StepResult
 import com.quickbirdstudios.surveykit.steps.Step
-import java.util.*
+import java.util.Stack
 
 internal class OrderedTaskNavigator(
     override val task: OrderedTask
 ) : TaskNavigator {
 
-
     //region Public API
 
     override var history: Stack<Step> = Stack()
@@ -28,7 +27,6 @@ internal class OrderedTaskNavigator(
 
     //endregion
 
-
     //region Private Helper
 
     private fun Step.previousInList(): Step? {

survey/src/main/java/com.quickbirdstudios.surveykit/backend/navigator/TaskNavigator.kt

@@ -5,7 +5,7 @@ import com.quickbirdstudios.surveykit.OrderedTask
 import com.quickbirdstudios.surveykit.Task
 import com.quickbirdstudios.surveykit.result.StepResult
 import com.quickbirdstudios.surveykit.steps.Step
-import java.util.*
+import java.util.Stack
 
 interface TaskNavigator {
 
@@ -47,4 +47,3 @@ interface TaskNavigator {
             }
     }
 }
-

survey/src/main/java/com.quickbirdstudios.surveykit/backend/presenter/Presenter.kt

@@ -6,7 +6,6 @@ import com.quickbirdstudios.surveykit.SurveyTheme
 import com.quickbirdstudios.surveykit.result.StepResult
 import com.quickbirdstudios.surveykit.steps.Step
 
-
 interface Presenter {
     val context: Context
     val viewContainer: FrameLayout
@@ -23,4 +22,3 @@ interface Presenter {
         None, SlideFromRight, SlideFromLeft;
     }
 }
-

survey/src/main/java/com.quickbirdstudios.surveykit/backend/presenter/PresenterImpl.kt

@@ -9,18 +9,16 @@ import com.quickbirdstudios.surveykit.backend.presenter.animations.ViewAnimator
 import com.quickbirdstudios.surveykit.backend.views.step.StepView
 import com.quickbirdstudios.surveykit.result.StepResult
 import com.quickbirdstudios.surveykit.steps.Step
-import java.util.*
+import java.util.Date
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
-
 internal class PresenterImpl(
     override val context: Context,
     override val viewContainer: FrameLayout,
     override val surveyTheme: SurveyTheme
 ) : Presenter {
 
-
     //region Members
 
     private val viewAnimator: ViewAnimator =
@@ -29,25 +27,24 @@ internal class PresenterImpl(
 
     //endregion
 
-
     //region Public API
 
     override suspend fun invoke(
-        transition: Presenter.Transition, step: Step, stepResult: StepResult?
+        transition: Presenter.Transition,
+        step: Step,
+        stepResult: StepResult?
     ): NextAction {
         val viewToPresent = step.createView(context, stepResult)
         return showAndWaitForResult(step.id, viewToPresent, transition)
     }
 
-
     override fun triggerBackOnCurrentView() {
 //        val results = currentQuestionView?.createResults() ?: return
         currentQuestionView?.back()
     }
 
     //endregion
 
-
     //region Private API
 
     private suspend fun showAndWaitForResult(
@@ -123,6 +120,4 @@ internal class PresenterImpl(
     }
 
     //endregion
-
-
 }