From 512606ee09d4b3e5bc831ceeb9faee92d74a9563 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 03:37:51 +0000 Subject: [PATCH] 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 --- build.gradle | 2 +- lawnchair/src/app/lawnchair/FeedBridge.kt | 18 ++++++++++++------ .../lawnchair/allapps/SearchItemBackground.kt | 10 ++++++++-- .../src/app/lawnchair/bubbles/DismissView.kt | 3 ++- lawnchair/src/app/lawnchair/font/FontCache.kt | 9 ++++++--- .../lawnchair/icons/LawnchairIconProvider.kt | 3 ++- .../nexuslauncher/OverlayCallbackImpl.kt | 4 +++- .../provider/SmartspaceWidgetReader.kt | 4 +++- .../src/app/lawnchair/util/SmartBorder.kt | 5 ++++- .../app/lawnchair/views/ComposeBottomSheet.kt | 2 +- .../app/lawnchair/views/LauncherPreviewView.kt | 2 +- 11 files changed, 43 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index c72a19636d..9de5b22f58 100644 --- a/build.gradle +++ b/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 { diff --git a/lawnchair/src/app/lawnchair/FeedBridge.kt b/lawnchair/src/app/lawnchair/FeedBridge.kt index 6ec0b879ef..bf9cd27490 100644 --- a/lawnchair/src/app/lawnchair/FeedBridge.kt +++ b/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( - "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 diff --git a/lawnchair/src/app/lawnchair/allapps/SearchItemBackground.kt b/lawnchair/src/app/lawnchair/allapps/SearchItemBackground.kt index a7d3b4fe6e..c6b76411f6 100644 --- a/lawnchair/src/app/lawnchair/allapps/SearchItemBackground.kt +++ b/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, ) } diff --git a/lawnchair/src/app/lawnchair/bubbles/DismissView.kt b/lawnchair/src/app/lawnchair/bubbles/DismissView.kt index 76941ff2ec..fd3c75b996 100644 --- a/lawnchair/src/app/lawnchair/bubbles/DismissView.kt +++ b/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 diff --git a/lawnchair/src/app/lawnchair/font/FontCache.kt b/lawnchair/src/app/lawnchair/font/FontCache.kt index 1788c8b9d2..0312b893a1 100644 --- a/lawnchair/src/app/lawnchair/font/FontCache.kt +++ b/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, ) diff --git a/lawnchair/src/app/lawnchair/icons/LawnchairIconProvider.kt b/lawnchair/src/app/lawnchair/icons/LawnchairIconProvider.kt index 4a6e0bccca..0921fe1a3a 100644 --- a/lawnchair/src/app/lawnchair/icons/LawnchairIconProvider.kt +++ b/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? = null - private val themeMap: Map + + val themeMap: Map get() { if (drawerThemedIcons.get() && !(isOlderLawnIconsInstalled)) { _themeMap = DISABLED_MAP diff --git a/lawnchair/src/app/lawnchair/nexuslauncher/OverlayCallbackImpl.kt b/lawnchair/src/app/lawnchair/nexuslauncher/OverlayCallbackImpl.kt index 8a5c8f1b0e..42f91053a0 100644 --- a/lawnchair/src/app/lawnchair/nexuslauncher/OverlayCallbackImpl.kt +++ b/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), ) } diff --git a/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceWidgetReader.kt b/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceWidgetReader.kt index a0162dbd30..a227941abf 100644 --- a/lawnchair/src/app/lawnchair/smartspace/provider/SmartspaceWidgetReader.kt +++ b/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 diff --git a/lawnchair/src/app/lawnchair/util/SmartBorder.kt b/lawnchair/src/app/lawnchair/util/SmartBorder.kt index e4b8f7bd7e..3b115984b0 100644 --- a/lawnchair/src/app/lawnchair/util/SmartBorder.kt +++ b/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, diff --git a/lawnchair/src/app/lawnchair/views/ComposeBottomSheet.kt b/lawnchair/src/app/lawnchair/views/ComposeBottomSheet.kt index 8efcc74b81..14c90ca4e3 100644 --- a/lawnchair/src/app/lawnchair/views/ComposeBottomSheet.kt +++ b/lawnchair/src/app/lawnchair/views/ComposeBottomSheet.kt @@ -48,8 +48,8 @@ class ComposeBottomSheet(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) diff --git a/lawnchair/src/app/lawnchair/views/LauncherPreviewView.kt b/lawnchair/src/app/lawnchair/views/LauncherPreviewView.kt index 3edc0a4ee3..e910f75483 100644 --- a/lawnchair/src/app/lawnchair/views/LauncherPreviewView.kt +++ b/lawnchair/src/app/lawnchair/views/LauncherPreviewView.kt @@ -92,7 +92,7 @@ class LauncherPreviewView( ModelDelegate(), LauncherBinder( LauncherAppState.getInstance(previewContext), - BgDataModel(), /* bgAllAppsList= */ + BgDataModel(), null, arrayOfNulls(0), ),