Update codestyle

usefulness · Nov 3, 2023 · 69299a8 · 69299a8
1 parent b69d91d
commit 69299a8
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 25 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -8,7 +8,9 @@ max_line_length = 140
 indent_size = 4
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = true
+ktlint_code_style = intellij_idea
 ktlint_standard_property-naming = disabled
+ktlint_class_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 2
 
 [{*.yml,yaml}]
 indent_size = 2
diff --git a/easylauncher/src/main/kotlin/com/project/starter/easylauncher/plugin/AgpUtils.kt b/easylauncher/src/main/kotlin/com/project/starter/easylauncher/plugin/AgpUtils.kt
@@ -12,13 +12,11 @@ internal fun ObjectFactory.getIconFiles(parent: File, iconName: String): Iterabl
     include(resourceFilePattern(iconName))
 }
 
-private fun resourceFilePattern(name: String): String {
-    return if (name.startsWith("@")) {
-        val (baseResType, fileName) = name.substring(1).split("/".toRegex(), 2)
-        "$baseResType*/$fileName.*"
-    } else {
-        name
-    }
+private fun resourceFilePattern(name: String): String = if (name.startsWith("@")) {
+    val (baseResType, fileName) = name.substring(1).split("/".toRegex(), 2)
+    "$baseResType*/$fileName.*"
+} else {
+    name
 }
 
 /**

diff --git a/...launcher/src/main/kotlin/com/project/starter/easylauncher/plugin/EasyLauncherExtension.kt b/...launcher/src/main/kotlin/com/project/starter/easylauncher/plugin/EasyLauncherExtension.kt
@@ -6,9 +6,7 @@ import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import javax.inject.Inject
 
-open class EasyLauncherExtension @Inject constructor(
-    objectFactory: ObjectFactory,
-) {
+open class EasyLauncherExtension @Inject constructor(objectFactory: ObjectFactory) {
 
     /**
      * Defines if the plugins should show warnings at configuration time. Disable by adding:

diff --git a/easylauncher/src/main/kotlin/com/project/starter/easylauncher/plugin/EasyLauncherPlugin.kt b/easylauncher/src/main/kotlin/com/project/starter/easylauncher/plugin/EasyLauncherPlugin.kt
@@ -149,10 +149,8 @@ class EasyLauncherPlugin : Plugin<Project> {
         variant: Variant,
         ribbonProductFlavors: Iterable<EasyLauncherConfig>,
         ribbonBuildTypes: Iterable<EasyLauncherConfig>,
-    ): List<EasyLauncherConfig> {
-        return ribbonProductFlavors.filter { config -> variant.productFlavors.any { config.name == it.second } } +
-            ribbonBuildTypes.filter { it.name == variant.buildType }
-    }
+    ): List<EasyLauncherConfig> = ribbonProductFlavors.filter { config -> variant.productFlavors.any { config.name == it.second } } +
+        ribbonBuildTypes.filter { it.name == variant.buildType }
 
     private val AndroidPluginVersion.canUseNewResources get() = this >= AndroidPluginVersion(7, 4).beta(2)
     private val AndroidPluginVersion.hasBrokenResourcesMerging get() = this >= AndroidPluginVersion(7, 3).alpha(1)

diff --git a/easylauncher/src/main/kotlin/com/project/starter/easylauncher/plugin/EasyLauncherTask.kt b/easylauncher/src/main/kotlin/com/project/starter/easylauncher/plugin/EasyLauncherTask.kt
@@ -19,9 +19,7 @@ import javax.inject.Inject
 import kotlin.system.measureTimeMillis
 
 @CacheableTask
-abstract class EasyLauncherTask @Inject constructor(
-    private val objects: ObjectFactory,
-) : DefaultTask() {
+abstract class EasyLauncherTask @Inject constructor(private val objects: ObjectFactory) : DefaultTask() {
 
     @get:Input
     abstract val manifestFiles: ListProperty<File>

diff --git a/easylauncher/src/main/kotlin/com/project/starter/easylauncher/plugin/models/Size.kt b/easylauncher/src/main/kotlin/com/project/starter/easylauncher/plugin/models/Size.kt
@@ -2,7 +2,10 @@ package com.project.starter.easylauncher.plugin.models
 
 import kotlin.math.roundToInt
 
-internal data class Size(val value: Int, val unit: String)
+internal data class Size(
+    val value: Int,
+    val unit: String,
+)
 
 private val sizeFormat by lazy { "(\\d*)(\\D*)".toRegex() }
 

diff --git a/sample/adaptive-support/src/main/kotlin/com/example/custom/adaptive/LauncherIconView.kt b/sample/adaptive-support/src/main/kotlin/com/example/custom/adaptive/LauncherIconView.kt
@@ -12,7 +12,10 @@ import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 
-class LauncherIconView(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) {
+class LauncherIconView(
+    context: Context,
+    attrs: AttributeSet?,
+) : FrameLayout(context, attrs) {
 
     init {
         inflate(context, R.layout.launcher_icon_view, this)
@@ -28,12 +31,12 @@ class LauncherIconView(context: Context, attrs: AttributeSet?) : FrameLayout(con
         adaptive?.setupAdaptiveIcon() ?: setupLegacyIcon(iconResource)
     }
 
-    private fun getAdaptiveIcon(@DrawableRes iconResource: Int): AdaptiveIconDrawable? {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            ContextCompat.getDrawable(context, iconResource) as? AdaptiveIconDrawable
-        } else {
-            null
-        }
+    private fun getAdaptiveIcon(@DrawableRes iconResource: Int): AdaptiveIconDrawable? = if (Build.VERSION.SDK_INT >=
+        Build.VERSION_CODES.O
+    ) {
+        ContextCompat.getDrawable(context, iconResource) as? AdaptiveIconDrawable
+    } else {
+        null
     }
 
     @SuppressLint("NewApi") // whole AdaptiveIconDrawable is available since API26