Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/upstream' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
Goooler committed Sep 12, 2024
2 parents 18e5d7b + 5f8d9a7 commit fe02dd5
Show file tree
Hide file tree
Showing 94 changed files with 232 additions and 201 deletions.
15 changes: 9 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ plugins {
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.20"
id 'org.jetbrains.kotlin.plugin.parcelize' version "2.0.20"
id 'org.jetbrains.kotlin.plugin.serialization' version "2.0.20"
id "com.google.devtools.ksp" version "2.0.20-1.0.24"
id "com.google.devtools.ksp" version "2.0.20-1.0.25"
id 'com.google.protobuf' version "0.9.4"
id 'app.cash.licensee' version "1.11.0"
id 'dev.rikka.tools.refine' version "4.4.0"
Expand All @@ -37,12 +37,11 @@ allprojects {
}
dependencies {
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.appcompat:appcompat:1.7.0'
}
}

plugins.withId('com.google.protobuf') {
def protocVersion = '4.28.0'
def protocVersion = '4.28.1'
protobuf {
// Configure the protoc executable
protoc {
Expand Down Expand Up @@ -294,6 +293,11 @@ androidComponents {
}
}

composeCompiler {
stabilityConfigurationFile = layout.projectDirectory.file("compose_compiler_config.conf")
reportsDestination = layout.buildDirectory.dir("compose_build_reports")
}

addFrameworkJar('framework-14.jar')

dependencies {
Expand Down Expand Up @@ -336,11 +340,10 @@ dependencies {

implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1'
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.2'
implementation "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7"
implementation 'com.github.ChickenHook:RestrictionBypass:2.2'
implementation 'dev.rikka.tools.refine:runtime:4.4.0'

implementation platform("androidx.compose:compose-bom:2024.09.00")
implementation platform("androidx.compose:compose-bom:2024.09.01")
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.ui:ui-util"
debugImplementation "androidx.compose.ui:ui-tooling"
Expand Down Expand Up @@ -414,7 +417,7 @@ spotless {
kotlin {
target("lawnchair/src/**/*.kt")
ktlint().customRuleSets([
"io.nlopez.compose.rules:ktlint:0.4.11",
"io.nlopez.compose.rules:ktlint:0.4.12",
]).editorConfigOverride([
"ktlint_compose_compositionlocal-allowlist": "disabled",
])
Expand Down
8 changes: 8 additions & 0 deletions compose_compiler_config.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
androidx.collection.*

java.nio.file.Path

kotlin.collections.*
kotlin.time.Duration

kotlinx.coroutines.CoroutineScope
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
distributionSha256Sum=1541fa36599e12857140465f3c91a97409b4512501c26f9631fb113e392c5bd1
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion lawnchair/res/values-af-rZA/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
<string name="dt2s_admin_hint">To use Double-Tap to Sleep, set Lawnchair as a device admin app. Tap \"Open settings\", then tap \"Activate this device admin app.\"</string>
<string name="dt2s_admin_warning">Dubbeltik om te slaap sal afgeskakel word.</string>
<string name="dt2s_a11y_hint_title">Turn on accessibility service</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"\n\nLawnchair uses Accessibility\'s `performGlobalAction` method to perform this action. This is a sensitive permission that allows monitoring other apps. However, Lawnchair is not configured for that functionality and receives no events.</string>
<string name="dt2s_warning_open_settings">Open settings</string>
<!--
Expand Down
2 changes: 1 addition & 1 deletion lawnchair/res/values-am-rET/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
<string name="dt2s_admin_hint">To use Double-Tap to Sleep, set Lawnchair as a device admin app. Tap \"Open settings\", then tap \"Activate this device admin app.\"</string>
<string name="dt2s_admin_warning">Double-Tap to Sleep will be turned off.</string>
<string name="dt2s_a11y_hint_title">Turn on accessibility service</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"\n\nLawnchair uses Accessibility\'s `performGlobalAction` method to perform this action. This is a sensitive permission that allows monitoring other apps. However, Lawnchair is not configured for that functionality and receives no events.</string>
<string name="dt2s_warning_open_settings">Open settings</string>
<!--
Expand Down
4 changes: 2 additions & 2 deletions lawnchair/res/values-ar-rSA/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
<string name="icon_shape_egg">بيضة</string>
<string name="icon_shape_cupertino">iOS</string>
<string name="icon_shape_octagon">ثماني</string>
<string name="icon_shape_hexagon">Hexagon</string>
<string name="icon_shape_hexagon">سداسي</string>
<string name="icon_shape_sammy">One UI</string>
<string name="icon_shape_rounded_square">مربع مستدير</string>
<string name="icon_shape_sharp_square">مربع حاد</string>
Expand Down Expand Up @@ -350,7 +350,7 @@
<string name="dt2s_admin_hint">لاستخدام النقرة المزدوجة لإطفاء الشاشة، عيّن Lawnchair كتطبيق مشرف للجهاز. انقر على فتح الإعدادات، ثم انقر على \"فعِّل التطبيق كمشرف على الجهاز.\"</string>
<string name="dt2s_admin_warning">سيتم إيقاف تشغيل الضغط المزدوج للسكون.</string>
<string name="dt2s_a11y_hint_title">تشغيل خدمة الوصول</string>
<string name="dt2s_a11y_hint">لاستخدام الضغط المزدوج للسكون، قم بتشغيل خدمة الوصول إلى Lawnchair. اضغط على \"فتح الإعدادات\" ثم قم باختيار \"Lawnchair\" وفعِّل \"استخدم Lawnchair\"</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"\n\nLawnchair uses Accessibility\'s `performGlobalAction` method to perform this action. This is a sensitive permission that allows monitoring other apps. However, Lawnchair is not configured for that functionality and receives no events.</string>
<string name="dt2s_warning_open_settings">فتح الإعدادات</string>
<!--
Expand Down
2 changes: 1 addition & 1 deletion lawnchair/res/values-az-rAZ/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
<string name="dt2s_admin_hint">To use Double-Tap to Sleep, set Lawnchair as a device admin app. Tap \"Open settings\", then tap \"Activate this device admin app.\"</string>
<string name="dt2s_admin_warning">Double-Tap to Sleep will be turned off.</string>
<string name="dt2s_a11y_hint_title">Turn on accessibility service</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"\n\nLawnchair uses Accessibility\'s `performGlobalAction` method to perform this action. This is a sensitive permission that allows monitoring other apps. However, Lawnchair is not configured for that functionality and receives no events.</string>
<string name="dt2s_warning_open_settings">Open settings</string>
<!--
Expand Down
2 changes: 1 addition & 1 deletion lawnchair/res/values-b+sr+Latn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
<string name="dt2s_admin_hint">Da biste koristili funkciju „Dodirnite dvaput za stanje spavanja”, podesite Lawnchair kao administrator uređaja. U podešavanjima dodirnite „Aktiviraj ovu aplikaciju za administratora uređaja”.</string>
<string name="dt2s_admin_warning">Funkcija „Dodirnite dvaput za stanje spavanja” će biti isključena</string>
<string name="dt2s_a11y_hint_title">Uključi uslugu pristupačnosti</string>
<string name="dt2s_a11y_hint">Da biste koristili funkciju „Dodirnite dvaput za stanje spavanja”, uključite Lawnchairovu uslugu pristupačnosti. U podešavanjima izaberite Lawnchair i dodirnite „Koristi Lawnchair.</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"\n\nLawnchair uses Accessibility\'s `performGlobalAction` method to perform this action. This is a sensitive permission that allows monitoring other apps. However, Lawnchair is not configured for that functionality and receives no events.</string>
<string name="dt2s_warning_open_settings">Otvori podešavanja</string>
<!--
Expand Down
2 changes: 1 addition & 1 deletion lawnchair/res/values-bn-rBD/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
<string name="dt2s_admin_hint">To use Double-Tap to Sleep, set Lawnchair as a device admin app. Tap \"Open settings\", then tap \"Activate this device admin app.\"</string>
<string name="dt2s_admin_warning">ডাবল-ট্যাপে লক হওয়া বন্ধ হয়ে যাবে.</string>
<string name="dt2s_a11y_hint_title">Turn on accessibility service</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"\n\nLawnchair uses Accessibility\'s `performGlobalAction` method to perform this action. This is a sensitive permission that allows monitoring other apps. However, Lawnchair is not configured for that functionality and receives no events.</string>
<string name="dt2s_warning_open_settings">Open settings</string>
<!--
Expand Down
2 changes: 1 addition & 1 deletion lawnchair/res/values-bs-rBA/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
<string name="dt2s_admin_hint">To use Double-Tap to Sleep, set Lawnchair as a device admin app. Tap \"Open settings\", then tap \"Activate this device admin app.\"</string>
<string name="dt2s_admin_warning">Double-Tap to Sleep will be turned off.</string>
<string name="dt2s_a11y_hint_title">Turn on accessibility service</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"\n\nLawnchair uses Accessibility\'s `performGlobalAction` method to perform this action. This is a sensitive permission that allows monitoring other apps. However, Lawnchair is not configured for that functionality and receives no events.</string>
<string name="dt2s_warning_open_settings">Open settings</string>
<!--
Expand Down
2 changes: 1 addition & 1 deletion lawnchair/res/values-ca-rES/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
<string name="dt2s_admin_hint">To use Double-Tap to Sleep, set Lawnchair as a device admin app. Tap \"Open settings\", then tap \"Activate this device admin app.\"</string>
<string name="dt2s_admin_warning">\"Toca dos cops per apagar la pantalla\" s\'apagarà.</string>
<string name="dt2s_a11y_hint_title">Turn on accessibility service</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"\n\nLawnchair uses Accessibility\'s `performGlobalAction` method to perform this action. This is a sensitive permission that allows monitoring other apps. However, Lawnchair is not configured for that functionality and receives no events.</string>
<string name="dt2s_warning_open_settings">Open settings</string>
<!--
Expand Down
8 changes: 4 additions & 4 deletions lawnchair/res/values-cs-rCZ/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
<string name="transparent_background_icons_description">Použít průhledné pozadí u ikon s tématem</string>
<string name="auto_adaptive_icons_label">Automaticky adaptivní ikony</string>
<string name="auto_adaptive_icons_description">Pro všechny neadaptivní ikony</string>
<string name="shadow_bg_icons_label">Show shadow behind icons</string>
<string name="shadow_bg_icons_label">Zobrazit stín za ikomana</string>
<string name="background_lightness_label">Jas pozadí</string>
<string name="adaptive_icon_background_description">Pro bílý režim použít 100% osvětlení pozadí</string>
<string name="reset_custom_icons">Obnovit upravené ikony</string>
Expand All @@ -161,7 +161,7 @@
<string name="icon_shape_egg">Vajíčko</string>
<string name="icon_shape_cupertino">iOS</string>
<string name="icon_shape_octagon">Osmiúhelník</string>
<string name="icon_shape_hexagon">Hexagon</string>
<string name="icon_shape_hexagon">Šestiúhelník</string>
<string name="icon_shape_sammy">One UI</string>
<string name="icon_shape_rounded_square">Zaoblený čtverec</string>
<string name="icon_shape_sharp_square">Ostrý čtverec</string>
Expand Down Expand Up @@ -226,7 +226,7 @@
<!-- Color style -->
<string name="color_style_label">Barevný styl</string>
<string name="color_style_spritz">Spritz</string>
<string name="color_style_tonal_spot">Tonal Spot</string>
<string name="color_style_tonal_spot">Tónová skvrna</string>
<string name="color_style_vibrant">Sytá</string>
<string name="color_style_expressive">Expressive</string>
<string name="color_style_rainbow">Rainbow</string>
Expand Down Expand Up @@ -350,7 +350,7 @@
<string name="dt2s_admin_hint">To use Double-Tap to Sleep, set Lawnchair as a device admin app. Tap \"Open settings\", then tap \"Activate this device admin app.\"</string>
<string name="dt2s_admin_warning">Uspání dvojitým poklepáním bude vypnuto.</string>
<string name="dt2s_a11y_hint_title">Zapnout službu usnadnění</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"\n\nLawnchair uses Accessibility\'s `performGlobalAction` method to perform this action. This is a sensitive permission that allows monitoring other apps. However, Lawnchair is not configured for that functionality and receives no events.</string>
<string name="dt2s_warning_open_settings">Otevřít nastavení</string>
<!--
Expand Down
2 changes: 1 addition & 1 deletion lawnchair/res/values-da-rDK/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
<string name="dt2s_admin_hint">To use Double-Tap to Sleep, set Lawnchair as a device admin app. Tap \"Open settings\", then tap \"Activate this device admin app.\"</string>
<string name="dt2s_admin_warning">Dobbelttryk for at sove vil blive slået fra.</string>
<string name="dt2s_a11y_hint_title">Turn on accessibility service</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"</string>
<string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"\n\nLawnchair uses Accessibility\'s `performGlobalAction` method to perform this action. This is a sensitive permission that allows monitoring other apps. However, Lawnchair is not configured for that functionality and receives no events.</string>
<string name="dt2s_warning_open_settings">Open settings</string>
<!--
Expand Down
2 changes: 1 addition & 1 deletion lawnchair/res/values-de-rDE/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
<string name="dt2s_admin_hint">Um Doppeltippen zum Display Ausschalten zu verwenden, aktiviere Lawnchair als App zur Geräteverwaltung. Tippe auf \"Einstellungen öffnen\" und tippe auf „Diese App zur Geräteverwaltung aktivieren“.</string>
<string name="dt2s_admin_warning">Doppeltes Tippen zum Schlafen wird deaktiviert.</string>
<string name="dt2s_a11y_hint_title">Bedienungshilfen aktivieren</string>
<string name="dt2s_a11y_hint">Um Doppel-Tippen zum Display Ausschalten zu verwenden, aktiviere die Bedienungshilfe für Lawnchair. Tippe auf \"Einstellungen öffnen\", wähle Lawnchair aus und aktiviere \"Lawnchair verwenden\".</string>
<string name="dt2s_a11y_hint">Um Doppeltippen zum Display ausschalten zu verwenden, aktiviere die Bedienungshilfen. Tippe auf \"Einstellungen öffnen\", wähle \"Lawnchair\" aus und aktiviere \"Lawnchair verwenden\"\"\n\nLawnchair verwendet die Bedienungshilfe \'performGlobalAction\', um diese Aktion auszuführen. Dies ist eine sensible Berechtigung, die es ermöglicht, andere Apps zu überwachen. Lawnchair ist jedoch nicht für derartige Funktionen konfiguriert und liest keine Vorgänge aus.</string>
<string name="dt2s_warning_open_settings">Einstellungen öffnen</string>
<!--
Expand Down
2 changes: 1 addition & 1 deletion lawnchair/res/values-el-rGR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
<string name="dt2s_admin_hint">Για να χρησιμοποιήσετε το διπλό πάτημα για ύπνο, ορίστε τον εκκινητή Lawnchair ως εφαρμογή διαχείρισης συσκευής. Πατήστε στο “Άνοιγμα ρυθμίσεων” και μετά πατήστε “Ενεργοποίηση αυτής της εφαρμογής ως διαχειριστή της συσκευής.”</string>
<string name="dt2s_admin_warning">Double Tap to Sleep will be disabled.</string>
<string name="dt2s_a11y_hint_title">Ενεργοποίηση υπηρεσίας προσβασιμότητας</string>
<string name="dt2s_a11y_hint">Για να χρησιμοποιήσετε το διπλό πάτημα για ύπνο, ενεργοποιήστε την υπηρεσία προσβασιμότητας του εκκινητή Lawnchair. Πατήστε στο “Άνοιγμα ρυθμίσεωνκαι μετά επιλέξτε τον Lawnchair και ενεργοποιήστε την “Χρήση του Lawnchair.”</string>
<string name="dt2s_a11y_hint">Για να χρησιμοποιήσετε την λειτουργία Διπλό Πάτημα Για Ύπνο, ενεργοποιήστε την υπηρεσία προσβασιμότητας του εκκινητή Lawnchair. Πατήστε \"Άνοιγμα ρυθμίσεων\", επιλέξτε \"Lawnchair\" και ενεργοποιήστε τη \"Χρήση Lawnchair\".\n\nΟ εκκινητής Lawnchair χρησιμοποιεί τη μέθοδο `performGlobalAction` της Προσβασιμότητας Εφαρμογών για την εκτέλεση αυτής της ενέργειας. Αυτή είναι μια ευαίσθητη άδεια που επιτρέπει την παρακολούθηση άλλων εφαρμογών. Ωστόσο, ο εκκινητής Lawnchair δεν έχει ρυθμιστεί για αυτήν τη λειτουργία και δεν λαμβάνει συμβάντα.</string>
<string name="dt2s_warning_open_settings">Άνοιγμα ρυθμίσεων</string>
<!--
Expand Down
Loading

0 comments on commit fe02dd5

Please sign in to comment.