Apply sync review choices directly below colored changes
This commit is contained in:
1 parent
6842f2ee3d
commit
7cec3ad0b3
44 files changed
+320
-312
No files matched your search
@@ -1,4 +1,9 @@
|
||||
# Changelog
|
||||
## [2.1.13] - 2026-10-07
|
||||
### Changed
|
||||
- Merge sync data directly from the action buttons below the change list, without a separate Apply step.
|
||||
- Review clearer sync changes with colored additions, removals and edits, and fewer repeated or empty details.
|
||||
|
||||
## [2.1.12] - 2026-10-07
|
||||
### Fixed
|
||||
- Display bold emphasis in Lumi replies and recognize app feature suggestions as feedback offline.
|
||||
|
||||
@@ -378,7 +378,7 @@ LOCALE_FILES := $(wildcard locales/*.txt)
|
||||
IMAGE_FILES := assets/app/icon.png assets/easteregg/art.png assets/easteregg/waozi.png assets/practices/whm/1.png assets/practices/whm/2.png assets/practices/meditation/1.png assets/pet/egg1.png $(wildcard assets/practices/*/banner*.png) $(wildcard assets/practices/sunsalutation/characters/*/*.png)
|
||||
SOUND_FILES := $(wildcard assets/sounds/*.ogg)
|
||||
FONT_SUBSET_DIR := assets/fonts/subset
|
||||
FONT_SUBSET_CORPUS := locales assets/fonts/input_common.txt
|
||||
FONT_SUBSET_CORPUS := locales assets/fonts/input_common.txt assets/fonts/ui_symbols.txt
|
||||
FONT_FILES := \
|
||||
$(FONT_SUBSET_DIR)/NotoSans-App-Regular.ttf \
|
||||
$(FONT_SUBSET_DIR)/NotoSansSC-App-Regular.otf \
|
||||
@@ -1228,7 +1228,7 @@ font-bundle-check:
|
||||
|
||||
font-subsets:
|
||||
sh $(KRYON_DIR)/scripts/subset-fonts.sh "$(FONT_SUBSET_DIR)" \
|
||||
"$(KRYON_DIR)/fonts/noto" App locales assets/fonts/input_common.txt
|
||||
"$(KRYON_DIR)/fonts/noto" App $(FONT_SUBSET_CORPUS)
|
||||
|
||||
|
||||
.PHONY: sync-server-test
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
# Changelog
|
||||
|
||||
## [2.1.13] - 2026-10-07
|
||||
|
||||
- Show clean, colored sync changes with translated explanations and complete change symbols.
|
||||
|
||||
## [2.1.12] - 2026-10-07
|
||||
|
||||
- Keep all apps working with Lumi's bold formatting and offline feature suggestions.
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
"apps": {
|
||||
"inbe": {
|
||||
"id": "inbe",
|
||||
"version": "2.1.12",
|
||||
"sequence": 12,
|
||||
"version": "2.1.13",
|
||||
"sequence": 13,
|
||||
"bundled": true
|
||||
},
|
||||
"habits": {
|
||||
|
||||
@@ -12,3 +12,4 @@ abcdefghijklmnopqrstuvwxyz
|
||||
。,、!?:;()[]「」『』ー〜・
|
||||
中文简体繁體日本語한국어
|
||||
·—›
|
||||
+ −
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1 @@
|
||||
↔ →
|
||||
@@ -6,9 +6,28 @@ tokens {
|
||||
panel-pressed: #181d26;
|
||||
border-hover: #4a5363;
|
||||
focus: #c9a8ff;
|
||||
review-added: #17663a;
|
||||
review-removed: #b3261e;
|
||||
review-changed: #805000;
|
||||
}
|
||||
}
|
||||
|
||||
Text.review-added {
|
||||
foreground: review-added;
|
||||
}
|
||||
Text.review-removed {
|
||||
foreground: review-removed;
|
||||
}
|
||||
Text.review-changed {
|
||||
foreground: review-changed;
|
||||
}
|
||||
Text.review-detail {
|
||||
foreground: muted;
|
||||
}
|
||||
Text.review-heading {
|
||||
foreground: text;
|
||||
}
|
||||
|
||||
Text.practice-heading {
|
||||
foreground: text;
|
||||
}
|
||||
|
||||
@@ -53,8 +53,8 @@ android {
|
||||
applicationId "xyz.waozi.inbe"
|
||||
minSdk 21
|
||||
targetSdk 36
|
||||
versionCode 149
|
||||
versionName "2.1.12"
|
||||
versionCode 150
|
||||
versionName "2.1.13"
|
||||
manifestPlaceholders = [
|
||||
inbeAppLabel: "Inner Breeze",
|
||||
inbeUsesCleartextTraffic: "false"
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
Changed
|
||||
---
|
||||
- Merge sync data directly from the action buttons below the change list, without a separate Apply step.
|
||||
- Review clearer sync changes with colored additions, removals and edits, and fewer repeated or empty details.
|
||||
+2
-14
@@ -2028,15 +2028,11 @@ Data sloučena
|
||||
---
|
||||
|
||||
[review_merge_detail]
|
||||
Zachovat záznamy z obou kopií. Konflikty se řídí stávajícími pravidly synchronizace. Před použitím zkontrolujte přidání, odstranění a změněné hodnoty.
|
||||
---
|
||||
|
||||
[review_keep_detail]
|
||||
Zachovat data v tomto zařízení. Žádné místní záznamy se nepřidají ani neodstraní; čekající změny zůstanou zachovány. Synchronizovaná kopie se přeskočí.
|
||||
Sloučení zachová záznamy z obou kopií. Konflikty se řeší podle stávajících pravidel synchronizace.
|
||||
---
|
||||
|
||||
[review_replace_detail]
|
||||
Nahradit synchronizované záznamy tohoto zařízení synchronizovanou kopií. Místní záznamy, které v ní chybí, se odstraní. Zkontrolujte každé odstranění.
|
||||
Použití synchronizovaných dat nahradí kopii v tomto zařízení a odstraní místní záznamy uvedené níže.
|
||||
---
|
||||
|
||||
[review_added]
|
||||
@@ -2059,10 +2055,6 @@ Změněno
|
||||
Náhled není dostupný. Změny nelze přijmout, dokud není kopie načtena a ověřena.
|
||||
---
|
||||
|
||||
[review_apply]
|
||||
Použít vybranou možnost
|
||||
---
|
||||
|
||||
[review_date]
|
||||
Datum
|
||||
---
|
||||
@@ -2132,10 +2124,6 @@ Dokončeno
|
||||
Nedokončeno
|
||||
---
|
||||
|
||||
[review_before_after]
|
||||
Toto zařízení › Po použití této možnosti
|
||||
---
|
||||
|
||||
[review_habit_days]
|
||||
Dny návyků
|
||||
---
|
||||
|
||||
+2
-14
@@ -2028,15 +2028,11 @@ Daten zusammengeführt
|
||||
---
|
||||
|
||||
[review_merge_detail]
|
||||
Einträge aus beiden Kopien behalten. Konflikte folgen den bestehenden Synchronisierungsregeln. Prüfe Ergänzungen, Entfernungen und geänderte Werte vor dem Anwenden.
|
||||
---
|
||||
|
||||
[review_keep_detail]
|
||||
Die Daten auf diesem Gerät behalten. Keine lokalen Einträge werden hinzugefügt oder entfernt; ausstehende Änderungen bleiben erhalten. Die synchronisierte Kopie wird übersprungen.
|
||||
Zusammenführen behält die Einträge beider Kopien. Konflikte werden nach den bestehenden Synchronisationsregeln gelöst.
|
||||
---
|
||||
|
||||
[review_replace_detail]
|
||||
Die synchronisierten Einträge dieses Geräts durch die synchronisierte Kopie ersetzen. Darin fehlende lokale Einträge werden entfernt. Prüfe jede Entfernung.
|
||||
Synchronisierte Daten verwenden ersetzt die Kopie dieses Geräts und entfernt die unten aufgeführten lokalen Einträge.
|
||||
---
|
||||
|
||||
[review_added]
|
||||
@@ -2059,10 +2055,6 @@ Keine Einträge ändern sich.
|
||||
Vorschau nicht verfügbar. Änderungen können erst nach dem Lesen und Prüfen der Kopie angenommen werden.
|
||||
---
|
||||
|
||||
[review_apply]
|
||||
Ausgewählte Option anwenden
|
||||
---
|
||||
|
||||
[review_date]
|
||||
Datum
|
||||
---
|
||||
@@ -2132,10 +2124,6 @@ Erledigt
|
||||
Nicht erledigt
|
||||
---
|
||||
|
||||
[review_before_after]
|
||||
Dieses Gerät › Nach Anwendung dieser Option
|
||||
---
|
||||
|
||||
[review_habit_days]
|
||||
Gewohnheitstage
|
||||
---
|
||||
|
||||
+2
-14
@@ -2027,15 +2027,11 @@ Data merged
|
||||
---
|
||||
|
||||
[review_merge_detail]
|
||||
Keep records from both copies. Conflicts use the existing sync rules. Review additions, removals and changed values below before applying.
|
||||
---
|
||||
|
||||
[review_keep_detail]
|
||||
Keep the current data on this device. No local records are added or removed; pending local changes are preserved. The synced snapshot is skipped.
|
||||
Merge both keeps records from both copies. Conflicts use the existing sync rules.
|
||||
---
|
||||
|
||||
[review_replace_detail]
|
||||
Replace this device’s synced records with the synced snapshot. Local records absent from it are removed. Review every removal below.
|
||||
Using synced data replaces this device’s copy and removes the local records listed below.
|
||||
---
|
||||
|
||||
[review_added]
|
||||
@@ -2058,10 +2054,6 @@ No records change.
|
||||
Preview unavailable. No changes can be accepted until the snapshot can be read and verified.
|
||||
---
|
||||
|
||||
[review_apply]
|
||||
Apply selected option
|
||||
---
|
||||
|
||||
[review_date]
|
||||
Date
|
||||
---
|
||||
@@ -2131,10 +2123,6 @@ Completed
|
||||
Not completed
|
||||
---
|
||||
|
||||
[review_before_after]
|
||||
This device › After applying this option
|
||||
---
|
||||
|
||||
[review_habit_days]
|
||||
Habit days
|
||||
---
|
||||
|
||||
+2
-14
@@ -2028,15 +2028,11 @@ Datos combinados
|
||||
---
|
||||
|
||||
[review_merge_detail]
|
||||
Conservar registros de ambas copias. Los conflictos siguen las reglas de sincronización actuales. Revisa las altas, bajas y valores modificados antes de aplicar.
|
||||
---
|
||||
|
||||
[review_keep_detail]
|
||||
Conservar los datos de este dispositivo. No se añaden ni eliminan registros locales; se conservan los cambios pendientes. Se omite la copia sincronizada.
|
||||
Combinar conserva los registros de ambas copias. Los conflictos siguen las reglas de sincronización existentes.
|
||||
---
|
||||
|
||||
[review_replace_detail]
|
||||
Reemplazar los registros sincronizados de este dispositivo por la copia sincronizada. Se eliminan los registros locales ausentes de ella. Revisa cada eliminación.
|
||||
Usar los datos sincronizados reemplaza la copia de este dispositivo y elimina los registros locales indicados abajo.
|
||||
---
|
||||
|
||||
[review_added]
|
||||
@@ -2059,10 +2055,6 @@ No cambia ningún registro.
|
||||
Vista previa no disponible. No se pueden aceptar cambios hasta leer y verificar la copia.
|
||||
---
|
||||
|
||||
[review_apply]
|
||||
Aplicar opción seleccionada
|
||||
---
|
||||
|
||||
[review_date]
|
||||
Fecha
|
||||
---
|
||||
@@ -2132,10 +2124,6 @@ Completado
|
||||
Sin completar
|
||||
---
|
||||
|
||||
[review_before_after]
|
||||
Este dispositivo › Después de aplicar esta opción
|
||||
---
|
||||
|
||||
[review_habit_days]
|
||||
Días de hábitos
|
||||
---
|
||||
|
||||
+2
-14
@@ -2028,15 +2028,11 @@ Données fusionnées
|
||||
---
|
||||
|
||||
[review_merge_detail]
|
||||
Conserver les enregistrements des deux copies. Les conflits suivent les règles de synchronisation actuelles. Vérifiez les ajouts, suppressions et valeurs modifiées avant de valider.
|
||||
---
|
||||
|
||||
[review_keep_detail]
|
||||
Conserver les données de cet appareil. Aucun enregistrement local n’est ajouté ou supprimé ; les modifications en attente sont conservées. La copie synchronisée est ignorée.
|
||||
Fusionner conserve les données des deux copies. Les conflits suivent les règles de synchronisation existantes.
|
||||
---
|
||||
|
||||
[review_replace_detail]
|
||||
Remplacer les enregistrements synchronisés de cet appareil par la copie synchronisée. Les enregistrements locaux absents de cette copie sont supprimés. Vérifiez chaque suppression.
|
||||
Utiliser les données synchronisées remplace la copie de cet appareil et supprime les données locales indiquées ci-dessous.
|
||||
---
|
||||
|
||||
[review_added]
|
||||
@@ -2059,10 +2055,6 @@ Aucun enregistrement ne change.
|
||||
Aperçu indisponible. Aucun changement ne peut être accepté avant la lecture et la vérification de la copie.
|
||||
---
|
||||
|
||||
[review_apply]
|
||||
Appliquer l’option choisie
|
||||
---
|
||||
|
||||
[review_date]
|
||||
Jour
|
||||
---
|
||||
@@ -2132,10 +2124,6 @@ Terminé
|
||||
Non terminé
|
||||
---
|
||||
|
||||
[review_before_after]
|
||||
Cet appareil › Après application de cette option
|
||||
---
|
||||
|
||||
[review_habit_days]
|
||||
Jours d’habitudes
|
||||
---
|
||||
|
||||
+2
-14
@@ -2028,15 +2028,11 @@ Data digabungkan
|
||||
---
|
||||
|
||||
[review_merge_detail]
|
||||
Simpan catatan dari kedua salinan. Konflik mengikuti aturan sinkronisasi yang ada. Periksa penambahan, penghapusan, dan perubahan nilai sebelum menerapkan.
|
||||
---
|
||||
|
||||
[review_keep_detail]
|
||||
Pertahankan data di perangkat ini. Tidak ada catatan lokal yang ditambah atau dihapus; perubahan tertunda tetap disimpan. Salinan tersinkron dilewati.
|
||||
Menggabungkan mempertahankan catatan dari kedua salinan. Konflik mengikuti aturan sinkronisasi yang ada.
|
||||
---
|
||||
|
||||
[review_replace_detail]
|
||||
Ganti catatan tersinkron perangkat ini dengan salinan tersinkron. Catatan lokal yang tidak ada di dalamnya akan dihapus. Periksa setiap penghapusan.
|
||||
Menggunakan data tersinkron mengganti salinan perangkat ini dan menghapus catatan lokal yang tercantum di bawah.
|
||||
---
|
||||
|
||||
[review_added]
|
||||
@@ -2059,10 +2055,6 @@ Tidak ada catatan yang berubah.
|
||||
Pratinjau tidak tersedia. Perubahan tidak dapat diterima sebelum salinan dibaca dan diverifikasi.
|
||||
---
|
||||
|
||||
[review_apply]
|
||||
Terapkan opsi yang dipilih
|
||||
---
|
||||
|
||||
[review_date]
|
||||
Tanggal
|
||||
---
|
||||
@@ -2132,10 +2124,6 @@ Selesai
|
||||
Belum selesai
|
||||
---
|
||||
|
||||
[review_before_after]
|
||||
Perangkat ini › Setelah opsi ini diterapkan
|
||||
---
|
||||
|
||||
[review_habit_days]
|
||||
Hari kebiasaan
|
||||
---
|
||||
|
||||
+2
-14
@@ -2028,15 +2028,11 @@ Dati uniti
|
||||
---
|
||||
|
||||
[review_merge_detail]
|
||||
Conserva i record di entrambe le copie. I conflitti seguono le regole di sincronizzazione attuali. Controlla aggiunte, rimozioni e valori modificati prima di applicare.
|
||||
---
|
||||
|
||||
[review_keep_detail]
|
||||
Conserva i dati di questo dispositivo. Nessun record locale viene aggiunto o rimosso; le modifiche in attesa sono mantenute. La copia sincronizzata viene ignorata.
|
||||
Unire conserva i dati di entrambe le copie. I conflitti seguono le regole di sincronizzazione esistenti.
|
||||
---
|
||||
|
||||
[review_replace_detail]
|
||||
Sostituisci i record sincronizzati di questo dispositivo con la copia sincronizzata. I record locali assenti vengono rimossi. Controlla ogni rimozione.
|
||||
Usare i dati sincronizzati sostituisce la copia di questo dispositivo e rimuove i dati locali elencati sotto.
|
||||
---
|
||||
|
||||
[review_added]
|
||||
@@ -2059,10 +2055,6 @@ Nessun record cambia.
|
||||
Anteprima non disponibile. Non si possono accettare modifiche prima di leggere e verificare la copia.
|
||||
---
|
||||
|
||||
[review_apply]
|
||||
Applica l’opzione selezionata
|
||||
---
|
||||
|
||||
[review_date]
|
||||
Data
|
||||
---
|
||||
@@ -2132,10 +2124,6 @@ Completato
|
||||
Non completato
|
||||
---
|
||||
|
||||
[review_before_after]
|
||||
Questo dispositivo › Dopo aver applicato questa opzione
|
||||
---
|
||||
|
||||
[review_habit_days]
|
||||
Giorni delle abitudini
|
||||
---
|
||||
|
||||
+2
-14
@@ -2030,15 +2030,11 @@ Inner Breezeは無料のオープンソースです。役に立ったら、少
|
||||
---
|
||||
|
||||
[review_merge_detail]
|
||||
両方のコピーの記録を保持します。競合は現在の同期ルールで処理されます。適用前に追加、削除、値の変更を確認してください。
|
||||
---
|
||||
|
||||
[review_keep_detail]
|
||||
この端末のデータを保持します。ローカルの記録は追加も削除もされず、未同期の変更も保持されます。同期コピーはスキップされます。
|
||||
統合すると両方のコピーの記録が保持されます。競合は既存の同期ルールに従って解決されます。
|
||||
---
|
||||
|
||||
[review_replace_detail]
|
||||
この端末の同期対象の記録を同期コピーで置き換えます。コピーにないローカルの記録は削除されます。各削除を確認してください。
|
||||
同期データを使うと、この端末のコピーが置き換えられ、以下のローカル記録が削除されます。
|
||||
---
|
||||
|
||||
[review_added]
|
||||
@@ -2061,10 +2057,6 @@ Inner Breezeは無料のオープンソースです。役に立ったら、少
|
||||
プレビューを表示できません。コピーの読み取りと検証が完了するまで変更を適用できません。
|
||||
---
|
||||
|
||||
[review_apply]
|
||||
選択した項目を適用
|
||||
---
|
||||
|
||||
[review_date]
|
||||
日付
|
||||
---
|
||||
@@ -2134,10 +2126,6 @@ Inner Breezeは無料のオープンソースです。役に立ったら、少
|
||||
未完了
|
||||
---
|
||||
|
||||
[review_before_after]
|
||||
この端末 › 選択した操作を適用した後
|
||||
---
|
||||
|
||||
[review_habit_days]
|
||||
習慣の日付
|
||||
---
|
||||
|
||||
+2
-14
@@ -2028,15 +2028,11 @@ Inner Breeze는 무료 오픈 소스입니다. 도움이 되셨다면 작은 후
|
||||
---
|
||||
|
||||
[review_merge_detail]
|
||||
두 사본의 기록을 보존합니다. 충돌은 기존 동기화 규칙에 따라 처리됩니다. 적용 전에 아래의 추가, 삭제 및 값 변경을 확인하세요.
|
||||
---
|
||||
|
||||
[review_keep_detail]
|
||||
이 기기의 데이터를 유지합니다. 로컬 기록을 추가하거나 삭제하지 않으며 대기 중인 변경도 보존합니다. 동기화된 사본은 건너뜁니다.
|
||||
병합하면 두 사본의 기록이 모두 유지됩니다. 충돌은 기존 동기화 규칙에 따라 해결됩니다.
|
||||
---
|
||||
|
||||
[review_replace_detail]
|
||||
이 기기의 동기화 기록을 동기화된 사본으로 교체합니다. 사본에 없는 로컬 기록은 삭제됩니다. 각 삭제 항목을 확인하세요.
|
||||
동기화된 데이터를 사용하면 이 기기의 사본이 교체되고 아래에 나열된 로컬 기록이 삭제됩니다.
|
||||
---
|
||||
|
||||
[review_added]
|
||||
@@ -2059,10 +2055,6 @@ Inner Breeze는 무료 오픈 소스입니다. 도움이 되셨다면 작은 후
|
||||
미리 보기를 사용할 수 없습니다. 사본을 읽고 검증하기 전에는 변경을 수락할 수 없습니다.
|
||||
---
|
||||
|
||||
[review_apply]
|
||||
선택한 옵션 적용
|
||||
---
|
||||
|
||||
[review_date]
|
||||
날짜
|
||||
---
|
||||
@@ -2132,10 +2124,6 @@ Inner Breeze는 무료 오픈 소스입니다. 도움이 되셨다면 작은 후
|
||||
미완료
|
||||
---
|
||||
|
||||
[review_before_after]
|
||||
이 기기 › 선택한 옵션을 적용한 후
|
||||
---
|
||||
|
||||
[review_habit_days]
|
||||
습관 날짜
|
||||
---
|
||||
|
||||
+2
-14
@@ -2028,15 +2028,11 @@ Dados mesclados
|
||||
---
|
||||
|
||||
[review_merge_detail]
|
||||
Manter registros das duas cópias. Conflitos seguem as regras atuais de sincronização. Revise inclusões, remoções e valores alterados antes de aplicar.
|
||||
---
|
||||
|
||||
[review_keep_detail]
|
||||
Manter os dados deste dispositivo. Nenhum registro local é adicionado ou removido; alterações pendentes são preservadas. A cópia sincronizada é ignorada.
|
||||
Mesclar mantém os registros das duas cópias. Os conflitos seguem as regras de sincronização existentes.
|
||||
---
|
||||
|
||||
[review_replace_detail]
|
||||
Substituir os registros sincronizados deste dispositivo pela cópia sincronizada. Registros locais ausentes nela são removidos. Revise cada remoção.
|
||||
Usar os dados sincronizados substitui a cópia deste dispositivo e remove os registros locais listados abaixo.
|
||||
---
|
||||
|
||||
[review_added]
|
||||
@@ -2059,10 +2055,6 @@ Nenhum registro muda.
|
||||
Prévia indisponível. Não é possível aceitar alterações até ler e verificar a cópia.
|
||||
---
|
||||
|
||||
[review_apply]
|
||||
Aplicar opção selecionada
|
||||
---
|
||||
|
||||
[review_date]
|
||||
Data
|
||||
---
|
||||
@@ -2132,10 +2124,6 @@ Concluído
|
||||
Não concluído
|
||||
---
|
||||
|
||||
[review_before_after]
|
||||
Este dispositivo › Após aplicar esta opção
|
||||
---
|
||||
|
||||
[review_habit_days]
|
||||
Dias de hábitos
|
||||
---
|
||||
|
||||
+2
-14
@@ -2028,15 +2028,11 @@ Inner Breeze бесплатное приложение с открытым ис
|
||||
---
|
||||
|
||||
[review_merge_detail]
|
||||
Сохранить записи из обеих копий. Конфликты разрешаются по текущим правилам синхронизации. Перед применением проверьте добавления, удаления и изменённые значения.
|
||||
---
|
||||
|
||||
[review_keep_detail]
|
||||
Сохранить данные на этом устройстве. Локальные записи не добавляются и не удаляются; ожидающие изменения сохраняются. Синхронизированная копия пропускается.
|
||||
Объединение сохраняет записи из обеих копий. Конфликты разрешаются по существующим правилам синхронизации.
|
||||
---
|
||||
|
||||
[review_replace_detail]
|
||||
Заменить синхронизируемые записи устройства синхронизированной копией. Отсутствующие в ней локальные записи удаляются. Проверьте каждое удаление.
|
||||
Использование синхронизированных данных заменяет копию на этом устройстве и удаляет перечисленные ниже локальные записи.
|
||||
---
|
||||
|
||||
[review_added]
|
||||
@@ -2059,10 +2055,6 @@ Inner Breeze бесплатное приложение с открытым ис
|
||||
Предпросмотр недоступен. Изменения нельзя принять до чтения и проверки копии.
|
||||
---
|
||||
|
||||
[review_apply]
|
||||
Применить выбранный вариант
|
||||
---
|
||||
|
||||
[review_date]
|
||||
Дата
|
||||
---
|
||||
@@ -2132,10 +2124,6 @@ Inner Breeze бесплатное приложение с открытым ис
|
||||
Не выполнено
|
||||
---
|
||||
|
||||
[review_before_after]
|
||||
Это устройство › После применения выбранного варианта
|
||||
---
|
||||
|
||||
[review_habit_days]
|
||||
Дни привычек
|
||||
---
|
||||
|
||||
+2
-14
@@ -2028,15 +2028,11 @@ Inner Breeze 免费且开源。如果它对您有帮助,一点小额捐赠将
|
||||
---
|
||||
|
||||
[review_merge_detail]
|
||||
保留两份数据中的记录。冲突按现有同步规则处理。应用前请检查下方的新增、删除和数值变化。
|
||||
---
|
||||
|
||||
[review_keep_detail]
|
||||
保留此设备上的数据。不新增或删除本地记录,并保留待同步的更改。跳过同步副本。
|
||||
合并会保留两份副本中的记录。冲突按现有同步规则处理。
|
||||
---
|
||||
|
||||
[review_replace_detail]
|
||||
用同步副本替换此设备的同步记录。同步副本中不存在的本地记录将被删除。请检查每项删除。
|
||||
使用已同步的数据会替换此设备上的副本,并删除下方列出的本地记录。
|
||||
---
|
||||
|
||||
[review_added]
|
||||
@@ -2059,10 +2055,6 @@ Inner Breeze 免费且开源。如果它对您有帮助,一点小额捐赠将
|
||||
无法预览。在读取并验证副本之前,无法接受更改。
|
||||
---
|
||||
|
||||
[review_apply]
|
||||
应用所选选项
|
||||
---
|
||||
|
||||
[review_date]
|
||||
日期
|
||||
---
|
||||
@@ -2132,10 +2124,6 @@ Inner Breeze 免费且开源。如果它对您有帮助,一点小额捐赠将
|
||||
未完成
|
||||
---
|
||||
|
||||
[review_before_after]
|
||||
本设备当前状态 › 应用此选项后的状态
|
||||
---
|
||||
|
||||
[review_habit_days]
|
||||
习惯日期
|
||||
---
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Package: inbe.waozi
|
||||
Version: 2.1.12
|
||||
Version: 2.1.13
|
||||
Architecture: arm64
|
||||
Maintainer: Waozi <[email protected]>
|
||||
Click-Version: 0.4
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
<binary>inbe</binary>
|
||||
</provides>
|
||||
<releases>
|
||||
<release version="2.1.12" date="2026-10-07"/>
|
||||
<release version="2.1.13" date="2026-10-07"/>
|
||||
</releases>
|
||||
<content_rating type="oars-1.1"/>
|
||||
</component>
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "inbe",
|
||||
"title": "Inner Breeze",
|
||||
"version": "2.1.12",
|
||||
"version": "2.1.13",
|
||||
"architecture": "arm64",
|
||||
"framework": "ubuntu-sdk-20.04",
|
||||
"description": "Syncable breathing, meditation, and habit practice app.",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"manifest_version": 3,
|
||||
"name": "Inner Breeze",
|
||||
"short_name": "Inbe",
|
||||
"version": "2.1.12",
|
||||
"version": "2.1.13",
|
||||
"description": "Breathing, meditation, habit tracking, and encrypted sync.",
|
||||
"permissions": [
|
||||
"contextMenus"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<binary>inbe</binary>
|
||||
</provides>
|
||||
<releases>
|
||||
<release version="2.1.12" date="2026-10-07"/>
|
||||
<release version="2.1.13" date="2026-10-07"/>
|
||||
</releases>
|
||||
<content_rating type="oars-1.1"/>
|
||||
</component>
|
||||
@@ -22,7 +22,7 @@
|
||||
<binary>inbe</binary>
|
||||
</provides>
|
||||
<releases>
|
||||
<release version="2.1.12" date="2026-10-07"/>
|
||||
<release version="2.1.13" date="2026-10-07"/>
|
||||
</releases>
|
||||
<content_rating type="oars-1.1"/>
|
||||
</component>
|
||||
@@ -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.12'
|
||||
version: '2.1.13'
|
||||
license: BSD-3-Clause
|
||||
base: core22
|
||||
confinement: strict
|
||||
|
||||
@@ -83,6 +83,9 @@ StyleColors :: struct {
|
||||
on_danger: u32
|
||||
link: u32
|
||||
icon: u32
|
||||
review_added: u32
|
||||
review_removed: u32
|
||||
review_changed: u32
|
||||
}
|
||||
|
||||
StyleColorsFor :: (catalog: ThemeCatalog, dark: bool) -> StyleColors {
|
||||
@@ -111,6 +114,10 @@ StyleColorsFor :: (catalog: ThemeCatalog, dark: bool) -> StyleColors {
|
||||
colors.on_danger = OnColor(scheme.error)
|
||||
colors.link = catalog.link
|
||||
colors.icon = catalog.icon
|
||||
dark_surface := OnColor(catalog.surface) == cast(u32)0xffffffff
|
||||
colors.review_added = ifx dark_surface then 0x86dca5ff else 0x17663aff
|
||||
colors.review_removed = ifx dark_surface then 0xffa3a3ff else 0xb3261eff
|
||||
colors.review_changed = ifx dark_surface then 0xffd477ff else 0x805000ff
|
||||
return colors
|
||||
}
|
||||
|
||||
@@ -182,6 +189,9 @@ StyleOverrides :: (parser: KssParser, colors: StyleColors,
|
||||
parser = KssAddColorOverride(parser, "scroll-border", colors.border_strong)
|
||||
parser = KssAddColorOverride(parser, "link", colors.link)
|
||||
parser = KssAddColorOverride(parser, "icon", colors.icon)
|
||||
parser = KssAddColorOverride(parser, "review-added", colors.review_added)
|
||||
parser = KssAddColorOverride(parser, "review-removed", colors.review_removed)
|
||||
parser = KssAddColorOverride(parser, "review-changed", colors.review_changed)
|
||||
return parser
|
||||
}
|
||||
|
||||
|
||||
@@ -567,9 +567,14 @@ setup_screenshot_scene :: (app: *InnerBreeze, request: *ScreenshotRequest) {
|
||||
return
|
||||
}
|
||||
statement: *void = null
|
||||
sql := "SELECT json_object('protocol_version',6,'server_version',24,'full_snapshot_required',json('true'),'changes',json_object('encrypted_records',json_extract(?1,'$.encrypted_records')))"
|
||||
social_records := "[]"
|
||||
if scene_text == "sync_review" {
|
||||
social_records = "[{\"kind\":\"friends.list\",\"json\":{\"friends\":[{\"user_id_hash\":\"fixture-a\",\"alias\":\"Alicia\"},{\"user_id_hash\":\"fixture-c\",\"alias\":\"Cara\"}]}},{\"kind\":\"friends.requests\",\"json\":{\"incoming\":[{\"id\":\"fixture-request-d\",\"requester_user_id_hash\":\"fixture-d\",\"requester_alias\":\"Dani\"}],\"outgoing\":[]}}]"
|
||||
}
|
||||
sql := "SELECT json_object('protocol_version',6,'server_version',24,'full_snapshot_required',json('true'),'changes',json_object('encrypted_records',json_extract(?1,'$.encrypted_records'),'social_cache',json(?2)))"
|
||||
if SqlitePrepareText(storage_db_handle(), sql, -1, *statement, null) == SQLITE_OK {
|
||||
bind_text(statement, 1, AppTextFromCString(payload, 2147483647))
|
||||
bind_text(statement, 2, social_records)
|
||||
if SqliteStep(statement) == SQLITE_ROW {
|
||||
storage_sync_review_write_json(AppTextFromCString(SqliteColumnText(statement, 0), 2147483647))
|
||||
}
|
||||
@@ -579,6 +584,8 @@ setup_screenshot_scene :: (app: *InnerBreeze, request: *ScreenshotRequest) {
|
||||
if scene_text == "sync_review" {
|
||||
storage_clear_local_sync_data()
|
||||
exec_sql("INSERT INTO habits(id,user_id,name,color_r,color_g,color_b,sync_mode,sync_activity,counter_enabled,sort_order,deleted_at,updated_at) VALUES('local-review-walk',(SELECT id FROM users LIMIT 1),'Local walk',80,140,100,0,0,1,0,0,1782300000)")
|
||||
exec_sql("INSERT OR REPLACE INTO social_snapshots VALUES((SELECT id FROM users LIMIT 1),'friends.list','{\"friends\":[{\"user_id_hash\":\"fixture-a\",\"alias\":\"Alice\"},{\"user_id_hash\":\"fixture-b\",\"alias\":\"Bob\"}]}',0)")
|
||||
exec_sql("INSERT OR REPLACE INTO social_snapshots VALUES((SELECT id FROM users LIMIT 1),'friends.requests','{\"incoming\":[],\"outgoing\":[]}',0)")
|
||||
}
|
||||
storage_enqueue_all_sync_state()
|
||||
storage_set_sync_enabled(0)
|
||||
|
||||
@@ -3,7 +3,7 @@ PackageBundledVersion :: (index: s32) -> string {
|
||||
if index < 0 || index >= 6 {
|
||||
return ""
|
||||
}
|
||||
versions: [6]string = .["2.1.12", "1.0.3", "1.0.3", "1.1.3", "1.1.2", "1.3.1"]
|
||||
versions: [6]string = .["2.1.13", "1.0.3", "1.0.3", "1.1.3", "1.1.2", "1.3.1"]
|
||||
return versions[index]
|
||||
}
|
||||
|
||||
@@ -11,6 +11,6 @@ PackageBundledSequence :: (index: s32) -> s32 {
|
||||
if index < 0 || index >= 6 {
|
||||
return 0
|
||||
}
|
||||
sequences: [6]s32 = .[12, 4, 4, 5, 4, 8]
|
||||
sequences: [6]s32 = .[13, 4, 4, 5, 4, 8]
|
||||
return sequences[index]
|
||||
}
|
||||
+2
-2
@@ -3,7 +3,7 @@
|
||||
|
||||
#define APP_VERSION_MAJOR 2
|
||||
#define APP_VERSION_MINOR 1
|
||||
#define APP_VERSION_PATCH 12
|
||||
#define APP_VERSION_STRING "2.1.12"
|
||||
#define APP_VERSION_PATCH 13
|
||||
#define APP_VERSION_STRING "2.1.13"
|
||||
|
||||
#endif
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
// Generated by update_version.sh from CHANGELOG.md. Do not edit by hand.
|
||||
VersionMajor :: 2
|
||||
VersionMinor :: 1
|
||||
VersionPatch :: 12
|
||||
VersionString :: "2.1.12"
|
||||
VersionPatch :: 13
|
||||
VersionString :: "2.1.13"
|
||||
@@ -46,6 +46,7 @@ c :: #system_library "c";
|
||||
#import "string_range"
|
||||
#import "byte_text_linux"
|
||||
#import "file_linux"
|
||||
#import "kss_parser"
|
||||
|
||||
using ModalType;
|
||||
using PendingSyncAccountAction;
|
||||
@@ -556,43 +557,109 @@ SettingsDataPrompt :: (app: *InnerBreeze, key: string,
|
||||
return result.action
|
||||
}
|
||||
|
||||
review_choice: s32 = 2;
|
||||
review_scroll: s32;
|
||||
review_cached_choice: s32 = -1;
|
||||
review_cached_revision: s64 = -1;
|
||||
review_cached_text: *u8;
|
||||
review_cached_replace_text: *u8;
|
||||
review_cached_available: bool;
|
||||
review_cached_replace_available: bool;
|
||||
|
||||
SettingsReviewReset :: () {
|
||||
free(cast(*void)review_cached_text)
|
||||
free(cast(*void)review_cached_replace_text)
|
||||
review_cached_text = null
|
||||
review_cached_choice = -1
|
||||
review_cached_replace_text = null
|
||||
review_cached_revision = -1
|
||||
review_choice = 2
|
||||
review_cached_available = false
|
||||
review_cached_replace_available = false
|
||||
review_scroll = 0
|
||||
}
|
||||
|
||||
SettingsReviewRemovals :: (value: string) -> string {
|
||||
start: s32 = 0
|
||||
removed_start: s32 = -1
|
||||
while start < cast(s32)value.count {
|
||||
end := start
|
||||
while end < cast(s32)value.count && value[end] != #char "\n" {
|
||||
end += 1
|
||||
}
|
||||
line := value[start:end]
|
||||
if line == LocaleText("review_removed") {
|
||||
removed_start = end + 1
|
||||
} else if removed_start >= 0 &&
|
||||
(line == LocaleText("review_changed") || line == LocaleText("review_added")) {
|
||||
return value[removed_start:start]
|
||||
}
|
||||
start = end + 1
|
||||
}
|
||||
if removed_start >= 0 {
|
||||
return value[removed_start:]
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
SettingsReviewLines :: (app: *InnerBreeze, value: string,
|
||||
bounds: Rectangle, offset: s32, font: s32, line_height: s32) {
|
||||
bounds: Rectangle, offset: s32, font: s32, line_height: s32,
|
||||
initial_class: string) -> s32 {
|
||||
start: s32 = 0
|
||||
y := cast(s32)bounds.y - offset
|
||||
action_class := initial_class
|
||||
while start < cast(s32)value.count {
|
||||
line := NextTextLine(value, start, bounds.width - cast(float32)AppScale(12),
|
||||
cast(TextWrap)TextWrapAuto, font, "ui")
|
||||
if y + line_height >= cast(s32)bounds.y &&
|
||||
y < cast(s32)(bounds.y + bounds.height) {
|
||||
props := SettingsDataTextProps(value[line.start:line.end],
|
||||
cast(s32)bounds.x, y, cast(s32)bounds.width - AppScale(12), line_height)
|
||||
props.font = font
|
||||
props.wrap = cast(TextWrap)TextWrapNone
|
||||
Text(app.ui.session, props)
|
||||
end := start
|
||||
while end < cast(s32)value.count && value[end] != #char "\n" {
|
||||
end += 1
|
||||
}
|
||||
y += line_height
|
||||
if line.next <= start {
|
||||
break
|
||||
logical_line := value[start:end]
|
||||
if logical_line == LocaleText("review_added") {
|
||||
action_class = "review-added"
|
||||
} else if logical_line == LocaleText("review_removed") {
|
||||
action_class = "review-removed"
|
||||
} else if logical_line == LocaleText("review_changed") {
|
||||
action_class = "review-changed"
|
||||
}
|
||||
start = line.next
|
||||
indent: s32 = 0
|
||||
while indent < cast(s32)logical_line.count && logical_line[indent] == #char " " {
|
||||
indent += 1
|
||||
}
|
||||
class_name := action_class
|
||||
if indent >= 6 {
|
||||
class_name = "review-detail"
|
||||
}
|
||||
inset: s32 = 0
|
||||
if indent >= 2 {
|
||||
inset = AppScale(12)
|
||||
}
|
||||
if indent >= 6 {
|
||||
inset = AppScale(24)
|
||||
}
|
||||
visible_line := logical_line[indent:]
|
||||
wrapped_start: s32 = 0
|
||||
while wrapped_start < cast(s32)visible_line.count {
|
||||
line := NextTextLine(visible_line, wrapped_start,
|
||||
bounds.width - cast(float32)(AppScale(12) + inset),
|
||||
cast(TextWrap)TextWrapAuto, font, "ui")
|
||||
if app != null && y + line_height >= cast(s32)bounds.y &&
|
||||
y < cast(s32)(bounds.y + bounds.height) {
|
||||
props := SettingsDataTextProps(visible_line[line.start:line.end],
|
||||
cast(s32)bounds.x + inset, y,
|
||||
cast(s32)bounds.width - AppScale(12) - inset, line_height)
|
||||
props.font = font
|
||||
props.wrap = cast(TextWrap)TextWrapNone
|
||||
props.class_name = KssClassId(KssMakeName(class_name))
|
||||
Text(app.ui.session, props)
|
||||
}
|
||||
y += line_height
|
||||
if line.next <= wrapped_start {
|
||||
break
|
||||
}
|
||||
wrapped_start = line.next
|
||||
}
|
||||
if visible_line.count == 0 {
|
||||
y += line_height
|
||||
}
|
||||
start = end + 1
|
||||
}
|
||||
return y - cast(s32)bounds.y + offset
|
||||
}
|
||||
|
||||
SettingsDataReviewModal :: (app: *InnerBreeze) -> s32 {
|
||||
@@ -628,74 +695,86 @@ SettingsDataReviewModal :: (app: *InnerBreeze) -> s32 {
|
||||
x := cast(s32)content.x
|
||||
y := cast(s32)content.y
|
||||
text_width := cast(s32)content.width
|
||||
options: [3]string = .["review_merge", "sync_review_keep_local", "sync_review_use_remote"]
|
||||
modes: [3]s32 = .[2, 0, 1]
|
||||
index: s32 = 0
|
||||
while index < 3 {
|
||||
button := SettingsDataButtonProps(LocaleText(options[index]),
|
||||
x, y, text_width, 5351 + index, review_choice == modes[index])
|
||||
if Button(app.ui.session, button) != 0 && review_choice != modes[index] {
|
||||
review_choice = modes[index]
|
||||
review_scroll = 0
|
||||
}
|
||||
y += AppScale(44)
|
||||
index += 1
|
||||
}
|
||||
revision := storage_data_revision()
|
||||
if review_cached_choice != review_choice || review_cached_revision != revision {
|
||||
if review_cached_revision != revision {
|
||||
free(cast(*void)review_cached_text)
|
||||
free(cast(*void)review_cached_replace_text)
|
||||
review_cached_text = null
|
||||
review_cached_available = storage_sync_review_plan(review_choice, *review_cached_text) != 0
|
||||
review_cached_choice = review_choice
|
||||
review_cached_replace_text = null
|
||||
review_cached_available = storage_sync_review_plan(2, *review_cached_text) != 0
|
||||
review_cached_replace_available = storage_sync_review_plan(1, *review_cached_replace_text) != 0
|
||||
review_cached_revision = storage_data_revision()
|
||||
}
|
||||
explanation_key := "review_merge_detail"
|
||||
if review_choice == 0 {
|
||||
explanation_key = "review_keep_detail"
|
||||
}
|
||||
if review_choice == 1 {
|
||||
explanation_key = "review_replace_detail"
|
||||
}
|
||||
// The cache owns the full preview; render only visible wrapped lines so
|
||||
// large reviews never hit a fixed frame-text or tree-label capacity.
|
||||
value := LocaleText("review_unavailable")
|
||||
if review_cached_available {
|
||||
value = AppTextFromCString(review_cached_text, 2147483647)
|
||||
}
|
||||
explanation := LocaleText(explanation_key)
|
||||
font := AppScale(14)
|
||||
explanation := LocaleText("review_merge_detail")
|
||||
font := AppScale(16)
|
||||
line_height := AppTextLineHeight(font)
|
||||
direction := LocaleText("review_before_after")
|
||||
direction := LocaleText("review_merge")
|
||||
direction_height := AppParagraphHeight(direction, text_width, font, 0)
|
||||
direction_props: TextProps = SettingsDataTextProps(direction,
|
||||
x, y, text_width, direction_height)
|
||||
direction_props.font = font
|
||||
direction_props.wrap = cast(TextWrap)TextWrapAuto
|
||||
direction_props.class_name = KssClassId(KssMakeName("review-heading"))
|
||||
Text(app.ui.session, direction_props)
|
||||
y += direction_height + AppScale(8)
|
||||
view := SettingsDataRect(x, y, text_width,
|
||||
cast(s32)(content.y + content.height) - y - AppScale(50))
|
||||
explanation_height := AppParagraphHeight(explanation,
|
||||
text_width - AppScale(12), font, 0) + line_height
|
||||
cast(s32)(content.y + content.height) - y - AppScale(140))
|
||||
explanation_height := SettingsReviewLines(null, explanation, view, 0,
|
||||
font, line_height, "review-detail") + line_height
|
||||
props: ScrollProps
|
||||
props.key = KeyHash("inbe/data/sync-review/details")
|
||||
props.bounds = view
|
||||
props.content_height = explanation_height +
|
||||
AppParagraphHeight(value, text_width - AppScale(12), font, 0)
|
||||
merge_height := SettingsReviewLines(null, value, view, 0, font, line_height, "")
|
||||
removals := SettingsReviewRemovals(AppTextFromCString(review_cached_replace_text, 2147483647))
|
||||
replacement := ""
|
||||
replacement_height: s32 = 0
|
||||
if removals.count > 0 {
|
||||
replacement = LocaleText("review_replace_detail")
|
||||
replacement_height = SettingsReviewLines(null, replacement, view, 0,
|
||||
font, line_height, "review-removed") + line_height
|
||||
}
|
||||
props.content_height = explanation_height + merge_height + replacement_height +
|
||||
SettingsReviewLines(null, removals, view, 0, font, line_height, "review-removed")
|
||||
props.scroll_offset = review_scroll
|
||||
scrolled := Scroll(app.ui.session, props)
|
||||
review_scroll = scrolled.scroll_offset
|
||||
if scrolled.opened {
|
||||
SettingsReviewLines(app, explanation, view, review_scroll, font, line_height)
|
||||
SettingsReviewLines(app, value, view, review_scroll - explanation_height, font, line_height)
|
||||
SettingsReviewLines(app, explanation, view, review_scroll, font, line_height, "review-detail")
|
||||
SettingsReviewLines(app, value, view, review_scroll - explanation_height, font, line_height, "")
|
||||
if removals.count > 0 {
|
||||
replacement_offset := review_scroll - explanation_height - merge_height
|
||||
SettingsReviewLines(app, replacement, view, replacement_offset,
|
||||
font, line_height, "review-removed")
|
||||
SettingsReviewLines(app, removals, view, replacement_offset - replacement_height,
|
||||
font, line_height, "review-removed")
|
||||
}
|
||||
unused End(app.ui.session)
|
||||
}
|
||||
apply := SettingsDataButtonProps(LocaleText("review_apply"),
|
||||
x, cast(s32)(content.y + content.height) - AppScale(40), text_width, 5354, true)
|
||||
apply.disabled = !review_cached_available
|
||||
options: [3]string = .["review_merge", "sync_review_keep_local", "sync_review_use_remote"]
|
||||
modes: [3]s32 = .[2, 0, 1]
|
||||
y = cast(s32)(content.y + content.height) - AppScale(132)
|
||||
index: s32 = 0
|
||||
decision: s32 = 0
|
||||
if Button(app.ui.session, apply) != 0 {
|
||||
decision = review_choice + 1
|
||||
while index < 3 {
|
||||
button := SettingsDataButtonProps(LocaleText(options[index]),
|
||||
x, y, text_width, 5351 + index, index == 0)
|
||||
if index == 0 {
|
||||
button.disabled = !review_cached_available
|
||||
} else if index == 2 {
|
||||
button.disabled = !review_cached_replace_available
|
||||
button.tone = cast(ButtonTone)ButtonToneDanger
|
||||
}
|
||||
if Button(app.ui.session, button) != 0 {
|
||||
decision = modes[index] + 1
|
||||
}
|
||||
y += AppScale(44)
|
||||
index += 1
|
||||
}
|
||||
unused End(app.ui.session)
|
||||
return decision
|
||||
|
||||
@@ -1007,10 +1007,15 @@ review_append_fields :: (out: *ReviewText, before: string, after: string) {
|
||||
}
|
||||
if before == "" || after == "" {
|
||||
value := ifx after != "" then new_value else old_value
|
||||
if (field == "review_count" || field == "profile_sessions_label") && value == "0" {
|
||||
// Record headings already name the person, practice and date.
|
||||
// Defaults add noise for new/removed records; actual field edits
|
||||
// still show both values, including empty values and zeroes.
|
||||
if field == "habit_name_label" || field == "review_date" ||
|
||||
field == "review_activity" || field == "review_order" {
|
||||
continue
|
||||
}
|
||||
if field == "habit_name_label" && value == "" {
|
||||
if value == "" || (value == "0" && field != "review_completed") ||
|
||||
(field == "review_source" && value == "app") {
|
||||
continue
|
||||
}
|
||||
}
|
||||
@@ -1121,21 +1126,29 @@ review_plan_for_json :: (json: string, choice: s32, out: **u8,
|
||||
parent = ""
|
||||
}
|
||||
if parent != next_parent {
|
||||
review_append(*text, " ")
|
||||
if next_category == "profile_sessions_label" {
|
||||
review_append(*text, " ")
|
||||
activity := sqlite3_column_int(statement, 1)
|
||||
review_append(*text, review_activity_name(activity))
|
||||
} else {
|
||||
review_append(*text, "\n")
|
||||
} else if next_parent.count > 0 &&
|
||||
next_parent != AppTextFromCString(SqliteColumnText(statement, 2), 2147483647) {
|
||||
review_append(*text, " ")
|
||||
review_append(*text, next_parent)
|
||||
review_append(*text, "\n")
|
||||
}
|
||||
review_append(*text, "\n")
|
||||
free(cast(*void)parent_copy)
|
||||
parent_copy = storage_duplicate_cstring(SqliteColumnText(statement, 1))
|
||||
parent = AppTextFromCString(parent_copy, 2147483647)
|
||||
}
|
||||
review_append(*text, " ")
|
||||
review_append(*text, LocaleText(AppTextFromCString(SqliteColumnText(statement, 3), 2147483647)))
|
||||
review_append(*text, ": ")
|
||||
if next_action == 0 {
|
||||
review_append(*text, "− ")
|
||||
} else if next_action == 1 {
|
||||
review_append(*text, "↔ ")
|
||||
} else {
|
||||
review_append(*text, "+ ")
|
||||
}
|
||||
review_append(*text, AppTextFromCString(SqliteColumnText(statement, 2), 2147483647))
|
||||
review_append(*text, "\n")
|
||||
review_append_fields(*text,
|
||||
|
||||
@@ -73,6 +73,13 @@ opened = [cmap for cmap in cmaps.values() if cmap is not None]
|
||||
if not opened:
|
||||
print("FAIL: cannot parse any shipped font cmap", file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
# Symbols use the existing cross-font fallback; Noto Sans Latin does not
|
||||
# contain every arrow. Keep them in the corpus and require a shipped glyph.
|
||||
for cp in sorted(codepoints(root / "assets/fonts/ui_symbols.txt")):
|
||||
if not any(cp in cmap for cmap in opened):
|
||||
print(f"FAIL: UI symbol U+{cp:04X} has no shipped glyph", file=sys.stderr)
|
||||
failures += 1
|
||||
before = failures
|
||||
for cp in sorted(cjk_needed):
|
||||
if not any(cp in cmap for cmap in opened):
|
||||
|
||||
@@ -93,6 +93,7 @@ class ReviewHostTest(AppControlTest):
|
||||
self.require('open', 'inbe')
|
||||
state = self.ready('inbe')
|
||||
window = int(state['window'])
|
||||
self.xdo('windowraise', host)
|
||||
pid = int(self.xdo('getwindowpid', window))
|
||||
self.assertNotEqual(pid, foreign_pid)
|
||||
self.assertEqual(Path(f'/proc/{pid}/exe').resolve(), OUTPUT / 'inbe')
|
||||
@@ -124,8 +125,10 @@ class ReviewHostTest(AppControlTest):
|
||||
self.xdo('windowfocus', '--sync', window)
|
||||
content_width = int(state['content_width'])
|
||||
content_height = int(state['content_height'])
|
||||
self.assertEqual(content_width, width)
|
||||
self.assertEqual(content_height, height - 64)
|
||||
self.assertGreater(content_width, 0)
|
||||
self.assertLessEqual(content_width, width)
|
||||
self.assertGreater(content_height, 0)
|
||||
self.assertLessEqual(content_height, height)
|
||||
panel_height = min(content_height - 32, 720)
|
||||
panel_top = (content_height - panel_height) // 2
|
||||
content_top = panel_top + 56
|
||||
@@ -142,16 +145,13 @@ class ReviewHostTest(AppControlTest):
|
||||
time.sleep(.3)
|
||||
self.assertEqual(self.count(db, "SELECT value FROM meta WHERE key='sync_pending_review_pending'"), '1')
|
||||
self.assertEqual(self.count(db, 'SELECT COUNT(*) FROM sync_outbox'), pending)
|
||||
if choice == 'keep':
|
||||
self.click_at(window, content_width // 2, content_top + 44 + 19)
|
||||
elif choice == 'replace':
|
||||
self.click_at(window, content_width // 2, content_top + 88 + 19)
|
||||
capture = self.require('screenshot', 'inbe')
|
||||
shutil.copy2(capture['path'], OUTPUT / f'{choice}-embedded.png')
|
||||
if choice == 'merge':
|
||||
self.scroll_at(window, content_width // 2, content_top + 260)
|
||||
self.assertEqual(self.count(db, "SELECT value FROM meta WHERE key='sync_pending_review_pending'"), '1')
|
||||
footer = panel_top + panel_height - 18 - 40 + 19
|
||||
footer = panel_top + panel_height - 18 - 132 + 19
|
||||
footer += {'merge': 0, 'keep': 1, 'replace': 2}[choice] * 44
|
||||
self.click_at(window, content_width // 2, footer)
|
||||
capture = self.require('screenshot', 'inbe')
|
||||
shutil.copy2(capture['path'], OUTPUT / f'{choice}-after-apply.png')
|
||||
@@ -169,7 +169,7 @@ class ReviewHostTest(AppControlTest):
|
||||
'local': self.count(db, "SELECT COUNT(*) FROM habits WHERE id='local-review-walk'"),
|
||||
'remote': self.count(db, "SELECT COUNT(*) FROM habits WHERE id<>'local-review-walk'")}, indent=2) + '\n')
|
||||
self.wait_until(lambda: self.count(db, "SELECT value FROM meta WHERE key='sync_pending_review_pending'") != '1',
|
||||
f'{choice}: Apply did not resolve the review')
|
||||
f'{choice}: Direct action did not resolve the review')
|
||||
self.assertEqual(self.count(db, "SELECT COUNT(*) FROM habits WHERE id='local-review-walk'"),
|
||||
0 if choice == 'replace' else 1)
|
||||
self.assertEqual(self.count(db, "SELECT COUNT(*) FROM habits WHERE id<>'local-review-walk'") > 0,
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Exercise the review choices using isolated encrypted screenshot fixtures."""
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import sqlite3
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
from PIL import Image
|
||||
|
||||
assert os.environ.get('INBE_REVIEW_PRIVATE_DISPLAY') == '1', 'run inside a private Xvfb display'
|
||||
root = Path(__file__).resolve().parents[1]
|
||||
@@ -22,19 +23,27 @@ def click(window, x, y):
|
||||
'mousedown', '1', 'sleep', '0.1', 'mouseup', '1')
|
||||
time.sleep(0.3)
|
||||
|
||||
def count(db, sql):
|
||||
with sqlite3.connect(db, timeout=3) as connection:
|
||||
return connection.execute(sql).fetchone()[0]
|
||||
readers = {}
|
||||
|
||||
for choice, width, height in [('merge', 900, 720), ('replace', 411, 813), ('keep', 900, 720)]:
|
||||
initial = output / (choice + '-initial.png')
|
||||
logfile = output / (choice + '.log')
|
||||
def count(db, sql):
|
||||
# Observe the live fixture through one read-only connection. Reopening a
|
||||
# writer between frames can trigger WAL cleanup while the app is writing.
|
||||
if db not in readers:
|
||||
readers[db] = sqlite3.connect(db.as_uri() + '?mode=ro', uri=True, timeout=3)
|
||||
return readers[db].execute(sql).fetchone()[0]
|
||||
|
||||
for choice, width, height, dark in [('merge', 900, 720, 0), ('replace', 411, 813, 0),
|
||||
('keep', 900, 720, 0), ('merge', 900, 720, 1)]:
|
||||
case = choice + ('-dark' if dark else '')
|
||||
initial = output / (case + '-initial.png')
|
||||
logfile = output / (case + '.log')
|
||||
env = os.environ.copy()
|
||||
env.update(APP_SHOT_WINDOW='1', APP_NO_TRAY='1', SDL_VIDEODRIVER='x11', YUE_DESKTOP_RECOVERY='0', LIBGL_ALWAYS_SOFTWARE='1')
|
||||
with logfile.open('w') as log:
|
||||
app = subprocess.Popen([str(binary), '--screenshot', str(initial),
|
||||
'--screenshot-scene', 'sync_review', '--screenshot-width', str(width),
|
||||
'--screenshot-height', str(height), '--screenshot-dark', '0'],
|
||||
'--screenshot-height', str(height), '--screenshot-theme', '0',
|
||||
'--screenshot-dark', str(dark)],
|
||||
cwd=root, env=env, stdout=log, stderr=subprocess.STDOUT)
|
||||
try:
|
||||
db = Path('/tmp') / ('inbe-screenshot-' + str(app.pid)) / 'inbe.db'
|
||||
@@ -57,59 +66,46 @@ for choice, width, height in [('merge', 900, 720), ('replace', 411, 813), ('keep
|
||||
assert window, 'fixture did not become ready'
|
||||
command('xdotool', 'windowfocus', '--sync', window)
|
||||
time.sleep(0.5)
|
||||
# Reproduce readable person-level changes in this child's store.
|
||||
# The real account, pending snapshot and desktop are untouched.
|
||||
snapshot_path = db.parent / 'sync-review.json'
|
||||
snapshot = json.loads(snapshot_path.read_text())
|
||||
snapshot['changes']['social_cache'] = [
|
||||
{'kind': 'friends.list', 'json': {'friends': [
|
||||
{'user_id_hash': 'fixture-a', 'alias': 'Alicia'},
|
||||
{'user_id_hash': 'fixture-c', 'alias': 'Cara'},
|
||||
]}},
|
||||
{'kind': 'friends.requests', 'json': {
|
||||
'incoming': [{'id': 'fixture-request-d',
|
||||
'requester_user_id_hash': 'fixture-d',
|
||||
'requester_alias': 'Dani'}],
|
||||
'outgoing': [],
|
||||
}},
|
||||
]
|
||||
snapshot_path.write_text(json.dumps(snapshot))
|
||||
with sqlite3.connect(db, timeout=3) as connection:
|
||||
user = connection.execute('SELECT id FROM users LIMIT 1').fetchone()[0]
|
||||
connection.executemany(
|
||||
'INSERT OR REPLACE INTO social_snapshots VALUES(?,?,?,0)', [
|
||||
(user, 'friends.list', json.dumps({'friends': [
|
||||
{'user_id_hash': 'fixture-a', 'alias': 'Alice'},
|
||||
{'user_id_hash': 'fixture-b', 'alias': 'Bob'},
|
||||
]})),
|
||||
(user, 'friends.requests', '{ "outgoing": [], "incoming": [] }'),
|
||||
])
|
||||
assert count(db, "SELECT COUNT(*) FROM habits WHERE id='local-review-walk'") == 1
|
||||
assert count(db, "SELECT COUNT(*) FROM habits WHERE id<>'local-review-walk'") == 0
|
||||
# The frame uses a 32-unit viewport margin and a 720-unit max height.
|
||||
panel_top = (height - min(height - 32, 720)) // 2
|
||||
content_top = panel_top + 56
|
||||
# Switching choices refreshes the cached plan after fixture edits.
|
||||
click(window, width // 2, content_top + 44 + 19)
|
||||
click(window, width // 2, content_top + 19)
|
||||
command('import', '-window', window, str(initial))
|
||||
if choice == 'keep':
|
||||
click(window, width // 2, content_top + 44 + 19)
|
||||
elif choice == 'replace':
|
||||
click(window, width // 2, content_top + 88 + 19)
|
||||
command('import', '-window', window, str(output / (choice + '-selected.png')))
|
||||
footer_start = panel_top + min(height - 32, 720) - 18 - 132
|
||||
panel_width = min(width - 32, 680)
|
||||
body = Image.open(initial).convert('RGB').crop((
|
||||
(width - panel_width) // 2 + 18, content_top,
|
||||
(width + panel_width) // 2 - 18, footer_start - 8))
|
||||
palette = list(body.get_flattened_data())
|
||||
expected_colors = ([(134, 220, 165), (255, 163, 163), (255, 212, 119)] if dark
|
||||
else [(23, 102, 58), (179, 38, 30), (128, 80, 0)])
|
||||
for color in expected_colors:
|
||||
matching = sum(all(abs(a - b) <= 20 for a, b in zip(pixel, color))
|
||||
for pixel in palette)
|
||||
assert matching > 5, ('missing change color', choice, color)
|
||||
# The long hierarchy scrolls inside the modal, without dismissing it.
|
||||
if choice == 'merge':
|
||||
start = content_top + 210
|
||||
start = content_top + 140
|
||||
command('xdotool', 'mousemove', '--window', window, str(width // 2), str(start + 130),
|
||||
'mousedown', '1', 'mousemove', '--window', window, str(width // 2), str(start),
|
||||
'mousedown', '1', 'sleep', '0.1',
|
||||
'mousemove', '--window', window, str(width // 2), str(start),
|
||||
'sleep', '0.15', 'mouseup', '1')
|
||||
time.sleep(0.4)
|
||||
assert count(db, "SELECT value FROM meta WHERE key='sync_pending_review_pending'") == '1'
|
||||
command('import', '-window', window, str(output / 'merge-scrolled.png'))
|
||||
footer = panel_top + min(height - 32, 720) - 18 - 40 + 19
|
||||
scrolled = output / (case + '-scrolled.png')
|
||||
command('import', '-window', window, str(scrolled))
|
||||
after = Image.open(scrolled).convert('RGB')
|
||||
assert after.crop((0, content_top, width, footer_start - 8)).tobytes() != (
|
||||
Image.open(initial).convert('RGB').crop((0, content_top, width, footer_start - 8)).tobytes()
|
||||
), 'review text did not scroll'
|
||||
assert after.crop((0, footer_start, width, height)).tobytes() == (
|
||||
Image.open(initial).convert('RGB').crop((0, footer_start, width, height)).tobytes()
|
||||
), 'action buttons moved with the scrolling text'
|
||||
footer = panel_top + min(height - 32, 720) - 18 - 132 + 19
|
||||
action_index = {'merge': 0, 'keep': 1, 'replace': 2}[choice]
|
||||
pending_before = count(db, 'SELECT COUNT(*) FROM sync_outbox')
|
||||
click(window, width // 2, footer)
|
||||
click(window, width // 2, footer + action_index * 44)
|
||||
time.sleep(0.5)
|
||||
local = count(db, "SELECT COUNT(*) FROM habits WHERE id='local-review-walk'")
|
||||
remote = count(db, "SELECT COUNT(*) FROM habits WHERE id<>'local-review-walk'")
|
||||
@@ -127,6 +123,9 @@ for choice, width, height in [('merge', 900, 720), ('replace', 411, 813), ('keep
|
||||
except subprocess.TimeoutExpired:
|
||||
app.kill()
|
||||
app.wait(timeout=5)
|
||||
if db in readers:
|
||||
readers.pop(db).close()
|
||||
shutil.rmtree(db.parent)
|
||||
assert 'APP: frame rejected with status' not in logfile.read_text()
|
||||
# A persisted review whose merge has no visible changes must resolve before
|
||||
# rendering a dialog, including when screenshot setup explicitly opened one.
|
||||
@@ -165,4 +164,7 @@ with (output / 'no-changes.log').open('w') as log:
|
||||
except subprocess.TimeoutExpired:
|
||||
app.kill()
|
||||
app.wait(timeout=5)
|
||||
print('PASS: desktop merge/keep, narrow replacement, modal scrolling, encrypted data outcomes, pending-upload preservation, no-changes review automatically resolved')
|
||||
if db in readers:
|
||||
readers.pop(db).close()
|
||||
shutil.rmtree(db.parent)
|
||||
print('PASS: desktop merge/keep, narrow replacement, direct footer actions, colored changes, modal scrolling, encrypted data outcomes, pending-upload preservation, no-changes review automatically resolved')
|
||||
+4
-4
@@ -6,8 +6,8 @@ IDI_APP_ICON ICON "inbe.ico"
|
||||
IDI_NOTIFICATION_ICON ICON "inbe.ico"
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 2,1,12,0
|
||||
PRODUCTVERSION 2,1,12,0
|
||||
FILEVERSION 2,1,13,0
|
||||
PRODUCTVERSION 2,1,13,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
@@ -24,11 +24,11 @@ BEGIN
|
||||
BEGIN
|
||||
VALUE "CompanyName", "waozi"
|
||||
VALUE "FileDescription", "Inner Breeze"
|
||||
VALUE "FileVersion", "2.1.12"
|
||||
VALUE "FileVersion", "2.1.13"
|
||||
VALUE "InternalName", "inbe"
|
||||
VALUE "OriginalFilename", "inbe-windows-x86_64.exe"
|
||||
VALUE "ProductName", "Inner Breeze"
|
||||
VALUE "ProductVersion", "2.1.12"
|
||||
VALUE "ProductVersion", "2.1.13"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
Reference in new issue
Block a user