Add live KSS appearance editing and Lumi style tools

This commit is contained in:
waozi committed 2026-10-09 01:12:24 -03:00
1 parent fcedfec6c9
commit 59efd97a4a
53 files changed
+2750 -120

No files matched your search

+8
View File
@@ -1,4 +1,12 @@
# Changelog
## [2.1.23] - 2026-10-09
### Added
- Customize KSS in Appearance with live preview, per-app styles, an inspector, undo, and reset to defaults.
- Ask Lumi to read, preview, and save appearance changes while preserving your existing customizations.
### Fixed
- Keep Telegram as input to Lumi without bot notifications; retain messages, replies and full history in Lumi.
## [2.1.22] - 2026-10-08
### Added
- Minimize a running practice into a small window and keep using the app.
+4
View File
@@ -1895,6 +1895,10 @@ style-apply-zi-test: $(ZI2C_BIN)
test: style-apply-zi-test
.PHONY: appearance-ui-test
appearance-ui-test: $(TARGET) $(INBE_FULL_BUNDLE)
sh tests/appearance_ui_test.sh $(abspath $(TARGET))
.PHONY: audio-settings-test
audio-settings-test: $(ZI2C_BIN)
@env -u DISPLAY -u WAYLAND_DISPLAY \
+3
View File
@@ -71,6 +71,9 @@ make site
Run the test suite:
[Custom appearance](docs/appearance.md) describes live KSS editing, per-app
customizations, reset, and Lumi's appearance tools.
```bash
make test
make visual-test
+5
View File
@@ -1,5 +1,10 @@
# Changelog
## [2.1.20] - 2026-10-09
- Customize each app in Appearance using live KSS editing, inspection, undo, and reset to defaults.
- Ask Lumi to preview and save your appearance changes.
## [2.1.19] - 2026-10-08
- Deliver the updated Diary to existing Inbe installations with today as its latest date.
+2 -2
View File
@@ -4,8 +4,8 @@
"apps": {
"inbe": {
"id": "inbe",
"version": "2.1.19",
"sequence": 16,
"version": "2.1.20",
"sequence": 17,
"bundled": true
},
"habits": {
+297
View File
@@ -320,5 +320,302 @@
"annotations": {
"readOnlyHint": true
}
},
{
"name": "read_style",
"description": "Read editable KSS, saved and live preview sources, shipped app/style-pack defaults, precedence and current revision for a scope. Always read before editing; preserve existing edits. Use supported KSS properties and existing component classes.",
"inputSchema": {
"type": "object",
"properties": {
"scope": {
"type": "string",
"enum": [
"all",
"lists",
"habits",
"practices",
"diary",
"lumi"
]
}
},
"required": [
"scope"
],
"additionalProperties": false
},
"annotations": {
"readOnlyHint": true,
"destructiveHint": false
}
},
{
"name": "inspect_style",
"description": "Inspect effective values and matching source rules for a widget/class/state in the selected scope. This reads the last valid preview without changing it.",
"inputSchema": {
"type": "object",
"properties": {
"scope": {
"type": "string",
"enum": [
"all",
"lists",
"habits",
"practices",
"diary",
"lumi"
]
},
"widget": {
"type": "string",
"enum": [
"App",
"Button",
"Text",
"Card",
"TextArea",
"TextField",
"NavigationBar",
"NavigationBarItem",
"Image",
"Surface"
]
},
"class": {
"type": "string",
"maxLength": 63
},
"state": {
"type": "string",
"enum": [
"normal",
"hover",
"pressed",
"focus",
"selected",
"disabled"
]
}
},
"required": [
"scope",
"widget",
"state"
],
"additionalProperties": false
},
"annotations": {
"readOnlyHint": true,
"destructiveHint": false
}
},
{
"name": "preview_style",
"description": "Replace the selected custom KSS draft and preview validated changes immediately. Invalid code remains editable and leaves the last working appearance intact. This does not save. Read the current revision first; send the complete custom sheet, preserving unrelated rules.",
"inputSchema": {
"type": "object",
"properties": {
"scope": {
"type": "string",
"enum": [
"all",
"lists",
"habits",
"practices",
"diary",
"lumi"
]
},
"revision": {
"type": "integer",
"minimum": 0,
"description": "The latest revision returned by read_style or the last successful style operation. Read again if another edit changed it."
},
"source": {
"type": "string",
"maxLength": 8191
}
},
"required": [
"scope",
"revision",
"source"
],
"additionalProperties": false
},
"annotations": {
"readOnlyHint": false,
"destructiveHint": false
}
},
{
"name": "save_style",
"description": "Validate and save the selected custom KSS draft for this account. Use after the user requests applying or keeping the preview.",
"inputSchema": {
"type": "object",
"properties": {
"scope": {
"type": "string",
"enum": [
"all",
"lists",
"habits",
"practices",
"diary",
"lumi"
]
},
"revision": {
"type": "integer",
"minimum": 0,
"description": "The latest revision returned by read_style or the last successful style operation. Read again if another edit changed it."
}
},
"required": [
"scope",
"revision"
],
"additionalProperties": false
},
"annotations": {
"readOnlyHint": false,
"destructiveHint": false
}
},
{
"name": "reset_style",
"description": "Reset the selected customization to its shipped default by saving an empty override. Other scopes and app data remain intact.",
"inputSchema": {
"type": "object",
"properties": {
"scope": {
"type": "string",
"enum": [
"all",
"lists",
"habits",
"practices",
"diary",
"lumi"
]
},
"revision": {
"type": "integer",
"minimum": 0,
"description": "The latest revision returned by read_style or the last successful style operation. Read again if another edit changed it."
}
},
"required": [
"scope",
"revision"
],
"additionalProperties": false
},
"annotations": {
"readOnlyHint": false,
"destructiveHint": false
}
},
{
"name": "undo_style",
"description": "Undo the latest edit in this scope and preview the restored draft. It is not saved until save_style.",
"inputSchema": {
"type": "object",
"properties": {
"scope": {
"type": "string",
"enum": [
"all",
"lists",
"habits",
"practices",
"diary",
"lumi"
]
},
"revision": {
"type": "integer",
"minimum": 0,
"description": "The latest revision returned by read_style or the last successful style operation. Read again if another edit changed it."
}
},
"required": [
"scope",
"revision"
],
"additionalProperties": false
},
"annotations": {
"readOnlyHint": false,
"destructiveHint": false
}
},
{
"name": "discard_style",
"description": "Discard unsaved changes in this scope and restore its saved appearance.",
"inputSchema": {
"type": "object",
"properties": {
"scope": {
"type": "string",
"enum": [
"all",
"lists",
"habits",
"practices",
"diary",
"lumi"
]
},
"revision": {
"type": "integer",
"minimum": 0,
"description": "The latest revision returned by read_style or the last successful style operation. Read again if another edit changed it."
}
},
"required": [
"scope",
"revision"
],
"additionalProperties": false
},
"annotations": {
"readOnlyHint": false,
"destructiveHint": false
}
},
{
"name": "format_style",
"description": "Format the current KSS draft without changing its meaning, then preview it. Saving is separate.",
"inputSchema": {
"type": "object",
"properties": {
"scope": {
"type": "string",
"enum": [
"all",
"lists",
"habits",
"practices",
"diary",
"lumi"
]
},
"revision": {
"type": "integer",
"minimum": 0,
"description": "The latest revision returned by read_style or the last successful style operation. Read again if another edit changed it."
}
},
"required": [
"scope",
"revision"
],
"additionalProperties": false
},
"annotations": {
"readOnlyHint": false,
"destructiveHint": false
}
}
]
+51
View File
@@ -0,0 +1,51 @@
# Custom appearance
Open **Settings → Appearance → Advanced appearance (KSS)**. Choose **All apps**
or Lists, Habits, Practices, Diary, or Lumi. Each scope has its own custom sheet.
The shared style pack and Inbe defaults remain readable in the Source menu.
Valid edits render after a short typing pause. An invalid draft stays editable;
the last complete preview remains installed. The status shows the source file,
line, and column of an error. **Save** persists the selected sheet for the current
account. **Discard** restores its saved sheet. **Undo edit** restores a previous
draft. **Format KSS** formats the draft without saving it. **Reset to defaults**
clears and saves only the selected customization. Resetting one app still keeps
the All apps customization; reset All apps as well to return to shipped styling.
```kss
Button {
radius: 24;
}
Button.profile-header:hover {
border-width: 2;
}
tokens {
color {
canvas: #14202b;
}
}
```
KSS is Kryon's stylesheet language. Use the component names, classes, tokens,
and properties shown in the shipped sheets; unsupported CSS properties produce
errors. Styles resolve in this order: shared pack and app defaults, All apps,
then the selected app. The inspector displays resolved properties and matching
source rules for a component and interaction state. Sheets may contain up to
8,191 UTF-8 bytes; the complete cascade allows 512 rules. Custom imports cannot
load files. Saved preferences never modify shipped assets or other accounts.
**Ask Lumi** opens the conversation with the selected scope in a draft. Describe
the look you want and send it. Online Lumi and Harmony use the same app-owned
tools: `read_style`, `inspect_style`, `preview_style`, `save_style`, `reset_style`,
`undo_style`, `discard_style`, and `format_style`. A mutation requires the current
revision from a read or preceding operation, so an outdated edit cannot overwrite
newer changes. Lumi requires an available online chat service; manual editing
works offline.
Verification: `make style-apply-zi-test appearance-ui-test` checks parsing,
atomic validation, scope isolation, persistence, reset, and real editor input on
a private display. Harmony's `tests/app_mcp_test.py` checks the registered tool
path through its companion and hosted app. Daochi's chat tests cover the complete
tool count and larger style-result continuations while retaining input limits.
+2 -2
View File
@@ -56,8 +56,8 @@ android {
minSdk 21
targetSdk 36
testInstrumentationRunner "android.test.InstrumentationTestRunner"
versionCode 159
versionName "2.1.22"
versionCode 160
versionName "2.1.23"
manifestPlaceholders = [
inbeAppLabel: "Inner Breeze",
inbeUsesCleartextTraffic: "false"
@@ -0,0 +1,7 @@
Added
---
- Customize KSS in Appearance with live preview, per-app styles, an inspector, undo, and reset to defaults.
- Ask Lumi to read, preview, and save appearance changes while preserving your existing customizations.
Fixed
---
- Keep Telegram as input to Lumi without bot notifications; retain messages, replies and full history in Lumi.
+53 -4
View File
@@ -2367,7 +2367,7 @@ Ne
---
[lumi_telegram]
Synchronizovat s Telegramem
Zprávy z Telegramu
---
[lumi_session_complete]
@@ -2395,7 +2395,7 @@ Přijatá zpětná vazba:
---
[lumi_telegram_body]
Pište si s Lumi v Telegramu.
Posílejte zprávy z Telegramu; odpovědi a celou historii si přečtete v Lumi.
---
[lumi_telegram_account]
@@ -2403,7 +2403,7 @@ Nejprve připojte svůj synchronizační účet.
---
[lumi_telegram_error]
Synchronizace s Telegramem není dostupná. Zkuste to znovu.
Připojení k Telegramu není dostupné. Zkuste to znovu.
---
[lumi_telegram_waiting]
@@ -2411,7 +2411,7 @@ V Telegramu klepněte na Spustit a pak se sem vraťte.
---
[lumi_telegram_connected]
Připojeno. Lumi odpovídá v Telegramu, dokud je Inbe otevřené.
Připojeno. Posílejte zprávy z Telegramu, když je Inbe otevřené; odpovědi a celá historie zůstávají v Lumi.
---
[lumi_telegram_open]
@@ -2577,6 +2577,55 @@ Ulož až osm uzlů.
[sync_account_options]
Možnosti účtu
---
[appearance_kss_advanced]
Pokročilý vzhled (KSS)
---
[appearance_kss_hint]
Upravujte vlastní KSS s okamžitým náhledem. Nejprve platí sdílené styly, pak změny pro všechny aplikace a nakonec pro vybranou aplikaci. Neplatné úpravy ponechají poslední funkční náhled. Uložení zachová změny; obnovení vymaže vybrané přizpůsobení.
---
[appearance_kss_scope]
Přizpůsobit
---
[appearance_kss_source]
Zdroj
---
[appearance_kss_all]
Všechny aplikace
---
[appearance_kss_custom]
Vlastní KSS
---
[appearance_kss_defaults]
Výchozí styl aplikace (jen čtení)
---
[appearance_kss_pack]
Balíček stylů (jen čtení)
---
[appearance_kss_preview]
Živý náhled — změny nejsou uložené
---
[appearance_kss_saved]
Vzhled uložen
---
[appearance_kss_format]
Formátovat KSS
---
[appearance_kss_undo]
Vrátit úpravu
---
[appearance_kss_lumi]
Zeptat se Lumi
---
[appearance_kss_inspect]
Prohlédnout součást
---
[appearance_kss_state]
Stav
---
[appearance_kss_prompt]
Pomoz mi přizpůsobit KSS pro
---
[session_minimize_button]
Minimalizovat
---
+53 -4
View File
@@ -2367,7 +2367,7 @@ Nein
---
[lumi_telegram]
Mit Telegram synchronisieren
Telegram-Eingabe
---
[lumi_session_complete]
@@ -2395,7 +2395,7 @@ App-Feedback erhalten:
---
[lumi_telegram_body]
Chatte mit Lumi in Telegram.
Sende Nachrichten über Telegram; Antworten und den gesamten Verlauf findest du in Lumi.
---
[lumi_telegram_account]
@@ -2403,7 +2403,7 @@ Verbinde zuerst dein Synchronisierungskonto.
---
[lumi_telegram_error]
Die Telegram-Synchronisierung ist nicht verfügbar. Versuche es erneut.
Die Telegram-Verbindung ist nicht verfügbar. Versuche es erneut.
---
[lumi_telegram_waiting]
@@ -2411,7 +2411,7 @@ Tippe in Telegram auf Start und komm dann hierher zurück.
---
[lumi_telegram_connected]
Verbunden. Lumi antwortet in Telegram, solange Inbe geöffnet ist.
Verbunden. Sende Nachrichten über Telegram, solange Inbe geöffnet ist; Antworten und der gesamte Verlauf bleiben in Lumi.
---
[lumi_telegram_open]
@@ -2577,6 +2577,55 @@ Speichere bis zu acht Knoten.
[sync_account_options]
Kontooptionen
---
[appearance_kss_advanced]
Erweiterte Darstellung (KSS)
---
[appearance_kss_hint]
Bearbeite eigenes KSS mit Live-Vorschau. Zuerst gelten gemeinsame Stile, dann Änderungen für alle Apps und zuletzt für die gewählte App. Ungültige Änderungen behalten die letzte gültige Vorschau. Speichern bewahrt Änderungen; Zurücksetzen löscht die gewählte Anpassung.
---
[appearance_kss_scope]
Anpassen
---
[appearance_kss_source]
Quelle
---
[appearance_kss_all]
Alle Apps
---
[appearance_kss_custom]
Eigenes KSS
---
[appearance_kss_defaults]
App-Vorgaben (nur lesen)
---
[appearance_kss_pack]
Stilpaket (nur lesen)
---
[appearance_kss_preview]
Live-Vorschau — Änderungen ungespeichert
---
[appearance_kss_saved]
Darstellung gespeichert
---
[appearance_kss_format]
KSS formatieren
---
[appearance_kss_undo]
Bearbeitung rückgängig
---
[appearance_kss_lumi]
Lumi fragen
---
[appearance_kss_inspect]
Komponente untersuchen
---
[appearance_kss_state]
Zustand
---
[appearance_kss_prompt]
Hilf mir, KSS anzupassen für
---
[session_minimize_button]
Minimieren
---
+53 -4
View File
@@ -2366,7 +2366,7 @@ No
---
[lumi_telegram]
Sync with Telegram
Telegram input
---
[lumi_session_complete]
@@ -2394,7 +2394,7 @@ App feedback received:
---
[lumi_telegram_body]
Chat with Lumi in Telegram.
Send from Telegram; read replies and full history in Lumi.
---
[lumi_telegram_account]
@@ -2402,7 +2402,7 @@ Connect your sync account first.
---
[lumi_telegram_error]
Telegram sync is unavailable. Try again.
Telegram connection is unavailable. Try again.
---
[lumi_telegram_waiting]
@@ -2410,7 +2410,7 @@ Tap Start in Telegram, then come back here.
---
[lumi_telegram_connected]
Connected. Lumi answers in Telegram while Inbe is open.
Connected. Send from Telegram while Inbe is open; replies and full history stay in Lumi.
---
[lumi_telegram_open]
@@ -2576,6 +2576,55 @@ Save up to eight nodes.
[sync_account_options]
Account options
---
[appearance_kss_advanced]
Advanced appearance (KSS)
---
[appearance_kss_hint]
Edit custom KSS to preview it live. Shared styles come first, then all-app changes, then changes for the selected app. Invalid edits keep the last working preview. Save keeps your changes; reset clears the selected customization.
---
[appearance_kss_scope]
Customize
---
[appearance_kss_source]
Source
---
[appearance_kss_all]
All apps
---
[appearance_kss_custom]
Custom KSS
---
[appearance_kss_defaults]
App defaults (read only)
---
[appearance_kss_pack]
Style pack (read only)
---
[appearance_kss_preview]
Live preview — changes are not saved
---
[appearance_kss_saved]
Saved appearance
---
[appearance_kss_format]
Format KSS
---
[appearance_kss_undo]
Undo edit
---
[appearance_kss_lumi]
Ask Lumi
---
[appearance_kss_inspect]
Inspect component
---
[appearance_kss_state]
State
---
[appearance_kss_prompt]
Help me customize KSS for
---
[session_minimize_button]
Minimize
---
+53 -4
View File
@@ -2367,7 +2367,7 @@ No, gracias
---
[lumi_telegram]
Sincronizar con Telegram
Mensajes desde Telegram
---
[lumi_session_complete]
@@ -2395,7 +2395,7 @@ Comentarios recibidos:
---
[lumi_telegram_body]
Chatea con Lumi en Telegram.
Envía mensajes desde Telegram; lee las respuestas y el historial completo en Lumi.
---
[lumi_telegram_account]
@@ -2403,7 +2403,7 @@ Primero conecta tu cuenta de sincronización.
---
[lumi_telegram_error]
La sincronización con Telegram no está disponible. Inténtalo de nuevo.
La conexión con Telegram no está disponible. Inténtalo de nuevo.
---
[lumi_telegram_waiting]
@@ -2411,7 +2411,7 @@ Pulsa Iniciar en Telegram y vuelve aquí.
---
[lumi_telegram_connected]
Conectado. Lumi responde en Telegram mientras Inbe esté abierto.
Conectado. Envía mensajes desde Telegram mientras Inbe esté abierto; las respuestas y el historial completo quedan en Lumi.
---
[lumi_telegram_open]
@@ -2577,6 +2577,55 @@ Guarda hasta ocho nodos.
[sync_account_options]
Opciones de cuenta
---
[appearance_kss_advanced]
Apariencia avanzada (KSS)
---
[appearance_kss_hint]
Edita KSS personalizado y previsualiza al instante. Primero se aplican los estilos compartidos, luego los cambios generales y después los de la app elegida. Los errores conservan la última vista válida. Guardar conserva los cambios; restablecer borra la personalización elegida.
---
[appearance_kss_scope]
Personalizar
---
[appearance_kss_source]
Fuente
---
[appearance_kss_all]
Todas las apps
---
[appearance_kss_custom]
KSS personalizado
---
[appearance_kss_defaults]
Valores de la app (solo lectura)
---
[appearance_kss_pack]
Paquete de estilo (solo lectura)
---
[appearance_kss_preview]
Vista previa — cambios sin guardar
---
[appearance_kss_saved]
Apariencia guardada
---
[appearance_kss_format]
Formatear KSS
---
[appearance_kss_undo]
Deshacer edición
---
[appearance_kss_lumi]
Consultar a Lumi
---
[appearance_kss_inspect]
Inspeccionar componente
---
[appearance_kss_state]
Estado
---
[appearance_kss_prompt]
Ayúdame a personalizar KSS para
---
[session_minimize_button]
Minimizar
---
+53 -4
View File
@@ -2367,7 +2367,7 @@ Non
---
[lumi_telegram]
Synchroniser avec Telegram
Messages depuis Telegram
---
[lumi_session_complete]
@@ -2395,7 +2395,7 @@ Commentaires reçus :
---
[lumi_telegram_body]
Discute avec Lumi sur Telegram.
Envoie des messages depuis Telegram ; lis les réponses et tout l’historique dans Lumi.
---
[lumi_telegram_account]
@@ -2403,7 +2403,7 @@ Connecte d’abord ton compte de synchronisation.
---
[lumi_telegram_error]
La synchronisation avec Telegram est indisponible. Réessaie.
La connexion à Telegram est indisponible. Réessaie.
---
[lumi_telegram_waiting]
@@ -2411,7 +2411,7 @@ Appuie sur Démarrer dans Telegram, puis reviens ici.
---
[lumi_telegram_connected]
Connecté. Lumi répond sur Telegram tant qu'Inbe est ouvert.
Connecté. Envoie des messages depuis Telegram quand Inbe est ouvert ; les réponses et tout l’historique restent dans Lumi.
---
[lumi_telegram_open]
@@ -2577,6 +2577,55 @@ Enregistrez jusqu’à huit nœuds.
[sync_account_options]
Options du compte
---
[appearance_kss_advanced]
Apparence avancée (KSS)
---
[appearance_kss_hint]
Modifiez le KSS personnalisé avec un aperçu immédiat. Les styles partagés sont suivis des changements globaux, puis de ceux de l’app choisie. Une modification invalide conserve le dernier aperçu valide. Enregistrer conserve les changements ; réinitialiser efface la personnalisation choisie.
---
[appearance_kss_scope]
Personnaliser
---
[appearance_kss_source]
Code source
---
[appearance_kss_all]
Toutes les apps
---
[appearance_kss_custom]
KSS personnalisé
---
[appearance_kss_defaults]
Style initial de l’app (lecture seule)
---
[appearance_kss_pack]
Pack de styles (lecture seule)
---
[appearance_kss_preview]
Aperçu en direct — modifications non enregistrées
---
[appearance_kss_saved]
Apparence enregistrée
---
[appearance_kss_format]
Formater le KSS
---
[appearance_kss_undo]
Annuler la modification
---
[appearance_kss_lumi]
Demander à Lumi
---
[appearance_kss_inspect]
Inspecter un composant
---
[appearance_kss_state]
État
---
[appearance_kss_prompt]
Aide-moi à personnaliser le KSS pour
---
[session_minimize_button]
Réduire
---
+53 -4
View File
@@ -2367,7 +2367,7 @@ Tidak
---
[lumi_telegram]
Sinkronkan dengan Telegram
Pesan dari Telegram
---
[lumi_session_complete]
@@ -2395,7 +2395,7 @@ Masukan aplikasi diterima:
---
[lumi_telegram_body]
Mengobrol dengan Lumi di Telegram.
Kirim pesan dari Telegram; baca balasan dan seluruh riwayat di Lumi.
---
[lumi_telegram_account]
@@ -2403,7 +2403,7 @@ Hubungkan akun sinkronisasi terlebih dahulu.
---
[lumi_telegram_error]
Sinkronisasi Telegram tidak tersedia. Coba lagi.
Koneksi Telegram tidak tersedia. Coba lagi.
---
[lumi_telegram_waiting]
@@ -2411,7 +2411,7 @@ Ketuk Mulai di Telegram, lalu kembali ke sini.
---
[lumi_telegram_connected]
Terhubung. Lumi menjawab di Telegram selama Inbe terbuka.
Terhubung. Kirim pesan dari Telegram saat Inbe terbuka; balasan dan seluruh riwayat tetap di Lumi.
---
[lumi_telegram_open]
@@ -2577,6 +2577,55 @@ Simpan hingga delapan simpul.
[sync_account_options]
Opsi akun
---
[appearance_kss_advanced]
Tampilan lanjutan (KSS)
---
[appearance_kss_hint]
Edit KSS khusus dengan pratinjau langsung. Gaya bersama diterapkan dahulu, lalu perubahan semua aplikasi, kemudian aplikasi yang dipilih. Edit tidak valid mempertahankan pratinjau terakhir yang berfungsi. Simpan mempertahankan perubahan; reset menghapus penyesuaian yang dipilih.
---
[appearance_kss_scope]
Sesuaikan
---
[appearance_kss_source]
Sumber
---
[appearance_kss_all]
Semua aplikasi
---
[appearance_kss_custom]
KSS khusus
---
[appearance_kss_defaults]
Gaya bawaan aplikasi (hanya baca)
---
[appearance_kss_pack]
Paket gaya (hanya baca)
---
[appearance_kss_preview]
Pratinjau langsung — perubahan belum disimpan
---
[appearance_kss_saved]
Tampilan tersimpan
---
[appearance_kss_format]
Rapikan KSS
---
[appearance_kss_undo]
Urungkan edit
---
[appearance_kss_lumi]
Tanya Lumi
---
[appearance_kss_inspect]
Periksa komponen
---
[appearance_kss_state]
Status
---
[appearance_kss_prompt]
Bantu saya menyesuaikan KSS untuk
---
[session_minimize_button]
Perkecil
---
+53 -4
View File
@@ -2367,7 +2367,7 @@ No, grazie
---
[lumi_telegram]
Sincronizza con Telegram
Messaggi da Telegram
---
[lumi_session_complete]
@@ -2395,7 +2395,7 @@ Feedback ricevuto:
---
[lumi_telegram_body]
Chatta con Lumi su Telegram.
Invia messaggi da Telegram; leggi le risposte e tutta la cronologia in Lumi.
---
[lumi_telegram_account]
@@ -2403,7 +2403,7 @@ Collega prima il tuo account di sincronizzazione.
---
[lumi_telegram_error]
La sincronizzazione con Telegram non è disponibile. Riprova.
La connessione a Telegram non è disponibile. Riprova.
---
[lumi_telegram_waiting]
@@ -2411,7 +2411,7 @@ Tocca Avvia in Telegram, poi torna qui.
---
[lumi_telegram_connected]
Collegato. Lumi risponde su Telegram finché Inbe è aperto.
Collegato. Invia messaggi da Telegram mentre Inbe è aperto; le risposte e tutta la cronologia restano in Lumi.
---
[lumi_telegram_open]
@@ -2577,6 +2577,55 @@ Salva fino a otto nodi.
[sync_account_options]
Opzioni account
---
[appearance_kss_advanced]
Aspetto avanzato (KSS)
---
[appearance_kss_hint]
Modifica il KSS personalizzato con anteprima immediata. Prima si applicano gli stili condivisi, poi le modifiche generali e infine quelle dell’app scelta. Le modifiche non valide mantengono l’ultima anteprima funzionante. Salva conserva le modifiche; ripristina elimina la personalizzazione scelta.
---
[appearance_kss_scope]
Personalizza
---
[appearance_kss_source]
Sorgente
---
[appearance_kss_all]
Tutte le app
---
[appearance_kss_custom]
KSS personalizzato
---
[appearance_kss_defaults]
Stile predefinito dell’app (sola lettura)
---
[appearance_kss_pack]
Pacchetto di stili (sola lettura)
---
[appearance_kss_preview]
Anteprima dal vivo — modifiche non salvate
---
[appearance_kss_saved]
Aspetto salvato
---
[appearance_kss_format]
Formatta KSS
---
[appearance_kss_undo]
Annulla modifica
---
[appearance_kss_lumi]
Chiedi a Lumi
---
[appearance_kss_inspect]
Ispeziona componente
---
[appearance_kss_state]
Stato
---
[appearance_kss_prompt]
Aiutami a personalizzare il KSS per
---
[session_minimize_button]
Riduci a icona
---
+53 -4
View File
@@ -2369,7 +2369,7 @@ WHMの最長息止め時間(秒)
---
[lumi_telegram]
Telegramと同期
Telegramからの入力
---
[lumi_session_complete]
@@ -2397,7 +2397,7 @@ Telegramと同期
---
[lumi_telegram_body]
TelegramでLumiとチャットできます。
Telegramからメッセージを送り、返信とすべての履歴はLumiで読めます。
---
[lumi_telegram_account]
@@ -2405,7 +2405,7 @@ TelegramでLumiとチャットできます。
---
[lumi_telegram_error]
Telegramとの同期を利用できません。もう一度お試しください。
Telegramに接続できません。もう一度お試しください。
---
[lumi_telegram_waiting]
@@ -2413,7 +2413,7 @@ Telegramで「開始」をタップしてから、ここに戻ってください
---
[lumi_telegram_connected]
接続済みです。Inbeを開いている間、LumiがTelegramで返信します。
接続済みです。Inbeを開いている間、Telegramからメッセージを送れます。返信とすべての履歴はLumiに残ります。
---
[lumi_telegram_open]
@@ -2579,6 +2579,55 @@ Daochiノード
[sync_account_options]
アカウント設定
---
[appearance_kss_advanced]
高度な外観設定(KSS)
---
[appearance_kss_hint]
独自のKSSを編集すると即座にプレビューできます。共通スタイル、全アプリの変更、選択したアプリの変更の順に適用します。不正な編集では最後の有効な表示を維持します。保存で変更を保持し、リセットで選択したカスタマイズを消去します。
---
[appearance_kss_scope]
カスタマイズ対象
---
[appearance_kss_source]
ソース
---
[appearance_kss_all]
すべてのアプリ
---
[appearance_kss_custom]
独自のKSS
---
[appearance_kss_defaults]
アプリの既定スタイル(読み取り専用)
---
[appearance_kss_pack]
スタイルパック(読み取り専用)
---
[appearance_kss_preview]
ライブプレビュー — 変更は未保存です
---
[appearance_kss_saved]
外観を保存しました
---
[appearance_kss_format]
KSSを整形
---
[appearance_kss_undo]
編集を元に戻す
---
[appearance_kss_lumi]
Lumiに相談
---
[appearance_kss_inspect]
コンポーネントを調べる
---
[appearance_kss_state]
状態
---
[appearance_kss_prompt]
次の対象のKSSのカスタマイズを手伝ってください
---
[session_minimize_button]
最小化
---
+53 -4
View File
@@ -2367,7 +2367,7 @@ WHM 시작
---
[lumi_telegram]
Telegram과 동기화
Telegram에서 메시지 보내기
---
[lumi_session_complete]
@@ -2395,7 +2395,7 @@ Telegram과 동기화
---
[lumi_telegram_body]
Telegram에서 Lumi와 대화하세요.
Telegram에서 메시지를 보내고, 답장과 전체 대화 기록은 Lumi에서 확인하세요.
---
[lumi_telegram_account]
@@ -2403,7 +2403,7 @@ Telegram에서 Lumi와 대화하세요.
---
[lumi_telegram_error]
Telegram 동기화를 사용할 수 없습니다. 다시 시도하세요.
Telegram에 연결할 수 없습니다. 다시 시도해 주세요.
---
[lumi_telegram_waiting]
@@ -2411,7 +2411,7 @@ Telegram에서 시작을 누른 다음 여기로 돌아오세요.
---
[lumi_telegram_connected]
연결되었습니다. Inbe가 열려 있는 동안 Lumi가 Telegram에서 답장해요.
연결되었습니다. Inbe가 열려 있을 때 Telegram에서 메시지를 보내세요. 답장과 전체 대화 기록은 Lumi에 남아요.
---
[lumi_telegram_open]
@@ -2577,6 +2577,55 @@ Daochi 노드
[sync_account_options]
계정 옵션
---
[appearance_kss_advanced]
고급 외관 설정 (KSS)
---
[appearance_kss_hint]
사용자 KSS를 편집하면 바로 미리 볼 수 있습니다. 공통 스타일, 모든 앱 변경, 선택한 앱 변경 순으로 적용됩니다. 잘못된 편집은 마지막 유효한 미리보기를 유지합니다. 저장은 변경을 보관하고 초기화는 선택한 맞춤 설정을 지웁니다.
---
[appearance_kss_scope]
맞춤 설정 대상
---
[appearance_kss_source]
소스
---
[appearance_kss_all]
모든 앱
---
[appearance_kss_custom]
사용자 KSS
---
[appearance_kss_defaults]
앱 기본 스타일 (읽기 전용)
---
[appearance_kss_pack]
스타일 팩 (읽기 전용)
---
[appearance_kss_preview]
실시간 미리보기 — 변경 사항이 저장되지 않았습니다
---
[appearance_kss_saved]
외관이 저장되었습니다
---
[appearance_kss_format]
KSS 서식 정리
---
[appearance_kss_undo]
편집 실행 취소
---
[appearance_kss_lumi]
Lumi에게 요청
---
[appearance_kss_inspect]
구성 요소 검사
---
[appearance_kss_state]
상태
---
[appearance_kss_prompt]
다음 대상의 KSS 맞춤 설정을 도와주세요
---
[session_minimize_button]
최소화
---
+53 -4
View File
@@ -2367,7 +2367,7 @@ Não
---
[lumi_telegram]
Sincronizar com o Telegram
Mensagens do Telegram
---
[lumi_session_complete]
@@ -2395,7 +2395,7 @@ Feedback recebido:
---
[lumi_telegram_body]
Converse com Lumi no Telegram.
Envie mensagens pelo Telegram; leia as respostas e todo o histórico no Lumi.
---
[lumi_telegram_account]
@@ -2403,7 +2403,7 @@ Primeiro, conecte sua conta de sincronização.
---
[lumi_telegram_error]
A sincronização com o Telegram está indisponível. Tente novamente.
A conexão com o Telegram não está disponível. Tente novamente.
---
[lumi_telegram_waiting]
@@ -2411,7 +2411,7 @@ Toque em Iniciar no Telegram e depois volte aqui.
---
[lumi_telegram_connected]
Conectado. Lumi responde no Telegram enquanto o Inbe estiver aberto.
Conectado. Envie mensagens pelo Telegram enquanto o Inbe estiver aberto; as respostas e todo o histórico ficam no Lumi.
---
[lumi_telegram_open]
@@ -2577,6 +2577,55 @@ Salve até oito nós.
[sync_account_options]
Opções da conta
---
[appearance_kss_advanced]
Aparência avançada (KSS)
---
[appearance_kss_hint]
Edite KSS personalizado com prévia ao vivo. Primeiro são aplicados os estilos compartilhados, depois as mudanças gerais e por fim as do app escolhido. Edições inválidas mantêm a última prévia válida. Salvar mantém as mudanças; redefinir apaga a personalização escolhida.
---
[appearance_kss_scope]
Personalizar
---
[appearance_kss_source]
Código-fonte
---
[appearance_kss_all]
Todos os apps
---
[appearance_kss_custom]
KSS personalizado
---
[appearance_kss_defaults]
Padrões do app (somente leitura)
---
[appearance_kss_pack]
Pacote de estilos (somente leitura)
---
[appearance_kss_preview]
Prévia ao vivo — alterações não salvas
---
[appearance_kss_saved]
Aparência salva
---
[appearance_kss_format]
Formatar KSS
---
[appearance_kss_undo]
Desfazer edição
---
[appearance_kss_lumi]
Perguntar à Lumi
---
[appearance_kss_inspect]
Inspecionar componente
---
[appearance_kss_state]
Estado
---
[appearance_kss_prompt]
Ajude-me a personalizar KSS para
---
[session_minimize_button]
Minimizar
---
+53 -4
View File
@@ -2367,7 +2367,7 @@ Inner Breeze бесплатное приложение с открытым ис
---
[lumi_telegram]
Синхронизация с Telegram
Сообщения из Telegram
---
[lumi_session_complete]
@@ -2395,7 +2395,7 @@ Inner Breeze бесплатное приложение с открытым ис
---
[lumi_telegram_body]
Общайтесь с Lumi в Telegram.
Отправляйте сообщения из Telegram; ответы и вся история доступны в Lumi.
---
[lumi_telegram_account]
@@ -2403,7 +2403,7 @@ Inner Breeze бесплатное приложение с открытым ис
---
[lumi_telegram_error]
Синхронизация с Telegram недоступна. Попробуйте ещё раз.
Подключение к Telegram недоступно. Попробуйте ещё раз.
---
[lumi_telegram_waiting]
@@ -2411,7 +2411,7 @@ Inner Breeze бесплатное приложение с открытым ис
---
[lumi_telegram_connected]
Подключено. Lumi отвечает в Telegram, пока Inbe открыт.
Подключено. Отправляйте сообщения из Telegram, пока Inbe открыт; ответы и вся история остаются в Lumi.
---
[lumi_telegram_open]
@@ -2577,6 +2577,55 @@ Inner Breeze бесплатное приложение с открытым ис
[sync_account_options]
Параметры аккаунта
---
[appearance_kss_advanced]
Расширенное оформление (KSS)
---
[appearance_kss_hint]
Редактируйте свой KSS с живым предпросмотром. Сначала применяются общие стили, затем изменения для всех приложений и для выбранного приложения. Ошибочная правка сохраняет последний рабочий вид. Сохранение оставляет изменения; сброс удаляет выбранную настройку.
---
[appearance_kss_scope]
Настроить
---
[appearance_kss_source]
Исходный код
---
[appearance_kss_all]
Все приложения
---
[appearance_kss_custom]
Свой KSS
---
[appearance_kss_defaults]
Стиль приложения (только чтение)
---
[appearance_kss_pack]
Пакет стилей (только чтение)
---
[appearance_kss_preview]
Живой предпросмотр — изменения не сохранены
---
[appearance_kss_saved]
Оформление сохранено
---
[appearance_kss_format]
Форматировать KSS
---
[appearance_kss_undo]
Отменить правку
---
[appearance_kss_lumi]
Спросить Lumi
---
[appearance_kss_inspect]
Просмотреть компонент
---
[appearance_kss_state]
Состояние
---
[appearance_kss_prompt]
Помоги мне настроить KSS для
---
[session_minimize_button]
Свернуть
---
+53 -4
View File
@@ -2367,7 +2367,7 @@ WHM 最长屏息时间(秒)
---
[lumi_telegram]
与Telegram同步
从Telegram输入
---
[lumi_session_complete]
@@ -2395,7 +2395,7 @@ WHM 最长屏息时间(秒)
---
[lumi_telegram_body]
在Telegram中与Lumi聊天。
从Telegram发送消息,在Lumi中查看回复和完整历史记录。
---
[lumi_telegram_account]
@@ -2403,7 +2403,7 @@ WHM 最长屏息时间(秒)
---
[lumi_telegram_error]
Telegram同步暂时不可用,请重试。
无法连接Telegram,请重试。
---
[lumi_telegram_waiting]
@@ -2411,7 +2411,7 @@ Telegram同步暂时不可用,请重试。
---
[lumi_telegram_connected]
已连接。Inbe打开时,Lumi会在Telegram中回复。
已连接。Inbe打开时可从Telegram发送消息,回复和完整历史记录保留在Lumi中。
---
[lumi_telegram_open]
@@ -2577,6 +2577,55 @@ Daochi 节点
[sync_account_options]
账户选项
---
[appearance_kss_advanced]
高级外观设置(KSS)
---
[appearance_kss_hint]
编辑自定义 KSS 即可实时预览。先应用共享样式,再应用所有应用的修改,最后应用所选应用的修改。无效编辑会保留最后可用的预览。保存会保留修改,重置会清除所选自定义设置。
---
[appearance_kss_scope]
自定义对象
---
[appearance_kss_source]
源码
---
[appearance_kss_all]
所有应用
---
[appearance_kss_custom]
自定义 KSS
---
[appearance_kss_defaults]
应用默认样式(只读)
---
[appearance_kss_pack]
样式包(只读)
---
[appearance_kss_preview]
实时预览 — 修改尚未保存
---
[appearance_kss_saved]
外观已保存
---
[appearance_kss_format]
格式化 KSS
---
[appearance_kss_undo]
撤销编辑
---
[appearance_kss_lumi]
请 Lumi 帮忙
---
[appearance_kss_inspect]
检查组件
---
[appearance_kss_state]
状态
---
[appearance_kss_prompt]
请帮我自定义以下对象的 KSS
---
[session_minimize_button]
最小化
---
+1 -1
View File
@@ -1,5 +1,5 @@
Package: inbe.waozi
Version: 2.1.22
Version: 2.1.23
Architecture: arm64
Maintainer: Waozi <[email protected]>
Click-Version: 0.4
+1 -1
View File
@@ -28,7 +28,7 @@
<binary>inbe</binary>
</provides>
<releases>
<release version="2.1.22" date="2026-10-08"/>
<release version="2.1.23" date="2026-10-09"/>
</releases>
<content_rating type="oars-1.1"/>
</component>
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "inbe",
"title": "Inner Breeze",
"version": "2.1.22",
"version": "2.1.23",
"architecture": "arm64",
"framework": "ubuntu-sdk-20.04",
"description": "Syncable breathing, meditation, and habit practice app.",
+1 -1
View File
@@ -2,7 +2,7 @@
"manifest_version": 3,
"name": "Inner Breeze",
"short_name": "Inbe",
"version": "2.1.22",
"version": "2.1.23",
"description": "Breathing, meditation, habit tracking, and encrypted sync.",
"permissions": [
"contextMenus"
+1 -1
View File
@@ -22,7 +22,7 @@
<binary>inbe</binary>
</provides>
<releases>
<release version="2.1.22" date="2026-10-08"/>
<release version="2.1.23" date="2026-10-09"/>
</releases>
<content_rating type="oars-1.1"/>
</component>
+1 -1
View File
@@ -22,7 +22,7 @@
<binary>inbe</binary>
</provides>
<releases>
<release version="2.1.22" date="2026-10-08"/>
<release version="2.1.23" date="2026-10-09"/>
</releases>
<content_rating type="oars-1.1"/>
</component>
+1 -1
View File
@@ -6,7 +6,7 @@ description: |
meditation, and habit tracking with visual and audio cues, meditation
timers, habit counters, session history, and optional sync.
version: '2.1.22'
version: '2.1.23'
license: BSD-3-Clause
base: core22
confinement: strict
+2
View File
@@ -16,6 +16,7 @@ app_force_dark_mode :: () -> bool #foreign c;
#import, file "text_buffers.zi";
#import, file "donation_threshold.zi";
#import, file "theme_catalog.zi";
#import, file "style_customization.zi";
#import "c_string"
#import, file "manual_seen.zi";
#import, file "settings_cache.zi";
@@ -452,6 +453,7 @@ app_load_settings :: (app: *InnerBreeze) -> s32 {
settings_missing = SettingsEmpty()
SettingsCacheLoad()
StyleCustomizationLoad()
speed = SettingsCacheInt("speed", DefaultSpeedLevel)
max_rounds = SettingsCacheInt("max_rounds",
+262 -27
View File
@@ -7,6 +7,10 @@
#import, file "theme_catalog.zi";
#import, file "mini_mode.zi";
#import, file "metrics.zi";
#import, file "style_customization.zi";
#import, file "../core/types.zi";
#import, file "text_buffers.zi";
#import "byte_text_linux"
#import "text_style"
#import "text_props"
#import "style"
@@ -248,52 +252,283 @@ style_installed_theme: s32;
style_installed_dark: bool;
style_installed_index: s32;
style_installed_waozi: bool;
style_installed_revision: s32 = -1;
style_installed_scope: s32 = -1;
style_generation: s32;
style_parse_sources: [StyleRuleCapacity]StyleRuleSource;
style_parse_source_count: s32;
style_compile_tokens: [128]KssToken;
style_compile_token_count: s32;
style_inspection_rules: StyleRules;
StyleRecordRule :: (parsed: *StyleRulesParse) {
index := parsed.rules.count - 1
if index < 0 || index >= StyleRuleCapacity {
return
}
origin := parsed.parser.origin
span := parsed.parser.rule_span
source := parsed.parser.cursor.source
style_parse_sources[index] = StyleRuleSource.{}
if span.selector_start >= 0 && span.selector_length > 0 &&
span.selector_start + span.selector_length <= source.count {
selector := source[span.selector_start:span.selector_start + span.selector_length]
CopyTextToBuffer(*style_parse_sources[index].selector[0], 160, selector)
}
if origin.file >= 0 && origin.file < parsed.parser.file_count {
file := parsed.parser.files[origin.file]
CopyTextToBuffer(*style_parse_sources[index].path[0], 64,
TextFromBytes(file.name[:file.length]))
}
style_parse_sources[index].line = origin.line
style_parse_sources[index].column = origin.column
style_parse_source_count = parsed.rules.count
}
StyleCompileSources :: (catalog: ThemeCatalog, dark: bool, style_index: s32,
all_source: string, scoped_source: string,
install: bool) -> bool {
env := KssEnvironmentWithNames(KssDefaultEnvironment(),
ifx dark then "dark" else "light", "", "", "", "", "")
root := StyleRootFor(style_index)
if all_source.count > 0 || scoped_source.count > 0 {
if style_index == 2 {
root = "@import <classic>; @import <inbe>; @import <user>; @import <scope>;"
} else if style_index == 3 {
root = "@import <lightfield>; @import <inbe>; @import <user>; @import <scope>;"
} else {
root = "@import <material>; @import <inbe>; @import <user>; @import <scope>;"
}
}
parsed: StyleRulesParse
for pass: cast(s32)0..cast(s32)1 {
parsed = BeginStyleRules(root, "styles/inbe-root.kss", env)
if !catalog.complete {
parsed.parser = KssFail(parsed.parser, "Could not load the selected theme.")
StyleParseError(*parsed)
return false
}
parsed.parser = StyleOverrides(parsed.parser, StyleColorsFor(catalog, dark), style_index)
if pass == 1 && style_compile_token_count > 0 {
for index: cast(s32)0..style_compile_token_count - 1 {
token := style_compile_tokens[index]
if token.file >= 0 {
parsed.parser = KssAddTokenOverride(parsed.parser, token)
}
}
}
custom_file: s32 = -1
scoped_file: s32 = -1
style_parse_source_count = 0
while !parsed.overflow &&
parsed.parser.status != cast(s32)KssStatusDone &&
parsed.parser.status != cast(s32)KssStatusError {
// Keep the rule table in this frame. Passing the whole parse value to
// StepStyleRules adds a second large table on small Android stacks.
parsed.parser = KssStep(parsed.parser)
if parsed.parser.status == cast(s32)KssStatusRule {
if parsed.rules.count >= StyleRuleCapacity {
parsed.overflow = true
} else {
parsed.rules.items[parsed.rules.count] = parsed.parser.rule
parsed.rules.count += 1
}
}
if !parsed.overflow && parsed.parser.status == cast(s32)KssStatusRule {
rule_index := parsed.rules.count - 1
if parsed.parser.origin.file == custom_file {
parsed.rules.items[rule_index].layer += 100
} else if parsed.parser.origin.file == scoped_file {
parsed.rules.items[rule_index].layer += 200
}
StyleRecordRule(*parsed)
}
if parsed.parser.status != cast(s32)KssStatusNeedImport {
continue
}
name := parsed.parser.pending_import
if parsed.parser.cursor.file != 0 {
parsed.parser = KssFail(parsed.parser,
"Custom sheets cannot import files. Shared styles are supplied by the app.")
break
}
if KssNameEquals(name, "user") {
custom_file = parsed.parser.file_count
parsed.parser.override_count = 0
for index: cast(s32)0..parsed.parser.token_count - 1 {
parsed.parser.tokens[index].file = -1
}
parsed = ProvideStyleRulesImport(parsed, all_source, "appearance/all.kss")
} else if KssNameEquals(name, "scope") {
scoped_file = parsed.parser.file_count
parsed = ProvideStyleRulesImport(parsed, scoped_source, "appearance/app.kss")
} else {
asset := StyleImport(name)
if !asset.found {
parsed = FailStyleRulesImport(parsed)
break
}
path := ifx KssNameEquals(name, "inbe") then "assets/styles/inbe.kss" else style_pack_id(style_index)
parsed = ProvideStyleRulesImport(parsed, asset.data, path)
}
}
if pass == 0 && StyleCollectCustomTokens(*parsed) {
continue
}
break
}
if parsed.overflow || parsed.parser.status != cast(s32)KssStatusDone {
StyleParseError(*parsed)
return false
}
if install {
return StylePublish(*parsed)
}
style_inspection_rules.count = parsed.rules.count
for index: cast(s32)0..parsed.rules.count - 1 {
style_inspection_rules.items[index] = StyleRule.{
.selector = parsed.rules.items[index].selector,
.state = parsed.rules.items[index].state,
.layer = parsed.rules.items[index].layer,
.order = parsed.rules.items[index].order,
.style = StyleWithoutTypeface(parsed.rules.items[index].style)}
}
return true
}
StyleCollectCustomTokens :: (parsed: *StyleRulesParse) -> bool {
style_compile_token_count = 0
if parsed.overflow || parsed.parser.status != cast(s32)KssStatusDone ||
parsed.parser.file_count <= 3 {
return false
}
for index: cast(s32)0..parsed.parser.token_count - 1 {
if parsed.parser.tokens[index].file >= 0 {
style_compile_tokens[style_compile_token_count] = parsed.parser.tokens[index]
style_compile_token_count += 1
}
}
return style_compile_token_count > 0
}
StyleParseError :: (parsed: *StyleRulesParse) {
StyleClearError()
if parsed.overflow {
unused AppCopyText("The combined stylesheet exceeds 512 rules.", style_error[:])
} else {
unused AppCopyText(TextFromBytes(parsed.parser.diagnostic[:
parsed.parser.diagnostic_length]), style_error[:])
}
style_error_line = parsed.parser.cursor.line
style_error_column = parsed.parser.cursor.column
file_index := parsed.parser.cursor.file
if file_index >= 0 && file_index < parsed.parser.file_count {
file := parsed.parser.files[file_index]
CopyTextToBuffer(*style_error_path[0], 64, TextFromBytes(file.name[:file.length]))
}
}
StylePublish :: (parsed: *StyleRulesParse) -> bool {
if parsed.overflow || parsed.parser.status != cast(s32)KssStatusDone {
StyleParseError(parsed)
return false
}
if !InstallParsedStyleRules(parsed.*) {
unused AppCopyText("Could not install the stylesheet.", style_error[:])
return false
}
for index: cast(s32)0..style_parse_source_count - 1 {
style_sources[index] = style_parse_sources[index]
}
style_source_count = style_parse_source_count
style_generation += 1
body: StyleData
body.font_size = cast(float32)Text16
AppMetricsConfigureFont(cast(s32)(TextStyleFor(TextStyleRequest.{}, body).font_size + 0.5))
return true
}
#program_export
StyleInstall :: (theme_id: s32, dark: bool, style_index: s32) -> bool {
if style_installed && style_installed_theme == theme_id &&
style_installed_dark == dark && style_installed_index == style_index &&
style_installed_waozi == AppWaoziTheme() {
style_installed_waozi == AppWaoziTheme() &&
style_installed_revision == style_revision && style_installed_scope == 0 {
return true
}
style_installed = false
catalog := ThemeCatalogLoad(theme_id, dark)
if !catalog.complete { return false }
env := KssEnvironmentWithNames(KssDefaultEnvironment(),
ifx dark then "dark" else "light", "", "", "", "", "")
parsed := BeginStyleRules(StyleRootFor(style_index),
"styles/inbe-root.kss", env)
parsed.parser = StyleOverrides(parsed.parser,
StyleColorsFor(catalog, dark), style_index)
imports: s32 = 0
while imports < 4 {
parsed = ParseStyleRules(parsed)
if parsed.parser.status != cast(s32)KssStatusNeedImport { break }
asset := StyleImport(parsed.parser.pending_import)
if !asset.found { return false }
parsed = ProvideStyleRulesImport(parsed, asset.data,
ifx KssNameEquals(parsed.parser.pending_import, "inbe") then
"inbe" else style_pack_id(style_index))
imports += 1
if !StyleCompileSources(catalog, dark, style_index, StyleAppliedSource(0), "", true) {
// A damaged stored preference must never leave startup without a UI.
style_documents[0].applied[0] = cast(u8)0
if !StyleCompileSources(catalog, dark, style_index, "", "", true) {
return false
}
}
if parsed.overflow || parsed.parser.status != cast(s32)KssStatusDone {
return false
}
if !InstallParsedStyleRules(parsed) { return false }
body: StyleData
body.font_size = cast(float32)Text16
AppMetricsConfigureFont(cast(s32)(TextStyleFor(TextStyleRequest.{},
body).font_size + 0.5))
style_installed = true
style_installed_theme = theme_id
style_installed_dark = dark
style_installed_index = style_index
style_installed_waozi = AppWaoziTheme()
style_installed_revision = style_revision
style_installed_scope = 0
return true
}
#program_export
app_apply_style :: (app: *InnerBreeze) -> bool {
if app == null { return false }
return StyleInstall(app.theme_id, app.dark_mode != 0, app.style_index)
scope := StyleActiveScope(app)
if scope == 0 {
return StyleInstall(app.theme_id, app.dark_mode != 0, app.style_index)
}
if style_installed && style_installed_theme == app.theme_id &&
style_installed_dark == (app.dark_mode != 0) &&
style_installed_index == app.style_index &&
style_installed_waozi == AppWaoziTheme() &&
style_installed_revision == style_revision && style_installed_scope == scope {
return true
}
catalog := ThemeCatalogLoad(app.theme_id, app.dark_mode != 0)
if !StyleCompileSources(catalog, app.dark_mode != 0, app.style_index,
StyleAppliedSource(0), StyleAppliedSource(scope), true) {
style_documents[scope].applied[0] = cast(u8)0
if !StyleCompileSources(catalog, app.dark_mode != 0, app.style_index,
StyleAppliedSource(0), "", true) {
return false
}
}
style_installed = true
style_installed_theme = app.theme_id
style_installed_dark = app.dark_mode != 0
style_installed_index = app.style_index
style_installed_waozi = AppWaoziTheme()
style_installed_revision = style_revision
style_installed_scope = scope
return true
}
StyleActiveScope :: (app: *InnerBreeze) -> s32 {
screen := app.breathing.screen
if screen == ScreenSettings && app.settings_tab == SETTINGS_TAB_THEME && style_editor_open {
return style_editor_scope
}
if screen == ScreenEList {
return 1
}
if screen == ScreenHabits || screen == ScreenHabitEdit || screen == ScreenHabitSessionEdit {
return 2
}
if screen == ScreenDiary {
return 4
}
if screen == ScreenLumi {
return 5
}
if screen == ScreenStart || screen == ScreenSession || screen == ScreenMeditation ||
screen == ScreenSunSalutation || screen == ScreenPatterns || screen == ScreenResults ||
screen == ScreenPracticeConfig {
return 3
}
return 0
}
+359
View File
@@ -0,0 +1,359 @@
// The Appearance editor, Lumi and external app tools share these operations.
#import "vec"
#import "std/json_scan"
#import "kss_formatter"
#import "byte_text_linux"
#import "kss_parser"
#import "style_parse"
#import "style_sheet"
#import "style"
#import "control_props"
#import "drawing_props"
#import, file "text_buffers.zi";
#import, file "settings_store.zi";
#import, file "mini_mode.zi";
#import, file "theme_catalog.zi";
#import, file "assets.zi";
#import, file "../cells/package_files.zi";
#import, file "app_style.zi";
#import, file "style_customization.zi";
#import, file "app_types.zi";
#import, file "../storage/temporary_data.zi";
c :: #system_library "c";
using ButtonState;
using ButtonTone;
using ButtonEmphasis;
using ControlSize;
using KssStatus;
storage_get_setting_text :: (key: string) -> string #foreign c;
storage_set_setting_text :: (key: string, value: string) #foreign c;
StyleCachePublished :: (app: *InnerBreeze, scope: s32) {
style_installed = true
style_installed_theme = app.theme_id
style_installed_dark = app.dark_mode != 0
style_installed_index = app.style_index
style_installed_waozi = AppWaoziTheme()
style_installed_revision = style_revision
style_installed_scope = scope
}
AppearancePreview :: (app: *InnerBreeze, scope: s32) -> bool {
if app == null || scope < 0 || scope >= StyleScopeCount {
return false
}
all_source := ifx scope == 0 then StyleDraftSource(0) else StyleAppliedSource(0)
scoped_source := ifx scope == 0 then "" else StyleDraftSource(scope)
catalog := ThemeCatalogLoad(app.theme_id, app.dark_mode != 0)
if !StyleCompileSources(catalog, app.dark_mode != 0,
app.style_index, all_source, scoped_source, true) {
// Keep the prior complete preview while the draft is incomplete.
style_installed_revision = style_revision
return false
}
unused AppCopyText(StyleDraftSource(scope), style_documents[scope].applied[:])
StyleClearError()
StyleCachePublished(app, scope)
return true
}
AppearanceEdit :: (app: *InnerBreeze, scope: s32, source: string) -> bool {
if !StyleSetDraft(scope, source) {
unused AppCopyText("KSS must contain fewer than 8192 bytes and no NUL characters.", style_error[:])
return false
}
return AppearancePreview(app, scope)
}
AppearanceSave :: (app: *InnerBreeze, scope: s32) -> bool {
if !AppearancePreview(app, scope) {
return false
}
source := StyleDraftSource(scope)
if !DataTemporary() {
storage_set_setting_text(StyleSettingKey(scope), source)
if storage_get_setting_text(StyleSettingKey(scope)) != source {
unused AppCopyText("Could not save custom KSS. The preview remains available.", style_error[:])
return false
}
}
unused AppCopyText(source, style_documents[scope].saved[:])
return true
}
AppearanceDiscard :: (app: *InnerBreeze, scope: s32) -> bool {
return AppearanceEdit(app, scope, StyleSavedSource(scope))
}
AppearanceReset :: (app: *InnerBreeze, scope: s32) -> bool {
if !StyleSetDraft(scope, "") {
return false
}
return AppearanceSave(app, scope)
}
AppearanceUndo :: (app: *InnerBreeze, scope: s32) -> bool {
if !StyleUndoDraft(scope) {
return false
}
return AppearancePreview(app, scope)
}
AppearanceFormat :: (app: *InnerBreeze, scope: s32) -> bool {
source := StyleDraftSource(scope)
formatted := KssFormat(source)
if !formatted.ok {
unused AppCopyText(TextFromBytes(formatted.diagnostic[:formatted.diagnostic_length]),
style_error[:])
return false
}
output: Vec(u8)
for index: cast(s32)0..formatted.count - 1 {
segment := formatted.segments[index]
if segment.kind == 0 {
unused BuilderAppend(output, source[segment.start:segment.start + segment.length])
} else if segment.kind == 1 {
unused VecPush(output, segment.atom)
} else {
unused VecPush(output, cast(u8)10)
for space: cast(s32)0..segment.length - 1 {
unused VecPush(output, cast(u8)32)
}
}
}
text := BuilderFinish(output)
defer { PackageFree(text) }
return AppearanceEdit(app, scope, text)
}
AppearanceJsonString :: (output: *Vec(u8), source: string) {
unused VecPush(output.*, cast(u8)34)
for byte: source {
if byte == cast(u8)34 || byte == cast(u8)92 {
unused VecPush(output.*, cast(u8)92)
unused VecPush(output.*, byte)
} else if byte == cast(u8)10 {
unused BuilderAppend(output.*, "\\n")
} else if byte == cast(u8)13 {
unused BuilderAppend(output.*, "\\r")
} else if byte == cast(u8)9 {
unused BuilderAppend(output.*, "\\t")
} else if byte >= cast(u8)32 {
unused VecPush(output.*, byte)
}
}
unused VecPush(output.*, cast(u8)34)
}
AppearanceWidgetKind :: (name: string) -> s32 {
if name == "Button" {
return StyleKindButton()
}
if name == "Text" {
return StyleKindText()
}
if name == "Card" {
return StyleKindCard()
}
if name == "TextArea" {
return StyleKindTextArea()
}
if name == "TextField" {
return StyleKindTextField()
}
if name == "NavigationBar" {
return StyleKindNavigationBar()
}
if name == "NavigationBarItem" {
return StyleKindNavigationBarItem()
}
if name == "Image" {
return StyleKindImage()
}
if name == "Surface" {
return StyleKindSurface()
}
if name == "App" {
return StyleKindApp()
}
return 0
}
AppearanceState :: (name: string) -> s32 {
if name == "normal" {
return cast(s32)ButtonStateNormal
}
if name == "hover" {
return cast(s32)ButtonStateHover
}
if name == "pressed" {
return cast(s32)ButtonStatePressed
}
if name == "focus" {
return cast(s32)ButtonStateFocus
}
if name == "selected" {
return cast(s32)ButtonStateSelected
}
if name == "disabled" {
return cast(s32)ButtonStateDisabled
}
return -1
}
AppearanceFacts :: (widget: string, class_name: string, state: s32) -> StyleFacts {
facts := StyleDefaultFacts(AppearanceWidgetKind(widget))
if class_name.count > 0 {
facts.class_name = KssClassId(KssMakeName(class_name))
}
facts.tone = cast(s32)ButtonToneNeutral
facts.emphasis = cast(s32)ButtonEmphasisSoft
facts.size = cast(s32)ControlSizeMedium
facts.role = 0
facts.state = state
return facts
}
AppearanceInspection :: (widget: string, class_name: string, state_name: string) -> string {
rules := ActiveStyleRules()
return AppearanceInspectionFor(rules, style_sources[:style_source_count], widget, class_name, state_name)
}
AppearanceInspectionFor :: (rules: StyleRules, sources: []StyleRuleSource,
widget: string, class_name: string, state_name: string) -> string {
state := AppearanceState(state_name)
facts := AppearanceFacts(widget, class_name, state)
base: StyleData
face := ResolveStyleRules(rules, base, facts, state)
output: Vec(u8)
BuilderPrint(*output, "% % :%\n", widget, class_name, state_name)
colors: [3]u32 = .[face.background, face.foreground, face.border]
names: [3]string = .["background", "foreground", "border"]
digits := "0123456789abcdef"
for index: cast(s32)0..cast(s32)2 {
BuilderPrint(*output, "%: #", names[index])
shift: s32 = 28
while shift >= 0 {
unused VecPush(output, digits[cast(s32)((colors[index] >> cast(u32)shift) & cast(u32)15)])
shift -= 4
}
unused VecPush(output, cast(u8)10)
}
BuilderPrint(*output, "radius: %\nfont-size: %\npadding-x: %\npadding-y: %\ngap: %\n\n",
face.radius, face.font_size, face.padding_x, face.padding_y, face.gap)
for index: cast(s32)0..rules.count - 1 {
if StyleRuleMatchesState(rules.items[index].state, state) &&
StyleSelectorMatches(rules.items[index].selector, facts) && index < sources.count {
origin := sources[index]
BuilderPrint(*output, "%:%:% %\n",
AppTextFromCString(*origin.path[0], 64), origin.line, origin.column,
AppTextFromCString(*origin.selector[0], 160))
}
}
return BuilderFinish(output)
}
AppearanceInspectTool :: (app: *InnerBreeze, scope: s32, arguments: string) -> string {
widget_bytes: [64]u8
class_bytes: [64]u8
state_bytes: [32]u8
widget_count := ReadStringText(arguments, FieldAt(arguments, 0, "widget"), widget_bytes[:])
class_field := FieldAt(arguments, 0, "class")
class_count := ifx class_field < 0 then 0 else ReadStringText(arguments, class_field, class_bytes[:])
state_count := ReadStringText(arguments, FieldAt(arguments, 0, "state"), state_bytes[:])
if widget_count <= 0 || widget_count >= 64 || class_count < 0 || class_count >= 64 ||
state_count <= 0 || state_count >= 32 {
return PackageText("{\"ok\":false,\"error\":\"Provide widget and state; class is optional.\"}", "")
}
widget := TextFromBytes(widget_bytes[:widget_count])
class_name := TextFromBytes(class_bytes[:class_count])
state_name := TextFromBytes(state_bytes[:state_count])
if AppearanceWidgetKind(widget) == 0 || AppearanceState(state_name) < 0 {
return PackageText("{\"ok\":false,\"error\":\"Unknown widget or state.\"}", "")
}
catalog := ThemeCatalogLoad(app.theme_id, app.dark_mode != 0)
if !StyleCompileSources(catalog, app.dark_mode != 0, app.style_index,
StyleAppliedSource(0), ifx scope == 0 then "" else StyleAppliedSource(scope), false) {
return PackageText("{\"ok\":false,\"error\":\"The selected scope cannot be inspected.\"}", "")
}
inspection := AppearanceInspectionFor(style_inspection_rules,
style_parse_sources[:style_parse_source_count], widget, class_name, state_name)
defer { PackageFree(inspection) }
output: Vec(u8)
BuilderPrint(*output, "{\"ok\":true,\"revision\":%,\"inspection\":", style_revision)
AppearanceJsonString(*output, inspection)
BuilderPrint(*output, "}")
return BuilderFinish(output)
}
AppearanceRead :: (app: *InnerBreeze, scope: s32) -> string {
output: Vec(u8)
BuilderPrint(*output, "{\"ok\":true,\"revision\":%,\"scope\":", style_revision)
AppearanceJsonString(*output, StyleScopeName(scope))
BuilderPrint(*output, ",\"pack\":")
AppearanceJsonString(*output, style_pack_id(app.style_index))
BuilderPrint(*output, ",\"source\":")
AppearanceJsonString(*output, StyleDraftSource(scope))
BuilderPrint(*output, ",\"saved_source\":")
AppearanceJsonString(*output, StyleSavedSource(scope))
BuilderPrint(*output, ",\"preview_source\":")
AppearanceJsonString(*output, StyleAppliedSource(scope))
BuilderPrint(*output, ",\"app_defaults\":")
defaults := AssetRead("assets/styles/inbe.kss")
AppearanceJsonString(*output, defaults.data)
BuilderPrint(*output, ",\"pack_defaults\":")
pack := StyleImport(KssMakeName(style_pack_id(app.style_index)))
AppearanceJsonString(*output, pack.data)
BuilderPrint(*output, ",\"precedence\":[\"shared pack and app defaults\",\"all apps customization\",\"selected app customization\"],\"source_limit\":8191,\"rule_limit\":512,\"error\":")
AppearanceJsonString(*output, AppTextFromCString(*style_error[0], 256))
BuilderPrint(*output, ",\"line\":%,\"column\":%}", style_error_line, style_error_column)
return BuilderFinish(output)
}
AppearanceTool :: (app: *InnerBreeze, name: string, arguments: string) -> string {
scope_bytes: [32]u8
count := ReadStringText(arguments, FieldAt(arguments, 0, "scope"), scope_bytes[:])
scope := StyleScopeIndex(TextFromBytes(scope_bytes[:ifx count > 0 && count < 32 then count else 0]))
if app == null || scope < 0 {
return PackageText("{\"ok\":false,\"error\":\"scope must be all, lists, habits, practices, diary or lumi\"}", "")
}
if name == "read_style" {
return AppearanceRead(app, scope)
}
if name == "inspect_style" {
return AppearanceInspectTool(app, scope, arguments)
}
revision := ReadNumber(arguments, FieldAt(arguments, 0, "revision"))
if !revision.valid || revision.value != cast(float64)style_revision {
return PackageText("{\"ok\":false,\"error\":\"Style changed. Read it again before editing.\"}", "")
}
ok: bool
if name == "preview_style" {
source_bytes: [StyleSourceCapacity]u8
field := FieldAt(arguments, 0, "source")
source_count := ReadStringText(arguments, field, source_bytes[:])
if field < 0 || field >= arguments.count || arguments[field] != cast(u8)34 ||
source_count < 0 || source_count >= StyleSourceCapacity {
return PackageText("{\"ok\":false,\"error\":\"source must be a KSS string of at most 8191 bytes\"}", "")
}
ok = AppearanceEdit(app, scope, TextFromBytes(source_bytes[:source_count]))
} else if name == "save_style" {
ok = AppearanceSave(app, scope)
} else if name == "reset_style" {
ok = AppearanceReset(app, scope)
} else if name == "undo_style" {
ok = AppearanceUndo(app, scope)
} else if name == "discard_style" {
ok = AppearanceDiscard(app, scope)
} else if name == "format_style" {
ok = AppearanceFormat(app, scope)
} else {
return PackageText("{\"ok\":false,\"error\":\"unknown appearance tool\"}", "")
}
output: Vec(u8)
BuilderPrint(*output, "{\"ok\":%,\"revision\":%,\"error\":", ok, style_revision)
AppearanceJsonString(*output, AppTextFromCString(*style_error[0], 256))
BuilderPrint(*output, ",\"line\":%,\"column\":%}", style_error_line, style_error_column)
return BuilderFinish(output)
}
+10
View File
@@ -1,4 +1,5 @@
// Lumi and app automation use the same validated, persisted app preferences.
#import "std/text"
#import, file "app_types.zi";
#import, file "app_settings.zi";
#import, file "device_preferences.zi";
@@ -8,6 +9,15 @@
using AppThemeMode;
using AppThemeSource;
AppSettingsReport :: (app: *InnerBreeze) -> string {
output: Vec(u8)
BuilderPrint(*output, "{\"ok\":true,\"theme\":\"%\",\"theme_id\":%,\"theme_mode\":%,\"theme_source\":%,\"style\":%,\"scale\":%,\"navigation\":%,\"sidebar_compact\":%}",
AppThemeName(app.theme_id), app.theme_id, app.theme_mode, app.theme_source,
app.style_index, app.ui_scale_tenths, app.navigation_placement,
app.nav_rail_collapsed)
return BuilderFinish(output)
}
AppThemeName :: (index: s32) -> string {
names: [13]string = .["sky", "ocean", "forest", "sunset", "lavender",
"cherry", "dawn", "sage", "sepia", "mono", "mint", "cobalt", "sweet"]
+179
View File
@@ -0,0 +1,179 @@
// Account-owned custom KSS. Drafts and previews never overwrite shipped assets.
#import "style_sheet"
#import, file "text_buffers.zi";
#import, file "settings_store.zi";
#import, file "../storage/storage_core.zi";
#import, file "../storage/temporary_data.zi";
StyleSourceCapacity :: 8192
StyleScopeCount :: 6
StyleUndoCapacity :: 16
StyleDocument :: struct {
saved: [StyleSourceCapacity]u8
draft: [StyleSourceCapacity]u8
applied: [StyleSourceCapacity]u8
}
StyleUndoEntry :: struct {
scope: s32
source: [StyleSourceCapacity]u8
}
StyleRuleSource :: struct {
selector: [160]u8
path: [64]u8
line: s32
column: s32
}
style_documents: [StyleScopeCount]StyleDocument;
style_undo: [StyleUndoCapacity]StyleUndoEntry;
style_undo_count: s32;
style_revision: s32;
style_editor_open: bool;
style_editor_scope: s32;
style_error: [256]u8;
style_error_path: [64]u8;
style_error_line: s32;
style_error_column: s32;
style_sources: [StyleRuleCapacity]StyleRuleSource;
style_source_count: s32;
StyleScopeName :: (scope: s32) -> string {
names: [StyleScopeCount]string = .["all", "lists", "habits", "practices", "diary", "lumi"]
if scope < 0 || scope >= StyleScopeCount {
return ""
}
return names[scope]
}
StyleScopeIndex :: (name: string) -> s32 {
for scope: cast(s32)0..StyleScopeCount - 1 {
if StyleScopeName(scope) == name {
return scope
}
}
return -1
}
StyleSettingKey :: (scope: s32) -> string {
keys: [StyleScopeCount]string = .["appearance.kss.all", "appearance.kss.lists",
"appearance.kss.habits", "appearance.kss.practices",
"appearance.kss.diary", "appearance.kss.lumi"]
if scope < 0 || scope >= StyleScopeCount {
return ""
}
return keys[scope]
}
StyleSavedSource :: (scope: s32) -> string {
if scope < 0 || scope >= StyleScopeCount {
return ""
}
return AppTextFromCString(*style_documents[scope].saved[0], StyleSourceCapacity)
}
StyleDraftSource :: (scope: s32) -> string {
if scope < 0 || scope >= StyleScopeCount {
return ""
}
return AppTextFromCString(*style_documents[scope].draft[0], StyleSourceCapacity)
}
StyleAppliedSource :: (scope: s32) -> string {
if scope < 0 || scope >= StyleScopeCount {
return ""
}
return AppTextFromCString(*style_documents[scope].applied[0], StyleSourceCapacity)
}
StyleCustomizationCollect :: (key: string, value: string, user: s64) {
unused user
for scope: cast(s32)0..StyleScopeCount - 1 {
if key == StyleSettingKey(scope) {
// Oversize or embedded-NUL data remains unapplied rather than truncated.
buffer: [StyleSourceCapacity]u8
if !AppCopyText(value, buffer[:]) {
unused AppCopyText("Saved KSS exceeds the source limit.", style_error[:])
return
}
style_documents[scope].saved = buffer
style_documents[scope].draft = buffer
style_documents[scope].applied = buffer
return
}
}
}
StyleCustomizationLoad :: () {
for scope: cast(s32)0..StyleScopeCount - 1 {
style_documents[scope] = StyleDocument.{}
}
style_undo_count = 0
style_editor_open = false
style_editor_scope = 0
style_error[0] = cast(u8)0
style_error_path[0] = cast(u8)0
style_error_line = 0
style_error_column = 0
style_revision += 1
if !DataTemporary() {
unused storage_list_settings(StyleCustomizationCollect, null)
}
}
StyleRememberDraft :: (scope: s32) {
if style_undo_count == StyleUndoCapacity {
for index: cast(s32)0..StyleUndoCapacity - 2 {
style_undo[index] = style_undo[index + 1]
}
style_undo_count -= 1
}
style_undo[style_undo_count].scope = scope
unused AppCopyText(StyleDraftSource(scope), style_undo[style_undo_count].source[:])
style_undo_count += 1
}
StyleSetDraft :: (scope: s32, source: string) -> bool {
if scope < 0 || scope >= StyleScopeCount || source.count >= StyleSourceCapacity {
return false
}
for byte: source {
if byte == cast(u8)0 {
return false
}
}
if source == StyleDraftSource(scope) {
return true
}
StyleRememberDraft(scope)
style_revision += 1
return AppCopyText(source, style_documents[scope].draft[:])
}
StyleUndoDraft :: (scope: s32) -> bool {
index := style_undo_count - 1
while index >= 0 {
if style_undo[index].scope == scope {
unused AppCopyText(AppTextFromCString(*style_undo[index].source[0],
StyleSourceCapacity), style_documents[scope].draft[:])
while index + 1 < style_undo_count {
style_undo[index] = style_undo[index + 1]
index += 1
}
style_undo_count -= 1
style_revision += 1
return true
}
index -= 1
}
return false
}
StyleClearError :: () {
style_error[0] = cast(u8)0
style_error_path[0] = cast(u8)0
style_error_line = 0
style_error_column = 0
}
+17 -1
View File
@@ -24,6 +24,7 @@
#import, file "../screens/lumi_screen.zi";
#import, file "../cells/diary_store.zi";
#import, file "../app/settings_actions.zi";
#import, file "../app/appearance_actions.zi";
#import, file "../app/assets.zi";
#import, file "../app/locale.zi";
#import, file "../app/text_buffers.zi";
@@ -94,9 +95,17 @@ AppToolExecute :: (app: *InnerBreeze, name: string, arguments: string) -> string
if ValueEnd(arguments, 0, 0) != arguments.count || arguments.count == 0 || arguments[0] != cast(u8)123 {
return PackageText("{\"ok\":false,\"error\":\"invalid arguments\"}", "")
}
if name == "get_settings" || name == "read_context" {
if name == "get_settings" {
return AppSettingsReport(app)
}
if name == "read_context" {
return AppToolContext(app)
}
if name == "read_style" || name == "inspect_style" || name == "preview_style" ||
name == "save_style" || name == "reset_style" || name == "undo_style" ||
name == "discard_style" || name == "format_style" {
return AppearanceTool(app, name, arguments)
}
if name == "show_progress_chart" {
metric_bytes: [32]u8
metric_text := ToolString(arguments, "metric", metric_bytes[:])
@@ -182,6 +191,13 @@ AppToolExecute :: (app: *InnerBreeze, name: string, arguments: string) -> string
if name == "set_theme" || name == "set_theme_mode" || name == "set_setting" ||
name == "open_view" || name == "practice" {
succeeded = AppMcpAction(app, name, arguments)
if succeeded && (name == "set_theme" || name == "set_theme_mode" || name == "set_setting") {
settings := AppSettingsReport(app)
defer { PackageFree(settings) }
output: Vec(u8)
BuilderPrint(*output, "{\"ok\":true,\"settings\":%}", settings)
return BuilderFinish(output)
}
} else {
title: [1024]u8
id: [65]u8
+3 -2
View File
@@ -9,6 +9,7 @@
#import, file "lumi_types.zi";
#import, file "lumi_ui_types.zi";
#import, file "lumi_response.zi";
#import, file "lumi_tool_budget.zi";
#import, file "lumi_telegram.zi";
#import, file "package_files.zi";
#import, file "../screens/lumi_screen.zi";
@@ -217,7 +218,7 @@ LumiOnlineAnswer :: (app: *InnerBreeze) -> bool {
LumiOnlineAppend(TextFromBytes(text[:count]))
return true
}
if calls > 4 || lumi_online_round >= 3 {
if !LumiToolRoundAllowed(lumi_online_round, calls, lumi_tool_count) {
return false
}
out: Vec(u8)
@@ -232,7 +233,7 @@ LumiOnlineAnswer :: (app: *InnerBreeze) -> bool {
}
name_bytes: [65]u8
id_bytes: [129]u8
arguments_bytes: [4097]u8
arguments_bytes: [65536]u8
name := ToolString(document[function_at:ValueEnd(document, function_at, 0)], "name", name_bytes[:])
arguments := ToolString(document[function_at:ValueEnd(document, function_at, 0)], "arguments", arguments_bytes[:])
id := ToolString(document[call_at:ValueEnd(document, call_at, 0)], "id", id_bytes[:])
+6
View File
@@ -0,0 +1,6 @@
// Leave room for read, inspect, preview, verify and save in one conversation.
// The call and round limits also bound repeated or unproductive model actions.
LumiToolRoundAllowed :: (round: s32, calls: s32, used: s32) -> bool {
return round >= 0 && round < 6 && calls > 0 && calls <= 4 &&
used >= 0 && used + calls <= 12
}
+2 -2
View File
@@ -3,7 +3,7 @@ PackageBundledVersion :: (index: s32) -> string {
if index < 0 || index >= 6 {
return ""
}
versions: [6]string = .["2.1.19", "1.0.3", "1.0.3", "1.1.3", "1.1.4", "1.3.2"]
versions: [6]string = .["2.1.20", "1.0.3", "1.0.3", "1.1.3", "1.1.4", "1.3.2"]
return versions[index]
}
@@ -11,6 +11,6 @@ PackageBundledSequence :: (index: s32) -> s32 {
if index < 0 || index >= 6 {
return 0
}
sequences: [6]s32 = .[16, 4, 4, 5, 6, 9]
sequences: [6]s32 = .[17, 4, 4, 5, 6, 9]
return sequences[index]
}
+2 -2
View File
@@ -3,7 +3,7 @@
#define APP_VERSION_MAJOR 2
#define APP_VERSION_MINOR 1
#define APP_VERSION_PATCH 22
#define APP_VERSION_STRING "2.1.22"
#define APP_VERSION_PATCH 23
#define APP_VERSION_STRING "2.1.23"
#endif
+2 -2
View File
@@ -1,5 +1,5 @@
// Generated by update_version.sh from CHANGELOG.md. Do not edit by hand.
VersionMajor :: 2
VersionMinor :: 1
VersionPatch :: 22
VersionString :: "2.1.22"
VersionPatch :: 23
VersionString :: "2.1.23"
+54 -7
View File
@@ -3,6 +3,7 @@
#scope_file
#import "std/text"
#import "std/json_scan"
#import "std/text_buffer"
#import "byte_text_linux"
#import "text_buffer"
#import, file "feature_request.zi";
@@ -11,6 +12,10 @@
#import, file "../app/account_activity_model.zi";
#import, file "../core/types.zi";
#import, file "../app/settings_actions.zi";
#import, file "../app/appearance_actions.zi";
#import, file "../app/style_customization.zi";
#import, file "../cells/package_files.zi";
#import, file "../cells/app_tools.zi";
#import, file "../app/app_nav_state.zi";
#import, file "../app/assets.zi";
#import, file "../app/exercise_types.zi";
@@ -31,12 +36,21 @@ host_c :: #system_library "c";
HostFree :: (bytes: *u8) #foreign host_c "free";
app_close_modal :: (app: *InnerBreeze) #foreign host_c;
HostDescriptor :: struct { data: *u8; count: s64 }
HostReceipt :: struct { request: [65]u8; control: [96]u8; payload: [2048]u8; ok: bool }
HostActionCapacity :: 65536
HostReceipt :: struct {
request: [65]u8
control: [96]u8
payload: [HostActionCapacity]u8
result: string
ok: bool
}
receipts: [32]HostReceipt;
receipt_next: s32;
last_request: [65]u8;
last_ok: bool;
published: string;
last_tool_result: string;
pending_tool_result: string;
HostIdentifier :: (value: string) -> bool {
if value.count == 0 { return false }
@@ -59,6 +73,15 @@ HostArgument :: (arguments: string, field: string, output: []u8) -> string {
HostAction :: (app: *InnerBreeze, control: string, arguments: string) -> bool {
text: [96]u8
if control == "mcp.read_style" || control == "mcp.inspect_style" ||
control == "mcp.preview_style" || control == "mcp.save_style" ||
control == "mcp.reset_style" || control == "mcp.undo_style" ||
control == "mcp.discard_style" || control == "mcp.format_style" {
pending_tool_result = AppearanceTool(app, control[4:], arguments)
ok_at := FieldAt(pending_tool_result, 0, "ok")
return ok_at >= 0 && ok_at + 4 <= pending_tool_result.count &&
pending_tool_result[ok_at:ok_at + 4] == "true"
}
if control == "mcp.set_theme" {
return AppSetTheme(app, HostArgument(arguments, "theme", text[:]))
}
@@ -159,7 +182,7 @@ AppMcpAction :: (app: *InnerBreeze, name: string, arguments: string) -> bool {
PollHostActions :: (app: *InnerBreeze) {
if app == null { return }
bytes: [2048]u8
bytes: [HostActionCapacity]u8
size := ReadHostAction(bytes[:])
if size <= 0 { return }
value := TextFromBytes(bytes[:size])
@@ -184,14 +207,29 @@ PollHostActions :: (app: *InnerBreeze) {
for receipt: receipts {
if AppTextFromCString(*receipt.request[0], 65) == TextFromBytes(request[:rn]) {
last_ok = AppTextFromCString(*receipt.control[0], 96) == TextFromBytes(control[:cn]) &&
AppTextFromCString(*receipt.payload[0], 2048) == value && receipt.ok
AppTextFromCString(*receipt.payload[0], HostActionCapacity) == value && receipt.ok
last_tool_result = receipt.result
return
}
}
last_ok = HostAction(app, TextFromBytes(control[:cn]), arguments)
payload: [2048]u8
control_name := TextFromBytes(control[:cn])
if control_name.count > 4 && control_name[:4] == "mcp." {
pending_tool_result = AppToolExecute(app, control_name[4:], arguments)
ok_at := FieldAt(pending_tool_result, 0, "ok")
last_ok = ok_at >= 0 && ok_at + 4 <= pending_tool_result.count &&
pending_tool_result[ok_at:ok_at + 4] == "true"
if control_name == "mcp.read_context" {
last_ok = pending_tool_result.count > 0
}
} else {
last_ok = HostAction(app, control_name, arguments)
}
payload: [HostActionCapacity]u8
unused AppCopyText(value, payload[:])
receipts[receipt_next] = .{request, control, payload, last_ok}
PackageFree(receipts[receipt_next].result)
receipts[receipt_next] = .{request, control, payload, pending_tool_result, last_ok}
last_tool_result = pending_tool_result
pending_tool_result = ""
receipt_next = (receipt_next + 1) % 32
}
@@ -234,11 +272,20 @@ ReportHostState :: (app: *InnerBreeze) {
tools := AssetRead("assets/mcp/tools.json")
activity: [2048]u8
unused ActivityContext(activity[:])
BuilderPrint(*out, "],\"account_activity\":%,\"account_activity_fresh\":%,\"settings\":{\"theme\":\"%\",\"theme_id\":%,\"theme_mode\":%,\"theme_source\":%,\"style\":%,\"scale\":%,\"navigation\":%,\"sidebar_compact\":%},\"mcp\":{\"tools\":%}}",
BuilderPrint(*out, "],\"account_activity\":%,\"account_activity_fresh\":%,\"settings\":{\"theme\":\"%\",\"theme_id\":%,\"theme_mode\":%,\"theme_source\":%,\"style\":%,\"scale\":%,\"navigation\":%,\"sidebar_compact\":%},\"mcp\":{\"tools\":%}",
TextUntilNul(activity[:]), remote_fresh || (account_activity.was_running && ActivityAvailable()),
AppThemeName(app.theme_id), app.theme_id, app.theme_mode, app.theme_source,
app.style_index, app.ui_scale_tenths, app.navigation_placement,
app.nav_rail_collapsed, ifx tools.found then tools.data else "[]")
// Results are published on this application's own window for its harness.
BuilderPrint(*out, ",\"appearance\":{\"revision\":%,\"scope\":%,\"open\":%,\"source\":",
style_revision, style_editor_scope, style_editor_open)
AppearanceJsonString(*out, StyleDraftSource(style_editor_scope))
BuilderPrint(*out, ",\"saved\":")
AppearanceJsonString(*out, StyleSavedSource(style_editor_scope))
BuilderPrint(*out, ",\"error\":")
AppearanceJsonString(*out, AppTextFromCString(*style_error[0], 256))
BuilderPrint(*out, "},\"tool_result\":%}", ifx last_tool_result.count > 0 then last_tool_result else "null")
state := BuilderFinish(out)
if state == published {
descriptor := cast(*HostDescriptor)(*state)
+14
View File
@@ -110,6 +110,20 @@ app_lumi_reset :: () {
lumi_choosing_diary = false
}
// Opening a conversation never submits it: the user supplies the desired look.
AppearanceAskLumi :: (app: *InnerBreeze, scope: string) {
prompt: Vec(u8)
BuilderPrint(*prompt, "% %: ", LocaleText("appearance_kss_prompt"), scope)
text := BuilderFinish(prompt)
defer { PackageFree(text) }
unused AppCopyText(text, lumi_input[:])
lumi_ui.value = AppTextFromCString(*lumi_input[0], LUMI_INPUT_MAX)
lumi_ui.cursor = cast(s32)lumi_ui.value.count
lumi_ui.anchor = lumi_ui.cursor
lumi_ui.focused = true
app_apply_nav_route(app, APP_NAV_ROUTE_LUMI)
}
// An installed delegate is restricted to the approved Lumi collection even
// when this same local profile already contains enabled private apps.
LumiHistoryAvailable :: () -> bool {
+323
View File
@@ -0,0 +1,323 @@
#import "geometry"
#import "control_props"
#import "button_props"
#import "button_widget"
#import "dropdown_props"
#import "dropdown_widget"
#import "text_props"
#import "text_widget"
#import "text_input_props"
#import "text_area_widget"
#import "text_input"
#import "style_sheet"
#import "drawing_props"
#import "kss_parser"
#import "vec"
#import, file "../../platform/raylib_text_input.zi";
#import, file "../../app/app_types.zi";
#import, file "../../app/app_style.zi";
#import, file "../../app/appearance_actions.zi";
#import, file "../../app/style_customization.zi";
#import, file "../../app/metrics.zi";
#import, file "../../app/locale.zi";
#import, file "../../app/text_buffers.zi";
#import, file "../../app/assets.zi";
#import, file "../../app/app_nav_state.zi";
#import, file "../../app/route_types.zi";
#import, file "../../screens/lumi_screen.zi";
#import, file "../../cells/package_files.zi";
#import, file "settings_types.zi";
#import, file "settings_ui.zi";
using ButtonTone;
using ButtonEmphasis;
using TextWrap;
using AppNavRoute;
c :: #system_library "c";
GetTime :: () -> float64 #foreign c;
appearance_inspector: [8192]u8;
appearance_inspector_revision: s32 = -1;
appearance_inspector_target: s32 = -1;
appearance_inspector_state: s32 = -1;
appearance_inspector_scope: s32 = -1;
AppearanceActionColumns :: (width: s32) -> s32 {
minimum := AppTextWidth(LocaleText("reset_to_defaults_label"), AppFontSize()) + AppScale(32)
columns := width / minimum
if columns < 1 {
columns = 1
}
if columns > 3 {
columns = 3
}
return columns
}
settings_appearance_height :: (width: s32) -> s32 {
height := AppScale(64)
if style_editor_open {
height += AppParagraphHeight(LocaleText("appearance_kss_hint"), width, AppFontSize(), 0) + AppScale(16)
height += settings_choice_row_height(LocaleText("appearance_kss_scope"), width)
height += settings_choice_row_height(LocaleText("appearance_kss_source"), width)
height += AppScale(300 + 12 + 74 + 210 + 24)
height += ((6 + AppearanceActionColumns(width) - 1) / AppearanceActionColumns(width)) * AppScale(52)
height += settings_choice_row_height(LocaleText("appearance_kss_inspect"), width)
height += settings_choice_row_height(LocaleText("appearance_kss_state"), width)
}
return height
}
AppearanceTarget :: (index: s32) -> string {
targets: [10]string = .["Button", "Text", "Card", "TextArea", "TextField",
"NavigationBarItem", "Button", "Button", "Button", "Image"]
if index < 0 || index >= 10 {
return "Button"
}
return targets[index]
}
AppearanceTargetClass :: (index: s32) -> string {
classes: [10]string = .["", "", "", "", "", "launcher-dock",
"profile-header", "practice-pager", "launcher-tile", "pose-muted"]
if index < 0 || index >= 10 {
return ""
}
return classes[index]
}
AppearanceTargetState :: (index: s32) -> string {
states: [6]string = .["normal", "hover", "pressed", "focus", "selected", "disabled"]
if index < 0 || index >= 6 {
return "normal"
}
return states[index]
}
settings_appearance_draw :: (app: *InnerBreeze, x: s32, width: s32,
y: *s32, state: *SettingsThemeState) {
if Button(app.ui.session, ButtonProps.{
.id = 7850,
.bounds = Rectangle.{cast(float32)x, cast(float32)y.*, cast(float32)width, cast(float32)AppScale(48)},
.label = LocaleText("appearance_kss_advanced"),
.selected = style_editor_open,
.tone = cast(ButtonTone)ButtonToneAccent,
.emphasis = cast(ButtonEmphasis)ButtonEmphasisSoft,
.disabled = app.modal.active != 0}) != 0 {
style_editor_open = !style_editor_open
state.custom_focused = false
unused app_apply_style(app)
}
y.* += AppScale(64)
if !style_editor_open {
return
}
hint_height := AppParagraphHeight(LocaleText("appearance_kss_hint"), width, AppFontSize(), 0)
unused Text(app.ui.session, TextProps.{
.text = LocaleText("appearance_kss_hint"), .font = AppFontSize(),
.bounds = Rectangle.{cast(float32)x, cast(float32)y.*, cast(float32)width, cast(float32)hint_height},
.wrap = cast(TextWrap)TextWrapAuto})
y.* += hint_height + AppScale(16)
scopes: [StyleScopeCount]DropdownOption
scopes[0].label = LocaleText("appearance_kss_all")
scopes[1].label = LocaleText("tab_elist")
scopes[2].label = LocaleText("tab_habits")
scopes[3].label = LocaleText("tab_practices")
scopes[4].label = LocaleText("tab_diary")
scopes[5].label = "Lumi"
scope_props: DropdownProps
scope_props.id = 7851
scope_props.bounds = settings_choice_row(app, x, width, y, LocaleText("appearance_kss_scope"))
scope_props.selected_index = style_editor_scope
scope_props.open = state.custom_scope_menu.open
scope_props.highlight_index = state.custom_scope_menu.highlight_index
scope_props.scroll_offset = state.custom_scope_menu.scroll_offset
state.custom_scope_menu = Dropdown(app.ui.session, scope_props, scopes[:])
if state.custom_scope_menu.changed {
style_editor_scope = state.custom_scope_menu.selected_index
state.custom_cursor = 0
state.custom_anchor = 0
state.custom_scroll = 0
state.custom_focused = false
state.custom_pending = false
unused app_apply_style(app)
}
sources: [3]DropdownOption
sources[0].label = LocaleText("appearance_kss_custom")
sources[1].label = LocaleText("appearance_kss_defaults")
sources[2].label = LocaleText("appearance_kss_pack")
source_props: DropdownProps
source_props.id = 7852
source_props.bounds = settings_choice_row(app, x, width, y, LocaleText("appearance_kss_source"))
source_props.selected_index = state.custom_source_view
source_props.open = state.custom_source_menu.open
source_props.highlight_index = state.custom_source_menu.highlight_index
source_props.scroll_offset = state.custom_source_menu.scroll_offset
state.custom_source_menu = Dropdown(app.ui.session, source_props, sources[:])
if state.custom_source_menu.changed {
state.custom_source_view = state.custom_source_menu.selected_index
state.custom_cursor = 0
state.custom_anchor = 0
state.custom_scroll = 0
}
source := StyleDraftSource(style_editor_scope)
if state.custom_source_view == 1 {
source = AssetRead("assets/styles/inbe.kss").data
} else if state.custom_source_view == 2 {
source = StyleImport(KssMakeName(style_pack_id(app.style_index))).data
}
typed: [128]u8
area: TextAreaProps
area.key = cast(u64)785300
area.focus_id = 7853
area.bounds = Rectangle.{cast(float32)x, cast(float32)y.*, cast(float32)width, cast(float32)AppScale(300)}
area.value = source
if state.custom_source_view == 0 {
area.value = FrameTextHold(*app.ui.frame_text, source)
}
area.label = LocaleText("appearance_kss_custom")
area.placeholder = "Button { radius: 24; }"
area.cursor = state.custom_cursor
area.anchor = state.custom_anchor
area.scroll_y = state.custom_scroll
area.focused = state.custom_focused
area.selecting = state.custom_selecting
area.preferred_x = state.custom_preferred_x
area.preferred_x_valid = state.custom_preferred_x_valid
area.wrap = true
area.read_only = state.custom_source_view != 0
area.max_bytes = StyleSourceCapacity - 1
area.max_codepoints = StyleSourceCapacity - 1
area.input = SampleTextAreaInput(area.focused, typed[:])
edited := TextArea(app.ui.session, area)
state.custom_cursor = edited.cursor
state.custom_anchor = edited.anchor
state.custom_scroll = edited.scroll_y
state.custom_focused = edited.focused
state.custom_selecting = edited.selecting
state.custom_preferred_x = edited.preferred_x
state.custom_preferred_x_valid = edited.preferred_x_valid
if edited.clipboard_write {
unused TextInputWriteClipboard(edited.clipboard_text)
}
if edited.edit.changed && state.custom_source_view == 0 {
bytes: [StyleSourceCapacity]u8
unused AppCopyText(source, bytes[:])
if AppReplaceText(bytes[:], edited.edit.start, edited.edit.end, edited.edit.replacement) {
unused StyleSetDraft(style_editor_scope, AppTextFromCString(*bytes[0], StyleSourceCapacity))
state.custom_pending = true
state.custom_preview_at = GetTime() + 0.25
}
}
if state.custom_pending && GetTime() >= state.custom_preview_at {
unused AppearancePreview(app, style_editor_scope)
state.custom_pending = false
}
y.* += AppScale(312)
error := AppTextFromCString(*style_error[0], 256)
status := ifx StyleDraftSource(style_editor_scope) == StyleSavedSource(style_editor_scope) then LocaleText("appearance_kss_saved") else LocaleText("appearance_kss_preview")
if error.count > 0 {
message: Vec(u8)
BuilderPrint(*message, "%:%:% %", AppTextFromCString(*style_error_path[0], 64),
style_error_line, style_error_column, error)
details := BuilderFinish(message)
status = FrameTextHold(*app.ui.frame_text, details)
PackageFree(details)
}
unused Text(app.ui.session, TextProps.{.text = status,
.bounds = Rectangle.{cast(float32)x, cast(float32)y.*, cast(float32)width, cast(float32)AppScale(66)},
.font = AppSmallFontSize(), .wrap = cast(TextWrap)TextWrapAuto})
y.* += AppScale(74)
labels: [6]string = .[LocaleText("save_button"), LocaleText("appearance_kss_format"),
LocaleText("appearance_kss_undo"), LocaleText("discard_button"),
LocaleText("reset_to_defaults_label"), LocaleText("appearance_kss_lumi")]
columns := AppearanceActionColumns(width)
gap := AppScale(8)
button_width := (width - gap * (columns - 1)) / columns
for index: cast(s32)0..cast(s32)5 {
if Button(app.ui.session, ButtonProps.{.id = 7860 + index,
.bounds = Rectangle.{cast(float32)(x + (index % columns) * (button_width + gap)),
cast(float32)(y.* + (index / columns) * AppScale(52)),
cast(float32)button_width, cast(float32)AppScale(44)},
.label = labels[index], .tone = cast(ButtonTone)ButtonToneNeutral,
.emphasis = cast(ButtonEmphasis)ButtonEmphasisSoft,
.disabled = app.modal.active != 0}) != 0 {
if index == 0 {
unused AppearanceSave(app, style_editor_scope)
} else if index == 1 {
unused AppearanceFormat(app, style_editor_scope)
} else if index == 2 {
unused AppearanceUndo(app, style_editor_scope)
} else if index == 3 {
unused AppearanceDiscard(app, style_editor_scope)
} else if index == 4 {
unused AppearanceReset(app, style_editor_scope)
} else {
AppearanceAskLumi(app, StyleScopeName(style_editor_scope))
}
state.custom_pending = false
}
}
y.* += ((6 + columns - 1) / columns) * AppScale(52)
targets: [10]DropdownOption
labels_target: [10]string = .["Button", "Text", "Card", "TextArea", "TextField",
"NavigationBarItem.launcher-dock", "Button.profile-header",
"Button.practice-pager", "Button.launcher-tile", "Image.pose-muted"]
for index: cast(s32)0..cast(s32)9 {
targets[index].label = labels_target[index]
}
target_props: DropdownProps
target_props.id = 7870
target_props.bounds = settings_choice_row(app, x, width, y, LocaleText("appearance_kss_inspect"))
target_props.selected_index = state.custom_target
target_props.open = state.custom_target_menu.open
target_props.highlight_index = state.custom_target_menu.highlight_index
target_props.scroll_offset = state.custom_target_menu.scroll_offset
state.custom_target_menu = Dropdown(app.ui.session, target_props, targets[:])
if state.custom_target_menu.changed {
state.custom_target = state.custom_target_menu.selected_index
}
states: [6]DropdownOption
for index: cast(s32)0..cast(s32)5 {
states[index].label = AppearanceTargetState(index)
}
state_props: DropdownProps
state_props.id = 7871
state_props.bounds = settings_choice_row(app, x, width, y, LocaleText("appearance_kss_state"))
state_props.selected_index = state.custom_state
state_props.open = state.custom_state_menu.open
state_props.highlight_index = state.custom_state_menu.highlight_index
state_props.scroll_offset = state.custom_state_menu.scroll_offset
state.custom_state_menu = Dropdown(app.ui.session, state_props, states[:])
if state.custom_state_menu.changed {
state.custom_state = state.custom_state_menu.selected_index
}
if appearance_inspector_revision != style_generation ||
appearance_inspector_target != state.custom_target ||
appearance_inspector_state != state.custom_state ||
appearance_inspector_scope != style_editor_scope {
report := AppearanceInspection(AppearanceTarget(state.custom_target),
AppearanceTargetClass(state.custom_target), AppearanceTargetState(state.custom_state))
CopyTextToBuffer(*appearance_inspector[0], 8192, report)
PackageFree(report)
appearance_inspector_revision = style_generation
appearance_inspector_target = state.custom_target
appearance_inspector_state = state.custom_state
appearance_inspector_scope = style_editor_scope
}
inspection: TextAreaProps
inspection.key = cast(u64)787200
inspection.focus_id = 7872
inspection.bounds = Rectangle.{cast(float32)x, cast(float32)y.*, cast(float32)width, cast(float32)AppScale(210)}
inspection.value = AppTextFromCString(*appearance_inspector[0], 8192)
inspection.label = LocaleText("appearance_kss_inspect")
inspection.read_only = true
inspection.wrap = true
inspection.scroll_y = state.custom_inspector_scroll
result := TextArea(app.ui.session, inspection)
state.custom_inspector_scroll = result.scroll_y
y.* += AppScale(234)
}
+3 -1
View File
@@ -29,6 +29,7 @@
#import, file "settings_ui.zi";
#import, file "settings_appearance.zi";
#import "input_props"
#import, file "../../app/metrics.zi";
#import, file "../../app/current_app.zi";
@@ -118,7 +119,7 @@ settings_theme_content_height :: (app: *InnerBreeze, content_w: s32) -> s32 {
return settings_section_height(LocaleText("theme_label"),
settings_theme_theme_body(app, inner)) +
settings_section_height(LocaleText("settings_section_layout"),
settings_theme_layout_body(app, inner))
settings_theme_layout_body(app, inner)) + settings_appearance_height(inner)
}
settings_theme_draw_app_icon :: (app: *InnerBreeze, section: SettingsSection,
@@ -237,6 +238,7 @@ settings_theme_draw :: (app: *InnerBreeze, x: s32, w: s32,
}
settings_section_end(y)
settings_appearance_draw(app, x, w, y, state)
}
#program_export
+17
View File
@@ -17,4 +17,21 @@ SettingsThemeState :: struct {
placement_menu: DropdownResult
mode_menu: DropdownResult
color_menu: DropdownResult
custom_scope_menu: DropdownResult
custom_source_menu: DropdownResult
custom_target_menu: DropdownResult
custom_state_menu: DropdownResult
custom_source_view: s32
custom_target: s32
custom_state: s32
custom_cursor: s32
custom_anchor: s32
custom_scroll: s32
custom_focused: bool
custom_selecting: bool
custom_preferred_x: s32
custom_preferred_x_valid: bool
custom_inspector_scroll: s32
custom_pending: bool
custom_preview_at: float64
}
+218
View File
@@ -0,0 +1,218 @@
"""KSS editor and app-owned Lumi tools on an owned private Xvfb window."""
import ast
import contextlib
import csv
import io
import json
import os
from pathlib import Path
import re
import sqlite3
import subprocess
import sys
import tempfile
import time
ROOT = Path(__file__).resolve().parents[1]
OUTPUT = ROOT / 'build/appearance-ui-test'
OUTPUT.mkdir(parents=True, exist_ok=True)
assert int(os.environ['DISPLAY'].split(':')[-1].split('.')[0]) >= 300
ENV = os.environ | dict(APP_NO_TRAY='1', SDL_AUDIODRIVER='dummy',
YUE_DESKTOP_RECOVERY='0')
for key in ('WAYLAND_DISPLAY', 'DBUS_SESSION_BUS_ADDRESS', 'SESSION_MANAGER'):
ENV.pop(key, None)
sequence = 0
receipts = []
def command(*args):
return subprocess.check_output(args, env=ENV, text=True, timeout=10).strip()
def wait_for(predicate, message):
deadline = time.monotonic() + 20
while time.monotonic() < deadline:
result = predicate()
if result:
return result
time.sleep(.1)
raise AssertionError(message)
@contextlib.contextmanager
def application(profile, label, width=900, height=720):
with (OUTPUT / (label + '.log')).open('w') as log:
app = subprocess.Popen([sys.argv[1], '--bundle', str(ROOT / 'build/inbe-full.zib')],
cwd=ROOT, env=ENV | dict(APP_DATA_ROOT=str(profile)),
stdout=log, stderr=subprocess.STDOUT)
try:
def find():
assert app.poll() is None, 'Owned application exited: ' + label
found = subprocess.run(['xdotool', 'search', '--onlyvisible', '--pid', str(app.pid)],
env=ENV, capture_output=True, text=True, timeout=5)
return found.stdout.strip().splitlines()[0] if found.returncode == 0 else ''
window = wait_for(find, 'Owned app window did not appear')
command('xdotool', 'windowsize', window, str(width), str(height))
command('xdotool', 'windowfocus', window)
wait_for(lambda: ' = ' in command('xprop', '-id', window, '_HARMONY_APP_STATE'),
'App state did not become ready')
yield window
assert app.poll() is None, 'Owned app crashed'
finally:
app.terminate()
try:
app.wait(timeout=5)
except subprocess.TimeoutExpired:
app.kill()
app.wait(timeout=5)
def state(window):
value = command('xprop', '-id', window, '_HARMONY_APP_STATE')
return json.loads(ast.literal_eval(value.split(' = ', 1)[1]))
def tool(window, name, arguments):
global sequence
sequence += 1
request = 'appearance-' + str(sequence)
payload = dict(request_id=request, control='mcp.' + name, arguments=arguments)
command('xprop', '-id', window, '-f', '_HARMONY_APP_ACTION', '8s',
'-set', '_HARMONY_APP_ACTION', json.dumps(payload))
report = wait_for(lambda: (value if (value := state(window))['last_request_id'] == request else None),
'App tool did not acknowledge: ' + name)
receipts.append(dict(request=payload, result=report['tool_result']))
return report['tool_result']
def read(window, scope='all'):
result = tool(window, 'read_style', dict(scope=scope))
assert result['ok'], result
return result
def change(window, name, scope='all', **arguments):
revision = read(window, scope)['revision']
return tool(window, name, dict(scope=scope, revision=revision, **arguments))
def capture(window, label):
path = OUTPUT / (label + '.png')
command('import', '-window', window, str(path))
return path
def words(window):
path = capture(window, 'current')
enlarged = OUTPUT / 'ocr.png'
command('convert', str(path), '-resize', '300%', str(enlarged))
tsv = command('tesseract', str(enlarged), 'stdout', '--psm', '11', '-c', 'tessedit_create_tsv=1')
rows = [row for row in csv.DictReader(io.StringIO(tsv), delimiter='\t')
if row.get('text', '').strip()]
for row in rows:
for key in ('left', 'top', 'width', 'height'):
row[key] = str(int(row[key]) // 3)
return rows
def tap(window, x, y):
command('xdotool', 'mousemove', '--window', window, str(x), str(y))
command('xdotool', 'mousedown', '1')
time.sleep(.12)
command('xdotool', 'mouseup', '1')
time.sleep(.3)
def locate(window, phrase, scroll=False):
expected = phrase.lower().split()
for attempt in range(14 if scroll else 1):
rows = words(window)
for i in range(len(rows) - len(expected) + 1):
if [re.sub(r'[^a-z0-9:]', '', row['text'].lower())
for row in rows[i:i + len(expected)]] == expected:
first = rows[i]
if phrase == 'save':
line = [row for row in rows if all(row[key] == first[key]
for key in ('block_num', 'par_num', 'line_num'))]
if len(line) != 1:
continue
return int(first['left']) + int(first['width']) // 2, int(first['top']) + int(first['height']) // 2
if scroll:
width = int(re.search(r'WIDTH=(\d+)', command('xdotool', 'getwindowgeometry', '--shell', window))[1])
command('xdotool', 'mousemove', '--window', window, str(width - 60), '500', 'click', '--repeat', '3', '5')
time.sleep(.2)
raise AssertionError('Rendered control not found: ' + phrase + '\n' + ' '.join(row['text'] for row in rows))
with tempfile.TemporaryDirectory(prefix='inbe-appearance-') as directory:
profile = Path(directory)
with application(profile, 'initialize'):
pass
with sqlite3.connect(profile / 'inbe.db') as db:
user = db.execute('SELECT id FROM users LIMIT 1').fetchone()[0]
settings = dict(enabled_apps='31', language='en', language_setup_done='1',
apps_setup_done='1', tutorial_seen='1', habits_guide_seen='1',
lumi_introduced='1', cells_auto_update='0')
for name in ('lists', 'habits', 'practices', 'diary', 'lumi'):
settings['app_used_' + name] = '1'
for key, value in settings.items():
db.execute('INSERT INTO settings(user_id,key,value,updated_at) VALUES(?,?,?,1) '
'ON CONFLICT(user_id,key) DO UPDATE SET value=excluded.value', (user, key, value))
with application(profile, 'editor', height=1100) as window:
published = {item['name'] for item in state(window)['mcp']['tools']}
assert {'read_style', 'inspect_style', 'preview_style', 'save_style', 'reset_style',
'discard_style', 'undo_style', 'format_style'} <= published
assert read(window)['rule_limit'] == 512
original = read(window)['revision']
assert change(window, 'preview_style', source='Button { radius: 24; }')['ok']
assert not tool(window, 'reset_style', dict(scope='all', revision=original))['ok']
inspected = tool(window, 'inspect_style', dict(scope='all', widget='Button', state='normal'))
assert inspected['ok'] and 'radius: 24' in inspected['inspection'], inspected
assert not change(window, 'preview_style', source='Button { radius: unknown; }')['ok']
assert read(window)['preview_source'] == 'Button { radius: 24; }'
assert not change(window, 'save_style')['ok']
assert change(window, 'undo_style')['ok']
assert change(window, 'save_style')['ok']
assert change(window, 'preview_style', scope='habits', source='Button { radius: 7; }')['ok']
assert change(window, 'save_style', scope='habits')['ok']
inspected = tool(window, 'inspect_style', dict(scope='habits', widget='Button', state='normal'))
assert 'radius: 7' in inspected['inspection'], inspected
inspected = tool(window, 'inspect_style', dict(scope='lists', widget='Button', state='normal'))
assert 'radius: 24' in inspected['inspection'], inspected
assert change(window, 'reset_style', scope='habits')['ok']
assert change(window, 'reset_style')['ok']
tool(window, 'open_view', dict(view='appearance'))
tap(window, *locate(window, 'advanced appearance', scroll=True))
wait_for(lambda: state(window)['appearance']['open'], 'Advanced editor did not open')
capture(window, 'desktop-editor')
tap(window, *locate(window, 'radius:', scroll=True))
command('xdotool', 'key', '--clearmodifiers', 'ctrl+a')
command('xdotool', 'type', '--clearmodifiers', '--delay', '10', 'Button { radius: 19; }')
wait_for(lambda: state(window)['appearance']['source'] == 'Button { radius: 19; }',
'Manual typing did not update KSS draft')
time.sleep(.5)
inspected = tool(window, 'inspect_style', dict(scope='all', widget='Button', state='normal'))
assert inspected['ok'] and 'radius: 19' in inspected['inspection'], inspected
tap(window, *locate(window, 'save', scroll=True))
wait_for(lambda: read(window)['saved_source'] == 'Button { radius: 19; }', 'UI save did not persist')
capture(window, 'saved-preview')
with application(profile, 'restart') as window:
assert read(window)['saved_source'] == 'Button { radius: 19; }'
assert change(window, 'reset_style')['ok']
assert read(window)['saved_source'] == ''
tool(window, 'open_view', dict(view='appearance'))
tap(window, *locate(window, 'advanced appearance', scroll=True))
tap(window, *locate(window, 'ask lumi', scroll=True))
capture(window, 'lumi-handoff')
assert state(window)['feature'] == 16
with application(profile, 'phone', width=390, height=844) as window:
assert read(window)['saved_source'] == ''
tool(window, 'open_view', dict(view='appearance'))
tap(window, *locate(window, 'advanced appearance', scroll=True))
locate(window, 'radius:', scroll=True)
capture(window, 'phone-editor')
with sqlite3.connect(profile / 'inbe.db') as db:
assert db.execute("SELECT value FROM settings WHERE key='appearance.kss.all'").fetchone()[0] == ''
(OUTPUT / 'results.json').write_text(json.dumps(receipts, indent=2) + '\n')
print('Appearance: real editor, live validation, scopes, save/restart, reset and Lumi handoff passed')
+8
View File
@@ -0,0 +1,8 @@
#!/bin/sh
set -eu
root=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd)
binary=${1:-"$root/build/bin/linux/inbe-linux-x86_64"}
exec env -u DISPLAY -u WAYLAND_DISPLAY -u XAUTHORITY -u DBUS_SESSION_BUS_ADDRESS \
-u SESSION_MANAGER YUE_DESKTOP_RECOVERY=0 LIBGL_ALWAYS_SOFTWARE=1 SDL_VIDEODRIVER=x11 \
xvfb-run -a -n 300 -s '-screen 0 1280x1400x24' \
python3 "$root/tests/appearance_ui_test.py" "$binary"
+7
View File
@@ -3,6 +3,13 @@ set -eu
root=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd)
work="$root/build/lumi-engine-test"
mkdir -p "$work"
"$root/build/ziran-toolchain/bin/ziran" bundle --root "$root/tests" \
--entry lumi_tool_budget_behavior:Answer -o "$work/tool-budget.zib" \
"$root/tests/lumi_tool_budget_behavior.zi"
result=$(env -u DISPLAY -u WAYLAND_DISPLAY -u XAUTHORITY -u DBUS_SESSION_BUS_ADDRESS \
"$root/build/ziran-toolchain/bin/ziran" run "$work/tool-budget.zib")
[ "$result" = 42 ]
printf '%s\n' 'Lumi tools: complete appearance workflow and bounded continuations passed'
"$root/build/ziran-toolchain/bin/ziran" bundle --root "$root/tests" \
--entry lumi_engine_behavior:Answer -o "$work/engine.zib" \
"$root/tests/lumi_engine_behavior.zi"
+24
View File
@@ -0,0 +1,24 @@
#import, file "../src/cells/lumi_tool_budget.zi";
#program_export
Answer :: () -> s32 {
// A style change can need five sequential results before its final reply:
// read, inspect, preview, inspect the preview, save.
used: s32
for round: cast(s32)0..cast(s32)4 {
if !LumiToolRoundAllowed(round, 1, used) {
return 1
}
used += 1
}
if LumiToolRoundAllowed(6, 1, used) ||
LumiToolRoundAllowed(0, 5, 0) ||
LumiToolRoundAllowed(0, 1, 12) ||
LumiToolRoundAllowed(0, 4, 9) {
return 2
}
if !LumiToolRoundAllowed(5, 4, 8) {
return 3
}
return 42
}
+133
View File
@@ -2,9 +2,17 @@
#import, file "../src/app/app_types.zi";
#import, file "../src/app/metrics.zi";
#import, file "../src/app/theme_catalog.zi";
#import, file "../src/app/appearance_actions.zi";
#import, file "../src/app/style_customization.zi";
#import, file "../src/app/text_buffers.zi";
#import, file "../src/cells/package_files.zi";
#import, file "../src/core/types.zi";
#import "vec"
#import "control_props"
#import "drawing_props"
#import "style_sheet"
#import "style"
using ButtonState;
#program_export
StartupStyleCheck :: () -> s32 {
@@ -21,6 +29,131 @@ StartupStyleCheck :: () -> s32 {
return 42
}
CustomButtonRadius :: () -> float32 {
base: StyleData
facts := AppearanceFacts("Button", "", cast(s32)ButtonStateNormal)
return ResolveInstalledStyleRules(base, facts, cast(s32)ButtonStateNormal).radius
}
#program_export
AccountStylesCheck :: (all_source: string, lumi_source: string) -> s32 {
StyleCustomizationLoad()
if StyleSavedSource(0) != all_source || StyleDraftSource(0) != all_source ||
StyleSavedSource(5) != lumi_source || StyleDraftSource(5) != lumi_source ||
style_undo_count != 0 || style_editor_open || style_error[0] != cast(u8)0 {
return 1
}
for scope: cast(s32)1..cast(s32)4 {
if StyleDraftSource(scope).count != 0 {
return 2
}
}
return 42
}
#program_export
CustomizationCheck :: () -> s32 {
StyleCustomizationLoad()
app: InnerBreeze
app.style_index = 1
app.theme_id = 0
if !AppearanceEdit(*app, 0, "Button { radius: 24; }") || CustomButtonRadius() != 24.0 {
return 1
}
if StyleSavedSource(0).count != 0 {
return 2
}
color := StyleTokenColor("canvas")
if AppearanceEdit(*app, 0, "Button { radius: unknown; }") || CustomButtonRadius() != 24.0 ||
StyleTokenColor("canvas").r != color.r || AppearanceSave(*app, 0) {
return 3
}
if !AppearanceUndo(*app, 0) || CustomButtonRadius() != 24.0 {
return 4
}
if !AppearanceSave(*app, 0) || StyleSavedSource(0) != "Button { radius: 24; }" {
return 5
}
StyleCustomizationLoad()
if StyleDraftSource(0) != "Button { radius: 24; }" || !app_apply_style(*app) {
return 6
}
if !AppearanceEdit(*app, 5, "Button { radius: 7; }") {
return 7
}
app.breathing.screen = ScreenLumi
if !app_apply_style(*app) || CustomButtonRadius() != 7.0 {
return 8
}
app.breathing.screen = ScreenHabits
if !app_apply_style(*app) || CustomButtonRadius() != 24.0 {
return 9
}
if !AppearanceReset(*app, 5) || StyleSavedSource(5).count != 0 || CustomButtonRadius() != 24.0 {
return 10
}
if !AppearanceEdit(*app, 0,
"tokens { length { radius: 22; } color { canvas: #102030; } }") {
return 11
}
color = StyleTokenColor("canvas")
if color.r != 16 || color.g != 32 || color.b != 48 {
return 12
}
base: StyleData
app_face := ResolveInstalledStyleRules(base, StyleDefaultFacts(StyleKindApp()), 1)
if app_face.background != cast(u32)0x102030ff {
return 13
}
if !AppearanceDiscard(*app, 0) || CustomButtonRadius() != 24.0 {
return 14
}
if AppearanceEdit(*app, 0, "@import <outside>;") || CustomButtonRadius() != 24.0 {
return 15
}
if !AppearanceDiscard(*app, 0) || !AppearanceFormat(*app, 0) || CustomButtonRadius() != 24.0 {
return 16
}
current_revision := style_revision
args: Vec(u8)
BuilderPrint(*args, "{\"scope\":\"all\",\"revision\":%}", current_revision - 1)
arguments := BuilderFinish(args)
result := AppearanceTool(*app, "reset_style", arguments)
if result == "" || StyleDraftSource(0).count == 0 || style_revision != current_revision {
return 17
}
PackageFree(result)
PackageFree(arguments)
result = AppearanceTool(*app, "inspect_style", "{\"scope\":\"all\",\"widget\":\"Button\",\"state\":\"normal\"}")
if result.count < 80 {
return 18
}
PackageFree(result)
result = AppearanceTool(*app, "read_style", "{\"scope\":\"all\"}")
if result.count < 1000 {
return 19
}
PackageFree(result)
overflow: Vec(u8)
for index: cast(s32)0..cast(s32)StyleRuleCapacity {
unused BuilderAppend(overflow, "Button{radius:1;}")
}
source := BuilderFinish(overflow)
if AppearanceEdit(*app, 0, source) || CustomButtonRadius() != 24.0 {
return 20
}
PackageFree(source)
if !AppearanceReset(*app, 0) || StyleSavedSource(0).count != 0 ||
StyleDraftSource(0).count != 0 || CustomButtonRadius() == 24.0 {
return 21
}
StyleCustomizationLoad()
if StyleDraftSource(0).count != 0 || StyleDraftSource(5).count != 0 {
return 22
}
return 42
}
#program_export
Answer :: () -> s32 {
app: InnerBreeze
+64 -1
View File
@@ -4,6 +4,55 @@
#include <assert.h>
#include <pthread.h>
#include <stdio.h>
#include <string.h>
#include "setting_visitor.h"
#include "style_customization.h"
static const char *style_keys[] = {
"appearance.kss.all", "appearance.kss.lists", "appearance.kss.habits",
"appearance.kss.practices", "appearance.kss.diary", "appearance.kss.lumi"
};
static char account_styles[2][6][8192];
static unsigned active_account;
#define saved_styles account_styles[active_account]
void
__wrap_storage_set_setting_text(String key, String value)
{
for(int index = 0; index < 6; index++) {
if(key.length == strlen(style_keys[index]) &&
memcmp(key.data, style_keys[index], key.length) == 0) {
assert(value.length < sizeof(saved_styles[index]));
memcpy(saved_styles[index], value.data, value.length);
saved_styles[index][value.length] = 0;
return;
}
}
assert(0 && "unexpected style setting");
}
String
__wrap_storage_get_setting_text(String key)
{
for(int index = 0; index < 6; index++) {
if(key.length == strlen(style_keys[index]) &&
memcmp(key.data, style_keys[index], key.length) == 0) {
return StringView(saved_styles[index], strlen(saved_styles[index]));
}
}
return StringView("", 0);
}
int32_t
__wrap_storage_list_settings(SettingVisitor callback, void *user)
{
for(int index = 0; index < 6; index++) {
callback.call(callback.context, StringView(style_keys[index], strlen(style_keys[index])),
StringView(saved_styles[index], strlen(saved_styles[index])),
(int64_t)(intptr_t)user);
}
return 1;
}
static void *
startup(void *argument)
@@ -11,7 +60,7 @@ startup(void *argument)
(void)argument;
int result = StartupStyleCheck();
if(result != 42) {
fprintf(stderr, "Style startup check failed: %d\n", result);
fprintf(stderr, "Style startup check failed: %d: %s\n", result, style_error);
}
assert(result == 42);
return NULL;
@@ -31,5 +80,19 @@ main(void)
assert(pthread_join(thread, NULL) == 0);
assert(pthread_attr_destroy(&attributes) == 0);
assert(Answer() == 42);
int custom = CustomizationCheck();
if(custom != 42) {
fprintf(stderr, "Custom appearance check failed: %d\n", custom);
}
assert(custom == 42);
strcpy(account_styles[0][0], "Button { radius: 24; }");
strcpy(account_styles[0][5], "Button { radius: 7; }");
assert(AccountStylesCheck(StringView(saved_styles[0], strlen(saved_styles[0])),
StringView(saved_styles[5], strlen(saved_styles[5]))) == 42);
active_account = 1;
assert(AccountStylesCheck(StringView("", 0), StringView("", 0)) == 42);
active_account = 0;
assert(AccountStylesCheck(StringView(saved_styles[0], strlen(saved_styles[0])),
StringView(saved_styles[5], strlen(saved_styles[5]))) == 42);
return 0;
}
+3
View File
@@ -8,6 +8,7 @@ work=$root/build/style-apply-zi-test
mkdir -p "$work/c"
"$bin/zi2c" --no-main --root "$root/tests" --module-path "$root/src" \
--module-path "$root/build/packages/ziran/std" \
--module-path "$root/build/packages/daochi-client" \
--module-path "$root/build/packages/kryon/src/ui" \
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
-o "$work/c" "$root/tests/style_apply_link_behavior.zi"
@@ -21,6 +22,8 @@ python3 "$root/scripts/embed-app-assets.py" "$work/assets.c" \
"$root/assets/styles/inbe.kss"
"${CC:-cc}" -std=c11 -Os -pthread -DZIRAN_BOUNDS_CHECK -ffunction-sections \
-fdata-sections -Wl,--gc-sections \
-Wl,--wrap=storage_set_setting_text -Wl,--wrap=storage_get_setting_text \
-Wl,--wrap=storage_list_settings \
-I"$root/build/packages/ziran/include" -I"$work/c" -I"$root/src/app" \
"$root/tests/style_apply_link_test.c" \
"$work/assets.c" "$work/c"/*.c -o "$work/test"
+4 -4
View File
@@ -6,8 +6,8 @@ IDI_APP_ICON ICON "inbe.ico"
IDI_NOTIFICATION_ICON ICON "inbe.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,1,22,0
PRODUCTVERSION 2,1,22,0
FILEVERSION 2,1,23,0
PRODUCTVERSION 2,1,23,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -24,11 +24,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "waozi"
VALUE "FileDescription", "Inner Breeze"
VALUE "FileVersion", "2.1.22"
VALUE "FileVersion", "2.1.23"
VALUE "InternalName", "inbe"
VALUE "OriginalFilename", "inbe-windows-x86_64.exe"
VALUE "ProductName", "Inner Breeze"
VALUE "ProductVersion", "2.1.22"
VALUE "ProductVersion", "2.1.23"
END
END
BLOCK "VarFileInfo"
+12 -12
View File
@@ -1,6 +1,14 @@
{
"format": 1,
"packages": [
{
"commit": "f01be2f1d5acf2a570e351013221238b7c543760",
"dependencies": {"kryon": "p311e13d7a9b1a20a"},
"id": "p03de317562242e4f",
"name": "Kss",
"ref": "master",
"url": "https://github.com/kryonlabs/kss.git"
},
{
"commit": "b31299434c785d0f2bd82f36b5bfd2fd36ba1216",
"dependencies": {},
@@ -38,17 +46,9 @@
"url": "https://github.com/LoupVaillant/Monocypher.git"
},
{
"commit": "2a00992af0347c47f04bafe27aa86f666268d638",
"dependencies": {"kryon": "p4d36356769dd6cb7"},
"id": "p4818b2449814c7f4",
"name": "Kss",
"ref": "master",
"url": "https://github.com/kryonlabs/kss.git"
},
{
"commit": "bf90d5bd9d453d14427d0b52e28862c300a7e805",
"commit": "baf7d25675ce4cc63aea7becb0dd77553809eba2",
"dependencies": {"raylib": "p5a77c9c35110e925"},
"id": "p4d36356769dd6cb7",
"id": "p311e13d7a9b1a20a",
"name": "kryon",
"ref": "master",
"url": "https://github.com/kryonlabs/kryon.git"
@@ -80,7 +80,7 @@
},
{
"commit": "7aa01465ac3f988e0404f3c6dc244bf4b009f253",
"dependencies": {"kryon": "p4d36356769dd6cb7"},
"dependencies": {"kryon": "p311e13d7a9b1a20a"},
"id": "paa08e1730a25bda0",
"name": "Game2D",
"ref": "master",
@@ -97,7 +97,7 @@
}
],
"root": {
"dependencies": {"curl": "pc4b263336680098b", "daochi_client": "pa6cfb65dcd8a925b", "game2d": "paa08e1730a25bda0", "kryon": "p4d36356769dd6cb7", "kss": "p4818b2449814c7f4", "liboqs": "p0d047aae8cb8cecb", "monocypher": "p2ff634c7b007140d", "oqs": "p55635fc8976895a9", "rini": "p09fa77e94b0dfc6c", "sqlite": "p151b83a361c86f2d"},
"dependencies": {"curl": "pc4b263336680098b", "daochi_client": "pa6cfb65dcd8a925b", "game2d": "paa08e1730a25bda0", "kryon": "p311e13d7a9b1a20a", "kss": "p03de317562242e4f", "liboqs": "p0d047aae8cb8cecb", "monocypher": "p2ff634c7b007140d", "oqs": "p55635fc8976895a9", "rini": "p09fa77e94b0dfc6c", "sqlite": "p151b83a361c86f2d"},
"name": "Inbe"
},
"toolchain": {