Spotless 6.24.0 + Ktlint 1.1.1 (#3972)

* Update plugin com.diffplug.spotless to v6.24.0

* Fix styles

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Goooler <wangzongler@gmail.com>

build.gradle

@@ -15,7 +15,7 @@ plugins {
     id 'app.cash.licensee' version "1.8.0"
     id 'dev.rikka.tools.refine' version "4.4.0"
     id 'org.gradle.android.cache-fix' version '3.0'
-    id 'com.diffplug.spotless' version '6.23.3'
+    id 'com.diffplug.spotless' version '6.24.0'
 }
 
 allprojects {

lawnchair/src/app/lawnchair/FeedBridge.kt

@@ -154,12 +154,18 @@ class FeedBridge(private val context: Context) {
         private const val OVERLAY_ACTION = "com.android.launcher3.WINDOW_OVERLAY"
 
         private val whitelist = mapOf<String, Long>(
-            "ua.itaysonlab.homefeeder" to 0x887456ed, // HomeFeeder, t.me/homefeeder
-            "launcher.libre.dev" to 0x2e9dbab5, // Librechair, t.me/librechair
-            SmartspacerConstants.SMARTSPACER_PACKAGE_NAME to 0x15c6e36f, // Smartspacer
-            "amirz.aidlbridge" to 0xb662cc2f, // AIDL Bridge
-            "com.google.android.googlequicksearchbox" to 0xe3ca78d8, // Google
-            "com.google.android.apps.nexuslauncher" to 0xb662cc2f, // Pixel Bridge (or launcher)
+            // HomeFeeder, t.me/homefeeder
+            "ua.itaysonlab.homefeeder" to 0x887456ed,
+            // Librechair, t.me/librechair
+            "launcher.libre.dev" to 0x2e9dbab5,
+            // Smartspacer
+            SmartspacerConstants.SMARTSPACER_PACKAGE_NAME to 0x15c6e36f,
+            // AIDL Bridge
+            "amirz.aidlbridge" to 0xb662cc2f,
+            // Google
+            "com.google.android.googlequicksearchbox" to 0xe3ca78d8,
+            // Pixel Bridge (or launcher)
+            "com.google.android.apps.nexuslauncher" to 0xb662cc2f,
         )
 
         fun getAvailableProviders(context: Context) = context.packageManager

lawnchair/src/app/lawnchair/allapps/SearchItemBackground.kt

@@ -34,8 +34,14 @@ class SearchItemBackground(
         val bottomRadius = if (roundBottom) searchGroupRadius else searchResultRadius
 
         cornerRadii = floatArrayOf(
-            topRadius, topRadius, topRadius, topRadius,
-            bottomRadius, bottomRadius, bottomRadius, bottomRadius,
+            topRadius,
+            topRadius,
+            topRadius,
+            topRadius,
+            bottomRadius,
+            bottomRadius,
+            bottomRadius,
+            bottomRadius,
         )
     }
 

lawnchair/src/app/lawnchair/bubbles/DismissView.kt

@@ -127,7 +127,8 @@ class DismissView(context: Context) : FrameLayout(context) {
         circle.setup(config.backgroundResId, config.iconResId, config.iconSizeResId)
         val targetSize: Int = resources.getDimensionPixelSize(config.targetSizeResId)
         circle.layoutParams = LayoutParams(
-            targetSize, targetSize,
+            targetSize,
+            targetSize,
             Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL,
         )
         // Initial position with circle offscreen so it's animated up

lawnchair/src/app/lawnchair/font/FontCache.kt

@@ -380,9 +380,12 @@ class FontCache private constructor(private val context: Context) {
 
         override suspend fun load(): Typeface? {
             val request = FontRequest(
-                "com.google.android.gms.fonts", // ProviderAuthority
-                "com.google.android.gms", // ProviderPackage
-                GoogleFontsListing.buildQuery(family, variant), // Query
+                // ProviderAuthority
+                "com.google.android.gms.fonts",
+                // ProviderPackage
+                "com.google.android.gms",
+                // Query
+                GoogleFontsListing.buildQuery(family, variant),
                 R.array.com_google_android_gms_fonts_certs,
             )
 

lawnchair/src/app/lawnchair/icons/LawnchairIconProvider.kt

@@ -57,7 +57,8 @@ class LawnchairIconProvider @JvmOverloads constructor(
     private var iconPackVersion = 0L
     private var themeMapName: String = ""
     private var _themeMap: Map<ComponentName, ThemedIconDrawable.ThemeData>? = null
-    private val themeMap: Map<ComponentName, ThemedIconDrawable.ThemeData>
+
+    val themeMap: Map<ComponentName, ThemedIconDrawable.ThemeData>
         get() {
             if (drawerThemedIcons.get() && !(isOlderLawnIconsInstalled)) {
                 _themeMap = DISABLED_MAP

lawnchair/src/app/lawnchair/nexuslauncher/OverlayCallbackImpl.kt

@@ -39,7 +39,9 @@ class OverlayCallbackImpl(private val mLauncher: LawnchairLauncher) :
     init {
         val enableFeed = PreferenceManager2.getInstance(mLauncher).enableFeed.firstBlocking()
         mClient = LauncherClient(
-            mLauncher, this, StaticInteger((if (enableFeed) 1 else 0) or 2 or 4 or 8),
+            mLauncher,
+            this,
+            StaticInteger((if (enableFeed) 1 else 0) or 2 or 4 or 8),
         )
     }
 

lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceWidgetReader.kt

@@ -118,7 +118,9 @@ class SmartspaceWidgetReader(context: Context) : SmartspaceDataSource(
         val temperature = temperatureText?.text?.toString()
         val pendingIntent = (temperatureText?.parent as? View)?.pendingIntent
         val weatherData = parseWeatherData(
-            weatherIcon, temperature, pendingIntent,
+            weatherIcon,
+            temperature,
+            pendingIntent,
         ) ?: return null
         val intent = Intent().apply {
             component = WEATHER_COMPONENT

lawnchair/src/app/lawnchair/util/SmartBorder.kt

@@ -118,7 +118,10 @@ fun Modifier.smartBorder(
                             val rect = insetOutline.roundRect
                             addRoundRect(
                                 RoundRect(
-                                    rect.left, rect.top, rect.right, rect.bottom,
+                                    rect.left,
+                                    rect.top,
+                                    rect.right,
+                                    rect.bottom,
                                     CornerRadius(
                                         rect.topLeftCornerRadius.x - cornerCompensation,
                                         rect.topLeftCornerRadius.y - cornerCompensation,

lawnchair/src/app/lawnchair/views/ComposeBottomSheet.kt

@@ -48,8 +48,8 @@ class ComposeBottomSheet<T>(context: Context) :
     private val container = ComposeView(context)
     private var imeShift = 0f
     private var _hintCloseProgress = mutableFloatStateOf(0f)
-    private val hintCloseProgress get() = _hintCloseProgress.floatValue
     private var hintCloseDistance = 0f
+    val hintCloseProgress: Float get() = _hintCloseProgress.floatValue
 
     init {
         layoutParams = BaseDragLayer.LayoutParams(MATCH_PARENT, MATCH_PARENT)

lawnchair/src/app/lawnchair/views/LauncherPreviewView.kt

@@ -92,7 +92,7 @@ class LauncherPreviewView(
                 ModelDelegate(),
                 LauncherBinder(
                     LauncherAppState.getInstance(previewContext),
-                    BgDataModel(), /* bgAllAppsList= */
+                    BgDataModel(),
                     null,
                     arrayOfNulls<BgDataModel.Callbacks>(0),
                 ),