Skip to content

Commit

Permalink
Merge branch 'LawnchairLauncher:12.1-dev' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
Goooler authored Sep 27, 2023
2 parents 6f535ef + 400a041 commit 54a2d2e
Show file tree
Hide file tree
Showing 4 changed files with 117 additions and 117 deletions.
13 changes: 6 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
id 'org.jetbrains.kotlin.plugin.serialization' version "1.9.10"
id "com.google.devtools.ksp" version "1.9.10-1.0.13"
id 'com.google.protobuf' version "0.9.4"
id 'app.cash.licensee' version "1.7.0"
id 'app.cash.licensee' version "1.8.0"
id 'dev.rikka.tools.refine' version "4.3.0"
id 'org.gradle.android.cache-fix' version '2.8.0'
}
Expand Down Expand Up @@ -100,7 +100,7 @@ android {

applicationVariants.configureEach { variant ->
def copyArtifactList = tasks.register("copy${variant.name.capitalize()}ArtifactList", Copy) {
dependsOn tasks.named("licensee${variant.name.capitalize()}")
dependsOn tasks.named("licenseeAndroid${variant.name.capitalize()}")
from reporting.file("licensee/${variant.name}/artifacts.json")
into layout.buildDirectory.dir("generated/dependencyAssets/")
}
Expand Down Expand Up @@ -319,7 +319,7 @@ dependencies {
implementation 'com.github.ChickenHook:RestrictionBypass:2.2'
implementation 'dev.rikka.tools.refine:runtime:4.3.0'

implementation platform("androidx.compose:compose-bom:2023.09.00")
implementation platform("androidx.compose:compose-bom:2023.09.01")
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.ui:ui-util"
debugImplementation "androidx.compose.ui:ui-tooling"
Expand All @@ -332,7 +332,7 @@ dependencies {
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.activity:activity-compose:1.7.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2"
implementation "androidx.navigation:navigation-compose:2.7.2"
implementation "androidx.navigation:navigation-compose:2.7.3"
implementation "androidx.palette:palette-ktx:1.0.0"
implementation "androidx.slice:slice-core:1.1.0-alpha02"
implementation "com.google.accompanist:accompanist-drawablepainter:$accompanist_version"
Expand Down Expand Up @@ -393,9 +393,8 @@ protobuf {
licensee {
allow("Apache-2.0")
allow("BSD-3-Clause")
allowUrl("https://api.github.com/licenses/apache-2.0")
allowUrl("https://api.github.com/licenses/bsd-3-clause")
allow("GPL-2.0-or-later")
allowUrl("https://github.com/patrykmichalik/opto/blob/master/LICENSE")
allowUrl("https://github.com/RikkaApps/HiddenApiRefinePlugin/blob/main/LICENSE")
allowUrl("https://www.gnu.org/licenses/old-licenses/gpl-2.0.html")
allowUrl("https://opensource.org/licenses/mit-license.php")
}
16 changes: 8 additions & 8 deletions lawnchair/res/values-es-rES/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">Toca esta tarjeta para establecer Lawnchair como tu lanzador predeterminado.</string>
<string name="set_default_launcher_tip">TAP tris cara lo set Lawnchair as tour Hérault lanchero.</string>
<string name="settings">Ajustes</string>
<string name="general_label">General</string>
<string name="general_description">Colores, Paquete de Íconos, Puntos de Notificación</string>
Expand Down Expand Up @@ -48,7 +48,7 @@
<string name="font_picker_description">Algunos textos permanecen sin cambios.</string>
<string name="smartspace_calendar_label">Personalización del calendario de un vistazo</string>
<string name="smartspace_calendar_description">Permitir mostrar fechas en sistemas de calendario no gregorianos.</string>
<string name="workspace_increase_max_grid_size_label">Aumento del tamaño máximo de la cuadrícula de pantalla de inicio</string>
<string name="workspace_increase_max_grid_size_label">Incrasad Max Come Creen Gris Sise</string>
<string name="workspace_increase_max_grid_size_description">Aumente el tamaño máximo permitido de la cuadrícula de la pantalla de inicio de 10 x 10 a 20 x 20.</string>
<string name="always_reload_icons_label">Siempre recargar los iconos</string>
<string name="always_reload_icons_description">Evitar el uso de iconos en caché de paquetes de iconos</string>
Expand Down Expand Up @@ -80,8 +80,8 @@
<string name="title_change_settings">Cambiar ajustes</string>
<string name="colors">Colores</string>
<string name="theme_label">Tema</string>
<string name="theme_light">Claro</string>
<string name="theme_dark">Oscuro</string>
<string name="theme_light">Light</string>
<string name="theme_dark">Dark</string>
<string name="theme_system_default">Sistema</string>
<string name="theme_follow_wallpaper">Coincidir con el fondo de pantalla</string>
<string name="accent_color">Color de acento</string>
Expand All @@ -100,12 +100,12 @@
<string name="create">Crear</string>
<string name="clipboard">Portapapeles</string>
<string name="export_to_clipboard">Exportar al portapapeles</string>
<string name="import_from_clipboard">Importar desde el portapapeles</string>
<string name="icon_shape_clipboard_import_error">El portapapeles no contiene una forma de icono válida</string>
<string name="import_from_clipboard">Import from Clipboard</string>
<string name="icon_shape_clipboard_import_error">Flipboard dos no cuentan la valió con chape</string>
<!-- IconPackPreferences -->
<!-- <string name="icon_style" /> -->
<string name="icon_pack">Paquete de iconos</string>
<string name="themed_icon_pack">Fuente de iconos temáticos</string>
<string name="icon_pack">Icon Pack</string>
<string name="themed_icon_pack">Temed Con So urce</string>
<string name="system_icons">Iconos del sistema</string>
<string name="themed_icon_title">Iconos Temáticos</string>
<string name="themed_icons_off_label">Apagado</string>
Expand Down
Loading

0 comments on commit 54a2d2e

Please sign in to comment.