Skip to content

Commit

Permalink
Merge branch 'LawnchairLauncher:14-dev' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
Goooler authored Sep 5, 2024
2 parents fcb1ded + 23f450e commit e760cae
Show file tree
Hide file tree
Showing 20 changed files with 648 additions and 477 deletions.
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ Here are some contribution tips to help you get started:
#### Additional documentation
- The Lawnchair Wiki ([at Github](https://github.com/LawnchairLauncher/lawnchair/wiki))
- Lawnchair Visual Guidelines ([README.md](/docs/assets/README.md))
- Lawnchair Quickstep Compat Lib ([README.md](compatLib/README.md))
- Lawnchair Preferences Components ([README.md](lawnchair/src/app/lawnchair/ui/preferences/components/README.md))
Expand Down
18 changes: 9 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ dependencies {
implementation fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'WindowManager-Shell-14.jar')
withQuickstepCompileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'framework-14.jar')

coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.1'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2'

implementation 'androidx.profileinstaller:profileinstaller:1.3.1'
baselineProfile projects.baselineProfile
Expand All @@ -340,7 +340,7 @@ dependencies {
implementation 'com.github.ChickenHook:RestrictionBypass:2.2'
implementation 'dev.rikka.tools.refine:runtime:4.4.0'

implementation platform("androidx.compose:compose-bom:2024.08.00")
implementation platform("androidx.compose:compose-bom:2024.09.00")
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.ui:ui-util"
debugImplementation "androidx.compose.ui:ui-tooling"
Expand All @@ -350,12 +350,12 @@ dependencies {
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.compose.material:material"
implementation "androidx.compose.runtime:runtime-livedata"
implementation 'androidx.compose.material3:material3:1.3.0-rc01'
implementation 'androidx.compose.material3:material3-window-size-class:1.3.0-rc01'
implementation 'androidx.compose.material3:material3'
implementation 'androidx.compose.material3:material3-window-size-class'
implementation "androidx.activity:activity-compose:1.9.2"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.5"
implementation "androidx.navigation:navigation-compose:2.8.0"
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.activity:activity-compose:1.9.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.4"
implementation "androidx.navigation:navigation-compose:2.8.0-rc01"
implementation "androidx.palette:palette-ktx:1.0.0"
implementation "androidx.slice:slice-core:1.1.0-alpha02"
def accompanistVersion = '0.34.0'
Expand Down Expand Up @@ -386,10 +386,10 @@ dependencies {
// Persian Date
implementation 'com.github.samanzamani:PersianDate:1.7.1'

implementation 'com.airbnb.android:lottie:6.5.1'
implementation 'com.airbnb.android:lottie:6.5.2'

// Compose drag and drop library
implementation 'sh.calvin.reorderable:reorderable:2.3.1'
implementation 'sh.calvin.reorderable:reorderable:2.3.2'

// Smartspacer
implementation('com.kieronquinn.smartspacer:sdk-client:1.0.11') {
Expand Down
4 changes: 2 additions & 2 deletions lawnchair/res/values-bn-rBD/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@
<string name="drawer_search_label">Drawer search</string>
<string name="drawer_search_description">Web suggestions, global search</string>
<string name="folders_label">ফোল্ডার-সমুহ</string>
<string name="folders_description">Row and column count</string>
<string name="folders_description">সারি ও কলাম গণনা</string>
<string name="gestures_label">জেসচার</string>
<string name="gestures_description">Taps and swipes</string>
<string name="quickstep_label">সাম্প্রতিক</string>
<string name="quickstep_description">Clear All button, corner radius</string>
<string name="about_label">সম্পর্কে</string>
<string name="app_info_drop_target_label">App info</string>
<string name="app_info_drop_target_label">অ্যাপের তথ্য</string>
<string name="debug_restart_launcher">লনচেয়ার পুনরায় চালু করুন</string>
<string name="experimental_features_label">Experimental features</string>
<!-- Experimental features -->
Expand Down
18 changes: 9 additions & 9 deletions lawnchair/res/values-es-rES/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -318,13 +318,13 @@
-->
<string name="create_backup">Crear copia de seguridad</string>
<string name="what_to_backup">Que quieres respaldar</string>
<string name="what_to_backup">Qué respaldar</string>
<string name="backup_content_layout_and_settings">Diseño y configuración</string>
<string name="backup_content_wallpaper">Fondo de pantalla</string>
<string name="backup_create_success">Copia de seguridad creada</string>
<string name="backup_create_error">No se pudo crear la copia de seguridad</string>
<string name="restore_backup">Restaurar respaldo</string>
<string name="what_to_restore">Que quieres restaurar</string>
<string name="what_to_restore">Qué restaurar</string>
<string name="backup_restore_success">Copia de seguridad restaurada</string>
<string name="backup_restore_error">No se pudo restaurar la copia de seguridad</string>
<string name="invalid_backup_file">Archivo de copia de seguridad inválido</string>
Expand Down Expand Up @@ -386,27 +386,27 @@
<string name="wallpaper_scrolling_label">Desplazar fondo</string>
<string name="wallpaper_depth_effect_label">Efecto de profundidad del fondo de pantalla</string>
<string name="wallpaper_depth_effect_description">Acerca y aleja el fondo de pantalla al cambiar entre áreas del launcher</string>
<string name="show_sys_ui_scrim">Mostrar sombra superior</string>
<string name="show_sys_ui_scrim">Sombra superior</string>
<string name="home_screen_grid">Cuadrícula de Pantalla de Inicio</string>
<string name="home_screen_lock">Bloquear pantalla de inicio</string>
<string name="home_screen_unlock">Desbloquear pantalla de inicio</string>
<string name="home_screen_locked">La pantalla de inicio está bloqueada</string>
<string name="home_screen_lock_description">Evita cambios en la disposición de la pantalla de inicio</string>
<string name="show_dot_pagination_label">Mostrar paginación de puntos</string>
<string name="show_dot_pagination_description">Usar puntos en vez de líneas para mostrar el número de página</string>
<string name="show_material_u_popup_label">Usar nuevo estilo de ventana emergente</string>
<string name="show_material_u_popup_description">Usa el estilo del material rebotado y ligeramente consolidado estilo</string>
<string name="show_material_u_popup_label">Usar el nuevo estilo del menú emergente</string>
<string name="show_material_u_popup_description">Usar el estilo de Material You animado y consolidado para los menús emergentes</string>
<string name="popup_menu">Menú emergente</string>
<string name="home_screen_lock_toggle_from_home_popup">Mostrar botón de bloqueo</string>
<string name="show_system_settings_entry">Mostrar botón de configuración del sistema</string>
<string name="home_screen_edit_toggle_from_home_popup">Mostrar el botón de edición de la pantalla de inicio</string>
<string name="status_bar_label">Barra de estado</string>
<string name="show_status_bar">Mostrar Barra de estado</string>
<string name="show_status_bar">Mostrar la barra de estado</string>
<string name="dark_status_bar_label">Barra de Estado Oscura</string>
<string name="home_screen_text_color">Color del texto</string>
<string name="color_light">Claro</string>
<string name="color_dark">Oscuro</string>
<string name="force_rounded_widgets">Esquinas Redondeadas</string>
<string name="force_rounded_widgets">Esquinas redondeadas</string>
<string name="allow_widget_overlap">Permitir superposición</string>
<string name="force_widget_resize_label">Forzar redimensionamiento del Widget</string>
<string name="force_widget_resize_description">Permite redimensionar los widgets que están limitados a un tamaño específico</string>
Expand Down Expand Up @@ -497,7 +497,7 @@
<string name="pref_category_search">Buscar</string>
<string name="show_app_search_bar">Mostrar Barra de Búsqueda</string>
<string name="pref_search_auto_show_keyboard">Mostrar teclado automáticamente</string>
<string name="fuzzy_search_title">Búsqueda Aproximada</string>
<string name="fuzzy_search_title">Búsqueda aproximada</string>
<string name="fuzzy_search_desc">Coincidencia aproximada de búsquedas de aplicaciones</string>
<string name="suggestion_pref_screen_title">Sugerencias</string>
<string name="show_suggested_apps_at_drawer_top">Mostrar las aplicaciones sugeridas en la parte superior del cajón de aplicaciones</string>
Expand All @@ -523,7 +523,7 @@
<!-- Description for each search result type -->
<string name="search_pref_result_files_description">Multimedia, archivos y más</string>
<string name="search_pref_result_contacts_description">Contactos y más</string>
<string name="search_pref_result_web_provider_description">Via <xliff:g id="web_search_provider">%1$s</xliff:g></string>
<string name="search_pref_result_web_provider_description">Mediante <xliff:g id="web_search_provider">%1$s</xliff:g></string>
<!-- Maximum xyz for each search result type -->
<string name="max_apps_result_count_title">Número máximo de aplicaciones</string>
<string name="max_people_result_count_title">Número máximo de personas</string>
Expand Down
Loading

0 comments on commit e760cae

Please sign in to comment.