From efc99119250f56303a9147699529896018ff4fd8 Mon Sep 17 00:00:00 2001 From: Egutierrez Date: Thu, 4 Jun 2026 23:43:59 +0200 Subject: [PATCH] feat(kotlin-compose): design system fn.compose:ui + toolbelt android Linux-first Design system Compose (kotlin/functions/ui, modulo Gradle `fn.compose:ui`): - FnTokens + FnTheme con la paleta heredada al hex de cpp/DESIGN_SYSTEM.md (Mantine v9 dark + indigo), identica a la web @fn_library y a las apps C++. - 26 componentes Compose (Layout/Display/Inputs/Feedback/Data/Charts) + FnTheme + FnTokens registrados en el registry (28 entradas kind=component lang=kt domain=ui), descubribles via fn_search. Habilitan init_kotlin_app. Recuperacion: el commit cb6d9e6 habia anadido `kotlin/functions/ui/` al .gitignore, por eso el design system nunca se versiono y se perdio del working tree. Des-ignorado; el .gitignore interno del modulo ya excluye build/.gradle/local.properties. La gallery (apps/gallery_kt) se recupero del sub-repo Gitea y sus 27 componentes se reconstruyeron con su MainActivity como contrato exacto. Toolbelt Android Linux-first (antes asumia WSL2 + Windows): - adb_wsl 1.1.0, android_emulator_start 1.1.0, android_emulator_list 1.1.0: resuelven adb/emulator nativos del SDK ($ANDROID_HOME), .exe solo fallback WSL2. - android_emulator_start: fix `timeout adb_run wait-for-device` (timeout no puede ejecutar una funcion del shell; ahora invoca el binario $ADB directamente). - install_android_sdk 1.0.1: fix licencias bajo pipefail (SIGPIPE de `yes`) + trap EXIT con variable unbound. - docs/capabilities/android.md regenerado Linux-first + seccion design system. Co-Authored-By: Claude Opus 4.8 (1M context) --- .gitignore | 1 - bash/functions/infra/adb_wsl.md | 86 +++-- bash/functions/infra/adb_wsl.sh | 35 +- bash/functions/infra/android_emulator_list.md | 34 +- bash/functions/infra/android_emulator_list.sh | 21 +- .../functions/infra/android_emulator_start.md | 36 +- .../functions/infra/android_emulator_start.sh | 43 ++- bash/functions/infra/install_android_sdk.md | 17 +- bash/functions/infra/install_android_sdk.sh | 16 +- docs/capabilities/android.md | 12 +- kotlin/functions/ui/.gitignore | 6 + kotlin/functions/ui/build.gradle.kts | 43 +++ kotlin/functions/ui/consumer-rules.pro | 1 + kotlin/functions/ui/gradle.properties | 4 + .../ui/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + kotlin/functions/ui/gradlew | 251 ++++++++++++++ kotlin/functions/ui/settings.gradle.kts | 21 ++ .../functions/ui/src/main/AndroidManifest.xml | 2 + .../main/kotlin/fn/compose/theme/FnTheme.kt | 79 +++++ .../main/kotlin/fn/compose/theme/FnTheme.md | 59 ++++ .../main/kotlin/fn/compose/theme/FnTokens.kt | 143 ++++++++ .../main/kotlin/fn/compose/theme/FnTokens.md | 48 +++ .../src/main/kotlin/fn/compose/ui/Charts.kt | 219 ++++++++++++ .../ui/src/main/kotlin/fn/compose/ui/Data.kt | 252 ++++++++++++++ .../src/main/kotlin/fn/compose/ui/Display.kt | 283 ++++++++++++++++ .../src/main/kotlin/fn/compose/ui/Feedback.kt | 260 ++++++++++++++ .../src/main/kotlin/fn/compose/ui/Inputs.kt | 318 ++++++++++++++++++ .../src/main/kotlin/fn/compose/ui/Layout.kt | 133 ++++++++ .../src/main/kotlin/fn/compose/ui/fn_alert.md | 32 ++ .../main/kotlin/fn/compose/ui/fn_app_shell.md | 34 ++ .../main/kotlin/fn/compose/ui/fn_avatar.md | 32 ++ .../src/main/kotlin/fn/compose/ui/fn_badge.md | 32 ++ .../main/kotlin/fn/compose/ui/fn_bar_chart.md | 32 ++ .../main/kotlin/fn/compose/ui/fn_button.md | 33 ++ .../src/main/kotlin/fn/compose/ui/fn_card.md | 34 ++ .../main/kotlin/fn/compose/ui/fn_checkbox.md | 32 ++ .../kotlin/fn/compose/ui/fn_data_table.md | 35 ++ .../main/kotlin/fn/compose/ui/fn_dialog.md | 32 ++ .../kotlin/fn/compose/ui/fn_empty_state.md | 32 ++ .../src/main/kotlin/fn/compose/ui/fn_group.md | 35 ++ .../main/kotlin/fn/compose/ui/fn_kpi_card.md | 32 ++ .../kotlin/fn/compose/ui/fn_line_chart.md | 32 ++ .../main/kotlin/fn/compose/ui/fn_loader.md | 32 ++ .../kotlin/fn/compose/ui/fn_page_header.md | 32 ++ .../src/main/kotlin/fn/compose/ui/fn_paper.md | 34 ++ .../main/kotlin/fn/compose/ui/fn_select.md | 32 ++ .../main/kotlin/fn/compose/ui/fn_skeleton.md | 32 ++ .../main/kotlin/fn/compose/ui/fn_sparkline.md | 32 ++ .../src/main/kotlin/fn/compose/ui/fn_stack.md | 35 ++ .../main/kotlin/fn/compose/ui/fn_switch.md | 32 ++ .../src/main/kotlin/fn/compose/ui/fn_tabs.md | 32 ++ .../src/main/kotlin/fn/compose/ui/fn_text.md | 32 ++ .../kotlin/fn/compose/ui/fn_text_input.md | 33 ++ .../src/main/kotlin/fn/compose/ui/fn_title.md | 32 ++ 55 files changed, 3170 insertions(+), 109 deletions(-) create mode 100644 kotlin/functions/ui/.gitignore create mode 100644 kotlin/functions/ui/build.gradle.kts create mode 100644 kotlin/functions/ui/consumer-rules.pro create mode 100644 kotlin/functions/ui/gradle.properties create mode 100644 kotlin/functions/ui/gradle/wrapper/gradle-wrapper.jar create mode 100644 kotlin/functions/ui/gradle/wrapper/gradle-wrapper.properties create mode 100755 kotlin/functions/ui/gradlew create mode 100644 kotlin/functions/ui/settings.gradle.kts create mode 100644 kotlin/functions/ui/src/main/AndroidManifest.xml create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/theme/FnTheme.kt create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/theme/FnTheme.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/theme/FnTokens.kt create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/theme/FnTokens.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Charts.kt create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Data.kt create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Display.kt create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Feedback.kt create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Inputs.kt create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Layout.kt create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_alert.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_app_shell.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_avatar.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_badge.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_bar_chart.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_button.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_card.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_checkbox.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_data_table.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_dialog.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_empty_state.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_group.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_kpi_card.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_line_chart.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_loader.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_page_header.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_paper.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_select.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_skeleton.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_sparkline.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_stack.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_switch.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_tabs.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_text.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_text_input.md create mode 100644 kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_title.md diff --git a/.gitignore b/.gitignore index 3d2f737a..d05c0482 100644 --- a/.gitignore +++ b/.gitignore @@ -81,7 +81,6 @@ Thumbs.db broken_paths.txt imgui.ini prompts/ -kotlin/functions/ui/ # Module versioning auto-generated headers (written by `fn index`, issue 0097) **/version_generated.h diff --git a/bash/functions/infra/adb_wsl.md b/bash/functions/infra/adb_wsl.md index 94714824..fec795a1 100644 --- a/bash/functions/infra/adb_wsl.md +++ b/bash/functions/infra/adb_wsl.md @@ -3,17 +3,17 @@ name: adb_wsl kind: function lang: bash domain: infra -version: "1.0.0" +version: "1.1.0" purity: impure -signature: "source adb_wsl.sh [ADB=] [ANDROID_SDK_WIN=]" -description: "Wrapper sourceable para usar adb.exe Windows desde WSL2. Resuelve binario, convierte paths, espera boot del emulador." -tags: ["android", "adb", "wsl", "windows"] +signature: "source adb_wsl.sh [ADB=] [ANDROID_HOME=]" +description: "Wrapper sourceable para resolver e invocar adb. Linux-first: usa el adb nativo del Android SDK ($ANDROID_HOME) o del PATH; fallback a adb.exe solo si detecta WSL2. Expone adb_run, adb_devices, adb_pick_serial, adb_s, adb_wait_boot." +tags: ["android", "adb", "linux", "emulator", "wsl"] params: - name: ADB - desc: "Env var opcional. Path absoluto a adb.exe. Si no se fija, se construye desde ANDROID_SDK_WIN o el default /mnt/c/Users/lucas/AppData/Local/Android/Sdk." - - name: ANDROID_SDK_WIN - desc: "Env var opcional. Raiz del Android SDK montado en WSL. Default: /mnt/c/Users/lucas/AppData/Local/Android/Sdk." -output: "Source-able shell helpers: adb_run, adb_devices, adb_wsl_to_win, adb_wait_boot. Define ADB env var apuntando a Windows adb.exe via ANDROID_SDK_WIN." + desc: "Env var opcional. Path absoluto al binario adb (override explicito). Si no se fija, se resuelve Linux-first: $ANDROID_HOME/platform-tools/adb, luego adb del PATH, luego adb.exe si WSL2." + - name: ANDROID_HOME + desc: "Env var opcional. Raiz del Android SDK nativo. Si esta presente, se usa $ANDROID_HOME/platform-tools/adb. Tambien se acepta ANDROID_SDK_ROOT." +output: "Source-able shell helpers: adb_run, adb_devices, adb_pick_serial, adb_s, adb_wait_boot, adb_wsl_to_win. Resuelve y fija la env var ADB al binario adb disponible." uses_functions: [] uses_types: [] returns: [] @@ -26,24 +26,33 @@ test_file_path: "" file_path: "bash/functions/infra/adb_wsl.sh" --- -## Uso +## Cuando usarla + +Sourcéala como capa base de cualquier script que hable con un device o emulador Android via adb. Es la dependencia comun de todo el toolbelt android del registry (`android_screenshot`, `android_input_*`, `android_logcat`, `android_app_*`, `android_push/pull`). En Linux nativo resuelve el adb del SDK automaticamente; no hace falta configurar nada si `ANDROID_HOME` esta exportado (o `adb` esta en el PATH). + +## Ejemplo ```bash -# Sourcear (usa SDK default) +# Linux nativo: con el SDK instalado y ANDROID_HOME exportado, resuelve solo. +source ~/android-sdk/env.sh source bash/functions/infra/adb_wsl.sh +adb_devices +# List of devices attached +# emulator-5554 device -# Sourcear con SDK custom -ANDROID_SDK_WIN=/mnt/d/Android/Sdk source bash/functions/infra/adb_wsl.sh +# Fijar binario adb explicito (override) +ADB=/opt/android/platform-tools/adb source bash/functions/infra/adb_wsl.sh -# Sourcear con binario fijo -ADB=/mnt/c/my/tools/adb.exe source bash/functions/infra/adb_wsl.sh +# Smoke test +bash bash/functions/infra/adb_wsl.sh --self-test +# Android Debug Bridge version 1.0.41 ``` ## Funciones expuestas ### `adb_run ""` -Ejecuta `$ADB` con los argumentos dados. Retorna el exit code de `adb.exe`. +Ejecuta `$ADB` con los argumentos dados. Retorna el exit code de adb. ```bash adb_run shell ls /sdcard/ @@ -54,45 +63,34 @@ adb_run install app.apk Alias de `adb_run devices`. Lista dispositivos/emuladores conectados. -```bash -adb_devices -# List of devices attached -# emulator-5554 device -``` +### `adb_pick_serial [--serial ] [...]` -### `adb_wsl_to_win ` - -Convierte un path WSL a formato Windows con `wslpath -w`. Si `wslpath` no está disponible retorna el path sin convertir. +Resuelve el serial a usar (multi-device). Lee `--serial X` de los args y setea los globals `ADB_PICK_SERIAL` y `ADB_PICK_REST`. Si no se pasa, autoselecciona el primer device/emulador conectado. ```bash -win_path=$(adb_wsl_to_win /home/lucas/proyecto/app.apk) -# C:\Users\lucas\AppData\Local\... (o la ruta Windows equivalente) -adb_run install "$win_path" +adb_pick_serial "$@" || { echo "no device" >&2; exit 3; } +serial="$ADB_PICK_SERIAL"; set -- "${ADB_PICK_REST[@]}" ``` +### `adb_s ` + +Atajo de `adb_run -s ` para multi-device. + ### `adb_wait_boot [timeout_s]` -Espera a que el emulador/dispositivo complete el boot (`sys.boot_completed = 1`). Útil tras lanzar un AVD en CI. +Espera a que el emulador/dispositivo complete el boot (`sys.boot_completed = 1`). Polling cada 3s. Retorna `0` si bootó, `1` si timeout (default 120s). -```bash -adb_wait_boot # timeout 120s -adb_wait_boot 60 # timeout 60s -``` +### `adb_wsl_to_win ` -Retorna `0` si el boot se completó, `1` si expiró el timeout. +Legacy WSL: convierte path WSL→Windows con `wslpath -w`. En Linux nativo (sin `wslpath`) devuelve el path tal cual. -## Smoke test +## Gotchas -```bash -bash bash/functions/infra/adb_wsl.sh --self-test -# OK -``` +- **Linux-first.** El default ya NO es Windows. Resolucion: `$ADB` → `$ANDROID_HOME/platform-tools/adb` → `adb` del PATH → (solo si `/proc/version` indica WSL2) `adb.exe`. En un PC Linux con el SDK instalado funciona sin configurar nada. +- **Necesita el SDK o adb en PATH.** Si no encuentra adb aborta con mensaje a stderr. Instala con `fn run install_android_sdk_bash_infra` y exporta `ANDROID_HOME` (o `source ~/android-sdk/env.sh`). +- **`ADB` se resuelve una sola vez al sourcing.** Cambiar el SDK despues requiere re-sourcear. +- **Sourcéala con bash, no zsh.** Los consumidores usan `${BASH_SOURCE[0]}` para localizar este archivo; ejecutarlos con `bash ` (no `zsh`/`source` desde zsh) resuelve el path correctamente. -## Notas +## Capability growth log -- El script es **source-able**: define funciones en el shell actual, no crea subshell. -- `ADB` se resuelve una sola vez al sourcing. Si el binario no existe en disco, la carga falla con mensaje en stderr y `return 1` / `exit 1`. -- `adb_wait_boot` hace polling cada 3 segundos. Ajustar `interval` si el emulador es especialmente lento. -- En WSL2 `wslpath` siempre está disponible; el fallback existe para entornos Linux puros que accidentalmente sourceen el archivo. -- Si el emulador requiere `-s `, pasar el flag directamente a `adb_run`: `adb_run -s emulator-5554 shell ...`. ---- +- v1.1.0 (2026-06-03) — Linux-first: la resolucion de adb ahora prioriza el adb nativo del SDK (`$ANDROID_HOME/platform-tools/adb`) y del PATH; el adb.exe de Windows queda como fallback legacy solo bajo WSL2. Se elimina el default hardcodeado `/mnt/c/Users/lucas/...`. Todo el toolbelt android (~20 funciones) pasa a funcionar en Linux nativo sin preexportar `ADB`. diff --git a/bash/functions/infra/adb_wsl.sh b/bash/functions/infra/adb_wsl.sh index 0eb04047..1e8376d2 100644 --- a/bash/functions/infra/adb_wsl.sh +++ b/bash/functions/infra/adb_wsl.sh @@ -1,20 +1,35 @@ #!/usr/bin/env bash -# adb_wsl — Wrapper sourceable para usar adb.exe Windows desde WSL2. +# adb_wsl — Wrapper sourceable para resolver e invocar adb. +# Linux-first: usa el adb nativo del Android SDK o del PATH. Conserva un +# fallback a adb.exe SOLO cuando se detecta WSL2 (legacy). El nombre del +# archivo se mantiene por compatibilidad con sus consumidores del registry. # Uso: source bash/functions/infra/adb_wsl.sh # Smoke test: bash bash/functions/infra/adb_wsl.sh --self-test # --------------------------------------------------------------------------- -# Resolver ADB +# Resolver ADB (Linux-first; fallback WSL legacy) # --------------------------------------------------------------------------- -# El caller puede fijar ADB antes de sourcing para apuntar a otro binario. +# Prioridad de resolucion: +# 1. $ADB preexportada por el caller (override explicito). +# 2. adb nativo del Android SDK ($ANDROID_HOME / $ANDROID_SDK_ROOT). +# 3. adb del PATH. +# 4. (legacy) adb.exe de Windows, solo si corremos dentro de WSL2. if [[ -z "${ADB:-}" ]]; then - _sdk_root="${ANDROID_SDK_WIN:-/mnt/c/Users/lucas/AppData/Local/Android/Sdk}" - ADB="${_sdk_root}/platform-tools/adb.exe" - unset _sdk_root + _sdk="${ANDROID_HOME:-${ANDROID_SDK_ROOT:-}}" + if [[ -n "$_sdk" && -x "$_sdk/platform-tools/adb" ]]; then + ADB="$_sdk/platform-tools/adb" + elif command -v adb &>/dev/null; then + ADB="$(command -v adb)" + elif grep -qiE "(microsoft|wsl)" /proc/version 2>/dev/null; then + _sdk_win="${ANDROID_SDK_WIN:-/mnt/c/Users/$USER/AppData/Local/Android/Sdk}" + ADB="${_sdk_win}/platform-tools/adb.exe" + unset _sdk_win + fi + unset _sdk fi -if [[ ! -f "$ADB" ]]; then - echo "adb_wsl: ADB no encontrado en '$ADB'. Fija ADB= o ANDROID_SDK_WIN= antes de sourcear." >&2 +if [[ -z "${ADB:-}" ]] || ! command -v "$ADB" &>/dev/null; then + echo "adb_wsl: adb no encontrado. Instala el SDK (fn run install_android_sdk_bash_infra), exporta ANDROID_HOME, o fija ADB= antes de sourcear." >&2 # Solo abortamos si el script se ejecuta directamente; si se sourcea, # permitimos continuar para que el caller maneje el error. return 1 2>/dev/null || exit 1 @@ -22,8 +37,8 @@ fi # --------------------------------------------------------------------------- # adb_run "" -# Ejecuta el ADB Windows con los argumentos dados. -# Retorna el exit code de adb.exe. +# Ejecuta adb (el binario resuelto en $ADB) con los argumentos dados. +# Retorna el exit code de adb. # --------------------------------------------------------------------------- adb_run() { "$ADB" "$@" diff --git a/bash/functions/infra/android_emulator_list.md b/bash/functions/infra/android_emulator_list.md index e0ed28fc..0feef297 100644 --- a/bash/functions/infra/android_emulator_list.md +++ b/bash/functions/infra/android_emulator_list.md @@ -3,11 +3,11 @@ name: android_emulator_list kind: function lang: bash domain: infra -version: "1.0.0" +version: "1.1.0" purity: impure signature: "android_emulator_list([--json])" -description: "Lista los AVDs disponibles invocando emulator.exe Windows desde WSL2." -tags: [android, emulator, wsl] +description: "Lista los AVDs disponibles. Linux-first: usa el emulator nativo del Android SDK ($ANDROID_HOME); fallback a emulator.exe solo bajo WSL2." +tags: [android, emulator, linux, avd, wsl] uses_functions: [] uses_types: [] returns: [] @@ -17,35 +17,41 @@ imports: [] params: - name: "--json" desc: "Optional flag, outputs JSON array instead of newline-separated names" -output: "Lista de AVDs disponibles en el SDK Windows. Una por linea, o JSON array con --json." +output: "Lista de AVDs disponibles en el SDK. Una por linea, o JSON array con --json." tested: false tests: [] test_file_path: "" file_path: "bash/functions/infra/android_emulator_list.sh" -notes: "Lee env var EMULATOR o ANDROID_SDK_WIN. Default Windows path: /mnt/c/Users/lucas/AppData/Local/Android/Sdk/emulator/emulator.exe. Exit 0 si lista (incluso vacia). Exit 1 solo si el binario no existe o no es ejecutable." +notes: "Resuelve el binario emulator Linux-first ($ANDROID_HOME/emulator/emulator -> emulator del PATH -> emulator.exe si WSL2). Override con EMULATOR=. Exit 0 si lista (incluso vacia). Exit 1 solo si el binario no existe." --- ## Ejemplo ```bash +source ~/android-sdk/env.sh # exporta ANDROID_HOME + # Listar AVDs (una por linea) android_emulator_list +# Pixel_API34 # Listar AVDs en formato JSON android_emulator_list --json -# ["Pixel_7_API_34","Pixel_4_API_30"] +# ["Pixel_API34"] # Sobreescribir ruta del emulador -EMULATOR="/custom/path/emulator.exe" android_emulator_list - -# Sobreescribir SDK base -ANDROID_SDK_WIN="/mnt/d/Android/Sdk" android_emulator_list +EMULATOR="/opt/android/emulator/emulator" android_emulator_list ``` -## Notas +## Cuando usarla -El script es ejecutable directamente (`chmod +x`) o invocable con `bash android_emulator_list.sh`. +Antes de arrancar un emulador, para validar que el AVD existe (lo hace `deploy_capacitor_to_emulator` y `run_kotlin_app_tests` internamente). Útil también para listar qué AVDs hay creados en la máquina. -`emulator.exe -list-avds` imprime warnings a stderr que se descartan con `2>/dev/null`. La captura con `mapfile` filtra ademas lineas vacias para producir una lista limpia. +## Gotchas -La variable `EMULATOR` tiene prioridad sobre `ANDROID_SDK_WIN`. Si ninguna esta definida se usa el path Windows por defecto de Lucas. +- **Linux-first.** El default ya no es Windows. Resuelve `$ANDROID_HOME/emulator/emulator`, luego `emulator` del PATH, y solo bajo WSL2 cae a `emulator.exe`. +- `emulator -list-avds` imprime warnings a stderr que se descartan con `2>/dev/null`. La captura con `mapfile` filtra líneas vacías. +- Override del binario con `EMULATOR=`; override del SDK con `ANDROID_HOME=`. + +## Capability growth log + +- v1.1.0 (2026-06-03) — Linux-first: resuelve el emulator nativo del SDK (`$ANDROID_HOME`) y del PATH antes que `emulator.exe`; se elimina el default hardcodeado `/mnt/c/Users/lucas/...`. diff --git a/bash/functions/infra/android_emulator_list.sh b/bash/functions/infra/android_emulator_list.sh index 0471eee0..9d311f35 100755 --- a/bash/functions/infra/android_emulator_list.sh +++ b/bash/functions/infra/android_emulator_list.sh @@ -1,12 +1,23 @@ #!/usr/bin/env bash -# android_emulator_list — Lista los AVDs disponibles invocando emulator.exe Windows desde WSL2. +# android_emulator_list — Lista los AVDs disponibles. Linux-first: usa el +# emulator nativo del Android SDK; fallback a emulator.exe solo bajo WSL2. set -euo pipefail -# Resolve emulator binary -EMULATOR="${EMULATOR:-${ANDROID_SDK_WIN:-/mnt/c/Users/lucas/AppData/Local/Android/Sdk}/emulator/emulator.exe}" +# Resolve emulator binary (Linux-first; WSL fallback) +if [[ -z "${EMULATOR:-}" ]]; then + _sdk="${ANDROID_HOME:-${ANDROID_SDK_ROOT:-}}" + if [[ -n "$_sdk" && -x "$_sdk/emulator/emulator" ]]; then + EMULATOR="$_sdk/emulator/emulator" + elif command -v emulator &>/dev/null; then + EMULATOR="$(command -v emulator)" + elif grep -qiE "(microsoft|wsl)" /proc/version 2>/dev/null; then + EMULATOR="${ANDROID_SDK_WIN:-/mnt/c/Users/$USER/AppData/Local/Android/Sdk}/emulator/emulator.exe" + fi + unset _sdk +fi -if [[ ! -x "$EMULATOR" ]]; then - echo "error: emulator binary not found or not executable: $EMULATOR" >&2 +if [[ -z "${EMULATOR:-}" ]] || ! command -v "$EMULATOR" &>/dev/null; then + echo "error: emulator no encontrado. Instala el SDK (fn run install_android_sdk_bash_infra) + el paquete 'emulator', exporta ANDROID_HOME, o fija EMULATOR=." >&2 exit 1 fi diff --git a/bash/functions/infra/android_emulator_start.md b/bash/functions/infra/android_emulator_start.md index dd06482c..d87444e3 100644 --- a/bash/functions/infra/android_emulator_start.md +++ b/bash/functions/infra/android_emulator_start.md @@ -3,14 +3,14 @@ name: android_emulator_start kind: function lang: bash domain: infra -version: "1.0.0" +version: "1.1.0" purity: impure signature: "android_emulator_start(avd_name: string, timeout_s: int) -> string" -description: "Arranca un AVD en background y espera a que termine de bootear. Idempotente: si ya hay emulador corriendo no lanza otro." -tags: [android, emulator, wsl] +description: "Arranca un AVD Android en background y espera a que termine de bootear. Linux-first: resuelve el emulator/adb nativos del SDK; fallback a binarios .exe solo bajo WSL2. Idempotente: si ya hay un emulador corriendo, imprime 'already running' y su serial sin lanzar otro." +tags: [android, emulator, linux, avd, wsl] params: - name: avd_name - desc: "Nombre del AVD a arrancar (visible con android_emulator_list o `emulator.exe -list-avds`)" + desc: "Nombre del AVD a arrancar (visible con android_emulator_list o `emulator -list-avds`)" - name: timeout_s desc: "Timeout total en segundos para esperar el boot completo. Opcional, default 180" output: "Serial del device emulado (ej. emulator-5554) en stdout. Exit 0 = boot completo, exit 1 = timeout o emulador murio." @@ -29,21 +29,31 @@ file_path: "bash/functions/infra/android_emulator_start.sh" ## Ejemplo ```bash +source ~/android-sdk/env.sh # exporta ANDROID_HOME -> resuelve emulator/adb nativos source bash/functions/infra/android_emulator_start.sh # Arrancar AVD con timeout por defecto (180s) -serial=$(android_emulator_start "Pixel_6_API_34") +serial=$(android_emulator_start "Pixel_API34") echo "Emulador listo: $serial" # emulator-5554 # Con timeout personalizado -serial=$(android_emulator_start "Pixel_6_API_34" 300) +serial=$(android_emulator_start "Pixel_API34" 300) ``` -## Notas +Para ver la ventana del emulador en un escritorio Linux, exporta `DISPLAY` (y `XAUTHORITY`) antes de invocar. -- Sourcea `adb_wsl.sh` del mismo directorio si existe (provee `ADB`, `adb_run`, `adb_wait_boot`). Si no, usa implementacion inline. -- Resuelve `EMULATOR` y `ADB` desde `ANDROID_SDK_WIN` (default `/mnt/c/Users/lucas/AppData/Local/Android/Sdk`) o desde las variables de entorno `EMULATOR=` / `ADB=` si ya están fijadas. -- Idempotente: si `adb devices` ya muestra un `emulator-*`, imprime "already running" + el serial y sale con exit 0 sin lanzar un segundo proceso. -- Log del emulador en `/tmp/emulator_.log`. PID en `/tmp/emulator_.pid`. -- El timeout total se reparte: primera mitad para `adb wait-for-device`, segunda mitad para esperar `sys.boot_completed=1`. -- Diseñado para WSL2 con Android SDK instalado en Windows. En Linux nativo basta cambiar las rutas de los binarios via `EMULATOR=` y `ADB=`. +## Cuando usarla + +Cuando un script necesita un emulador booteado antes de instalar un APK o correr tests instrumentados (`gradle_instrumented_test`, `run_kotlin_app_tests`). Es idempotente, así que se puede llamar al principio de cualquier pipeline sin comprobar antes si ya hay uno arriba. + +## Gotchas + +- **Linux-first.** Resuelve `EMULATOR`/`ADB` desde `$ANDROID_HOME/{emulator/emulator, platform-tools/adb}` o del PATH; `emulator.exe`/`adb.exe` solo como fallback bajo WSL2. Override manual con `EMULATOR=`/`ADB=`. +- **Necesita `DISPLAY` para ventana.** Sin un servidor X accesible el emulador puede fallar al abrir ventana. Para headless/CI añade `-no-window` (editar la función o lanzar el emulador aparte). +- **Aceleración KVM.** Requiere acceso a `/dev/kvm` (grupo `kvm` o ACL). Sin ella el boot es lentísimo o falla. +- Log del emulador en `/tmp/emulator_.log`, PID en `/tmp/emulator_.pid`. +- El timeout total se reparte: primera mitad para `adb wait-for-device`, segunda para `sys.boot_completed=1`. + +## Capability growth log + +- v1.1.0 (2026-06-03) — Linux-first: resuelve emulator/adb nativos del SDK (`$ANDROID_HOME`) antes que los `.exe` de Windows (ahora solo fallback WSL2); se elimina el default hardcodeado `/mnt/c/Users/lucas/...`. fix: `timeout adb_run wait-for-device` fallaba siempre porque `timeout` no puede ejecutar la función shell `adb_run`; ahora invoca el binario `"$ADB"` directamente. diff --git a/bash/functions/infra/android_emulator_start.sh b/bash/functions/infra/android_emulator_start.sh index c23044f2..17ee1983 100644 --- a/bash/functions/infra/android_emulator_start.sh +++ b/bash/functions/infra/android_emulator_start.sh @@ -11,11 +11,17 @@ if [[ -f "$_ADB_WSL_SH" ]]; then # shellcheck source=adb_wsl.sh source "$_ADB_WSL_SH" else - # Fallback inline: resolver ADB + # Fallback inline: resolver ADB (Linux-first; WSL fallback) if [[ -z "${ADB:-}" ]]; then - _sdk_root="${ANDROID_SDK_WIN:-/mnt/c/Users/lucas/AppData/Local/Android/Sdk}" - ADB="${_sdk_root}/platform-tools/adb.exe" - unset _sdk_root + _sdk="${ANDROID_HOME:-${ANDROID_SDK_ROOT:-}}" + if [[ -n "$_sdk" && -x "$_sdk/platform-tools/adb" ]]; then + ADB="$_sdk/platform-tools/adb" + elif command -v adb &>/dev/null; then + ADB="$(command -v adb)" + else + ADB="${ANDROID_SDK_WIN:-/mnt/c/Users/$USER/AppData/Local/Android/Sdk}/platform-tools/adb.exe" + fi + unset _sdk fi adb_run() { "$ADB" "$@"; } adb_wait_boot() { @@ -33,12 +39,18 @@ else fi # --------------------------------------------------------------------------- -# Resolver EMULATOR +# Resolver EMULATOR (Linux-first; WSL fallback) # --------------------------------------------------------------------------- if [[ -z "${EMULATOR:-}" ]]; then - _sdk_root="${ANDROID_SDK_WIN:-/mnt/c/Users/lucas/AppData/Local/Android/Sdk}" - EMULATOR="${_sdk_root}/emulator/emulator.exe" - unset _sdk_root + _sdk="${ANDROID_HOME:-${ANDROID_SDK_ROOT:-}}" + if [[ -n "$_sdk" && -x "$_sdk/emulator/emulator" ]]; then + EMULATOR="$_sdk/emulator/emulator" + elif command -v emulator &>/dev/null; then + EMULATOR="$(command -v emulator)" + elif grep -qiE "(microsoft|wsl)" /proc/version 2>/dev/null; then + EMULATOR="${ANDROID_SDK_WIN:-/mnt/c/Users/$USER/AppData/Local/Android/Sdk}/emulator/emulator.exe" + fi + unset _sdk fi # --------------------------------------------------------------------------- @@ -49,12 +61,12 @@ android_emulator_start() { local timeout_s="${2:-180}" # Validaciones de entorno - if [[ ! -f "$EMULATOR" ]]; then - echo "android_emulator_start: emulator.exe no encontrado en '$EMULATOR'. Fija EMULATOR= o ANDROID_SDK_WIN=." >&2 + if [[ -z "${EMULATOR:-}" ]] || ! command -v "$EMULATOR" &>/dev/null; then + echo "android_emulator_start: emulator no encontrado. Instala el SDK + paquete 'emulator', exporta ANDROID_HOME, o fija EMULATOR=." >&2 return 1 fi - if [[ ! -f "$ADB" ]]; then - echo "android_emulator_start: adb.exe no encontrado en '$ADB'. Fija ADB= o ANDROID_SDK_WIN=." >&2 + if [[ -z "${ADB:-}" ]] || ! command -v "$ADB" &>/dev/null; then + echo "android_emulator_start: adb no encontrado. Instala platform-tools, exporta ANDROID_HOME, o fija ADB=." >&2 return 1 fi @@ -74,9 +86,12 @@ android_emulator_start() { local emu_pid=$! echo "$emu_pid" > "$pid_file" - # Esperar a que el dispositivo aparezca en adb + # Esperar a que el dispositivo aparezca en adb. + # Usamos el binario "$ADB" directamente (no la funcion adb_run): `timeout` + # ejecuta un comando externo y no puede ver funciones del shell, asi que + # `timeout ... adb_run` fallaba siempre con "command not found". local wait_timeout=$(( timeout_s / 2 )) - if ! timeout "$wait_timeout" adb_run wait-for-device 2>/dev/null; then + if ! timeout "$wait_timeout" "$ADB" wait-for-device 2>/dev/null; then echo "android_emulator_start: timeout esperando que el dispositivo aparezca en adb (${wait_timeout}s)." >&2 return 1 fi diff --git a/bash/functions/infra/install_android_sdk.md b/bash/functions/infra/install_android_sdk.md index b8abcdc4..eb5b125f 100644 --- a/bash/functions/infra/install_android_sdk.md +++ b/bash/functions/infra/install_android_sdk.md @@ -3,7 +3,7 @@ name: install_android_sdk kind: function lang: bash domain: infra -version: "1.0.0" +version: "1.0.1" purity: impure signature: "install_android_sdk() -> void" description: "Descarga e instala Android SDK command-line tools y JDK 17 localmente (sin root/sudo) en $ANDROID_SDK_DIR (default: $HOME/android-sdk). Idempotente: detecta instalacion existente y sale sin hacer nada. Genera env.sh con JAVA_HOME, ANDROID_HOME y PATH listos para hacer source." @@ -50,6 +50,17 @@ ANDROID_SDK_DIR=/opt/android source install_android_sdk.sh source ~/android-sdk/env.sh ``` +## Cuando usarla + +Cuando necesites un Android SDK funcional en una maquina Linux sin permisos de root: CI, contenedores, o un PC de desarrollo donde quieras un SDK aislado en `$HOME`. Instala la base minima para compilar (cmdline-tools + JDK 17 + platform-tools + API 34 + build-tools). Hazle `source` para tener `sdkmanager`/`avdmanager`/`adb` en el PATH antes de invocar `gradle_run`, `gradle_assemble_debug` o `capacitor_build_apk`. + +## Gotchas + +- **No instala `emulator` ni system images.** Solo la base de compilacion. Para correr un AVD: tras hacer `source env.sh`, instala `emulator` y una imagen (`sdkmanager "emulator" "system-images;android-34;google_apis;x86_64"`) y crea el AVD con `avdmanager create avd`. +- **Aceleracion KVM:** el emulador necesita acceso a `/dev/kvm`. Verifica con `[ -w /dev/kvm ]`; si no, anade tu usuario al grupo `kvm` (`sudo usermod -aG kvm $USER` + re-login) o concede ACL. +- **URL de cmdline-tools clavada** a la build 11076708 (2024). Si Google la retira, actualizar `tools_url` en el `.sh`. +- **Idempotente:** re-ejecutar no reinstala; detecta `sdkmanager` existente y sale en 0. + ## Notas Requiere `curl` y `unzip` (disponibles en la mayoria de distros Linux). No requiere root ni sudo. @@ -61,3 +72,7 @@ La reorganizacion del zip es necesaria porque Google distribuye cmdline-tools co El archivo `env.sh` generado en `$ANDROID_SDK_DIR/env.sh` contiene las variables de entorno necesarias (`JAVA_HOME`, `ANDROID_HOME`, `ANDROID_SDK_ROOT`, `PATH`) y puede hacerse source desde `.bashrc`, `.zshrc` o desde scripts de CI. Paquetes instalados: `platform-tools` (adb, fastboot), `platforms;android-34` (API 34), `build-tools;34.0.0`. + +## Capability growth log + +- v1.0.1 (2026-06-03) — fix: `yes | sdkmanager --licenses` daba falso negativo bajo `pipefail` (SIGPIPE de `yes`, exit 141) abortando una instalacion exitosa; ahora se desactiva `pipefail` solo en ese pipe. fix: el trap `EXIT` referenciaba `$tmp_dir` (variable `local`) fuera del scope de la funcion → "unbound variable" con `set -u`; ahora es global con expansion defensiva. diff --git a/bash/functions/infra/install_android_sdk.sh b/bash/functions/infra/install_android_sdk.sh index fd65f27d..7b9e02c4 100644 --- a/bash/functions/infra/install_android_sdk.sh +++ b/bash/functions/infra/install_android_sdk.sh @@ -5,11 +5,14 @@ set -euo pipefail install_android_sdk() { local sdk_dir="${ANDROID_SDK_DIR:-$HOME/android-sdk}" - local tmp_dir + # tmp_dir es global a proposito: el trap EXIT se dispara al terminar el + # script (fuera del scope de la funcion), donde una variable `local` ya no + # existiria y `set -u` la marcaria como unbound. La expansion defensiva + # ${tmp_dir:-} evita el fallo aunque el trap corra antes de la asignacion. tmp_dir="$(mktemp -d)" # Limpia temporales al salir - trap 'rm -rf "$tmp_dir"' EXIT + trap 'rm -rf "${tmp_dir:-}"' EXIT # 1. Verifica si ya está instalado if [[ -f "$sdk_dir/cmdline-tools/latest/bin/sdkmanager" ]]; then @@ -103,11 +106,18 @@ install_android_sdk() { export PATH="$JAVA_HOME/bin:$sdk_dir/cmdline-tools/latest/bin:$sdk_dir/platform-tools:$PATH" # 4. Acepta licencias e instala paquetes necesarios + # `yes` recibe SIGPIPE (exit 141) cuando sdkmanager termina de leer y cierra + # el pipe; bajo `set -o pipefail` eso convierte un exito real en falso + # negativo. Desactivamos pipefail solo aqui para que el exit del pipeline + # refleje el de sdkmanager (ultimo comando), no el SIGPIPE de `yes`. echo "Aceptando licencias de Android SDK..." - if ! yes | "$sdkmanager" --licenses; then + set +o pipefail + if ! yes | "$sdkmanager" --licenses >/dev/null 2>&1; then + set -o pipefail echo "ERROR: fallo al aceptar licencias de Android SDK" >&2 return 1 fi + set -o pipefail echo "Instalando platform-tools, platforms;android-34, build-tools;34.0.0..." if ! "$sdkmanager" "platform-tools" "platforms;android-34" "build-tools;34.0.0"; then diff --git a/docs/capabilities/android.md b/docs/capabilities/android.md index 13f1ff1d..eaab8710 100644 --- a/docs/capabilities/android.md +++ b/docs/capabilities/android.md @@ -1,12 +1,14 @@ # Capability: android -Toolbelt Android operable desde WSL2. Cubre: ADB (`adb_wsl`, conexion al daemon Windows), AVD emulator management (list/start/stop/wait, geo-fix), APK lifecycle (`android_apk_install`, `android_app_clear`, `android_app_launch`, `android_uninstall`), Capacitor build pipelines (`capacitor_build_apk`, `deploy_capacitor_to_emulator`), logcat streaming. WSL2 -> Windows adb daemon, no requiere Android Studio. +Toolbelt Android **Linux-first** (con fallback WSL2 legacy). Cubre: ADB (`adb_wsl` resuelve el adb nativo del SDK), AVD emulator management (list/start/stop/wait, geo-fix), APK lifecycle (`android_apk_install`, `android_app_clear`, `android_app_launch`, `android_uninstall`), Capacitor build pipelines (`capacitor_build_apk`, `deploy_capacitor_to_emulator`), build Gradle nativo (`gradle_*`, `init_kotlin_app`, `run_kotlin_app_tests`), logcat streaming. Usa el SDK nativo en `~/android-sdk` (via `install_android_sdk`); el adb/emulator de Windows solo se usa como fallback cuando se detecta WSL2. + +Design system Compose: las apps Kotlin nativas (`init_kotlin_app`) heredan `FnTheme` + `FnTokens` del módulo `kotlin/functions/ui` (`fn.compose:ui`), con la paleta exacta de Mantine v9 dark + indigo (misma que web `@fn_library` y C++ `fn_tokens`). ## Funciones | ID | Firma | Que hace | |---|---|---| -| `adb_wsl_bash_infra` | `source adb_wsl.sh [ADB=] [ANDROID_SDK_WIN=]` | Wrapper sourceable para usar adb.exe Windows desde WSL2. Resuelve binario, convierte paths, espera boot del emulador. | +| `adb_wsl_bash_infra` | `source adb_wsl.sh [ADB=] [ANDROID_HOME=]` | Wrapper sourceable para resolver e invocar adb. Linux-first: usa el adb nativo del Android SDK ($ANDROID_HOME) o del PATH; fallback a adb.exe solo si detecta WSL2. Expone adb_run, adb_devices, adb_pick_serial, adb_s, adb_wait_boot. | | `android_apk_install_bash_infra` | `android_apk_install([--serial S], apk_path: string, package_name?: string, activity_name?: string) -> void` | Instala APK en device/emulador via adb y opcionalmente lanza la app. Multi-emulator via --serial. | | `android_app_clear_bash_infra` | `android_app_clear([--serial ], package: string) -> void` | Wipe app data + cache via pm clear. App keeps installed but factory-state. Multi-emulator via --serial. | | `android_app_info_bash_infra` | `android_app_info([--serial ], package, [--json]) -> stdout` | Inspect installed app: version, target SDK, activities via dumpsys package. | @@ -16,8 +18,8 @@ Toolbelt Android operable desde WSL2. Cubre: ADB (`adb_wsl`, conexion al daemon | `android_emu_battery_bash_infra` | `android_emu_battery([--serial ], level: int, [--charging ]) -> void` | Simulate battery state on emulator (level + charging). Emulator-only. | | `android_emu_geo_fix_bash_infra` | `android_emu_geo_fix([--serial ], longitude: string, latitude: string, [altitude: string]) -> void` | Fake GPS location on Android emulator via emu geo fix. Emulator-only (not physical devices). | | `android_emu_rotate_bash_infra` | `android_emu_rotate([--serial ] [portrait\|landscape\|0\|90\|180\|270])` | Rotate emulator screen. Empty=toggle, or fixed orientation. Locks autorotate. | -| `android_emulator_list_bash_infra` | `android_emulator_list([--json])` | Lista los AVDs disponibles invocando emulator.exe Windows desde WSL2. | -| `android_emulator_start_bash_infra` | `android_emulator_start(avd_name: string, timeout_s: int) -> string` | Arranca un AVD en background y espera a que termine de bootear. Idempotente: si ya hay emulador corriendo no lanza otro. | +| `android_emulator_list_bash_infra` | `android_emulator_list([--json])` | Lista los AVDs disponibles. Linux-first: usa el emulator nativo del Android SDK ($ANDROID_HOME); fallback a emulator.exe solo bajo WSL2. | +| `android_emulator_start_bash_infra` | `android_emulator_start(avd_name: string, timeout_s: int) -> string` | Arranca un AVD Android en background y espera a que termine de bootear. Linux-first: resuelve el emulator/adb nativos del SDK; fallback a binarios .exe solo bajo WSL2. Idempotente: si ya hay un emulador corriendo, imprime 'already running' y su serial sin lanzar otro. | | `android_emulator_stop_bash_infra` | `android_emulator_stop(serial?: string) -> void` | Para uno o todos los emuladores Android via adb emu kill. Si serial esta vacio, detecta todos los emulator-* activos y los para. Idempotente: exit 0 aunque no haya nada que matar. | | `android_input_keyevent_bash_infra` | `android_input_keyevent([--serial ] key: string)` | Send key event via adb shell input keyevent. Accepts aliases (BACK, HOME, POWER, ENTER, MENU, RECENT_APPS, VOLUME_UP, VOLUME_DOWN), raw numeric codes, or explicit KEYCODE_* names. | | `android_input_swipe_bash_infra` | `android_input_swipe([--serial ], x1: int, y1: int, x2: int, y2: int, [duration_ms: int])` | Send swipe gesture between two points with duration. | @@ -31,6 +33,8 @@ Toolbelt Android operable desde WSL2. Cubre: ADB (`adb_wsl`, conexion al daemon | `android_shell_bash_infra` | `android_shell([--serial ], cmd ...args)` | Execute arbitrary shell command on Android device. Multi-emulator via --serial. | | `capacitor_build_apk_bash_pipelines` | `capacitor_build_apk(web_app_dir: string, [app_id: string], [app_name: string]) -> void` | Pipeline que convierte una web app en un APK de Android usando Capacitor. Valida el entorno (ANDROID_HOME, Java 17+), construye el bundle web si no existe dist/, inicializa Capacitor si no está configurado, añade la plataforma Android, sincroniza y compila el APK con Gradle. El APK final queda en el directorio raíz de la web app. | | `deploy_capacitor_to_emulator_bash_pipelines` | `deploy_capacitor_to_emulator(app_dir: string, avd_name?: string, package_name?: string) -> void` | Pipeline end-to-end: build Capacitor APK + arranca AVD + instala + opcionalmente lanza la app. Valida que el AVD existe, construye el APK con capacitor_build_apk, arranca el emulador de forma idempotente, instala el APK y lanza la app si se da package_name. Imprime comando logcat sugerido al final. | +| `fn_theme_kt_ui` | `@Composable fun FnTheme(darkMode: Boolean = true, content: @Composable () -> Unit)` | Provider raiz del design system Compose del registry (@fn_compose). Envuelve MaterialTheme con un ColorScheme derivado de FnColors (Mantine v9 dark + indigo). Dark por defecto, mirror de FnMantineProvider (web) y fn::run_app ThemeMode::FnDark (C++). Toda app del registry envuelve su contenido en FnTheme. | +| `fn_tokens_kt_ui` | `object FnTokens { colors; spacing; radius; typography; shadows }` | Design tokens del design system Compose del registry (@fn_compose). Paleta heredada exacta (mismos hex) de cpp/DESIGN_SYSTEM.md / Mantine v9 dark + indigo: FnColors, FnSpacing (Dp), FnRadius (Dp), FnTypography (sp + weights), FnShadows (Dp). Fuente unica de valores visuales para apps Android del registry. | | `gradle_assemble_debug_bash_infra` | `gradle_assemble_debug(project_dir: string, module: string) -> string` | Build APK debug de un modulo Android via gradlew assembleDebug. | | `gradle_clean_bash_infra` | `gradle_clean(project_dir: string) -> int` | Limpia build artifacts de un proyecto Android (gradle clean + rm .gradle + rm build). | | `gradle_instrumented_test_bash_infra` | `gradle_instrumented_test(project_dir: string, module: string) -> int` | Corre instrumented tests Compose en emulador/device Android conectado. | diff --git a/kotlin/functions/ui/.gitignore b/kotlin/functions/ui/.gitignore new file mode 100644 index 00000000..6645d008 --- /dev/null +++ b/kotlin/functions/ui/.gitignore @@ -0,0 +1,6 @@ +.gradle/ +build/ +local.properties +*.iml +.idea/ +.cxx/ diff --git a/kotlin/functions/ui/build.gradle.kts b/kotlin/functions/ui/build.gradle.kts new file mode 100644 index 00000000..aa7edefe --- /dev/null +++ b/kotlin/functions/ui/build.gradle.kts @@ -0,0 +1,43 @@ +plugins { + id("com.android.library") version "8.4.0" + id("org.jetbrains.kotlin.android") version "1.9.22" +} + +// group:name must match the `fn.compose:ui` module notation that apps substitute. +group = "fn.compose" +version = "0.1.0" + +android { + namespace = "fn.compose.ui" + compileSdk = 34 + + defaultConfig { + minSdk = 24 + consumerProguardFiles("consumer-rules.pro") + } + + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.8" + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = "17" + } +} + +dependencies { + // `api` so consuming apps inherit Compose transitively through fn.compose:ui. + implementation(platform("androidx.compose:compose-bom:2024.02.00")) + api("androidx.compose.ui:ui") + api("androidx.compose.ui:ui-graphics") + api("androidx.compose.ui:ui-text") + api("androidx.compose.foundation:foundation") + api("androidx.compose.material3:material3") + api("androidx.compose.ui:ui-tooling-preview") +} diff --git a/kotlin/functions/ui/consumer-rules.pro b/kotlin/functions/ui/consumer-rules.pro new file mode 100644 index 00000000..7aa2aa14 --- /dev/null +++ b/kotlin/functions/ui/consumer-rules.pro @@ -0,0 +1 @@ +# No consumer ProGuard rules required yet for the fn.compose:ui design system. diff --git a/kotlin/functions/ui/gradle.properties b/kotlin/functions/ui/gradle.properties new file mode 100644 index 00000000..f0a2e55f --- /dev/null +++ b/kotlin/functions/ui/gradle.properties @@ -0,0 +1,4 @@ +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +android.useAndroidX=true +kotlin.code.style=official +android.nonTransitiveRClass=true diff --git a/kotlin/functions/ui/gradle/wrapper/gradle-wrapper.jar b/kotlin/functions/ui/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..1b33c55baabb587c669f562ae36f953de2481846 GIT binary patch literal 43764 zcma&OWmKeVvL#I6?i3D%6z=Zs?ofE*?rw#G$eqJB ziT4y8-Y@s9rkH0Tz>ll(^xkcTl)CY?rS&9VNd66Yc)g^6)JcWaY(5$5gt z8gr3SBXUTN;~cBgz&})qX%#!Fxom2Yau_`&8)+6aSN7YY+pS410rRUU*>J}qL0TnJ zRxt*7QeUqTh8j)Q&iavh<}L+$Jqz))<`IfKussVk%%Ah-Ti?Eo0hQH!rK%K=#EAw0 zwq@@~XNUXRnv8$;zv<6rCRJ6fPD^hfrh;0K?n z=p!u^3xOgWZ%f3+?+>H)9+w^$Tn1e;?UpVMJb!!;f)`6f&4|8mr+g)^@x>_rvnL0< zvD0Hu_N>$(Li7|Jgu0mRh&MV+<}`~Wi*+avM01E)Jtg=)-vViQKax!GeDc!xv$^mL z{#OVBA$U{(Zr8~Xm|cP@odkHC*1R8z6hcLY#N@3E-A8XEvpt066+3t9L_6Zg6j@9Q zj$$%~yO-OS6PUVrM2s)(T4#6=JpI_@Uz+!6=GdyVU?`!F=d;8#ZB@(5g7$A0(`eqY z8_i@3w$0*es5mrSjhW*qzrl!_LQWs4?VfLmo1Sd@Ztt53+etwzAT^8ow_*7Jp`Y|l z*UgSEwvxq+FYO!O*aLf-PinZYne7Ib6ny3u>MjQz=((r3NTEeU4=-i0LBq3H-VJH< z^>1RE3_JwrclUn9vb7HcGUaFRA0QHcnE;6)hnkp%lY1UII#WPAv?-;c?YH}LWB8Nl z{sx-@Z;QxWh9fX8SxLZk8;kMFlGD3Jc^QZVL4nO)1I$zQwvwM&_!kW+LMf&lApv#< zur|EyC|U@5OQuph$TC_ZU`{!vJp`13e9alaR0Dbn5ikLFH7>eIz4QbV|C=%7)F=qo z_>M&5N)d)7G(A%c>}UCrW!Ql_6_A{?R7&CL`;!KOb3 z8Z=$YkV-IF;c7zs{3-WDEFJzuakFbd*4LWd<_kBE8~BFcv}js_2OowRNzWCtCQ6&k z{&~Me92$m*@e0ANcWKuz)?YjB*VoSTx??-3Cc0l2U!X^;Bv@m87eKHukAljrD54R+ zE;@_w4NPe1>3`i5Qy*3^E9x#VB6?}v=~qIprrrd5|DFkg;v5ixo0IsBmik8=Y;zv2 z%Bcf%NE$a44bk^`i4VwDLTbX=q@j9;JWT9JncQ!+Y%2&HHk@1~*L8-{ZpY?(-a9J-1~<1ltr9i~D9`P{XTIFWA6IG8c4;6bFw*lzU-{+?b&%OcIoCiw00n>A1ra zFPE$y@>ebbZlf(sN_iWBzQKDV zmmaLX#zK!@ZdvCANfwV}9@2O&w)!5gSgQzHdk2Q`jG6KD7S+1R5&F)j6QTD^=hq&7 zHUW+r^da^%V(h(wonR(j?BOiC!;y=%nJvz?*aW&5E87qq;2z`EI(f zBJNNSMFF9U{sR-af5{IY&AtoGcoG)Iq-S^v{7+t0>7N(KRoPj;+2N5;9o_nxIGjJ@ z7bYQK)bX)vEhy~VL%N6g^NE@D5VtV+Q8U2%{ji_=6+i^G%xeskEhH>Sqr194PJ$fB zu1y^){?9Vkg(FY2h)3ZHrw0Z<@;(gd_dtF#6y_;Iwi{yX$?asr?0N0_B*CifEi7<6 zq`?OdQjCYbhVcg+7MSgIM|pJRu~`g?g3x?Tl+V}#$It`iD1j+!x+!;wS0+2e>#g?Z z*EA^k7W{jO1r^K~cD#5pamp+o@8&yw6;%b|uiT?{Wa=4+9<}aXWUuL#ZwN1a;lQod zW{pxWCYGXdEq9qAmvAB904}?97=re$>!I%wxPV#|f#@A*Y=qa%zHlDv^yWbR03%V0 zprLP+b(#fBqxI%FiF*-n8HtH6$8f(P6!H3V^ysgd8de-N(@|K!A< z^qP}jp(RaM9kQ(^K(U8O84?D)aU(g?1S8iWwe)gqpHCaFlJxb*ilr{KTnu4_@5{K- z)n=CCeCrPHO0WHz)dDtkbZfUfVBd?53}K>C5*-wC4hpDN8cGk3lu-ypq+EYpb_2H; z%vP4@&+c2p;thaTs$dc^1CDGlPG@A;yGR5@$UEqk6p58qpw#7lc<+W(WR;(vr(D>W z#(K$vE#uBkT=*q&uaZwzz=P5mjiee6>!lV?c}QIX%ZdkO1dHg>Fa#xcGT6~}1*2m9 zkc7l3ItD6Ie~o_aFjI$Ri=C!8uF4!Ky7iG9QTrxVbsQroi|r)SAon#*B*{}TB-?=@ z8~jJs;_R2iDd!$+n$%X6FO&PYS{YhDAS+U2o4su9x~1+U3z7YN5o0qUK&|g^klZ6X zj_vrM5SUTnz5`*}Hyts9ADwLu#x_L=nv$Z0`HqN`Zo=V>OQI)fh01n~*a%01%cx%0 z4LTFVjmW+ipVQv5rYcn3;d2o4qunWUY!p+?s~X~(ost@WR@r@EuDOSs8*MT4fiP>! zkfo^!PWJJ1MHgKS2D_hc?Bs?isSDO61>ebl$U*9*QY(b=i&rp3@3GV@z>KzcZOxip z^dzA~44;R~cnhWz7s$$v?_8y-k!DZys}Q?4IkSyR!)C0j$(Gm|t#e3|QAOFaV2}36 z?dPNY;@I=FaCwylc_;~kXlZsk$_eLkNb~TIl8QQ`mmH&$*zwwR8zHU*sId)rxHu*K z;yZWa8UmCwju%aSNLwD5fBl^b0Ux1%q8YR*uG`53Mi<`5uA^Dc6Ync)J3N7;zQ*75)hf%a@{$H+%S?SGT)ks60)?6j$ zspl|4Ad6@%-r1t*$tT(en!gIXTUDcsj?28ZEzz)dH)SV3bZ+pjMaW0oc~rOPZP@g! zb9E+ndeVO_Ib9c_>{)`01^`ZS198 z)(t=+{Azi11$eu%aU7jbwuQrO`vLOixuh~%4z@mKr_Oc;F%Uq01fA)^W&y+g16e?rkLhTxV!EqC%2}sx_1u7IBq|}Be&7WI z4I<;1-9tJsI&pQIhj>FPkQV9{(m!wYYV@i5h?A0#BN2wqlEwNDIq06|^2oYVa7<~h zI_OLan0Do*4R5P=a3H9`s5*>xU}_PSztg`+2mv)|3nIy=5#Z$%+@tZnr> zLcTI!Mxa`PY7%{;KW~!=;*t)R_sl<^b>eNO@w#fEt(tPMg_jpJpW$q_DoUlkY|uo> z0-1{ouA#;t%spf*7VjkK&$QrvwUERKt^Sdo)5@?qAP)>}Y!h4(JQ!7{wIdkA+|)bv z&8hBwoX4v|+fie}iTslaBX^i*TjwO}f{V)8*!dMmRPi%XAWc8<_IqK1jUsApk)+~R zNFTCD-h>M5Y{qTQ&0#j@I@tmXGj%rzhTW5%Bkh&sSc=$Fv;M@1y!zvYG5P2(2|(&W zlcbR1{--rJ&s!rB{G-sX5^PaM@3EqWVz_y9cwLR9xMig&9gq(voeI)W&{d6j1jh&< zARXi&APWE1FQWh7eoZjuP z;vdgX>zep^{{2%hem;e*gDJhK1Hj12nBLIJoL<=0+8SVEBx7!4Ea+hBY;A1gBwvY<)tj~T=H`^?3>zeWWm|LAwo*S4Z%bDVUe z6r)CH1H!(>OH#MXFJ2V(U(qxD{4Px2`8qfFLG+=a;B^~Te_Z!r3RO%Oc#ZAHKQxV5 zRYXxZ9T2A%NVJIu5Pu7!Mj>t%YDO$T@M=RR(~mi%sv(YXVl`yMLD;+WZ{vG9(@P#e zMo}ZiK^7^h6TV%cG+;jhJ0s>h&VERs=tuZz^Tlu~%d{ZHtq6hX$V9h)Bw|jVCMudd zwZ5l7In8NT)qEPGF$VSKg&fb0%R2RnUnqa){)V(X(s0U zkCdVZe6wy{+_WhZh3qLp245Y2RR$@g-!9PjJ&4~0cFSHMUn=>dapv)hy}|y91ZWTV zCh=z*!S3_?`$&-eZ6xIXUq8RGl9oK0BJw*TdU6A`LJqX9eS3X@F)g$jLkBWFscPhR zpCv8#KeAc^y>>Y$k^=r|K(DTC}T$0#jQBOwB#@`P6~*IuW_8JxCG}J4va{ zsZzt}tt+cv7=l&CEuVtjD6G2~_Meh%p4RGuY?hSt?(sreO_F}8r7Kp$qQdvCdZnDQ zxzc*qchE*E2=WK)^oRNa>Ttj`fpvF-JZ5tu5>X1xw)J@1!IqWjq)ESBG?J|ez`-Tc zi5a}GZx|w-h%5lNDE_3ho0hEXMoaofo#Z;$8|2;EDF&*L+e$u}K=u?pb;dv$SXeQM zD-~7P0i_`Wk$#YP$=hw3UVU+=^@Kuy$>6?~gIXx636jh{PHly_a2xNYe1l60`|y!7 z(u%;ILuW0DDJ)2%y`Zc~hOALnj1~txJtcdD#o4BCT68+8gZe`=^te6H_egxY#nZH&P*)hgYaoJ^qtmpeea`35Fw)cy!w@c#v6E29co8&D9CTCl%^GV|X;SpneSXzV~LXyRn-@K0Df z{tK-nDWA!q38M1~`xUIt_(MO^R(yNY#9@es9RQbY@Ia*xHhD&=k^T+ zJi@j2I|WcgW=PuAc>hs`(&CvgjL2a9Rx zCbZyUpi8NWUOi@S%t+Su4|r&UoU|ze9SVe7p@f1GBkrjkkq)T}X%Qo1g!SQ{O{P?m z-OfGyyWta+UCXH+-+(D^%kw#A1-U;?9129at7MeCCzC{DNgO zeSqsV>W^NIfTO~4({c}KUiuoH8A*J!Cb0*sp*w-Bg@YfBIPZFH!M}C=S=S7PLLcIG zs7K77g~W)~^|+mx9onzMm0qh(f~OsDTzVmRtz=aZTllgR zGUn~_5hw_k&rll<4G=G+`^Xlnw;jNYDJz@bE?|r866F2hA9v0-8=JO3g}IHB#b`hy zA42a0>{0L7CcabSD+F7?pGbS1KMvT{@1_@k!_+Ki|5~EMGt7T%u=79F)8xEiL5!EJ zzuxQ`NBliCoJMJdwu|);zRCD<5Sf?Y>U$trQ-;xj6!s5&w=9E7)%pZ+1Nh&8nCCwM zv5>Ket%I?cxr3vVva`YeR?dGxbG@pi{H#8@kFEf0Jq6~K4>kt26*bxv=P&jyE#e$| zDJB_~imk^-z|o!2njF2hL*|7sHCnzluhJjwLQGDmC)Y9 zr9ZN`s)uCd^XDvn)VirMgW~qfn1~SaN^7vcX#K1G`==UGaDVVx$0BQnubhX|{e z^i0}>k-;BP#Szk{cFjO{2x~LjK{^Upqd&<+03_iMLp0$!6_$@TbX>8U-f*-w-ew1?`CtD_0y_Lo|PfKi52p?`5$Jzx0E8`M0 zNIb?#!K$mM4X%`Ry_yhG5k@*+n4||2!~*+&pYLh~{`~o(W|o64^NrjP?-1Lgu?iK^ zTX6u3?#$?R?N!{599vg>G8RGHw)Hx&=|g4599y}mXNpM{EPKKXB&+m?==R3GsIq?G zL5fH={=zawB(sMlDBJ+{dgb)Vx3pu>L=mDV0{r1Qs{0Pn%TpopH{m(By4;{FBvi{I z$}x!Iw~MJOL~&)p93SDIfP3x%ROjg}X{Sme#hiJ&Yk&a;iR}V|n%PriZBY8SX2*;6 z4hdb^&h;Xz%)BDACY5AUsV!($lib4>11UmcgXKWpzRL8r2Srl*9Y(1uBQsY&hO&uv znDNff0tpHlLISam?o(lOp#CmFdH<6HmA0{UwfU#Y{8M+7od8b8|B|7ZYR9f<#+V|ZSaCQvI$~es~g(Pv{2&m_rKSB2QQ zMvT}$?Ll>V+!9Xh5^iy3?UG;dF-zh~RL#++roOCsW^cZ&({6q|?Jt6`?S8=16Y{oH zp50I7r1AC1(#{b`Aq5cw>ypNggHKM9vBx!W$eYIzD!4KbLsZGr2o8>g<@inmS3*>J zx8oG((8f!ei|M@JZB`p7+n<Q}?>h249<`7xJ?u}_n;Gq(&km#1ULN87CeTO~FY zS_Ty}0TgQhV zOh3T7{{x&LSYGQfKR1PDIkP!WnfC1$l+fs@Di+d4O=eVKeF~2fq#1<8hEvpwuqcaH z4A8u~r^gnY3u6}zj*RHjk{AHhrrDqaj?|6GaVJbV%o-nATw}ASFr!f`Oz|u_QPkR# z0mDudY1dZRlk@TyQ?%Eti=$_WNFtLpSx9=S^be{wXINp%MU?a`F66LNU<c;0&ngifmP9i;bj6&hdGMW^Kf8e6ZDXbQD&$QAAMo;OQ)G zW(qlHh;}!ZP)JKEjm$VZjTs@hk&4{?@+NADuYrr!R^cJzU{kGc1yB?;7mIyAWwhbeA_l_lw-iDVi7wcFurf5 z#Uw)A@a9fOf{D}AWE%<`s1L_AwpZ?F!Vac$LYkp<#A!!`XKaDC{A%)~K#5z6>Hv@V zBEqF(D5?@6r3Pwj$^krpPDCjB+UOszqUS;b2n>&iAFcw<*im2(b3|5u6SK!n9Sg4I z0KLcwA6{Mq?p%t>aW0W!PQ>iUeYvNjdKYqII!CE7SsS&Rj)eIw-K4jtI?II+0IdGq z2WT|L3RL?;GtGgt1LWfI4Ka`9dbZXc$TMJ~8#Juv@K^1RJN@yzdLS8$AJ(>g!U9`# zx}qr7JWlU+&m)VG*Se;rGisutS%!6yybi%B`bv|9rjS(xOUIvbNz5qtvC$_JYY+c& za*3*2$RUH8p%pSq>48xR)4qsp!Q7BEiJ*`^>^6INRbC@>+2q9?x(h0bpc>GaNFi$K zPH$6!#(~{8@0QZk=)QnM#I=bDx5vTvjm$f4K}%*s+((H2>tUTf==$wqyoI`oxI7>C z&>5fe)Yg)SmT)eA(|j@JYR1M%KixxC-Eceknf-;N=jJTwKvk#@|J^&5H0c+%KxHUI z6dQbwwVx3p?X<_VRVb2fStH?HH zFR@Mp=qX%#L3XL)+$PXKV|o|#DpHAoqvj6uQKe@M-mnhCSou7Dj4YuO6^*V`m)1lf z;)@e%1!Qg$10w8uEmz{ENb$^%u}B;J7sDd zump}onoD#!l=agcBR)iG!3AF0-63%@`K9G(CzKrm$VJ{v7^O9Ps7Zej|3m= zVXlR&yW6=Y%mD30G@|tf=yC7-#L!16Q=dq&@beWgaIL40k0n% z)QHrp2Jck#evLMM1RGt3WvQ936ZC9vEje0nFMfvmOHVI+&okB_K|l-;|4vW;qk>n~ z+|kk8#`K?x`q>`(f6A${wfw9Cx(^)~tX7<#TpxR#zYG2P+FY~mG{tnEkv~d6oUQA+ z&hNTL=~Y@rF`v-RZlts$nb$3(OL1&@Y11hhL9+zUb6)SP!;CD)^GUtUpCHBE`j1te zAGud@miCVFLk$fjsrcpjsadP__yj9iEZUW{Ll7PPi<$R;m1o!&Xdl~R_v0;oDX2z^!&8}zNGA}iYG|k zmehMd1%?R)u6R#<)B)1oe9TgYH5-CqUT8N7K-A-dm3hbm_W21p%8)H{O)xUlBVb+iUR}-v5dFaCyfSd zC6Bd7=N4A@+Bna=!-l|*_(nWGDpoyU>nH=}IOrLfS+-d40&(Wo*dDB9nQiA2Tse$R z;uq{`X7LLzP)%Y9aHa4YQ%H?htkWd3Owv&UYbr5NUDAH^<l@Z0Cx%`N+B*i!!1u>D8%;Qt1$ zE5O0{-`9gdDxZ!`0m}ywH!;c{oBfL-(BH<&SQ~smbcobU!j49O^f4&IIYh~f+hK*M zZwTp%{ZSAhMFj1qFaOA+3)p^gnXH^=)`NTYgTu!CLpEV2NF=~-`(}7p^Eof=@VUbd z_9U|8qF7Rueg&$qpSSkN%%%DpbV?8E8ivu@ensI0toJ7Eas^jyFReQ1JeY9plb^{m z&eQO)qPLZQ6O;FTr*aJq=$cMN)QlQO@G&%z?BKUs1&I^`lq>=QLODwa`(mFGC`0H< zOlc*|N?B5&!U6BuJvkL?s1&nsi$*5cCv7^j_*l&$-sBmRS85UIrE--7eD8Gr3^+o? zqG-Yl4S&E;>H>k^a0GdUI(|n1`ws@)1%sq2XBdK`mqrNq_b4N{#VpouCXLzNvjoFv zo9wMQ6l0+FT+?%N(ka*;%m~(?338bu32v26!{r)|w8J`EL|t$}TA4q_FJRX5 zCPa{hc_I(7TGE#@rO-(!$1H3N-C0{R$J=yPCXCtGk{4>=*B56JdXU9cQVwB`6~cQZ zf^qK21x_d>X%dT!!)CJQ3mlHA@ z{Prkgfs6=Tz%63$6Zr8CO0Ak3A)Cv#@BVKr&aiKG7RYxY$Yx>Bj#3gJk*~Ps-jc1l z;4nltQwwT4@Z)}Pb!3xM?+EW0qEKA)sqzw~!C6wd^{03-9aGf3Jmt=}w-*!yXupLf z;)>-7uvWN4Unn8b4kfIza-X=x*e4n5pU`HtgpFFd))s$C@#d>aUl3helLom+RYb&g zI7A9GXLRZPl}iQS*d$Azxg-VgcUr*lpLnbPKUV{QI|bsG{8bLG<%CF( zMoS4pRDtLVYOWG^@ox^h8xL~afW_9DcE#^1eEC1SVSb1BfDi^@g?#f6e%v~Aw>@w- zIY0k+2lGWNV|aA*e#`U3=+oBDmGeInfcL)>*!w|*;mWiKNG6wP6AW4-4imN!W)!hE zA02~S1*@Q`fD*+qX@f3!2yJX&6FsEfPditB%TWo3=HA;T3o2IrjS@9SSxv%{{7&4_ zdS#r4OU41~GYMiib#z#O;zohNbhJknrPPZS6sN$%HB=jUnlCO_w5Gw5EeE@KV>soy z2EZ?Y|4RQDDjt5y!WBlZ(8M)|HP<0YyG|D%RqD+K#e7-##o3IZxS^wQ5{Kbzb6h(i z#(wZ|^ei>8`%ta*!2tJzwMv+IFHLF`zTU8E^Mu!R*45_=ccqI};Zbyxw@U%a#2}%f zF>q?SrUa_a4H9l+uW8JHh2Oob>NyUwG=QH~-^ZebU*R@67DcXdz2{HVB4#@edz?B< z5!rQH3O0>A&ylROO%G^fimV*LX7>!%re{_Sm6N>S{+GW1LCnGImHRoF@csnFzn@P0 zM=jld0z%oz;j=>c7mMwzq$B^2mae7NiG}%>(wtmsDXkWk{?BeMpTrIt3Mizq?vRsf zi_WjNp+61uV(%gEU-Vf0;>~vcDhe(dzWdaf#4mH3o^v{0EWhj?E?$5v02sV@xL0l4 zX0_IMFtQ44PfWBbPYN#}qxa%=J%dlR{O!KyZvk^g5s?sTNycWYPJ^FK(nl3k?z-5t z39#hKrdO7V(@!TU)LAPY&ngnZ1MzLEeEiZznn7e-jLCy8LO zu^7_#z*%I-BjS#Pg-;zKWWqX-+Ly$T!4`vTe5ZOV0j?TJVA*2?*=82^GVlZIuH%9s zXiV&(T(QGHHah=s&7e|6y?g+XxZGmK55`wGV>@1U)Th&=JTgJq>4mI&Av2C z)w+kRoj_dA!;SfTfkgMPO>7Dw6&1*Hi1q?54Yng`JO&q->^CX21^PrU^JU#CJ_qhV zSG>afB%>2fx<~g8p=P8Yzxqc}s@>>{g7}F!;lCXvF#RV)^fyYb_)iKVCz1xEq=fJ| z0a7DMCK*FuP=NM*5h;*D`R4y$6cpW-E&-i{v`x=Jbk_xSn@2T3q!3HoAOB`@5Vg6) z{PW|@9o!e;v1jZ2{=Uw6S6o{g82x6g=k!)cFSC*oemHaVjg?VpEmtUuD2_J^A~$4* z3O7HsbA6wxw{TP5Kk)(Vm?gKo+_}11vbo{Tp_5x79P~#F)ahQXT)tSH5;;14?s)On zel1J>1x>+7;g1Iz2FRpnYz;sD0wG9Q!vuzE9yKi3@4a9Nh1!GGN?hA)!mZEnnHh&i zf?#ZEN2sFbf~kV;>K3UNj1&vFhc^sxgj8FCL4v>EOYL?2uuT`0eDH}R zmtUJMxVrV5H{L53hu3#qaWLUa#5zY?f5ozIn|PkMWNP%n zWB5!B0LZB0kLw$k39=!akkE9Q>F4j+q434jB4VmslQ;$ zKiO#FZ`p|dKS716jpcvR{QJkSNfDVhr2%~eHrW;fU45>>snr*S8Vik-5eN5k*c2Mp zyxvX&_cFbB6lODXznHHT|rsURe2!swomtrqc~w5 zymTM8!w`1{04CBprR!_F{5LB+2_SOuZN{b*!J~1ZiPpP-M;);!ce!rOPDLtgR@Ie1 zPreuqm4!H)hYePcW1WZ0Fyaqe%l}F~Orr)~+;mkS&pOhP5Ebb`cnUt!X_QhP4_4p( z8YKQCDKGIy>?WIFm3-}Br2-N`T&FOi?t)$hjphB9wOhBXU#Hb+zm&We_-O)s(wc`2 z8?VsvU;J>Ju7n}uUb3s1yPx_F*|FlAi=Ge=-kN?1;`~6szP%$3B0|8Sqp%ebM)F8v zADFrbeT0cgE>M0DMV@_Ze*GHM>q}wWMzt|GYC%}r{OXRG3Ij&<+nx9;4jE${Fj_r* z`{z1AW_6Myd)i6e0E-h&m{{CvzH=Xg!&(bLYgRMO_YVd8JU7W+7MuGWNE=4@OvP9+ zxi^vqS@5%+#gf*Z@RVyU9N1sO-(rY$24LGsg1>w>s6ST^@)|D9>cT50maXLUD{Fzf zt~tp{OSTEKg3ZSQyQQ5r51){%=?xlZ54*t1;Ow)zLe3i?8tD8YyY^k%M)e`V*r+vL zPqUf&m)U+zxps+NprxMHF{QSxv}>lE{JZETNk1&F+R~bp{_T$dbXL2UGnB|hgh*p4h$clt#6;NO~>zuyY@C-MD@)JCc5XrYOt`wW7! z_ti2hhZBMJNbn0O-uTxl_b6Hm313^fG@e;RrhIUK9@# z+DHGv_Ow$%S8D%RB}`doJjJy*aOa5mGHVHz0e0>>O_%+^56?IkA5eN+L1BVCp4~m=1eeL zb;#G!#^5G%6Mw}r1KnaKsLvJB%HZL)!3OxT{k$Yo-XrJ?|7{s4!H+S2o?N|^Z z)+?IE9H7h~Vxn5hTis^3wHYuOU84+bWd)cUKuHapq=&}WV#OxHpLab`NpwHm8LmOo zjri+!k;7j_?FP##CpM+pOVx*0wExEex z@`#)K<-ZrGyArK;a%Km`^+We|eT+#MygHOT6lXBmz`8|lyZOwL1+b+?Z$0OhMEp3R z&J=iRERpv~TC=p2-BYLC*?4 zxvPs9V@g=JT0>zky5Poj=fW_M!c)Xxz1<=&_ZcL=LMZJqlnO1P^xwGGW*Z+yTBvbV z-IFe6;(k1@$1;tS>{%pXZ_7w+i?N4A2=TXnGf=YhePg8bH8M|Lk-->+w8Y+FjZ;L=wSGwxfA`gqSn)f(XNuSm>6Y z@|#e-)I(PQ^G@N`%|_DZSb4_pkaEF0!-nqY+t#pyA>{9^*I-zw4SYA1_z2Bs$XGUZbGA;VeMo%CezHK0lO={L%G)dI-+8w?r9iexdoB{?l zbJ}C?huIhWXBVs7oo{!$lOTlvCLZ_KN1N+XJGuG$rh<^eUQIqcI7^pmqhBSaOKNRq zrx~w^?9C?*&rNwP_SPYmo;J-#!G|{`$JZK7DxsM3N^8iR4vvn>E4MU&Oe1DKJvLc~ zCT>KLZ1;t@My zRj_2hI^61T&LIz)S!+AQIV23n1>ng+LUvzv;xu!4;wpqb#EZz;F)BLUzT;8UA1x*6vJ zicB!3Mj03s*kGV{g`fpC?V^s(=JG-k1EMHbkdP4P*1^8p_TqO|;!Zr%GuP$8KLxuf z=pv*H;kzd;P|2`JmBt~h6|GxdU~@weK5O=X&5~w$HpfO}@l-T7@vTCxVOwCkoPQv8 z@aV_)I5HQtfs7^X=C03zYmH4m0S!V@JINm6#(JmZRHBD?T!m^DdiZJrhKpBcur2u1 zf9e4%k$$vcFopK5!CC`;ww(CKL~}mlxK_Pv!cOsFgVkNIghA2Au@)t6;Y3*2gK=5d z?|@1a)-(sQ%uFOmJ7v2iG&l&m^u&^6DJM#XzCrF%r>{2XKyxLD2rgWBD;i(!e4InDQBDg==^z;AzT2z~OmV0!?Z z0S9pX$+E;w3WN;v&NYT=+G8hf=6w0E1$0AOr61}eOvE8W1jX%>&Mjo7&!ulawgzLH zbcb+IF(s^3aj12WSi#pzIpijJJzkP?JzRawnxmNDSUR#7!29vHULCE<3Aa#be}ie~d|!V+ z%l~s9Odo$G&fH!t!+`rUT0T9DulF!Yq&BfQWFZV1L9D($r4H(}Gnf6k3^wa7g5|Ws zj7%d`!3(0bb55yhC6@Q{?H|2os{_F%o=;-h{@Yyyn*V7?{s%Grvpe!H^kl6tF4Zf5 z{Jv1~yZ*iIWL_9C*8pBMQArfJJ0d9Df6Kl#wa}7Xa#Ef_5B7=X}DzbQXVPfCwTO@9+@;A^Ti6il_C>g?A-GFwA0#U;t4;wOm-4oS})h z5&on>NAu67O?YCQr%7XIzY%LS4bha9*e*4bU4{lGCUmO2UQ2U)QOqClLo61Kx~3dI zmV3*(P6F_Tr-oP%x!0kTnnT?Ep5j;_IQ^pTRp=e8dmJtI4YgWd0}+b2=ATkOhgpXe z;jmw+FBLE}UIs4!&HflFr4)vMFOJ19W4f2^W(=2)F%TAL)+=F>IE$=e=@j-*bFLSg z)wf|uFQu+!=N-UzSef62u0-C8Zc7 zo6@F)c+nZA{H|+~7i$DCU0pL{0Ye|fKLuV^w!0Y^tT$isu%i1Iw&N|tX3kwFKJN(M zXS`k9js66o$r)x?TWL}Kxl`wUDUpwFx(w4Yk%49;$sgVvT~n8AgfG~HUcDt1TRo^s zdla@6heJB@JV z!vK;BUMznhzGK6PVtj0)GB=zTv6)Q9Yt@l#fv7>wKovLobMV-+(8)NJmyF8R zcB|_K7=FJGGn^X@JdFaat0uhKjp3>k#^&xE_}6NYNG?kgTp>2Iu?ElUjt4~E-?`Du z?mDCS9wbuS%fU?5BU@Ijx>1HG*N?gIP+<~xE4u=>H`8o((cS5M6@_OK%jSjFHirQK zN9@~NXFx*jS{<|bgSpC|SAnA@I)+GB=2W|JJChLI_mx+-J(mSJ!b)uUom6nH0#2^(L@JBlV#t zLl?j54s`Y3vE^c_3^Hl0TGu*tw_n?@HyO@ZrENxA+^!)OvUX28gDSF*xFtQzM$A+O zCG=n#6~r|3zt=8%GuG} z<#VCZ%2?3Q(Ad#Y7GMJ~{U3>E{5e@z6+rgZLX{Cxk^p-7dip^d29;2N1_mm4QkASo z-L`GWWPCq$uCo;X_BmGIpJFBlhl<8~EG{vOD1o|X$aB9KPhWO_cKiU*$HWEgtf=fn zsO%9bp~D2c@?*K9jVN@_vhR03>M_8h!_~%aN!Cnr?s-!;U3SVfmhRwk11A^8Ns`@KeE}+ zN$H}a1U6E;*j5&~Og!xHdfK5M<~xka)x-0N)K_&e7AjMz`toDzasH+^1bZlC!n()crk9kg@$(Y{wdKvbuUd04N^8}t1iOgsKF zGa%%XWx@WoVaNC1!|&{5ZbkopFre-Lu(LCE5HWZBoE#W@er9W<>R=^oYxBvypN#x3 zq#LC8&q)GFP=5^-bpHj?LW=)-g+3_)Ylps!3^YQ{9~O9&K)xgy zMkCWaApU-MI~e^cV{Je75Qr7eF%&_H)BvfyKL=gIA>;OSq(y z052BFz3E(Prg~09>|_Z@!qj}@;8yxnw+#Ej0?Rk<y}4ghbD569B{9hSFr*^ygZ zr6j7P#gtZh6tMk6?4V$*Jgz+#&ug;yOr>=qdI#9U&^am2qoh4Jy}H2%a|#Fs{E(5r z%!ijh;VuGA6)W)cJZx+;9Bp1LMUzN~x_8lQ#D3+sL{be-Jyeo@@dv7XguJ&S5vrH` z>QxOMWn7N-T!D@1(@4>ZlL^y5>m#0!HKovs12GRav4z!>p(1~xok8+_{| z#Ae4{9#NLh#Vj2&JuIn5$d6t@__`o}umFo(n0QxUtd2GKCyE+erwXY?`cm*h&^9*8 zJ+8x6fRZI-e$CRygofIQN^dWysCxgkyr{(_oBwwSRxZora1(%(aC!5BTtj^+YuevI zx?)H#(xlALUp6QJ!=l9N__$cxBZ5p&7;qD3PsXRFVd<({Kh+mShFWJNpy`N@ab7?9 zv5=klvCJ4bx|-pvOO2-+G)6O?$&)ncA#Urze2rlBfp#htudhx-NeRnJ@u%^_bfw4o z4|{b8SkPV3b>Wera1W(+N@p9H>dc6{cnkh-sgr?e%(YkWvK+0YXVwk0=d`)}*47*B z5JGkEdVix!w7-<%r0JF~`ZMMPe;f0EQHuYHxya`puazyph*ZSb1mJAt^k4549BfS; zK7~T&lRb=W{s&t`DJ$B}s-eH1&&-wEOH1KWsKn0a(ZI+G!v&W4A*cl>qAvUv6pbUR z#(f#EKV8~hk&8oayBz4vaswc(?qw1vn`yC zZQDl2PCB-&Uu@g9ZQHhO+v(W0bNig{-k0;;`+wM@#@J)8r?qOYs#&vUna8ILxN7S{ zp1s41KnR8miQJtJtOr|+qk}wrLt+N*z#5o`TmD1)E&QD(Vh&pjZJ_J*0!8dy_ z>^=@v=J)C`x&gjqAYu`}t^S=DFCtc0MkBU2zf|69?xW`Ck~(6zLD)gSE{7n~6w8j_ zoH&~$ED2k5-yRa0!r8fMRy z;QjBYUaUnpd}mf%iVFPR%Dg9!d>g`01m~>2s))`W|5!kc+_&Y>wD@@C9%>-lE`WB0 zOIf%FVD^cj#2hCkFgi-fgzIfOi+ya)MZK@IZhHT5FVEaSbv-oDDs0W)pA0&^nM0TW zmgJmd7b1R7b0a`UwWJYZXp4AJPteYLH>@M|xZFKwm!t3D3&q~av?i)WvAKHE{RqpD{{%OhYkK?47}+}` zrR2(Iv9bhVa;cDzJ%6ntcSbx7v7J@Y4x&+eWSKZ*eR7_=CVIUSB$^lfYe@g+p|LD{ zPSpQmxx@b$%d!05|H}WzBT4_cq?@~dvy<7s&QWtieJ9)hd4)$SZz}#H2UTi$CkFWW|I)v_-NjuH!VypONC=1`A=rm_jfzQ8Fu~1r8i{q-+S_j$ z#u^t&Xnfi5tZtl@^!fUJhx@~Cg0*vXMK}D{>|$#T*+mj(J_@c{jXBF|rm4-8%Z2o! z2z0o(4%8KljCm^>6HDK!{jI7p+RAPcty_~GZ~R_+=+UzZ0qzOwD=;YeZt*?3%UGdr z`c|BPE;yUbnyARUl&XWSNJ<+uRt%!xPF&K;(l$^JcA_CMH6)FZt{>6ah$|(9$2fc~ z=CD00uHM{qv;{Zk9FR0~u|3|Eiqv9?z2#^GqylT5>6JNZwKqKBzzQpKU2_pmtD;CT zi%Ktau!Y2Tldfu&b0UgmF(SSBID)15*r08eoUe#bT_K-G4VecJL2Pa=6D1K6({zj6 za(2Z{r!FY5W^y{qZ}08+h9f>EKd&PN90f}Sc0ejf%kB4+f#T8Q1=Pj=~#pi$U zp#5rMR%W25>k?<$;$x72pkLibu1N|jX4cWjD3q^Pk3js!uK6h7!dlvw24crL|MZs_ zb%Y%?Fyp0bY0HkG^XyS76Ts*|Giw{31LR~+WU5NejqfPr73Rp!xQ1mLgq@mdWncLy z%8}|nzS4P&`^;zAR-&nm5f;D-%yNQPwq4N7&yULM8bkttkD)hVU>h>t47`{8?n2&4 zjEfL}UEagLUYwdx0sB2QXGeRmL?sZ%J!XM`$@ODc2!y|2#7hys=b$LrGbvvjx`Iqi z&RDDm3YBrlKhl`O@%%&rhLWZ*ABFz2nHu7k~3@e4)kO3%$=?GEFUcCF=6-1n!x^vmu+Ai*amgXH+Rknl6U>#9w;A} zn2xanZSDu`4%%x}+~FG{Wbi1jo@wqBc5(5Xl~d0KW(^Iu(U3>WB@-(&vn_PJt9{1`e9Iic@+{VPc`vP776L*viP{wYB2Iff8hB%E3|o zGMOu)tJX!`qJ}ZPzq7>=`*9TmETN7xwU;^AmFZ-ckZjV5B2T09pYliaqGFY|X#E-8 z20b>y?(r-Fn5*WZ-GsK}4WM>@TTqsxvSYWL6>18q8Q`~JO1{vLND2wg@58OaU!EvT z1|o+f1mVXz2EKAbL!Q=QWQKDZpV|jznuJ}@-)1&cdo z^&~b4Mx{*1gurlH;Vhk5g_cM&6LOHS2 zRkLfO#HabR1JD4Vc2t828dCUG#DL}f5QDSBg?o)IYYi@_xVwR2w_ntlpAW0NWk$F1 z$If?*lP&Ka1oWfl!)1c3fl`g*lMW3JOn#)R1+tfwrs`aiFUgz3;XIJ>{QFxLCkK30 zNS-)#DON3yb!7LBHQJ$)4y%TN82DC2-9tOIqzhZ27@WY^<6}vXCWcR5iN{LN8{0u9 zNXayqD=G|e?O^*ms*4P?G%o@J1tN9_76e}E#66mr89%W_&w4n66~R;X_vWD(oArwj z4CpY`)_mH2FvDuxgT+akffhX0b_slJJ*?Jn3O3~moqu2Fs1oL*>7m=oVek2bnprnW zixkaIFU%+3XhNA@@9hyhFwqsH2bM|`P?G>i<-gy>NflhrN{$9?LZ1ynSE_Mj0rADF zhOz4FnK}wpLmQuV zgO4_Oz9GBu_NN>cPLA=`SP^$gxAnj;WjJnBi%Q1zg`*^cG;Q)#3Gv@c^j6L{arv>- zAW%8WrSAVY1sj$=umcAf#ZgC8UGZGoamK}hR7j6}i8#np8ruUlvgQ$j+AQglFsQQq zOjyHf22pxh9+h#n$21&$h?2uq0>C9P?P=Juw0|;oE~c$H{#RGfa>| zj)Iv&uOnaf@foiBJ}_;zyPHcZt1U~nOcNB{)og8Btv+;f@PIT*xz$x!G?u0Di$lo7 zOugtQ$Wx|C($fyJTZE1JvR~i7LP{ zbdIwqYghQAJi9p}V&$=*2Azev$6K@pyblphgpv8^9bN!?V}{BkC!o#bl&AP!3DAjM zmWFsvn2fKWCfjcAQmE+=c3Y7j@#7|{;;0f~PIodmq*;W9Fiak|gil6$w3%b_Pr6K_ zJEG@&!J%DgBZJDCMn^7mk`JV0&l07Bt`1ymM|;a)MOWz*bh2#d{i?SDe9IcHs7 zjCrnyQ*Y5GzIt}>`bD91o#~5H?4_nckAgotN{2%!?wsSl|LVmJht$uhGa+HiH>;av z8c?mcMYM7;mvWr6noUR{)gE!=i7cZUY7e;HXa221KkRoc2UB>s$Y(k%NzTSEr>W(u z<(4mcc)4rB_&bPzX*1?*ra%VF}P1nwiP5cykJ&W{!OTlz&Td0pOkVp+wc z@k=-Hg=()hNg=Q!Ub%`BONH{ z_=ZFgetj@)NvppAK2>8r!KAgi>#%*7;O-o9MOOfQjV-n@BX6;Xw;I`%HBkk20v`qoVd0)}L6_49y1IhR z_OS}+eto}OPVRn*?UHC{eGyFU7JkPz!+gX4P>?h3QOwGS63fv4D1*no^6PveUeE5% zlehjv_3_^j^C({a2&RSoVlOn71D8WwMu9@Nb@=E_>1R*ve3`#TF(NA0?d9IR_tm=P zOP-x;gS*vtyE1Cm zG0L?2nRUFj#aLr-R1fX*$sXhad)~xdA*=hF3zPZhha<2O$Ps+F07w*3#MTe?)T8|A!P!v+a|ot{|^$q(TX`35O{WI0RbU zCj?hgOv=Z)xV?F`@HKI11IKtT^ocP78cqHU!YS@cHI@{fPD?YXL)?sD~9thOAv4JM|K8OlQhPXgnevF=F7GKD2#sZW*d za}ma31wLm81IZxX(W#A9mBvLZr|PoLnP>S4BhpK8{YV_}C|p<)4#yO{#ISbco92^3 zv&kCE(q9Wi;9%7>>PQ!zSkM%qqqLZW7O`VXvcj;WcJ`2~v?ZTYB@$Q&^CTfvy?1r^ z;Cdi+PTtmQwHX_7Kz?r#1>D zS5lWU(Mw_$B&`ZPmqxpIvK<~fbXq?x20k1~9az-Q!uR78mCgRj*eQ>zh3c$W}>^+w^dIr-u{@s30J=)1zF8?Wn|H`GS<=>Om|DjzC{}Jt?{!fSJe*@$H zg>wFnlT)k#T?LslW zu$^7Uy~$SQ21cE?3Ijl+bLfuH^U5P^$@~*UY#|_`uvAIe(+wD2eF}z_y!pvomuVO; zS^9fbdv)pcm-B@CW|Upm<7s|0+$@@<&*>$a{aW+oJ%f+VMO<#wa)7n|JL5egEgoBv zl$BY(NQjE0#*nv=!kMnp&{2Le#30b)Ql2e!VkPLK*+{jv77H7)xG7&=aPHL7LK9ER z5lfHxBI5O{-3S?GU4X6$yVk>lFn;ApnwZybdC-GAvaznGW-lScIls-P?Km2mF>%B2 zkcrXTk+__hj-3f48U%|jX9*|Ps41U_cd>2QW81Lz9}%`mTDIhE)jYI$q$ma7Y-`>% z8=u+Oftgcj%~TU}3nP8&h7k+}$D-CCgS~wtWvM|UU77r^pUw3YCV80Ou*+bH0!mf0 zxzUq4ed6y>oYFz7+l18PGGzhB^pqSt)si=9M>~0(Bx9*5r~W7sa#w+_1TSj3Jn9mW zMuG9BxN=}4645Cpa#SVKjFst;9UUY@O<|wpnZk$kE+to^4!?0@?Cwr3(>!NjYbu?x z1!U-?0_O?k!NdM^-rIQ8p)%?M+2xkhltt*|l=%z2WFJhme7*2xD~@zk#`dQR$6Lmd zb3LOD4fdt$Cq>?1<%&Y^wTWX=eHQ49Xl_lFUA(YQYHGHhd}@!VpYHHm=(1-O=yfK#kKe|2Xc*9}?BDFN zD7FJM-AjVi)T~OG)hpSWqH>vlb41V#^G2B_EvYlWhDB{Z;Q9-0)ja(O+By`31=biA zG&Fs#5!%_mHi|E4Nm$;vVQ!*>=_F;ZC=1DTPB#CICS5fL2T3XmzyHu?bI;m7D4@#; ztr~;dGYwb?m^VebuULtS4lkC_7>KCS)F@)0OdxZIFZp@FM_pHnJes8YOvwB|++#G( z&dm*OP^cz95Wi15vh`Q+yB>R{8zqEhz5of>Po$9LNE{xS<)lg2*roP*sQ}3r3t<}; zPbDl{lk{pox~2(XY5=qg0z!W-x^PJ`VVtz$git7?)!h>`91&&hESZy1KCJ2nS^yMH z!=Q$eTyRi68rKxdDsdt+%J_&lapa{ds^HV9Ngp^YDvtq&-Xp}60B_w@Ma>_1TTC;^ zpbe!#gH}#fFLkNo#|`jcn?5LeUYto%==XBk6Ik0kc4$6Z+L3x^4=M6OI1=z5u#M%0 z0E`kevJEpJjvvN>+g`?gtnbo$@p4VumliZV3Z%CfXXB&wPS^5C+7of2tyVkMwNWBiTE2 z8CdPu3i{*vR-I(NY5syRR}I1TJOV@DJy-Xmvxn^IInF>Tx2e)eE9jVSz69$6T`M9-&om!T+I znia!ZWJRB28o_srWlAxtz4VVft8)cYloIoVF=pL zugnk@vFLXQ_^7;%hn9x;Vq?lzg7%CQR^c#S)Oc-8d=q_!2ZVH764V z!wDKSgP}BrVV6SfCLZnYe-7f;igDs9t+K*rbMAKsp9L$Kh<6Z;e7;xxced zn=FGY<}CUz31a2G}$Q(`_r~75PzM4l_({Hg&b@d8&jC}B?2<+ed`f#qMEWi z`gm!STV9E4sLaQX+sp5Nu9*;9g12naf5?=P9p@H@f}dxYprH+3ju)uDFt^V{G0APn zS;16Dk{*fm6&BCg#2vo?7cbkkI4R`S9SSEJ=#KBk3rl69SxnCnS#{*$!^T9UUmO#&XXKjHKBqLdt^3yVvu8yn|{ zZ#%1CP)8t-PAz(+_g?xyq;C2<9<5Yy<~C74Iw(y>uUL$+$mp(DRcCWbCKiGCZw@?_ zdomfp+C5xt;j5L@VfhF*xvZdXwA5pcdsG>G<8II-|1dhAgzS&KArcb0BD4ZZ#WfiEY{hkCq5%z9@f|!EwTm;UEjKJsUo696V>h zy##eXYX}GUu%t{Gql8vVZKkNhQeQ4C%n|RmxL4ee5$cgwlU+?V7a?(jI#&3wid+Kz5+x^G!bb#$q>QpR#BZ}Xo5UW^ zD&I`;?(a}Oys7-`I^|AkN?{XLZNa{@27Dv^s4pGowuyhHuXc zuctKG2x0{WCvg_sGN^n9myJ}&FXyGmUQnW7fR$=bj$AHR88-q$D!*8MNB{YvTTEyS zn22f@WMdvg5~o_2wkjItJN@?mDZ9UUlat2zCh(zVE=dGi$rjXF7&}*sxac^%HFD`Y zTM5D3u5x**{bW!68DL1A!s&$2XG@ytB~dX-?BF9U@XZABO`a|LM1X3HWCllgl0+uL z04S*PX$%|^WAq%jkzp~%9HyYIF{Ym?k)j3nMwPZ=hlCg9!G+t>tf0o|J2%t1 ztC+`((dUplgm3`+0JN~}&FRRJ3?l*>Y&TfjS>!ShS`*MwO{WIbAZR#<%M|4c4^dY8 z{Rh;-!qhY=dz5JthbWoovLY~jNaw>%tS4gHVlt5epV8ekXm#==Po$)}mh^u*cE>q7*kvX&gq)(AHoItMYH6^s6f(deNw%}1=7O~bTHSj1rm2|Cq+3M z93djjdomWCTCYu!3Slx2bZVy#CWDozNedIHbqa|otsUl+ut?>a;}OqPfQA05Yim_2 zs@^BjPoFHOYNc6VbNaR5QZfSMh2S*`BGwcHMM(1@w{-4jVqE8Eu0Bi%d!E*^Rj?cR z7qgxkINXZR)K^=fh{pc0DCKtrydVbVILI>@Y0!Jm>x-xM!gu%dehm?cC6ok_msDVA*J#{75%4IZt}X|tIVPReZS#aCvuHkZxc zHVMtUhT(wp09+w9j9eRqz~LtuSNi2rQx_QgQ(}jBt7NqyT&ma61ldD(s9x%@q~PQl zp6N*?=N$BtvjQ_xIT{+vhb1>{pM0Arde0!X-y))A4znDrVx8yrP3B1(7bKPE5jR@5 zwpzwT4cu~_qUG#zYMZ_!2Tkl9zP>M%cy>9Y(@&VoB84#%>amTAH{(hL4cDYt!^{8L z645F>BWO6QaFJ-{C-i|-d%j7#&7)$X7pv#%9J6da#9FB5KyDhkA+~)G0^87!^}AP>XaCSScr;kL;Z%RSPD2CgoJ;gpYT5&6NUK$86$T?jRH=w8nI9Z534O?5fk{kd z`(-t$8W|#$3>xoMfXvV^-A(Q~$8SKDE^!T;J+rQXP71XZ(kCCbP%bAQ1|%$%Ov9_a zyC`QP3uPvFoBqr_+$HenHklqyIr>PU_Fk5$2C+0eYy^~7U&(!B&&P2%7#mBUhM!z> z_B$Ko?{Pf6?)gpYs~N*y%-3!1>o-4;@1Zz9VQHh)j5U1aL-Hyu@1d?X;jtDBNk*vMXPn@ z+u@wxHN*{uHR!*g*4Xo&w;5A+=Pf9w#PeZ^x@UD?iQ&${K2c}UQgLRik-rKM#Y5rdDphdcNTF~cCX&9ViRP}`>L)QA4zNXeG)KXFzSDa6 zd^St;inY6J_i=5mcGTx4_^Ys`M3l%Q==f>{8S1LEHn{y(kbxn5g1ezt4CELqy)~TV6{;VW>O9?5^ ztcoxHRa0jQY7>wwHWcxA-BCwzsP>63Kt&3fy*n#Cha687CQurXaRQnf5wc9o8v7Rw zNwGr2fac;Wr-Ldehn7tF^(-gPJwPt@VR1f;AmKgxN&YPL;j=0^xKM{!wuU|^mh3NE zy35quf}MeL!PU;|{OW_x$TBothLylT-J>_x6p}B_jW1L>k)ps6n%7Rh z96mPkJIM0QFNYUM2H}YF5bs%@Chs6#pEnloQhEl?J-)es!(SoJpEPoMTdgA14-#mC zghayD-DJWtUu`TD8?4mR)w5E`^EHbsz2EjH5aQLYRcF{l7_Q5?CEEvzDo(zjh|BKg z3aJl_n#j&eFHsUw4~lxqnr!6NL*se)6H=A+T1e3xUJGQrd}oSPwSy5+$tt{2t5J5@(lFxl43amsARG74iyNC}uuS zd2$=(r6RdamdGx^eatX@F2D8?U23tDpR+Os?0Gq2&^dF+$9wiWf?=mDWfjo4LfRwL zI#SRV9iSz>XCSgEj!cW&9H-njJopYiYuq|2w<5R2!nZ27DyvU4UDrHpoNQZiGPkp@ z1$h4H46Zn~eqdj$pWrv;*t!rTYTfZ1_bdkZmVVIRC21YeU$iS-*XMNK`#p8Z_DJx| zk3Jssf^XP7v0X?MWFO{rACltn$^~q(M9rMYoVxG$15N;nP)A98k^m3CJx8>6}NrUd@wp-E#$Q0uUDQT5GoiK_R{ z<{`g;8s>UFLpbga#DAf%qbfi`WN1J@6IA~R!YBT}qp%V-j!ybkR{uY0X|x)gmzE0J z&)=eHPjBxJvrZSOmt|)hC+kIMI;qgOnuL3mbNR0g^<%|>9x7>{}>a2qYSZAGPt4it?8 zNcLc!Gy0>$jaU?}ZWxK78hbhzE+etM`67*-*x4DN>1_&{@5t7_c*n(qz>&K{Y?10s zXsw2&nQev#SUSd|D8w7ZD2>E<%g^; zV{yE_O}gq?Q|zL|jdqB^zcx7vo(^})QW?QKacx$yR zhG|XH|8$vDZNIfuxr-sYFR{^csEI*IM#_gd;9*C+SysUFejP0{{z7@P?1+&_o6=7V|EJLQun^XEMS)w(=@eMi5&bbH*a0f;iC~2J74V2DZIlLUHD&>mlug5+v z6xBN~8-ovZylyH&gG#ptYsNlT?-tzOh%V#Y33zlsJ{AIju`CjIgf$@gr8}JugRq^c zAVQ3;&uGaVlVw}SUSWnTkH_6DISN&k2QLMBe9YU=sA+WiX@z)FoSYX`^k@B!j;ZeC zf&**P?HQG6Rk98hZ*ozn6iS-dG}V>jQhb3?4NJB*2F?6N7Nd;EOOo;xR7acylLaLy z9)^lykX39d@8@I~iEVar4jmjjLWhR0d=EB@%I;FZM$rykBNN~jf>#WbH4U{MqhhF6 zU??@fSO~4EbU4MaeQ_UXQcFyO*Rae|VAPLYMJEU`Q_Q_%s2*>$#S^)&7er+&`9L=1 z4q4ao07Z2Vsa%(nP!kJ590YmvrWg+YrgXYs_lv&B5EcoD`%uL79WyYA$0>>qi6ov7 z%`ia~J^_l{p39EY zv>>b}Qs8vxsu&WcXEt8B#FD%L%ZpcVtY!rqVTHe;$p9rbb5O{^rFMB>auLn-^;s+-&P1#h~mf~YLg$8M9 zZ4#87;e-Y6x6QO<{McUzhy(%*6| z)`D~A(TJ$>+0H+mct(jfgL4x%^oC^T#u(bL)`E2tBI#V1kSikAWmOOYrO~#-cc_8! zCe|@1&mN2{*ceeiBldHCdrURk4>V}79_*TVP3aCyV*5n@jiNbOm+~EQ_}1#->_tI@ zqXv+jj2#8xJtW508rzFrYcJxoek@iW6SR@1%a%Bux&;>25%`j3UI`0DaUr7l79`B1 zqqUARhW1^h6=)6?;@v>xrZNM;t}{yY3P@|L}ey@gG( z9r{}WoYN(9TW&dE2dEJIXkyHA4&pU6ki=rx&l2{DLGbVmg4%3Dlfvn!GB>EVaY_%3+Df{fBiqJV>~Xf8A0aqUjgpa} zoF8YXO&^_x*Ej}nw-$-F@(ddB>%RWoPUj?p8U{t0=n>gAI83y<9Ce@Q#3&(soJ{64 z37@Vij1}5fmzAuIUnXX`EYe;!H-yTVTmhAy;y8VZeB#vD{vw9~P#DiFiKQ|kWwGFZ z=jK;JX*A;Jr{#x?n8XUOLS;C%f|zj-7vXtlf_DtP7bpurBeX%Hjwr z4lI-2TdFpzkjgiv!8Vfv`=SP+s=^i3+N~1ELNWUbH|ytVu>EyPN_3(4TM^QE1swRo zoV7Y_g)a>28+hZG0e7g%@2^s>pzR4^fzR-El}ARTmtu!zjZLuX%>#OoU3}|rFjJg} zQ2TmaygxJ#sbHVyiA5KE+yH0LREWr%^C*yR|@gM$nK2P zo}M}PV0v))uJh&33N>#aU376@ZH79u(Yw`EQ2hM3SJs9f99+cO6_pNW$j$L-CtAfe zYfM)ccwD!P%LiBk!eCD?fHCGvgMQ%Q2oT_gmf?OY=A>&PaZQOq4eT=lwbaf}33LCH zFD|)lu{K7$8n9gX#w4~URjZxWm@wlH%oL#G|I~Fb-v^0L0TWu+`B+ZG!yII)w05DU z>GO?n(TN+B=>HdxVDSlIH76pta$_LhbBg;eZ`M7OGcqt||qi zogS72W1IN%=)5JCyOHWoFP7pOFK0L*OAh=i%&VW&4^LF@R;+K)t^S!96?}^+5QBIs zjJNTCh)?)4k^H^g1&jc>gysM`y^8Rm3qsvkr$9AeWwYpa$b22=yAd1t<*{ zaowSEFP+{y?Ob}8&cwfqoy4Pb9IA~VnM3u!trIK$&&0Op#Ql4j>(EW?UNUv#*iH1$ z^j>+W{afcd`{e&`-A{g}{JnIzYib)!T56IT@YEs{4|`sMpW3c8@UCoIJv`XsAw!XC z34|Il$LpW}CIHFC5e*)}00I5{%OL*WZRGzC0?_}-9{#ue?-ug^ zLE|uv-~6xnSs_2_&CN9{9vyc!Xgtn36_g^wI0C4s0s^;8+p?|mm;Odt3`2ZjwtK;l zfd6j)*Fr#53>C6Y8(N5?$H0ma;BCF3HCjUs7rpb2Kf*x3Xcj#O8mvs#&33i+McX zQpBxD8!O{5Y8D&0*QjD=Yhl9%M0)&_vk}bmN_Ud^BPN;H=U^bn&(csl-pkA+GyY0Z zKV7sU_4n;}uR78ouo8O%g*V;79KY?3d>k6%gpcmQsKk&@Vkw9yna_3asGt`0Hmj59 z%0yiF*`jXhByBI9QsD=+>big5{)BGe&+U2gAARGe3ID)xrid~QN_{I>k}@tzL!Md_ z&=7>TWciblF@EMC3t4-WX{?!m!G6$M$1S?NzF*2KHMP3Go4=#ZHkeIv{eEd;s-yD# z_jU^Ba06TZqvV|Yd;Z_sN%$X=!T+&?#p+OQIHS%!LO`Hx0q_Y0MyGYFNoM{W;&@0@ zLM^!X4KhdtsET5G<0+|q0oqVXMW~-7LW9Bg}=E$YtNh1#1D^6Mz(V9?2g~I1( zoz9Cz=8Hw98zVLwC2AQvp@pBeKyidn6Xu0-1SY1((^Hu*-!HxFUPs)yJ+i`^BC>PC zjwd0mygOVK#d2pRC9LxqGc6;Ui>f{YW9Bvb>33bp^NcnZoH~w9(lM5@JiIlfa-6|k ziy31UoMN%fvQfhi8^T+=yrP{QEyb-jK~>$A4SZT-N56NYEbpvO&yUme&pWKs3^94D zH{oXnUTb3T@H+RgzML*lejx`WAyw*?K7B-I(VJx($2!NXYm%3`=F~TbLv3H<{>D?A zJo-FDYdSA-(Y%;4KUP2SpHKAIcv9-ld(UEJE7=TKp|Gryn;72?0LHqAN^fk6%8PCW z{g_-t)G5uCIf0I`*F0ZNl)Z>))MaLMpXgqWgj-y;R+@A+AzDjsTqw2Mo9ULKA3c70 z!7SOkMtZb+MStH>9MnvNV0G;pwSW9HgP+`tg}e{ij0H6Zt5zJ7iw`hEnvye!XbA@!~#%vIkzowCOvq5I5@$3wtc*w2R$7!$*?}vg4;eDyJ_1=ixJuEp3pUS27W?qq(P^8$_lU!mRChT}ctvZz4p!X^ zOSp|JOAi~f?UkwH#9k{0smZ7-#=lK6X3OFEMl7%)WIcHb=#ZN$L=aD`#DZKOG4p4r zwlQ~XDZ`R-RbF&hZZhu3(67kggsM-F4Y_tI^PH8PMJRcs7NS9ogF+?bZB*fcpJ z=LTM4W=N9yepVvTj&Hu~0?*vR1HgtEvf8w%Q;U0^`2@e8{SwgX5d(cQ|1(!|i$km! zvY03MK}j`sff;*-%mN~ST>xU$6Bu?*Hm%l@0dk;j@%>}jsgDcQ)Hn*UfuThz9(ww_ zasV`rSrp_^bp-0sx>i35FzJwA!d6cZ5#5#nr@GcPEjNnFHIrtUYm1^Z$;{d&{hQV9 z6EfFHaIS}46p^5I-D_EcwwzUUuO}mqRh&T7r9sfw`)G^Q%oHxEs~+XoM?8e*{-&!7 z7$m$lg9t9KP9282eke608^Q2E%H-xm|oJ8=*SyEo} z@&;TQ3K)jgspgKHyGiKVMCz>xmC=H5Fy3!=TP)-R3|&1S-B)!6q50wfLHKM@7Bq6E z44CY%G;GY>tC`~yh!qv~YdXw! zSkquvYNs6k1r7>Eza?Vkkxo6XRS$W7EzL&A`o>=$HXgBp{L(i^$}t`NcnAxzbH8Ht z2!;`bhKIh`f1hIFcI5bHI=ueKdzmB9)!z$s-BT4ItyY|NaA_+o=jO%MU5as9 zc2)aLP>N%u>wlaXTK!p)r?+~)L+0eCGb5{8WIk7K52$nufnQ+m8YF+GQc&{^(zh-$ z#wyWV*Zh@d!b(WwXqvfhQX)^aoHTBkc;4ossV3&Ut*k>AI|m+{#kh4B!`3*<)EJVj zwrxK>99v^k4&Y&`Awm>|exo}NvewV%E+@vOc>5>%H#BK9uaE2$vje zWYM5fKuOTtn96B_2~~!xJPIcXF>E_;yO8AwpJ4)V`Hht#wbO3Ung~@c%%=FX4)q+9 z99#>VC2!4l`~0WHs9FI$Nz+abUq# zz`Of97})Su=^rGp2S$)7N3rQCj#0%2YO<R&p>$<#lgXcUj=4H_{oAYiT3 z44*xDn-$wEzRw7#@6aD)EGO$0{!C5Z^7#yl1o;k0PhN=aVUQu~eTQ^Xy{z8Ow6tk83 z4{5xe%(hx)%nD&|e*6sTWH`4W&U!Jae#U4TnICheJmsw{l|CH?UA{a6?2GNgpZLyzU2UlFu1ZVwlALmh_DOs03J^Cjh1im`E3?9&zvNmg(MuMw&0^Lu$(#CJ*q6DjlKsY-RMJ^8yIY|{SQZ*9~CH|u9L z`R78^r=EbbR*_>5?-)I+$6i}G)%mN(`!X72KaV(MNUP7Nv3MS9S|Pe!%N2AeOt5zG zVJ;jI4HZ$W->Ai_4X+`9c(~m=@ek*m`ZQbv3ryI-AD#AH=`x$~WeW~M{Js57(K7(v ze5`};LG|%C_tmd>bkufMWmAo&B+DT9ZV~h(4jg0>^aeAqL`PEUzJJtI8W1M!bQWpv zvN(d}E1@nlYa!L!!A*RN!(Q3F%J?5PvQ0udu?q-T)j3JKV~NL>KRb~w-lWc685uS6 z=S#aR&B8Sc8>cGJ!!--?kwsJTUUm`Jk?7`H z7PrO~xgBrSW2_tTlCq1LH8*!o?pj?qxy8}(=r_;G18POrFh#;buWR0qU24+XUaVZ0 z?(sXcr@-YqvkCmHr{U2oPogHL{r#3r49TeR<{SJX1pcUqyWPrkYz^X8#QW~?F)R5i z>p^!i<;qM8Nf{-fd6!_&V*e_9qP6q(s<--&1Ttj01j0w>bXY7y1W*%Auu&p|XSOH=)V7Bd4fUKh&T1)@cvqhuD-d=?w}O zjI%i(f|thk0Go*!d7D%0^ztBfE*V=(ZIN84f5HU}T9?ulmEYzT5usi=DeuI*d|;M~ zp_=Cx^!4k#=m_qSPBr5EK~E?3J{dWWPH&oCcNepYVqL?nh4D5ynfWip$m*YlZ8r^Z zuFEUL-nW!3qjRCLIWPT0x)FDL7>Yt7@8dA?R2kF@WE>ysMY+)lTsgNM#3VbXVGL}F z1O(>q>2a+_`6r5Xv$NZAnp=Kgnr3)cL(^=8ypEeOf3q8(HGe@7Tt59;yFl||w|mnO zHDxg2G3z8=(6wjj9kbcEY@Z0iOd7Gq5GiPS5% z*sF1J<#daxDV2Z8H>wxOF<;yKzMeTaSOp_|XkS9Sfn6Mpe9UBi1cSTieGG5$O;ZLIIJ60Y>SN4vC?=yE_CWlo(EEE$e4j?z&^FM%kNmRtlbEL^dPPgvs9sbK5fGw*r@ z+!EU@u$T8!nZh?Fdf_qk$VuHk^yVw`h`_#KoS*N%epIIOfQUy_&V}VWDGp3tplMbf z5Se1sJUC$7N0F1-9jdV2mmGK{-}fu|Nv;12jDy0<-kf^AmkDnu6j~TPWOgy1MT68|D z=4=50jVbUKdKaQgD`eWGr3I&^<6uhkjz$YwItY8%Yp9{z4-{6g{73<_b*@XJ4Nm3-3z z?BW3{aY_ccRjb@W1)i5nLg|7BnWS!B`_Uo9CWaE`Ij327QH?i)9A}4Ug4wmxVVa^b z-4+m%-wwOl7cKH7+=x&nrCrbEC)Q$fpg&V83#uEH;C=GNMz`ps@^RxK%T*8%OPnC` z{WO~J%nxYJ`x|N%?&i7?;{_8t^jM&=50HlaOQj8fS}_`moH$c;vI<|cruPFnpT8yU zS%rPOCUSd5Zdb(zwk`hqwTQn)*&n)uYsP*F_(~xEWq}C= zv30kFmZFwJZ@ELVX3?$dXQh|icO7UrL*_5G=I^xXjImz`ZPp>?g#tf(ej~KaIU0algsG!IS09;>?MvqGg#c{i+}qY|{P8W~O%#>|gFd z<1dr$-oxyRGN17yZo1OwLnzwYs0|;IS_nymNB0IlSzPQ%-r`?T=;_XQ^~&#}b|AB} zkNbN5uB?-sUB-T5QLlg%Uk3)uHB;>VIzGe9_J9 zaeISkQm!v(9d(0ML^b9fR^sfHFlH?7Mvddt37OuR{|O0{uv)(&-6<87W4 zyO>s!=cPgP3O&7xxU5DlIPw_o3O>6o6Qb?JWs3qw#p3sBc3g$?Dx zi(6D+DYgV;GrUis-CL%Qe{nvZnwaVXmbhH(|GFh|Q)k=1uvA$I@1DXI7bKlQ@8D6P zS?(*?><>)G49q0wr;NajpxP4W2G)kHl6^=Z>hrNEI4Mwd_$O6$1dXF;Q#hE(-eeW6 zz03GJF%Wl?HO=_ztv5*zRlcU~{+{k%#N59mgm~eK>P!QZ6E?#Cu^2)+K8m@ySvZ*5 z|HDT}BkF@3!l(0%75G=1u2hETXEj!^1Z$!)!lyGXlWD!_vqGE$Z)#cUVBqlORW>0^ zDjyVTxwKHKG|0}j-`;!R-p>}qQfBl(?($7pP<+Y8QE#M8SCDq~k<+>Q^Zf@cT_WdX3~BSe z+|KK|7OL5Hm5(NFP~j>Ct3*$wi0n0!xl=(C61`q&cec@mFlH(sy%+RH<=s)8aAPN`SfJdkAQjdv82G5iRdv8 zh{9wHUZaniSEpslXl^_ODh}mypC?b*9FzLjb~H@3DFSe;D(A-K3t3eOTB(m~I6C;(-lKAvit(70k`%@+O*Ztdz;}|_TS~B?Tpmi=QKC^m_ z2YpEaT3iiz*;T~ap1yiA)a`dKMwu`^UhIUeltNQ1Yjo=q@bI@&3zH?rVUg=IxLy-ni zyxDu%-Fr{H6owTjZU2O5>nDb=q&Jz_TjeSq%!2m40x&U6w~GQ({quPL73IsJS;f`$ zsuhioqCBj(gJ>2hoo)Gou7(WP*pX)f=Y=!=k!&1K?EYY%jJ~X&DnK{^saPQK<1BJ z_A`_{%ZozcB(3w$z^To^6d|XuT@=X~wtW!+{4ID@N{AB~J6AL5vuY>JwvWCNFKsKh zd}@>q@_WV#QZ&UJ0#?X(pXR!oyXOEG3rqzHbCzGLONDb042i$})fM@XF)uSP(DHUc z^&{|$*xe{cs?Gp8=B%RY3L7#$ve$?TWh>MZdxF1zH1v}1z+$Ov#G7?%D)bBCyDe*% zSeKSpETC2V1){II>@UwJi>4uBN+iAx+82E~gb|Cr&8E^i&)A!uv-g?jzH99wU}8+# z$nh>yvb;TwZmS@7LrvuCu_d0-WxFNI&C7%sWuTL%YU!l|I1{|->=dlOeHOCtUO#zkS3ESO8LHV4hTdQL5EdV zuWD33fFPH}HPrW^s$Qn1Xgp&AT6<-He{{4%eIu3rN=iK|9mURdKXfB&Q?qGok%!cs ze53UP{Z!TO-Y@q2;;k2avA3`lm4OoN4@S*k=UA)7H;qZ`d8`XaYFCv?Ba+uGW@r5v z&&{nf(24WSBOhc7!qF^@0cz;XcUynNaj6w2349;s!K{KVqs5yS{ z7VubS`2OzT^5#1~6Tt^RTvt9-J|D2F>y~>2;jeF>g`hx5l%B3H=aLExQihuYngzlnBTYOTHJQMzl>kwqN5JYs)Ej zblA@ntkUS~xi+}y6|(81helS}Q~&VB37qyV|S3Y=><^1wh%msQM?fz z<58MX(=|PSUKCF#)dbhR%D&xgCD?$aR0qen+wpp6 zst}vX18!Be96TD??j1HsHTUx(a&@F?=gT`Q$oJFFyrh^;zgz!(NlAHGn0cJy@us=w zNhC#l5G;H}+>49Nsh12=ZPO2r*2OBQe5kpb&1?*PIBFitK8}FUfb~S-#hKfF0o#&d z#3aPkB$9scYku&kA6{0xHnBV#&Wei5J>5T-XX-gUXEPo+9b7WL=*XESc(3BshL`aj zXp}QIp*40}oWJt*l043e8_5;H5PI5c)U&IEw5dF(4zjX0y_lk9 zAp@!mK>WUqHo)-jop=DoK>&no>kAD=^qIE7qis&_*4~ z6q^EF$D@R~3_xseCG>Ikb6Gfofb$g|75PPyyZN&tiRxqovo_k zO|HA|sgy#B<32gyU9x^&)H$1jvw@qp+1b(eGAb)O%O!&pyX@^nQd^9BQ4{(F8<}|A zhF&)xusQhtoXOOhic=8#Xtt5&slLia3c*a?dIeczyTbC#>FTfiLST57nc3@Y#v_Eg#VUv zT8cKH#f3=1PNj!Oroz_MAR*pow%Y0*6YCYmUy^7`^r|j23Q~^*TW#cU7CHf0eAD_0 zEWEVddxFgQ7=!nEBQ|ibaScslvhuUk^*%b#QUNrEB{3PG@uTxNwW}Bs4$nS9wc(~O zG7Iq>aMsYkcr!9#A;HNsJrwTDYkK8ikdj{M;N$sN6BqJ<8~z>T20{J8Z2rRUuH7~3 z=tgS`AgxbBOMg87UT4Lwge`*Y=01Dvk>)^{Iu+n6fuVX4%}>?3czOGR$0 zpp*wp>bsFFSV`V;r_m+TZns$ZprIi`OUMhe^cLE$2O+pP3nP!YB$ry}2THx2QJs3< za1;>d-AggCarrQ>&Z!d@;mW+!q6eXhb&`GbzUDSxpl8AJ#Cm#tuc)_xh(2NV=5XMs zrf_ozRYO$NkC=pKFX5OH8v1>0i9Z$ec`~Mf+_jQ68spn(CJwclDhEEkH2Qw;${J$clv__nUjn5jA0wCLEnu1j;v!0vB>Ri6m9`;R{JMS%^)4FC zU0Z44+u$I$w=Bj|iu4DT5h~sS`C*zbmX?@-crY}E+hy>}2~C0Nn(EKk@5^qO4@l@! z6O0lr%tzGC`D^)8xU3FnMZVm0kX1sBWhaQyzVoXFWwr%Ny?=2M{5s#5i7fTu3gEkG zc{(Pr$v=;`Y#&`y*J}#M9ux>0?xu!`$9cUKm#Bdd_&S#LPTS?ZPV6zN6>W6JTS~-LfjL{mB=b(KMk3 z2HjBSlJeyUVqDd=Mt!=hpYsvby2GL&3~zm;0{^nZJq+4vb?5HH4wufvr}IX42sHeK zm@x?HN$8TsTavXs)tLDFJtY9b)y~Tl@7z4^I8oUQq4JckH@~CVQ;FoK(+e0XAM>1O z(ei}h?)JQp>)d=6ng-BZF1Z5hsAKW@mXq+hU?r8I(*%`tnIIOXw7V6ZK(T9RFJJe@ zZS!aC+p)Gf2Ujc=a6hx4!A1Th%YH!Lb^xpI!Eu` zmJO{9rw){B1Ql18d%F%da+Tbu1()?o(zT7StYqK6_w`e+fjXq5L^y(0 z09QA6H4oFj59c2wR~{~>jUoDzDdKz}5#onYPJRwa`SUO)Pd4)?(ENBaFVLJr6Kvz= zhTtXqbx09C1z~~iZt;g^9_2nCZ{};-b4dQJbv8HsWHXPVg^@(*!@xycp#R?a|L!+` zY5w))JWV`Gls(=}shH0#r*;~>_+-P5Qc978+QUd>J%`fyn{*TsiG-dWMiJXNgwBaT zJ=wgYFt+1ACW)XwtNx)Q9tA2LPoB&DkL16P)ERWQlY4%Y`-5aM9mZ{eKPUgI!~J3Z zkMd5A_p&v?V-o-6TUa8BndiX?ooviev(DKw=*bBVOW|=zps9=Yl|-R5@yJe*BPzN}a0mUsLn{4LfjB_oxpv(mwq# zSY*%E{iB)sNvWfzg-B!R!|+x(Q|b@>{-~cFvdDHA{F2sFGA5QGiIWy#3?P2JIpPKg6ncI^)dvqe`_|N=8 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/kotlin/functions/ui/settings.gradle.kts b/kotlin/functions/ui/settings.gradle.kts new file mode 100644 index 00000000..078621e3 --- /dev/null +++ b/kotlin/functions/ui/settings.gradle.kts @@ -0,0 +1,21 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +// Single-project Android library build. The root project IS the `fn.compose:ui` +// library. Apps consume it via composite build: +// includeBuild("../../kotlin/functions/ui") { +// dependencySubstitution { substitute(module("fn.compose:ui")).using(project(":")) } +// } +rootProject.name = "ui" diff --git a/kotlin/functions/ui/src/main/AndroidManifest.xml b/kotlin/functions/ui/src/main/AndroidManifest.xml new file mode 100644 index 00000000..b2d3ea12 --- /dev/null +++ b/kotlin/functions/ui/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/theme/FnTheme.kt b/kotlin/functions/ui/src/main/kotlin/fn/compose/theme/FnTheme.kt new file mode 100644 index 00000000..c8eca5a2 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/theme/FnTheme.kt @@ -0,0 +1,79 @@ +package fn.compose.theme + +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable + +/** + * Material 3 [androidx.compose.material3.ColorScheme] derived from [FnColors]. + * + * This is the registry's canonical dark identity (Mantine v9 dark + indigo). + * Equivalent to `FnMantineProvider` (web) and `fn::run_app` with + * `ThemeMode::FnDark` (C++). + */ +private val FnDarkColorScheme = darkColorScheme( + primary = FnColors.primary, + onPrimary = FnColors.white, + primaryContainer = FnColors.primaryActive, + onPrimaryContainer = FnColors.white, + secondary = FnColors.primaryLight, + onSecondary = FnColors.white, + background = FnColors.bg, + onBackground = FnColors.text, + surface = FnColors.surface, + onSurface = FnColors.text, + surfaceVariant = FnColors.surfaceHover, + onSurfaceVariant = FnColors.textMuted, + error = FnColors.error, + onError = FnColors.white, + outline = FnColors.border, + outlineVariant = FnColors.borderStrong, +) + +private val FnLightColorScheme = lightColorScheme( + primary = FnColors.primary, + onPrimary = FnColors.white, + primaryContainer = FnColors.primaryLight, + onPrimaryContainer = FnColors.white, + secondary = FnColors.primaryActive, + onSecondary = FnColors.white, + background = FnColors.lightBg, + onBackground = FnColors.lightText, + surface = FnColors.lightSurface, + onSurface = FnColors.lightText, + surfaceVariant = FnColors.lightSurface, + onSurfaceVariant = FnColors.lightTextMuted, + error = FnColors.error, + onError = FnColors.white, + outline = FnColors.lightBorder, +) + +/** + * Root theme provider for every registry Android app. Dark by default, mirroring + * the web frontend's `defaultColorScheme="dark"`. + * + * Usage: + * ``` + * setContent { + * FnTheme { + * Surface(Modifier.fillMaxSize()) { /* ... */ } + * } + * } + * ``` + * + * Override the scheme with `FnTheme(darkMode = false) { ... }` or follow the + * system with `FnTheme(darkMode = isSystemInDarkTheme()) { ... }`. + * + * Apps must NOT call `MaterialTheme {}` directly — always go through `FnTheme`. + */ +@Composable +fun FnTheme( + darkMode: Boolean = true, + content: @Composable () -> Unit, +) { + MaterialTheme( + colorScheme = if (darkMode) FnDarkColorScheme else FnLightColorScheme, + content = content, + ) +} diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/theme/FnTheme.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/theme/FnTheme.md new file mode 100644 index 00000000..fabe4ddf --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/theme/FnTheme.md @@ -0,0 +1,59 @@ +--- +name: fn_theme +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnTheme(darkMode: Boolean = true, content: @Composable () -> Unit)" +description: "Provider raiz del design system Compose del registry (@fn_compose). Envuelve MaterialTheme con un ColorScheme derivado de FnColors (Mantine v9 dark + indigo). Dark por defecto, mirror de FnMantineProvider (web) y fn::run_app ThemeMode::FnDark (C++). Toda app del registry envuelve su contenido en FnTheme." +tags: [compose, android, ui, theme, provider, material3, design-system] +props: [] +emits: [] +uses_functions: [fn_tokens_kt_ui] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Aplica el ColorScheme del registry (dark o light) al arbol Composable hijo via MaterialTheme. No retorna valor; emite UI." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/theme/FnTheme.kt" +--- + +## Ejemplo + +```kotlin +import fn.compose.theme.FnTheme + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + FnTheme { // darkMode = true por defecto + Surface(modifier = Modifier.fillMaxSize()) { + Text("Mi app") + } + } + } + } +} + +// Forzar light, o seguir el sistema: +FnTheme(darkMode = false) { /* ... */ } +FnTheme(darkMode = isSystemInDarkTheme()) { /* ... */ } +``` + +## Cuando usarla + +Una vez por app, en el `setContent {}` de la `MainActivity` (o en cualquier `@Preview`/test de Roborazzi), envolviendo todo el árbol de UI. Es el equivalente Compose de `FnMantineProvider`. Sin `FnTheme`, los componentes caen al Material3 stock (morado) y pierden la identidad del registry. + +## Gotchas + +- **NUNCA `MaterialTheme {}` directo en una app.** Siempre `FnTheme {}`. `MaterialTheme` stock no aplica los tokens del registry. +- **Dark-first.** El default es `darkMode = true`, igual que el frontend web. Pasar `darkMode = false` solo para capturas light o si la app lo requiere explícitamente. +- **Composite build requerido.** Las apps consumen `FnTheme` via `includeBuild("../../kotlin/functions/ui")` con substitución `fn.compose:ui`. No es un artifact Maven publicado; cambios en el módulo recompilan las apps automáticamente. + +## Capability growth log + +- v0.1.0 (2026-06-03) — versión inicial. Provider MaterialTheme dark/light con ColorScheme derivado de FnColors (paleta heredada exacta de C++/Mantine). Desbloquea el scaffolder `init_kotlin_app`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/theme/FnTokens.kt b/kotlin/functions/ui/src/main/kotlin/fn/compose/theme/FnTokens.kt new file mode 100644 index 00000000..f22f9e2f --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/theme/FnTokens.kt @@ -0,0 +1,143 @@ +package fn.compose.theme + +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.TextUnit +import androidx.compose.ui.unit.sp + +/** + * Design tokens for the registry's Android Compose apps. + * + * The color palette is inherited *exactly* (same hex literals) from the C++ + * design system (`cpp/DESIGN_SYSTEM.md` section 4.1), which in turn mirrors + * Mantine v9 dark + indigo used by the web frontend (`@fn_library`). A button + * rendered here must look identical to the same button on web and on the C++ + * ImGui apps. Do not invent new colors — extend this object and keep it aligned + * with the canonical Mantine values. + */ +object FnColors { + // --- Indigo brand scale (Mantine indigo) --- + val indigo4 = Color(0xFF748FFC) + val indigo5 = Color(0xFF5C7CFA) + val indigo6 = Color(0xFF4C6EF5) + val indigo7 = Color(0xFF4263EB) + + // --- Dark gray scale (Mantine dark) --- + val dark0 = Color(0xFFC1C2C5) + val dark1 = Color(0xFFA6A7AB) + val dark2 = Color(0xFF909296) + val dark3 = Color(0xFF5C5F66) + val dark4 = Color(0xFF373A40) + val dark5 = Color(0xFF2C2E33) + val dark6 = Color(0xFF25262B) + val dark7 = Color(0xFF1A1B1E) + val dark8 = Color(0xFF141517) + val dark9 = Color(0xFF101113) + + // --- Status colors (Mantine *.6) --- + val green6 = Color(0xFF40C057) + val yellow6 = Color(0xFFFAB005) + val red6 = Color(0xFFFA5252) + val blue6 = Color(0xFF228BE6) + + // --- Pure --- + val white = Color(0xFFFFFFFF) + val black = Color(0xFF000000) + + // --- Semantic aliases (match fn_tokens::colors:: in C++) --- + val primary = indigo6 // #4C6EF5 + val primaryHover = indigo5 // #5C7CFA + val primaryLight = indigo4 // #748FFC + val primaryActive = indigo7 // #4263EB + + val success = green6 // #40C057 + val warning = yellow6 // #FAB005 + val error = red6 // #FA5252 + val info = blue6 // #228BE6 + + val bg = dark7 // #1A1B1E + val surface = dark6 // #25262B + val surfaceHover = dark5 // #2C2E33 + val surfaceActive = dark4 // #373A40 + + val border = dark4 // #373A40 + val borderStrong = dark3 // #5C5F66 + + val text = dark0 // #C1C2C5 + val textMuted = dark2 // #909296 + val textDim = dark3 // #5C5F66 + + // --- Light scheme companions (for FnTheme(darkMode = false)) --- + val lightBg = Color(0xFFFFFFFF) + val lightSurface = Color(0xFFF8F9FA) // gray.0 + val lightBorder = Color(0xFFDEE2E6) // gray.3 + val lightText = Color(0xFF212529) // gray.9 + val lightTextMuted = Color(0xFF868E96) // gray.6 +} + +/** + * Spacing scale in [Dp]. Slightly denser than CSS Mantine, aligned to the + * value set documented in `kotlin/PATTERNS.md` section 2. + */ +object FnSpacing { + val xs: Dp = 8.dp + val sm: Dp = 12.dp + val md: Dp = 16.dp + val lg: Dp = 24.dp + val xl: Dp = 32.dp + val xxl: Dp = 48.dp +} + +/** Corner radius scale in [Dp]. Identical to the C++ `fn_tokens::radius`. */ +object FnRadius { + val none: Dp = 0.dp + val xs: Dp = 2.dp + val sm: Dp = 4.dp + val md: Dp = 8.dp // Mantine defaultRadius + val lg: Dp = 12.dp + val xl: Dp = 16.dp + val full: Dp = 9999.dp +} + +/** Font sizes (sp) and weights mirroring the web/C++ typography scale. */ +object FnTypography { + val xs: TextUnit = 11.sp + val sm: TextUnit = 13.sp + val md: TextUnit = 15.sp + val lg: TextUnit = 18.sp + val xl: TextUnit = 22.sp + + // Heading sizes h1..h6 + val h1: TextUnit = 32.sp + val h2: TextUnit = 26.sp + val h3: TextUnit = 22.sp + val h4: TextUnit = 18.sp + val h5: TextUnit = 15.sp + val h6: TextUnit = 13.sp + + val normal: FontWeight = FontWeight.Normal + val medium: FontWeight = FontWeight.Medium + val semibold: FontWeight = FontWeight.SemiBold + val bold: FontWeight = FontWeight.Bold +} + +/** Elevation tokens in [Dp]. No direct C++ analogue (ImGui is flat). */ +object FnShadows { + val none: Dp = 0.dp + val xs: Dp = 1.dp + val sm: Dp = 2.dp + val md: Dp = 4.dp + val lg: Dp = 8.dp + val xl: Dp = 16.dp +} + +/** Aggregator so a single import (`FnTokens`) exposes every token group. */ +object FnTokens { + val colors = FnColors + val spacing = FnSpacing + val radius = FnRadius + val typography = FnTypography + val shadows = FnShadows +} diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/theme/FnTokens.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/theme/FnTokens.md new file mode 100644 index 00000000..30959990 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/theme/FnTokens.md @@ -0,0 +1,48 @@ +--- +name: fn_tokens +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: pure +signature: "object FnTokens { colors; spacing; radius; typography; shadows }" +description: "Design tokens del design system Compose del registry (@fn_compose). Paleta heredada exacta (mismos hex) de cpp/DESIGN_SYSTEM.md / Mantine v9 dark + indigo: FnColors, FnSpacing (Dp), FnRadius (Dp), FnTypography (sp + weights), FnShadows (Dp). Fuente unica de valores visuales para apps Android del registry." +tags: [compose, android, ui, tokens, theme, design-system, mantine] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Objetos Kotlin de solo lectura: FnColors (Color), FnSpacing/FnRadius/FnShadows (Dp), FnTypography (TextUnit + FontWeight), y el agregador FnTokens." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/theme/FnTokens.kt" +--- + +## Ejemplo + +```kotlin +import fn.compose.theme.FnColors +import fn.compose.theme.FnSpacing +import fn.compose.theme.FnRadius + +Box( + modifier = Modifier + .background(FnColors.surface, RoundedCornerShape(FnRadius.md)) + .padding(FnSpacing.md) +) { + Text("Hola", color = FnColors.primary) // #4C6EF5 — mismo indigo que web y C++ +} +``` + +## Cuando usarla + +Siempre que escribas un Composable en una app del registry y necesites un color, espaciado, radio, tamaño de fuente o elevación. NUNCA pongas `Color(0xFF...)` o `8.dp` literal en código de app — usa el token. Garantiza que la app se vea idéntica a su equivalente web (Mantine) y C++ (ImGui), porque los tres comparten los mismos valores. + +## Gotchas + +- **Paleta heredada, no inventada.** Los hex coinciden 1:1 con `cpp/DESIGN_SYSTEM.md §4.1` (Mantine v9 dark + indigo). Si cambias un color aquí, debe cambiarse también en web y C++ para no romper la coherencia cross-platform. +- **Spacing más denso que CSS.** `FnSpacing` usa la escala de `kotlin/PATTERNS.md` (8/12/16/24/32/48 dp), no los px de CSS Mantine. Es intencional (densidad de pantalla móvil). +- **Es `object`, no `@Composable`.** Se consume directo (`FnColors.primary`), no via `MaterialTheme.colorScheme`. Para colores semánticos theme-aware en componentes propios, prefiere `MaterialTheme.colorScheme.*` (lo aplica `fn_theme_kt_ui`). diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Charts.kt b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Charts.kt new file mode 100644 index 00000000..6c8da2d1 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Charts.kt @@ -0,0 +1,219 @@ +package fn.compose.ui + +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.width +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.StrokeJoin +import androidx.compose.ui.graphics.drawscope.DrawScope +import androidx.compose.ui.graphics.drawscope.Fill +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import fn.compose.theme.FnColors + +// --------------------------------------------------------------------------- +// Data class +// --------------------------------------------------------------------------- + +/** A single bar in [FnBarChart]. */ +data class FnBarItem(val label: String, val value: Float) + +// --------------------------------------------------------------------------- +// FnLineChart +// --------------------------------------------------------------------------- + +/** + * Canvas-based line chart. Draws a polyline connecting [data] points + * normalised to [min, max], plus a semi-transparent fill below the line. + * + * Handles empty lists and single-point lists without crashing. + */ +@Composable +fun FnLineChart( + data: List, + modifier: Modifier = Modifier, +) { + val primaryColor = FnColors.primary + val fillColor = FnColors.primary.copy(alpha = 0.15f) + + Canvas( + modifier = Modifier + .fillMaxWidth() + .height(160.dp) + .then(modifier), + ) { + if (data.size < 2) return@Canvas + + val minVal = data.min() + val maxVal = data.max() + val range = (maxVal - minVal).takeIf { it > 0f } ?: 1f + + val strokePx = 2.dp.toPx() + val points = buildOffsets(data, minVal, range, size.width, size.height) + + // --- fill path --- + val fillPath = Path().apply { + moveTo(points.first().x, size.height) + points.forEach { lineTo(it.x, it.y) } + lineTo(points.last().x, size.height) + close() + } + drawPath(fillPath, color = fillColor, style = Fill) + + // --- polyline --- + drawPolyline(points, primaryColor, strokePx) + } +} + +// --------------------------------------------------------------------------- +// FnBarChart +// --------------------------------------------------------------------------- + +/** + * Canvas-based vertical bar chart. Bars are drawn proportional to the + * maximum value in [data]. Labels are rendered below each bar using + * [Text] (no FnText dependency to keep Charts.kt standalone). + * + * Handles empty lists without crashing. + */ +@Composable +fun FnBarChart( + data: List, + modifier: Modifier = Modifier, +) { + if (data.isEmpty()) return + + val primaryColor = FnColors.primary + val labelColor = FnColors.textMuted + val maxVal = data.maxOf { it.value }.takeIf { it > 0f } ?: 1f + val barGapDp: Dp = 4.dp + + Column(modifier = modifier) { + // --- bar canvas --- + Canvas( + modifier = Modifier + .fillMaxWidth() + .height(160.dp), + ) { + val count = data.size + val totalGapPx = barGapDp.toPx() * (count - 1) + val barWidth = (size.width - totalGapPx) / count + + data.forEachIndexed { index, item -> + val barHeight = (item.value / maxVal) * size.height + val left = index * (barWidth + barGapDp.toPx()) + val top = size.height - barHeight + + drawRect( + color = primaryColor, + topLeft = Offset(left, top), + size = androidx.compose.ui.geometry.Size(barWidth, barHeight), + ) + } + } + + // --- labels row --- + Row(modifier = Modifier.fillMaxWidth()) { + data.forEach { item -> + Text( + text = item.label, + modifier = Modifier.weight(1f), + color = labelColor, + fontSize = 10.sp, + textAlign = androidx.compose.ui.text.style.TextAlign.Center, + maxLines = 1, + ) + } + } + } +} + +// --------------------------------------------------------------------------- +// FnSparkline +// --------------------------------------------------------------------------- + +/** + * Compact mini line chart — no axes, no fill, no labels. + * Ideal for embedding in KPI cards or table cells. + * + * Handles empty lists and single-point lists without crashing. + */ +@Composable +fun FnSparkline( + data: List, + modifier: Modifier = Modifier, +) { + val primaryColor = FnColors.primary + + Canvas( + modifier = Modifier + .width(80.dp) + .height(24.dp) + .then(modifier), + ) { + if (data.size < 2) return@Canvas + + val minVal = data.min() + val maxVal = data.max() + val range = (maxVal - minVal).takeIf { it > 0f } ?: 1f + + val strokePx = 1.5.dp.toPx() + val points = buildOffsets(data, minVal, range, size.width, size.height) + drawPolyline(points, primaryColor, strokePx) + } +} + +// --------------------------------------------------------------------------- +// Private helpers +// --------------------------------------------------------------------------- + +/** + * Converts a list of raw values into [Offset] positions scaled to the + * given [canvasWidth] x [canvasHeight]. + */ +private fun buildOffsets( + data: List, + minVal: Float, + range: Float, + canvasWidth: Float, + canvasHeight: Float, +): List { + val count = data.size + return data.mapIndexed { index, value -> + val x = if (count == 1) 0f else index / (count - 1).toFloat() * canvasWidth + val y = canvasHeight - ((value - minVal) / range) * canvasHeight + Offset(x, y) + } +} + +/** + * Draws connected line segments between consecutive [points] using the + * given [color] and [strokeWidthPx]. + */ +private fun DrawScope.drawPolyline( + points: List, + color: Color, + strokeWidthPx: Float, +) { + for (i in 0 until points.lastIndex) { + drawLine( + color = color, + start = points[i], + end = points[i + 1], + strokeWidth = strokeWidthPx, + cap = StrokeCap.Round, + ) + } +} diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Data.kt b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Data.kt new file mode 100644 index 00000000..7aadaeec --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Data.kt @@ -0,0 +1,252 @@ +package fn.compose.ui + +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.StrokeJoin +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import fn.compose.theme.FnColors +import fn.compose.theme.FnRadius +import fn.compose.theme.FnSpacing +import fn.compose.theme.FnTypography + +/** + * Page-level header with title, optional subtitle and trailing action slot. + * + * Layout: SpaceBetween Row with CenterVertically alignment. + * Left side: Column with title + optional subtitle. + * Right side: optional actions lambda. + */ +@Composable +fun FnPageHeader( + title: String, + modifier: Modifier = Modifier, + subtitle: String? = null, + actions: (@Composable () -> Unit)? = null, +) { + Row( + modifier = modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically, + ) { + Column(modifier = Modifier.weight(1f)) { + Text( + text = title, + fontSize = FnTypography.lg, + fontWeight = FnTypography.bold, + color = MaterialTheme.colorScheme.onSurface, + ) + if (subtitle != null) { + Text( + text = subtitle, + fontSize = FnTypography.sm, + fontWeight = FnTypography.normal, + color = FnColors.textMuted, + ) + } + } + if (actions != null) { + actions() + } + } +} + +/** + * KPI metric card: label, large value, optional delta badge and optional + * inline sparkline drawn with Canvas (no external dependency). + * + * The [modifier] is forwarded to the outermost Surface so callers can pass + * `Modifier.weight(1f)` inside a Row (as the gallery does). + */ +@Composable +fun FnKpiCard( + label: String, + value: String, + modifier: Modifier = Modifier, + delta: String? = null, + deltaPositive: Boolean = true, + sparklineData: List? = null, +) { + Surface( + modifier = modifier + .border( + width = 1.dp, + color = FnColors.border, + shape = RoundedCornerShape(FnRadius.md), + ), + shape = RoundedCornerShape(FnRadius.md), + color = MaterialTheme.colorScheme.surface, + tonalElevation = 0.dp, + shadowElevation = 0.dp, + ) { + Column( + modifier = Modifier.padding(FnSpacing.md), + verticalArrangement = Arrangement.spacedBy(FnSpacing.xs / 2), + ) { + // Label + Text( + text = label, + fontSize = FnTypography.sm, + fontWeight = FnTypography.normal, + color = FnColors.textMuted, + ) + + // Primary value + Text( + text = value, + fontSize = FnTypography.xl, + fontWeight = FnTypography.bold, + color = MaterialTheme.colorScheme.onSurface, + ) + + // Delta badge + if (delta != null) { + Text( + text = delta, + fontSize = FnTypography.xs, + fontWeight = FnTypography.medium, + color = if (deltaPositive) FnColors.success else FnColors.error, + ) + } + + // Inline sparkline — drawn with Canvas, no external component + if (!sparklineData.isNullOrEmpty()) { + val primaryColor = FnColors.primary + Canvas( + modifier = Modifier + .fillMaxWidth() + .height(32.dp), + ) { + val data = sparklineData + if (data.size < 2) return@Canvas + + val minVal = data.min() + val maxVal = data.max() + val range = (maxVal - minVal).let { if (it == 0f) 1f else it } + + val w = size.width + val h = size.height + val stepX = w / (data.size - 1).toFloat() + + // Build path points + val points = data.mapIndexed { index, v -> + val x = index * stepX + // Normalize: high value -> low y (top of canvas) + val y = h - ((v - minVal) / range) * h + Offset(x, y) + } + + // Draw polyline segment by segment + for (i in 0 until points.size - 1) { + drawLine( + color = primaryColor, + start = points[i], + end = points[i + 1], + strokeWidth = 2.dp.toPx(), + cap = StrokeCap.Round, + ) + } + } + } + } + } +} + +/** + * Column descriptor for [FnDataTable]. + * + * @param T row data type. + * @param header Column header label. + * @param weight Relative width weight passed to [Modifier.weight]. + * @param cell Composable that renders a single cell for a given row value. + */ +data class FnTableColumn( + val header: String, + val weight: Float, + val cell: @Composable (T) -> Unit, +) + +/** + * Static data table. + * + * Uses a non-lazy [Column] so it can be embedded inside a parent + * `verticalScroll` (as the gallery does). Do not wrap in LazyColumn. + * + * Layout: + * - Header row: one Text per column, weighted, bold, muted color. + * - [HorizontalDivider] below the header. + * - One Row per data entry: one [Box] per column, weighted. + * - [HorizontalDivider] between data rows (not after the last). + */ +@Composable +fun FnDataTable( + rows: List, + columns: List>, + modifier: Modifier = Modifier, +) { + Column(modifier = modifier) { + // Header row + Row( + modifier = Modifier + .fillMaxWidth() + .padding( + horizontal = FnSpacing.sm, + vertical = FnSpacing.xs, + ), + verticalAlignment = Alignment.CenterVertically, + ) { + columns.forEach { col -> + Text( + text = col.header, + modifier = Modifier.weight(col.weight), + fontSize = FnTypography.sm, + fontWeight = FontWeight.Bold, + color = FnColors.textMuted, + ) + } + } + + HorizontalDivider(color = FnColors.border, thickness = 1.dp) + + // Data rows + rows.forEachIndexed { rowIndex, row -> + Row( + modifier = Modifier + .fillMaxWidth() + .padding( + horizontal = FnSpacing.sm, + vertical = FnSpacing.xs, + ), + verticalAlignment = Alignment.CenterVertically, + ) { + columns.forEach { col -> + Box(modifier = Modifier.weight(col.weight)) { + col.cell(row) + } + } + } + // Divider between rows, not after the last + if (rowIndex < rows.lastIndex) { + HorizontalDivider(color = FnColors.border, thickness = 1.dp) + } + } + } +} diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Display.kt b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Display.kt new file mode 100644 index 00000000..a590bafe --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Display.kt @@ -0,0 +1,283 @@ +package fn.compose.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import fn.compose.theme.FnColors +import fn.compose.theme.FnRadius +import fn.compose.theme.FnShadows +import fn.compose.theme.FnSpacing +import fn.compose.theme.FnTypography + +// --------------------------------------------------------------------------- +// FnText +// --------------------------------------------------------------------------- + +/** Body text size scale. Maps directly to [FnTypography] sp values. */ +enum class FnTextSize { Xs, Sm, Md, Lg, Xl } + +/** + * Stateless body text following the registry typography scale. + * + * @param text String to display. + * @param size One of [FnTextSize] — maps to FnTypography.xs … xl. + * @param color Text color. Defaults to [MaterialTheme.colorScheme.onSurface] + * when [Color.Unspecified] is passed. + */ +@Composable +fun FnText( + text: String, + modifier: Modifier = Modifier, + size: FnTextSize = FnTextSize.Md, + color: Color = Color.Unspecified, +) { + val fontSize = when (size) { + FnTextSize.Xs -> FnTypography.xs + FnTextSize.Sm -> FnTypography.sm + FnTextSize.Md -> FnTypography.md + FnTextSize.Lg -> FnTypography.lg + FnTextSize.Xl -> FnTypography.xl + } + val resolvedColor = if (color == Color.Unspecified) { + MaterialTheme.colorScheme.onSurface + } else { + color + } + Text( + text = text, + modifier = modifier, + color = resolvedColor, + fontSize = fontSize, + fontWeight = FnTypography.normal, + ) +} + +// --------------------------------------------------------------------------- +// FnTitle +// --------------------------------------------------------------------------- + +/** + * Heading text from order 1 (largest) to order 6 (smallest). + * + * Orders 1–2 use [FontWeight.Bold]; orders 3–6 use [FontWeight.SemiBold]. + * Font size maps to [FnTypography.h1] … [FnTypography.h6]. + */ +@Composable +fun FnTitle( + text: String, + modifier: Modifier = Modifier, + order: Int = 1, +) { + val clamped = order.coerceIn(1, 6) + val fontSize = when (clamped) { + 1 -> FnTypography.h1 + 2 -> FnTypography.h2 + 3 -> FnTypography.h3 + 4 -> FnTypography.h4 + 5 -> FnTypography.h5 + else -> FnTypography.h6 + } + val fontWeight = if (clamped <= 2) FnTypography.bold else FnTypography.semibold + Text( + text = text, + modifier = modifier, + color = MaterialTheme.colorScheme.onSurface, + fontSize = fontSize, + fontWeight = fontWeight, + ) +} + +// --------------------------------------------------------------------------- +// FnCard +// --------------------------------------------------------------------------- + +/** Visual style variant for [FnCard]. */ +enum class FnCardVariant { Default, Borderless, Ghost } + +/** + * Container card with three visual variants. + * + * - **Default**: surface background, 1 dp border ([FnColors.border]), + * [FnRadius.md] corners, [FnShadows.sm] elevation, [FnSpacing.md] padding. + * - **Borderless**: surface background, no border, no shadow, + * [FnSpacing.md] padding. + * - **Ghost**: transparent background, no border, no shadow, + * [FnSpacing.md] padding. + */ +@Composable +fun FnCard( + modifier: Modifier = Modifier, + variant: FnCardVariant = FnCardVariant.Default, + content: @Composable ColumnScope.() -> Unit, +) { + val shape = RoundedCornerShape(FnRadius.md) + + when (variant) { + FnCardVariant.Default -> { + Surface( + modifier = modifier, + shape = shape, + color = MaterialTheme.colorScheme.surface, + shadowElevation = FnShadows.sm, + tonalElevation = 0.dp, + ) { + Column( + modifier = Modifier + .border(width = 1.dp, color = FnColors.border, shape = shape) + .padding(FnSpacing.md), + content = content, + ) + } + } + + FnCardVariant.Borderless -> { + Surface( + modifier = modifier, + shape = shape, + color = MaterialTheme.colorScheme.surface, + shadowElevation = 0.dp, + tonalElevation = 0.dp, + ) { + Column( + modifier = Modifier.padding(FnSpacing.md), + content = content, + ) + } + } + + FnCardVariant.Ghost -> { + Surface( + modifier = modifier, + shape = shape, + color = Color.Transparent, + shadowElevation = 0.dp, + tonalElevation = 0.dp, + ) { + Column( + modifier = Modifier.padding(FnSpacing.md), + content = content, + ) + } + } + } +} + +// --------------------------------------------------------------------------- +// FnBadge +// --------------------------------------------------------------------------- + +/** Semantic color options for [FnBadge]. */ +enum class FnBadgeColor { Brand, Gray, Green, Red, Yellow, Blue } + +/** + * Pill-shaped label using a semitransparent background derived from the base + * color (alpha 0.18) and the base color as text color. + * + * Color mapping: + * - Brand → [FnColors.primary] + * - Gray → [FnColors.textMuted] + * - Green → [FnColors.success] + * - Red → [FnColors.error] + * - Yellow → [FnColors.warning] + * - Blue → [FnColors.info] + */ +@Composable +fun FnBadge( + text: String, + modifier: Modifier = Modifier, + color: FnBadgeColor = FnBadgeColor.Brand, +) { + val baseColor = when (color) { + FnBadgeColor.Brand -> FnColors.primary + FnBadgeColor.Gray -> FnColors.textMuted + FnBadgeColor.Green -> FnColors.success + FnBadgeColor.Red -> FnColors.error + FnBadgeColor.Yellow -> FnColors.warning + FnBadgeColor.Blue -> FnColors.info + } + val bgColor = baseColor.copy(alpha = 0.18f) + val shape = RoundedCornerShape(FnRadius.full) + + Box( + modifier = modifier + .background(color = bgColor, shape = shape) + .padding(horizontal = 8.dp, vertical = 3.dp), + contentAlignment = Alignment.Center, + ) { + Text( + text = text, + color = baseColor, + fontSize = FnTypography.xs, + fontWeight = FnTypography.medium, + ) + } +} + +// --------------------------------------------------------------------------- +// FnAvatar +// --------------------------------------------------------------------------- + +/** Size variants for [FnAvatar]. */ +enum class FnAvatarSize { Sm, Md, Lg } + +/** + * Circular avatar displaying up to two initials on a [FnColors.primary] + * background. + * + * Size mapping: + * - Sm → 28 dp + * - Md → 40 dp + * - Lg → 56 dp + * + * Text size scales proportionally (xs / sm / md) so the initials always fit. + */ +@Composable +fun FnAvatar( + initials: String, + modifier: Modifier = Modifier, + size: FnAvatarSize = FnAvatarSize.Md, +) { + val sizeDp = when (size) { + FnAvatarSize.Sm -> 28.dp + FnAvatarSize.Md -> 40.dp + FnAvatarSize.Lg -> 56.dp + } + val fontSize = when (size) { + FnAvatarSize.Sm -> FnTypography.xs + FnAvatarSize.Md -> FnTypography.sm + FnAvatarSize.Lg -> FnTypography.md + } + // Truncate to at most two characters so the avatar never overflows. + val label = initials.take(2).uppercase() + + Box( + modifier = modifier + .size(sizeDp) + .background(color = FnColors.primary, shape = CircleShape), + contentAlignment = Alignment.Center, + ) { + Text( + text = label, + color = FnColors.white, + fontSize = fontSize, + fontWeight = FnTypography.semibold, + textAlign = TextAlign.Center, + ) + } +} diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Feedback.kt b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Feedback.kt new file mode 100644 index 00000000..186c83dc --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Feedback.kt @@ -0,0 +1,260 @@ +package fn.compose.ui + +import androidx.compose.animation.core.LinearEasing +import androidx.compose.animation.core.RepeatMode +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.infiniteRepeatable +import androidx.compose.animation.core.rememberInfiniteTransition +import androidx.compose.animation.core.tween +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ScrollableTabRow +import androidx.compose.material3.Tab +import androidx.compose.material3.TabRow +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import fn.compose.theme.FnColors +import fn.compose.theme.FnRadius +import fn.compose.theme.FnSpacing +import fn.compose.theme.FnTypography + +// --------------------------------------------------------------------------- +// FnTabs +// --------------------------------------------------------------------------- + +/** + * Tab bar backed by [TabRow] or [ScrollableTabRow] depending on [scrollable]. + * + * Each item in [tabs] becomes a [Tab] whose selected state is determined by + * comparing its index with [selectedIndex]. Selecting a tab triggers + * [onTabSelected] with the tapped index. + */ +@Composable +fun FnTabs( + tabs: List, + selectedIndex: Int, + onTabSelected: (Int) -> Unit, + modifier: Modifier = Modifier, + scrollable: Boolean = false, +) { + val tabContent: @Composable () -> Unit = { + tabs.forEachIndexed { index, label -> + Tab( + selected = index == selectedIndex, + onClick = { onTabSelected(index) }, + text = { Text(label) }, + ) + } + } + + if (scrollable) { + ScrollableTabRow( + selectedTabIndex = selectedIndex, + modifier = modifier, + ) { tabContent() } + } else { + TabRow( + selectedTabIndex = selectedIndex, + modifier = modifier, + ) { tabContent() } + } +} + +// --------------------------------------------------------------------------- +// FnAlert +// --------------------------------------------------------------------------- + +/** Semantic intent of an [FnAlert]. Maps to a status color from [FnColors]. */ +enum class FnAlertVariant { Info, Success, Warning, Error } + +/** + * Inline alert banner. + * + * The background is the variant's status color at 15 % opacity; the border is + * the same color at full opacity (1 dp). When [title] is supplied it is + * rendered in bold above [text]. + */ +@Composable +fun FnAlert( + text: String, + modifier: Modifier = Modifier, + title: String? = null, + variant: FnAlertVariant = FnAlertVariant.Info, +) { + val colorBase: Color = when (variant) { + FnAlertVariant.Info -> FnColors.info + FnAlertVariant.Success -> FnColors.success + FnAlertVariant.Warning -> FnColors.warning + FnAlertVariant.Error -> FnColors.error + } + val shape = RoundedCornerShape(FnRadius.sm) + val onSurface = MaterialTheme.colorScheme.onSurface + + Box( + modifier = modifier + .fillMaxWidth() + .clip(shape) + .background(colorBase.copy(alpha = 0.15f)) + .border(width = 1.dp, color = colorBase, shape = shape) + .padding(FnSpacing.md), + ) { + Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { + if (title != null) { + Text( + text = title, + color = colorBase, + fontWeight = FontWeight.Bold, + fontSize = FnTypography.sm, + ) + } + Text( + text = text, + color = onSurface, + fontSize = FnTypography.sm, + ) + } + } +} + +// --------------------------------------------------------------------------- +// FnLoader +// --------------------------------------------------------------------------- + +/** Visual size of an [FnLoader] spinner. */ +enum class FnLoaderSize { Sm, Md, Lg } + +/** + * Indeterminate circular progress indicator using [FnColors.primary]. + * + * [size] maps to 16 dp (Sm), 32 dp (Md), or 56 dp (Lg). The stroke width + * scales proportionally (2 / 3 / 5 dp). + */ +@Composable +fun FnLoader( + modifier: Modifier = Modifier, + size: FnLoaderSize = FnLoaderSize.Md, +) { + val (sizeDp, strokeDp) = when (size) { + FnLoaderSize.Sm -> 16.dp to 2.dp + FnLoaderSize.Md -> 32.dp to 3.dp + FnLoaderSize.Lg -> 56.dp to 5.dp + } + + CircularProgressIndicator( + modifier = modifier.size(sizeDp), + color = FnColors.primary, + strokeWidth = strokeDp, + ) +} + +// --------------------------------------------------------------------------- +// FnSkeleton +// --------------------------------------------------------------------------- + +/** + * Shimmer placeholder rectangle. + * + * Fills the available width to [height] dp with a rounded shape and an + * animated alpha oscillating between [FnColors.surfaceHover] and + * [FnColors.surfaceActive], simulating a loading shimmer without external + * dependencies. + */ +@Composable +fun FnSkeleton( + modifier: Modifier = Modifier, + height: Dp = 16.dp, +) { + val infiniteTransition = rememberInfiniteTransition(label = "skeleton_shimmer") + val alpha by infiniteTransition.animateFloat( + initialValue = 0f, + targetValue = 1f, + animationSpec = infiniteRepeatable( + animation = tween(durationMillis = 800, easing = LinearEasing), + repeatMode = RepeatMode.Reverse, + ), + label = "skeleton_alpha", + ) + + // Interpolate between surfaceHover and surfaceActive using the animated alpha. + val shimmerColor = androidx.compose.ui.graphics.lerp( + FnColors.surfaceHover, + FnColors.surfaceActive, + alpha, + ) + + Box( + modifier = modifier + .fillMaxWidth() + .height(height) + .clip(RoundedCornerShape(FnRadius.sm)) + .background(shimmerColor), + ) +} + +// --------------------------------------------------------------------------- +// FnEmptyState +// --------------------------------------------------------------------------- + +/** + * Centred empty-state panel with optional icon, title, description, and + * action slot. + * + * Layout (top to bottom, horizontally centred): + * 1. [icon] rendered as large emoji/text (40 sp) — only if non-null. + * 2. [title] in bold body size. + * 3. [description] in [FnColors.textMuted]. + * 4. [action] composable slot — only if non-null. + * + * Padding is [FnSpacing.lg] on all sides; vertical gaps use [FnSpacing.sm]. + */ +@Composable +fun FnEmptyState( + title: String, + description: String, + modifier: Modifier = Modifier, + icon: String? = null, + action: (@Composable () -> Unit)? = null, +) { + Column( + modifier = modifier.padding(FnSpacing.lg), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(FnSpacing.sm), + ) { + if (icon != null) { + Text( + text = icon, + fontSize = 40.sp, + ) + } + Text( + text = title, + fontWeight = FontWeight.Bold, + fontSize = FnTypography.md, + ) + Text( + text = description, + color = FnColors.textMuted, + fontSize = FnTypography.sm, + ) + action?.invoke() + } +} diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Inputs.kt b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Inputs.kt new file mode 100644 index 00000000..08f847ab --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Inputs.kt @@ -0,0 +1,318 @@ +package fn.compose.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.Checkbox +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExposedDropdownMenuBox +import androidx.compose.material3.ExposedDropdownMenuDefaults +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.style.TextDecoration +import androidx.compose.ui.unit.dp +import fn.compose.theme.FnColors +import fn.compose.theme.FnRadius +import fn.compose.theme.FnSpacing + +// --------------------------------------------------------------------------- +// Button +// --------------------------------------------------------------------------- + +/** Variants for [FnButton]. Maps to Material3 button styles + custom colors. */ +enum class FnButtonVariant { + Filled, + Outlined, + Secondary, + Ghost, + Destructive, + Link, +} + +private val buttonShape = RoundedCornerShape(FnRadius.sm) + +/** + * Design-system button with six visual variants. Stateless — the caller + * drives [onClick]. + * + * - Filled: primary container color. + * - Outlined: border only, no fill. + * - Secondary: filled with [FnColors.surfaceActive]. + * - Ghost: text-only, no chrome. + * - Destructive: filled with [FnColors.error]. + * - Link: text-only with [FnColors.primary] color and underline decoration. + */ +@Composable +fun FnButton( + text: String, + onClick: () -> Unit, + modifier: Modifier = Modifier, + variant: FnButtonVariant = FnButtonVariant.Filled, +) { + val shape = buttonShape + when (variant) { + FnButtonVariant.Filled -> Button( + onClick = onClick, + modifier = modifier, + shape = shape, + ) { + Text(text) + } + + FnButtonVariant.Outlined -> OutlinedButton( + onClick = onClick, + modifier = modifier, + shape = shape, + ) { + Text(text) + } + + FnButtonVariant.Secondary -> Button( + onClick = onClick, + modifier = modifier, + shape = shape, + colors = ButtonDefaults.buttonColors( + containerColor = FnColors.surfaceActive, + contentColor = FnColors.text, + ), + ) { + Text(text) + } + + FnButtonVariant.Ghost -> TextButton( + onClick = onClick, + modifier = modifier, + shape = shape, + ) { + Text(text) + } + + FnButtonVariant.Destructive -> Button( + onClick = onClick, + modifier = modifier, + shape = shape, + colors = ButtonDefaults.buttonColors( + containerColor = FnColors.error, + contentColor = FnColors.white, + ), + ) { + Text(text) + } + + FnButtonVariant.Link -> TextButton( + onClick = onClick, + modifier = modifier, + shape = shape, + ) { + Text( + text = text, + color = FnColors.primary, + textDecoration = TextDecoration.Underline, + ) + } + } +} + +// --------------------------------------------------------------------------- +// Text input +// --------------------------------------------------------------------------- + +/** + * Single-line text field with optional label, placeholder and inline error. + * Stateless — the caller owns [value] / [onValueChange]. + * + * When [error] is non-null, the field enters error state and the supporting + * text slot shows the error message in [FnColors.error]. + */ +@Composable +fun FnTextInput( + value: String, + onValueChange: (String) -> Unit, + modifier: Modifier = Modifier, + label: String? = null, + placeholder: String? = null, + error: String? = null, +) { + OutlinedTextField( + value = value, + onValueChange = onValueChange, + modifier = modifier, + label = label?.let { { Text(it) } }, + placeholder = placeholder?.let { { Text(it) } }, + isError = error != null, + singleLine = true, + supportingText = error?.let { + { + Text( + text = it, + color = FnColors.error, + ) + } + }, + ) +} + +// --------------------------------------------------------------------------- +// Select (dropdown) +// --------------------------------------------------------------------------- + +/** + * Exposed dropdown menu that lets the caller pick one item from [options]. + * Stateless — the caller drives [selected] / [onSelected]. + * + * Annotated with [ExperimentalMaterial3Api] because [ExposedDropdownMenuBox] + * is part of the experimental Material3 API surface in BOM 2024.02.00. + */ +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun FnSelect( + options: List, + selected: String?, + onSelected: (String) -> Unit, + modifier: Modifier = Modifier, + label: String? = null, +) { + var expanded by remember { mutableStateOf(false) } + + ExposedDropdownMenuBox( + expanded = expanded, + onExpandedChange = { expanded = it }, + modifier = modifier, + ) { + OutlinedTextField( + value = selected ?: "", + onValueChange = {}, + readOnly = true, + label = label?.let { { Text(it) } }, + trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) }, + modifier = Modifier + .menuAnchor() + .fillMaxWidth(), + ) + ExposedDropdownMenu( + expanded = expanded, + onDismissRequest = { expanded = false }, + ) { + options.forEach { option -> + DropdownMenuItem( + text = { Text(option) }, + onClick = { + onSelected(option) + expanded = false + }, + ) + } + } + } +} + +// --------------------------------------------------------------------------- +// Switch +// --------------------------------------------------------------------------- + +/** + * Labeled toggle. The [label] is rendered to the right of the [Switch] when + * non-null. Stateless — the caller owns [checked] / [onCheckedChange]. + */ +@Composable +fun FnSwitch( + checked: Boolean, + onCheckedChange: (Boolean) -> Unit, + modifier: Modifier = Modifier, + label: String? = null, +) { + Row( + modifier = modifier, + horizontalArrangement = Arrangement.spacedBy(FnSpacing.sm), + verticalAlignment = Alignment.CenterVertically, + ) { + Switch( + checked = checked, + onCheckedChange = onCheckedChange, + ) + if (label != null) { + Text(text = label) + } + } +} + +// --------------------------------------------------------------------------- +// Checkbox +// --------------------------------------------------------------------------- + +/** + * Labeled checkbox. The [label] is rendered to the right of the [Checkbox] + * when non-null. Stateless — the caller owns [checked] / [onCheckedChange]. + */ +@Composable +fun FnCheckbox( + checked: Boolean, + onCheckedChange: (Boolean) -> Unit, + modifier: Modifier = Modifier, + label: String? = null, +) { + Row( + modifier = modifier, + horizontalArrangement = Arrangement.spacedBy(FnSpacing.sm), + verticalAlignment = Alignment.CenterVertically, + ) { + Checkbox( + checked = checked, + onCheckedChange = onCheckedChange, + ) + if (label != null) { + Text(text = label) + } + } +} + +// --------------------------------------------------------------------------- +// Dialog +// --------------------------------------------------------------------------- + +/** + * Modal confirmation dialog. + * + * Rendered only when [open] is true. Provides "Confirmar" (calls [onConfirm]) + * and "Cancelar" (calls [onDismiss]) text buttons. The caller is responsible + * for updating the [open] flag in response to those callbacks. + */ +@Composable +fun FnDialog( + open: Boolean, + onDismiss: () -> Unit, + title: String, + description: String, + onConfirm: () -> Unit, + modifier: Modifier = Modifier, +) { + if (open) { + AlertDialog( + onDismissRequest = onDismiss, + title = { Text(title) }, + text = { Text(description) }, + confirmButton = { + TextButton(onClick = onConfirm) { Text("Confirmar") } + }, + dismissButton = { + TextButton(onClick = onDismiss) { Text("Cancelar") } + }, + modifier = modifier, + ) + } +} diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Layout.kt b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Layout.kt new file mode 100644 index 00000000..786f145b --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Layout.kt @@ -0,0 +1,133 @@ +package fn.compose.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.Dp +import fn.compose.theme.FnColors +import fn.compose.theme.FnRadius +import fn.compose.theme.FnShadows +import fn.compose.theme.FnSpacing + +/** + * Vertical layout primitive. Wraps a [Column] with [Arrangement.spacedBy] using [gap]. + * + * Equivalent to the web `` component from `@fn_library` (Mantine Stack). + * Use to stack items with consistent vertical spacing without inline padding. + * + * @param modifier Modifier applied to the outer [Column]. + * @param gap Space between children. Defaults to [FnSpacing.md] (16 dp). + * @param content Composable children provided in [ColumnScope]. + */ +@Composable +fun FnStack( + modifier: Modifier = Modifier, + gap: Dp = FnSpacing.md, + content: @Composable ColumnScope.() -> Unit, +) { + Column( + modifier = modifier, + verticalArrangement = Arrangement.spacedBy(gap), + content = content, + ) +} + +/** + * Horizontal layout primitive. Wraps a [Row] with [Arrangement.spacedBy] using [gap] + * and vertically centers children via [Alignment.CenterVertically]. + * + * Equivalent to the web `` component from `@fn_library` (Mantine Group). + * Use to place items side-by-side with consistent horizontal spacing. + * + * @param modifier Modifier applied to the outer [Row]. + * @param gap Space between children. Defaults to [FnSpacing.sm] (12 dp). + * @param content Composable children provided in [RowScope]. + */ +@Composable +fun FnGroup( + modifier: Modifier = Modifier, + gap: Dp = FnSpacing.sm, + content: @Composable RowScope.() -> Unit, +) { + Row( + modifier = modifier, + horizontalArrangement = Arrangement.spacedBy(gap), + verticalAlignment = Alignment.CenterVertically, + content = content, + ) +} + +/** + * Elevated container surface. Wraps a [Surface] with [FnColors.surface] background, + * rounded corners ([FnRadius.md]) and a subtle tonal elevation ([FnShadows.xs]). + * + * Equivalent to the web `` component from `@fn_library` (Mantine Paper). + * Use when content needs a visual separation from the background without a heavy border. + * + * @param modifier Modifier applied to the [Surface]. + * @param content Composable children provided in [ColumnScope] with [FnSpacing.md] padding. + */ +@Composable +fun FnPaper( + modifier: Modifier = Modifier, + content: @Composable ColumnScope.() -> Unit, +) { + Surface( + modifier = modifier, + color = FnColors.surface, + shape = RoundedCornerShape(FnRadius.md), + tonalElevation = FnShadows.xs, + ) { + Column( + modifier = Modifier.padding(FnSpacing.md), + content = content, + ) + } +} + +/** + * Root application shell with a top app bar and a content slot that receives + * the inner padding from [Scaffold]. + * + * Equivalent to the web `` component from `@fn_library`. Place this + * at the top of every screen composable so the system status bar and navigation + * insets are handled consistently. + * + * The [TopAppBar] is annotated with [ExperimentalMaterial3Api] as required by + * Compose Material 3 (BOM 2024.02.00). The opt-in is scoped to this function. + * + * @param title Text displayed in the top app bar. + * @param modifier Modifier applied to the [Scaffold]. + * @param content Screen content. Receives [PaddingValues] from the scaffold and + * is responsible for applying them (e.g. via [Modifier.padding]). + */ +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun FnAppShell( + title: String, + modifier: Modifier = Modifier, + content: @Composable (PaddingValues) -> Unit, +) { + Scaffold( + modifier = modifier, + topBar = { + TopAppBar( + title = { Text(text = title) }, + ) + }, + content = content, + ) +} diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_alert.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_alert.md new file mode 100644 index 00000000..2ed493ff --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_alert.md @@ -0,0 +1,32 @@ +--- +name: fn_alert +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnAlert(text: String, modifier: Modifier = Modifier, title: String? = null, variant: FnAlertVariant = FnAlertVariant.Info)" +description: "Bloque de aviso con 4 variantes semanticas (Info/Success/Warning/Error), fondo y borde del color." +tags: [compose, android, ui, feedback, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Feedback.kt" +--- + +## Ejemplo + +```kotlin +FnAlert("Guardado", title = "Success", variant = FnAlertVariant.Success) +``` + +## Cuando usarla + +Para mensajes contextuales de estado dentro de una pantalla. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_app_shell.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_app_shell.md new file mode 100644 index 00000000..2b027e09 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_app_shell.md @@ -0,0 +1,34 @@ +--- +name: fn_app_shell +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnAppShell(title: String, modifier: Modifier = Modifier, content: @Composable (PaddingValues) -> Unit)" +description: "Scaffold con TopAppBar (titulo) que envuelve el contenido principal de una pantalla. Equivalente de de Mantine." +tags: [compose, android, ui, layout, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Layout.kt" +--- + +## Ejemplo + +```kotlin +FnAppShell(title = "Mi App") { padding -> + FnStack(Modifier.padding(padding)) { /* ... */ } +} +``` + +## Cuando usarla + +Como contenedor raiz de cada pantalla de la app, una vez dentro de FnTheme. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_avatar.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_avatar.md new file mode 100644 index 00000000..49af75d6 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_avatar.md @@ -0,0 +1,32 @@ +--- +name: fn_avatar +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnAvatar(initials: String, modifier: Modifier = Modifier, size: FnAvatarSize = FnAvatarSize.Md)" +description: "Circulo con iniciales sobre fondo primary, tamanos Sm (28dp), Md (40dp), Lg (56dp)." +tags: [compose, android, ui, display, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Display.kt" +--- + +## Ejemplo + +```kotlin +FnAvatar("EG", size = FnAvatarSize.Md) +``` + +## Cuando usarla + +Para representar usuarios o entidades por iniciales cuando no hay imagen. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_badge.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_badge.md new file mode 100644 index 00000000..1e90031e --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_badge.md @@ -0,0 +1,32 @@ +--- +name: fn_badge +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnBadge(text: String, modifier: Modifier = Modifier, color: FnBadgeColor = FnBadgeColor.Brand)" +description: "Pill de estado con 6 colores semanticos (Brand/Gray/Green/Red/Yellow/Blue), fondo tenue + texto del color." +tags: [compose, android, ui, display, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Display.kt" +--- + +## Ejemplo + +```kotlin +FnBadge("ACTIVE", color = FnBadgeColor.Green) +``` + +## Cuando usarla + +Para etiquetar estados, categorias o tags cortos. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_bar_chart.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_bar_chart.md new file mode 100644 index 00000000..4c35443a --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_bar_chart.md @@ -0,0 +1,32 @@ +--- +name: fn_bar_chart +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnBarChart(data: List, modifier: Modifier = Modifier)" +description: "Grafico de barras verticales Canvas con labels. Define FnBarItem(label, value)." +tags: [compose, android, ui, charts, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Charts.kt" +--- + +## Ejemplo + +```kotlin +FnBarChart(data = listOf(FnBarItem("Lun", 12f), FnBarItem("Mar", 19f))) +``` + +## Cuando usarla + +Para comparar valores discretos por categoria. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_button.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_button.md new file mode 100644 index 00000000..4148d622 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_button.md @@ -0,0 +1,33 @@ +--- +name: fn_button +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnButton(text: String, onClick: () -> Unit, modifier: Modifier = Modifier, variant: FnButtonVariant = FnButtonVariant.Filled)" +description: "Boton con 6 variantes: Filled, Outlined, Secondary, Ghost, Destructive, Link. Mirror de los variants de Mantine." +tags: [compose, android, ui, inputs, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Inputs.kt" +--- + +## Ejemplo + +```kotlin +FnButton("Enviar", onClick = { /* ... */ }) +FnButton("Borrar", onClick = {}, variant = FnButtonVariant.Destructive) +``` + +## Cuando usarla + +Para cualquier accion; elige variant segun jerarquia/semantica. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_card.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_card.md new file mode 100644 index 00000000..5d2cfefc --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_card.md @@ -0,0 +1,34 @@ +--- +name: fn_card +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnCard(modifier: Modifier = Modifier, variant: FnCardVariant = FnCardVariant.Default, content: @Composable ColumnScope.() -> Unit)" +description: "Tarjeta contenedora con tres variantes: Default (borde + sombra), Borderless (solo fondo), Ghost (transparente)." +tags: [compose, android, ui, display, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Display.kt" +--- + +## Ejemplo + +```kotlin +FnCard(variant = FnCardVariant.Default) { + FnText("Dentro de la card") +} +``` + +## Cuando usarla + +Para agrupar contenido relacionado con enfasis visual. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_checkbox.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_checkbox.md new file mode 100644 index 00000000..76e50932 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_checkbox.md @@ -0,0 +1,32 @@ +--- +name: fn_checkbox +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnCheckbox(checked: Boolean, onCheckedChange: (Boolean) -> Unit, modifier: Modifier = Modifier, label: String? = null)" +description: "Checkbox con label opcional. Stateless." +tags: [compose, android, ui, inputs, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Inputs.kt" +--- + +## Ejemplo + +```kotlin +FnCheckbox(checked = ok, onCheckedChange = { ok = it }, label = "Acepto") +``` + +## Cuando usarla + +Para seleccion booleana en formularios y listas. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_data_table.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_data_table.md new file mode 100644 index 00000000..a2c89b3d --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_data_table.md @@ -0,0 +1,35 @@ +--- +name: fn_data_table +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnDataTable(rows: List, columns: List>, modifier: Modifier = Modifier)" +description: "Tabla generica por columnas (FnTableColumn: header, weight, cell). Column estatica, cada celda es un Composable. Define FnTableColumn." +tags: [compose, android, ui, data, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Data.kt" +--- + +## Ejemplo + +```kotlin +FnDataTable(rows = users, columns = listOf( + FnTableColumn("Nombre", 2f) { FnText(it.name) }, + FnTableColumn("Estado", 1f) { FnBadge(it.status) }, +)) +``` + +## Cuando usarla + +Para mostrar datos tabulares con celdas personalizadas. No anidar en verticalScroll con muchas filas. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_dialog.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_dialog.md new file mode 100644 index 00000000..715359e6 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_dialog.md @@ -0,0 +1,32 @@ +--- +name: fn_dialog +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnDialog(open: Boolean, onDismiss: () -> Unit, title: String, description: String, onConfirm: () -> Unit, modifier: Modifier = Modifier)" +description: "Modal AlertDialog con titulo, descripcion y botones Confirmar/Cancelar. Se renderiza solo si open." +tags: [compose, android, ui, inputs, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Inputs.kt" +--- + +## Ejemplo + +```kotlin +FnDialog(open = show, onDismiss = { show = false }, title = "Confirmar", description = "Seguro?", onConfirm = { show = false }) +``` + +## Cuando usarla + +Para confirmaciones y dialogos modales bloqueantes. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_empty_state.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_empty_state.md new file mode 100644 index 00000000..28403390 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_empty_state.md @@ -0,0 +1,32 @@ +--- +name: fn_empty_state +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnEmptyState(title: String, description: String, modifier: Modifier = Modifier, icon: String? = null, action: (@Composable () -> Unit)? = null)" +description: "Estado vacio centrado con icono (emoji), titulo, descripcion y accion opcional." +tags: [compose, android, ui, feedback, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Feedback.kt" +--- + +## Ejemplo + +```kotlin +FnEmptyState(title = "Sin datos", description = "Anade el primero", icon = "📭") +``` + +## Cuando usarla + +Para listas/pantallas sin contenido todavia. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_group.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_group.md new file mode 100644 index 00000000..23496a17 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_group.md @@ -0,0 +1,35 @@ +--- +name: fn_group +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnGroup(modifier: Modifier = Modifier, gap: Dp = FnSpacing.sm, content: @Composable RowScope.() -> Unit)" +description: "Row con separacion uniforme entre hijos y alineacion vertical centrada. Equivalente Compose de de Mantine." +tags: [compose, android, ui, layout, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Layout.kt" +--- + +## Ejemplo + +```kotlin +FnGroup { + FnButton("Guardar", onClick = {}) + FnButton("Cancelar", onClick = {}, variant = FnButtonVariant.Ghost) +} +``` + +## Cuando usarla + +Para alinear elementos en fila (botones, badges) con separacion uniforme. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_kpi_card.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_kpi_card.md new file mode 100644 index 00000000..37772861 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_kpi_card.md @@ -0,0 +1,32 @@ +--- +name: fn_kpi_card +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnKpiCard(label: String, value: String, modifier: Modifier = Modifier, delta: String? = null, deltaPositive: Boolean = true, sparklineData: List? = null)" +description: "Tarjeta de metrica con label, valor grande, delta coloreado y sparkline inline opcional." +tags: [compose, android, ui, data, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Data.kt" +--- + +## Ejemplo + +```kotlin +FnKpiCard(label = "Revenue", value = "42k", delta = "+12%", sparklineData = listOf(1f,3f,2f,5f)) +``` + +## Cuando usarla + +Para dashboards: mostrar un KPI con tendencia. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_line_chart.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_line_chart.md new file mode 100644 index 00000000..308400a9 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_line_chart.md @@ -0,0 +1,32 @@ +--- +name: fn_line_chart +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnLineChart(data: List, modifier: Modifier = Modifier)" +description: "Grafico de linea Canvas con relleno de area, sin dependencias externas. Normaliza la serie automaticamente." +tags: [compose, android, ui, charts, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Charts.kt" +--- + +## Ejemplo + +```kotlin +FnLineChart(data = listOf(10f,14f,12f,18f,22f), modifier = Modifier.fillMaxWidth()) +``` + +## Cuando usarla + +Para series temporales o tendencias continuas. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_loader.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_loader.md new file mode 100644 index 00000000..f2d182d3 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_loader.md @@ -0,0 +1,32 @@ +--- +name: fn_loader +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnLoader(modifier: Modifier = Modifier, size: FnLoaderSize = FnLoaderSize.Md)" +description: "Spinner CircularProgressIndicator en color primary, tamanos Sm/Md/Lg." +tags: [compose, android, ui, feedback, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Feedback.kt" +--- + +## Ejemplo + +```kotlin +FnLoader(size = FnLoaderSize.Md) +``` + +## Cuando usarla + +Para indicar carga indeterminada. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_page_header.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_page_header.md new file mode 100644 index 00000000..63bd570d --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_page_header.md @@ -0,0 +1,32 @@ +--- +name: fn_page_header +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnPageHeader(title: String, modifier: Modifier = Modifier, subtitle: String? = null, actions: (@Composable () -> Unit)? = null)" +description: "Cabecera de seccion con titulo, subtitulo opcional y slot de acciones a la derecha." +tags: [compose, android, ui, data, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Data.kt" +--- + +## Ejemplo + +```kotlin +FnPageHeader("Usuarios", subtitle = "Listado activo", actions = { FnButton("Nuevo", onClick = {}) }) +``` + +## Cuando usarla + +Al inicio de cada seccion/pantalla para titular y exponer acciones. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_paper.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_paper.md new file mode 100644 index 00000000..5b6f1085 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_paper.md @@ -0,0 +1,34 @@ +--- +name: fn_paper +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnPaper(modifier: Modifier = Modifier, content: @Composable ColumnScope.() -> Unit)" +description: "Contenedor Surface minimal con radius y sombra leves, fondo surface del tema. Mas ligero que FnCard." +tags: [compose, android, ui, layout, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Layout.kt" +--- + +## Ejemplo + +```kotlin +FnPaper(modifier = Modifier.fillMaxWidth()) { + FnText("Contenido") +} +``` + +## Cuando usarla + +Para agrupar contenido en una superficie elevada sin el borde marcado de FnCard. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_select.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_select.md new file mode 100644 index 00000000..5ac68968 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_select.md @@ -0,0 +1,32 @@ +--- +name: fn_select +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnSelect(options: List, selected: String?, onSelected: (String) -> Unit, modifier: Modifier = Modifier, label: String? = null)" +description: "Dropdown ExposedDropdownMenu sobre una lista de opciones string. Stateless respecto a la seleccion." +tags: [compose, android, ui, inputs, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Inputs.kt" +--- + +## Ejemplo + +```kotlin +FnSelect(options = listOf("A","B"), selected = sel, onSelected = { sel = it }, label = "Tipo") +``` + +## Cuando usarla + +Para elegir una opcion de una lista cerrada. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_skeleton.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_skeleton.md new file mode 100644 index 00000000..d4c25400 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_skeleton.md @@ -0,0 +1,32 @@ +--- +name: fn_skeleton +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnSkeleton(modifier: Modifier = Modifier, height: Dp = 16.dp)" +description: "Placeholder animado (shimmer) para contenido en carga. Interpola entre surfaceHover y surfaceActive." +tags: [compose, android, ui, feedback, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Feedback.kt" +--- + +## Ejemplo + +```kotlin +FnSkeleton(height = 20.dp) +``` + +## Cuando usarla + +Para esqueletos de carga antes de que lleguen los datos. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_sparkline.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_sparkline.md new file mode 100644 index 00000000..f93d16c2 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_sparkline.md @@ -0,0 +1,32 @@ +--- +name: fn_sparkline +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnSparkline(data: List, modifier: Modifier = Modifier)" +description: "Mini grafico de linea inline (sin ejes ni labels) para incrustar en KPIs, tablas o filas." +tags: [compose, android, ui, charts, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Charts.kt" +--- + +## Ejemplo + +```kotlin +FnSparkline(listOf(20f,35f,28f,42f,38f)) +``` + +## Cuando usarla + +Para tendencias compactas dentro de otra fila/tarjeta. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_stack.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_stack.md new file mode 100644 index 00000000..32d17429 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_stack.md @@ -0,0 +1,35 @@ +--- +name: fn_stack +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnStack(modifier: Modifier = Modifier, gap: Dp = FnSpacing.md, content: @Composable ColumnScope.() -> Unit)" +description: "Column con separacion uniforme entre hijos (Arrangement.spacedBy(gap)). Equivalente Compose de de Mantine." +tags: [compose, android, ui, layout, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Layout.kt" +--- + +## Ejemplo + +```kotlin +FnStack(gap = FnSpacing.md) { + FnText("Linea 1") + FnText("Linea 2") +} +``` + +## Cuando usarla + +Para apilar elementos en vertical con separacion consistente sin repetir Spacers. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_switch.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_switch.md new file mode 100644 index 00000000..94338470 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_switch.md @@ -0,0 +1,32 @@ +--- +name: fn_switch +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnSwitch(checked: Boolean, onCheckedChange: (Boolean) -> Unit, modifier: Modifier = Modifier, label: String? = null)" +description: "Toggle Switch con label opcional a la derecha. Stateless." +tags: [compose, android, ui, inputs, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Inputs.kt" +--- + +## Ejemplo + +```kotlin +FnSwitch(checked = on, onCheckedChange = { on = it }, label = "Activado") +``` + +## Cuando usarla + +Para opciones booleanas de activado/desactivado. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_tabs.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_tabs.md new file mode 100644 index 00000000..147c424c --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_tabs.md @@ -0,0 +1,32 @@ +--- +name: fn_tabs +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnTabs(tabs: List, selectedIndex: Int, onTabSelected: (Int) -> Unit, modifier: Modifier = Modifier, scrollable: Boolean = false)" +description: "Barra de pestanas TabRow (o ScrollableTabRow si scrollable). Stateless respecto al indice activo." +tags: [compose, android, ui, feedback, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Feedback.kt" +--- + +## Ejemplo + +```kotlin +FnTabs(tabs = cats, selectedIndex = tab, onTabSelected = { tab = it }, scrollable = true) +``` + +## Cuando usarla + +Para navegar entre secciones/categorias dentro de una pantalla. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_text.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_text.md new file mode 100644 index 00000000..c714d879 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_text.md @@ -0,0 +1,32 @@ +--- +name: fn_text +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnText(text: String, modifier: Modifier = Modifier, size: FnTextSize = FnTextSize.Md, color: Color = Color.Unspecified)" +description: "Texto de cuerpo con escala de tamanos Xs/Sm/Md/Lg/Xl via FnTypography. Color onSurface por defecto." +tags: [compose, android, ui, display, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Display.kt" +--- + +## Ejemplo + +```kotlin +FnText("Hola", size = FnTextSize.Lg) +``` + +## Cuando usarla + +Para todo texto de cuerpo; no uses Text de Material directo. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_text_input.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_text_input.md new file mode 100644 index 00000000..ac9a4079 --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_text_input.md @@ -0,0 +1,33 @@ +--- +name: fn_text_input +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnTextInput(value: String, onValueChange: (String) -> Unit, modifier: Modifier = Modifier, label: String? = null, placeholder: String? = null, error: String? = null)" +description: "Campo de texto OutlinedTextField con label, placeholder y estado de error opcionales. Stateless." +tags: [compose, android, ui, inputs, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Inputs.kt" +--- + +## Ejemplo + +```kotlin +var v by remember { mutableStateOf("") } +FnTextInput(value = v, onValueChange = { v = it }, label = "Nombre") +``` + +## Cuando usarla + +Para entrada de texto de una linea con validacion visual. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`. diff --git a/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_title.md b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_title.md new file mode 100644 index 00000000..3dedc8bc --- /dev/null +++ b/kotlin/functions/ui/src/main/kotlin/fn/compose/ui/fn_title.md @@ -0,0 +1,32 @@ +--- +name: fn_title +kind: component +lang: kt +domain: ui +version: "0.1.0" +framework: compose +purity: impure +signature: "@Composable fun FnTitle(text: String, modifier: Modifier = Modifier, order: Int = 1)" +description: "Encabezado con jerarquia order 1..6 (h1..h6 de FnTypography), peso bold/semibold." +tags: [compose, android, ui, display, design-system] +props: [] +emits: [] +uses_functions: [] +uses_types: [] +returns: [] +returns_optional: false +error_type: "" +imports: [] +output: "Composable del design system @fn_compose. Emite UI con la identidad del registry (paleta Mantine v9 dark + indigo via FnTheme/FnTokens)." +file_path: "kotlin/functions/ui/src/main/kotlin/fn/compose/ui/Display.kt" +--- + +## Ejemplo + +```kotlin +FnTitle("Seccion", order = 2) +``` + +## Cuando usarla + +Para titulos de seccion y headings jerarquicos. Importa desde `fn.compose.ui`; requiere estar dentro de un `FnTheme {}`.