Merge remote-tracking branch 'origin/upstream' into trunk

# Conflicts: # .github/workflows/ci.yml # .github/workflows/release_update.yml # gradle/wrapper/gradle-wrapper.properties
Goooler · Jan 20, 2024 · 831bfa0 · 831bfa0
2 parents a0f6490 + 4f4ef34
commit 831bfa0
Show file tree

Hide file tree

Showing 18 changed files with 77 additions and 45 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
       - uses: gradle/gradle-build-action@v3-prerelease
         with:
           dependency-graph: ${{ github.ref == 'refs/heads/release' && 'generate-and-submit' || 'disabled'}}
@@ -61,7 +61,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
       - uses: gradle/gradle-build-action@v3-prerelease
         with:
           gradle-home-cache-cleanup: true

diff --git a/build.gradle b/build.gradle
@@ -10,12 +10,12 @@ plugins {
     id 'org.jetbrains.kotlin.android' version "1.9.22"
     id 'org.jetbrains.kotlin.plugin.parcelize' version "1.9.22"
     id 'org.jetbrains.kotlin.plugin.serialization' version "1.9.22"
-    id "com.google.devtools.ksp" version "1.9.22-1.0.16"
+    id "com.google.devtools.ksp" version "1.9.22-1.0.17"
     id 'com.google.protobuf' version "0.9.4"
     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 {
@@ -386,7 +386,7 @@ spotless {
     kotlin {
         target("lawnchair/src/**/*.kt")
         ktlint().customRuleSets([
-            "io.nlopez.compose.rules:ktlint:0.3.9",
+            "io.nlopez.compose.rules:ktlint:0.3.10",
         ]).editorConfigOverride([
             "ktlint_compose_modifier-missing-check": "disabled",
             "ktlint_compose_compositionlocal-allowlist": "disabled",

diff --git a/ci.py b/ci.py
@@ -45,8 +45,12 @@ def send_artifact_to_telegram_chat(chat_id):
 def send_internal_notifications():
     repository = git.Repo(".")
     commit_range = f"{github_event_before}...{github_sha}"
-    commits = list(repository.iter_commits(commit_range))
-
+    try:
+        commits = list(repository.iter_commits(commit_range))
+    except git.exc.GitCommandError as error:
+        print(f"Error fetching commits: {error}")
+        return
+
     if len(commits) == 0: return
 
     overview_link = f"https://github.com/{github_repository}/compare/{commit_range}"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-rc-1-bin.zip
+distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/lawnchair/res/values-lt-rLT/strings.xml b/lawnchair/res/values-lt-rLT/strings.xml
@@ -16,7 +16,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- PreferenceDashboard -->
-    <string name="set_default_launcher_tip">Tap this card to set Lawnchair as your default launcher.</string>
+    <string name="set_default_launcher_tip">Spasukite šia kortelę, kad nustatyti Lawnchair kaip numatytąjį paleidėja.</string>
     <string name="settings">Nustatymai</string>
     <string name="general_label">Pagrindinis</string>
     <string name="general_description">Pranešimu taškai, Ikonu Paketas</string>
@@ -105,7 +105,7 @@
     <!-- IconPackPreferences -->
     <!-- <string name="icon_style" /> -->
     <string name="icon_pack">Piktogramų Paketas</string>
-    <string name="themed_icon_pack">Themed Icon Source</string>
+    <string name="themed_icon_pack">Temuotų Ikonų Šaltinis</string>
     <string name="system_icons">Sistemos Piktogramos</string>
     <string name="themed_icon_title">Teminės Piktogramos</string>
     <string name="themed_icons_off_label">Išjungtos</string>
@@ -169,8 +169,8 @@
     <!-- <string name="gesture_double_tap" /> -->
     <string name="minus_one_enable">Srautas</string>
     <string name="minus_one_unavailable">Srautas neįdiegtas.</string>
-    <string name="feed_provider">Feed Provider</string>
-    <string name="feed_default">Default</string>
+    <string name="feed_provider">\"Feed\" Tekėjas</string>
+    <string name="feed_default">Numatytas</string>
     <string name="wallpaper">Ekrano Fonas</string>
     <string name="wallpaper_scrolling_label">Slenkanti Ekrano Nuotrauka</string>
     <string name="wallpaper_depth_effect_label">Ekrano Nuotraukos Gylio Efektas</string>
@@ -183,9 +183,9 @@
     <string name="home_screen_unlock">Atrakinti Pagrindinį Ekraną</string>
     <!-- used in popup menu-->
     <string name="home_screen_locked">Pagrindinis Ekranas yra užrakintas.</string>
-    <string name="popup_menu">Pop-up Menu</string>
-    <string name="home_screen_lock_toggle_from_home_popup">Show Lock Button</string>
-    <string name="show_system_settings_entry">Show System Settings Entry</string>
+    <string name="popup_menu">Pop-up Menių</string>
+    <string name="home_screen_lock_toggle_from_home_popup">Rodyti ūžrakto mygtuką</string>
+    <string name="show_system_settings_entry">Rodyti Sistemos Nustatymų eilutę</string>
     <string name="status_bar_label">Būsenos Juosta</string>
     <string name="show_status_bar">Rodyti statuso juosta</string>
     <string name="dark_status_bar_label">Juoda statuso juosta</string>
@@ -242,7 +242,7 @@
     <string name="smartspace_mode_google_search">Google Paieška</string>
     <!-- DockPreferences -->
     <!-- <string name="dock_label" /> -->
-    <string name="show_hotseat_title">Enable Dock</string>
+    <string name="show_hotseat_title">Įjungti Užduočių juostą</string>
     <string name="hotseat_mode_label">Paieškos Juostos Valdiklis</string>
     <string name="hotseat_mode_disabled">Išjungta</string>
     <string name="hotseat_mode_lawnchair">Lawnchair</string>
@@ -251,13 +251,13 @@
     <string name="corner_radius_label">Kampų Spindulys</string>
     <string name="apply_accent_color_label">Naudoti akcento spalva</string>
     <string name="search_provider">Paieškos Teikėjas</string>
-    <string name="hotseat_bottom_space_label">Bottom Padding</string>
+    <string name="hotseat_bottom_space_label">Apačios tarpas</string>
     <string name="grid">Tinklelis</string>
     <string name="dock_icons">Apatinės Eilutės Piktogramos</string>
     <!-- SearchProviderPreferences -->
     <!-- search_provider -->
     <string name="search_provider_app_search">Programų Paieška</string>
-    <string name="search_provider_sponsored_description">%1$s &amp; Lawnchair have a revenue share agreement.\n\nSearching with %1$s helps support Lawnchair.</string>
+    <string name="search_provider_sponsored_description">%1$s&amp; Lawnchair turi pelno dalinimosi sutartį.\n\nIeškojimas su %1$s padeda išlaikyti Lawnchair.</string>
     <string name="app_label">Programėlė</string>
     <string name="website_label">Interneto Svetainė</string>
     <string name="qsb_search_provider_app_required">Reikalinga programėlė.</string>
@@ -269,7 +269,7 @@
     <string name="hidden_apps_label">Paslėptos Programėlės</string>
     <string name="show_enable_smart_hide">Rodyti, kai Įrašytas Pilnas Vardas</string>
     <string name="hide_hidden_apps_search">Paslėpti Paieškos Rezultatuose</string>
-    <string name="pref_all_apps_bulk_icon_loading_title">Load Apps in Bulk</string>
+    <string name="pref_all_apps_bulk_icon_loading_title">Krauti programėles Krūvomis</string>
     <string name="pref_all_apps_bulk_icon_loading_description">Load and display icons in bulk instead of individually loading and displaying icons</string>
     <string name="pref_category_search">Ieškokite</string>
     <string name="show_app_search_bar">Rodyti Ieškojimo Juostą</string>

diff --git a/lawnchair/res/values-vi-rVN/strings.xml b/lawnchair/res/values-vi-rVN/strings.xml
@@ -184,7 +184,7 @@
     <!-- used in popup menu-->
     <string name="home_screen_locked">Đã khoá màn hình chính.</string>
     <string name="popup_menu">Pop-up Menu</string>
-    <string name="home_screen_lock_toggle_from_home_popup">Show Lock Button</string>
+    <string name="home_screen_lock_toggle_from_home_popup">Hiển thị phím khóa</string>
     <string name="show_system_settings_entry">Hiển thị mục cài đặt hệ thống</string>
     <string name="status_bar_label">Thanh trạng thái</string>
     <string name="show_status_bar">Hiện thanh trạng thái</string>
@@ -242,7 +242,7 @@
     <string name="smartspace_mode_google_search">Google Tìm kiếm</string>
     <!-- DockPreferences -->
     <!-- <string name="dock_label" /> -->
-    <string name="show_hotseat_title">Enable Dock</string>
+    <string name="show_hotseat_title">Bật Dock</string>
     <string name="hotseat_mode_label">Tiện ích thanh tìm kiếm</string>
     <string name="hotseat_mode_disabled">Đã vô hiệu hoá</string>
     <string name="hotseat_mode_lawnchair">Lawnchair</string>
@@ -251,7 +251,7 @@
     <string name="corner_radius_label">Độ cong của góc</string>
     <string name="apply_accent_color_label">Áp dụng màu nhấn</string>
     <string name="search_provider">Nhà cung cấp dịch vụ tìm kiếm</string>
-    <string name="hotseat_bottom_space_label">Bottom Padding</string>
+    <string name="hotseat_bottom_space_label">Khoảng cách với cạnh đáy</string>
     <string name="grid">Lưới</string>
     <string name="dock_icons">Biểu tượng ở khay ứng dụng</string>
     <!-- SearchProviderPreferences -->
@@ -282,7 +282,7 @@
     <string name="max_suggestion_result_count_title">Max Suggestion Result Count</string>
     <string name="max_settings_entry_result_count_title">Max Settings Entry Result Count</string>
     <string name="max_recent_result_count_title">Max History Result Count</string>
-    <string name="clear_history">Clear</string>
+    <string name="clear_history">Xóa</string>
     <!-- <string name="grid" /> -->
     <string name="app_drawer_columns">Số cột của trang ứng dụng</string>
     <string name="row_height_label">Chiều cao hàng</string>
@@ -414,7 +414,7 @@
     <string name="warn_contact_permission_content">Requires contact permission</string>
     <string name="warn_files_permission_content">Requires storage permission</string>
     <string name="all_apps_search_result_files_description">Media, documents, folders, and more.</string>
-    <string name="all_apps_search_result_contacts_description">Contacts and more</string>
+    <string name="all_apps_search_result_contacts_description">Danh bạn và mục khác</string>
     <string name="quickstep_incompatible">Tích hợp hệ thống không tương thích</string>
     <string name="quickstep_incompatible_description">Thiết bị của bạn được thiết lập để hỗ trợ cử chỉ hệ thống (gọi là Quickstep) được cung cấp bởi %1$s, nhưng phiên bản này của %1$s không tương thích với phiên bản Android của bạn. Để tiếp tục sử dụng thiết bị, vui lòng gỡ cài đặt bản cập nhật của %1$s hoặc vô hiệu hóa %1$s khỏi cung cấp cử chỉ hệ thống.</string>
     <string name="delete">Xoá</string>

diff --git 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<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

diff --git 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
@@ -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
@@ -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
@@ -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

diff --git 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
@@ -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/theme/color/ColorTokens.kt b/lawnchair/src/app/lawnchair/theme/color/ColorTokens.kt
@@ -53,7 +53,7 @@ object ColorTokens {
 
     @JvmField val ColorBackground = DayNightColorToken(Neutral1_50, Neutral1_900)
 
-    @JvmField val ColorBackgroundFloating = DayNightColorToken(Neutral1_50, Neutral1_900)
+    @JvmField val ColorBackgroundFloating = DayNightColorToken(Neutral1_50, Neutral1_800)
 
     @JvmField val ColorPrimary = DayNightColorToken(Neutral1_50, Neutral1_900)
 

diff --git a/.../src/app/lawnchair/ui/preferences/components/colorpreference/pickers/CustomColorPicker.kt b/.../src/app/lawnchair/ui/preferences/components/colorpreference/pickers/CustomColorPicker.kt
@@ -35,6 +35,7 @@ import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -332,6 +333,7 @@ private fun HsvColorPicker(
             onValueChange = { newValue -> updateColor(newBrightness = newValue) },
         )
 
+        val latestOnSelectedColorChange by rememberUpdatedState(onSelectedColorChange)
         LaunchedEffect(key1 = selectedColor) {
             if (selectedColor ==
                 hsvValuesToIntColor(hue, saturation, brightness)
@@ -345,7 +347,7 @@ private fun HsvColorPicker(
                 brightness = it[2]
             }
 
-            onSelectedColorChange()
+            latestOnSelectedColorChange()
         }
     }
 }
@@ -406,11 +408,12 @@ private fun RgbColorPicker(
             onValueChange = { newValue -> updateColor(newBlue = newValue.toInt()) },
         )
 
+        val latestOnSelectedColorChange by rememberUpdatedState(onSelectedColorChange)
         LaunchedEffect(key1 = selectedColor) {
             red = selectedColor.red
             green = selectedColor.green
             blue = selectedColor.blue
-            onSelectedColorChange()
+            latestOnSelectedColorChange()
         }
     }
 }
diff --git 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
@@ -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)

diff --git 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<BgDataModel.Callbacks>(0),
                 ),