Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9181c91a3a | ||
|
|
63e790f96a | ||
|
|
aef5f5441b | ||
|
|
827d5e350b | ||
|
|
f64195ec1d | ||
|
|
60b699f28b | ||
|
|
85b9d3daf5 | ||
|
|
89bb5a63ca | ||
|
|
94c004b923 | ||
|
|
9822180288 | ||
|
|
0976fb82bc | ||
|
|
8353f49f27 | ||
|
|
07b46d7bf0 | ||
|
|
99375c9c4b | ||
|
|
1381311e02 | ||
|
|
595f239015 | ||
|
|
d43a8de800 | ||
|
|
894f8f7da8 | ||
|
|
629aa739f6 | ||
|
|
323be33ec4 | ||
|
|
64480683d6 | ||
|
|
2a4d93f3b6 | ||
|
|
61f5a75634 | ||
|
|
085ed5393d | ||
|
|
015843c4d6 | ||
|
|
5d335ff637 | ||
|
|
61731bd680 | ||
|
|
e3f6a22d24 | ||
|
|
e00245e212 | ||
|
|
951309c75f | ||
|
|
c3d36d8d28 | ||
|
|
a9b615614b | ||
|
|
0fb8630dc9 | ||
|
|
bda1bf536d | ||
|
|
7e27498379 | ||
|
|
08ef56d788 | ||
|
|
a3f92aaf5c | ||
|
|
447e2b6187 | ||
|
|
72fd21dad0 | ||
|
|
f9da10204d | ||
|
|
1549f5e3bc | ||
|
|
0c650fc94f | ||
|
|
52716b1edb | ||
|
|
9e40eda25e | ||
|
|
92985e8a03 | ||
|
|
5aedde8d80 | ||
|
|
eb25d437a4 | ||
|
|
7690e04429 | ||
|
|
07ca47ee7c | ||
|
|
7c3275fee3 | ||
|
|
249702ca32 | ||
|
|
2797b3371d | ||
|
|
bc7514406b | ||
|
|
79bcf2c328 | ||
|
|
b5962360c1 | ||
|
|
83ecc17423 | ||
|
|
f01c4d7d81 | ||
|
|
03b714aa64 | ||
|
|
5f116c29cb | ||
|
|
cdbdcd20cb | ||
|
|
6a3362f59e | ||
|
|
43013c64ab | ||
|
|
3f86abb35a | ||
|
|
3e75089266 | ||
|
|
d51fdea355 | ||
|
|
5bc63e7b13 | ||
|
|
03e1fccab3 | ||
|
|
ed2e52c13a | ||
|
|
616ef0cb09 | ||
|
|
e7debfc68f | ||
|
|
796f1393de | ||
|
|
99567e68c1 | ||
|
|
f714674e62 | ||
|
|
3d75216483 | ||
|
|
ac485ea355 | ||
|
|
ad59bb0c51 | ||
|
|
efbeec104d | ||
|
|
f9d109182d | ||
|
|
ccb8c2f2b5 | ||
|
|
2405fb2fcf | ||
|
|
8c25a6630b | ||
|
|
97dd375822 | ||
|
|
93103cc0ea | ||
|
|
a0ded8e537 | ||
|
|
1f8ada56f9 | ||
|
|
e80097fb83 | ||
|
|
4e0dedf97d | ||
|
|
675b2c260a | ||
|
|
463c858565 | ||
|
|
8b739fcbd4 | ||
|
|
7b23749f7d | ||
|
|
3c3eb9e0f2 | ||
|
|
a896ad4f55 | ||
|
|
19ad586e0c | ||
|
|
bdb1e92a51 | ||
|
|
8d1cf2b8f9 | ||
|
|
6547bd9636 | ||
|
|
8d9117bd16 | ||
|
|
695aafa231 | ||
|
|
88598d830f | ||
|
|
0be5f925a7 | ||
|
|
39096d0dd4 | ||
|
|
2242553194 | ||
|
|
5d6985b2b5 | ||
|
|
ba216da8e6 | ||
|
|
13c469166a | ||
|
|
e1298bd262 | ||
|
|
6c1eb327e3 | ||
|
|
3ff05eac4e | ||
|
|
93f1bae5b7 | ||
|
|
896f0b1c22 | ||
|
|
615e32b0c6 | ||
|
|
77093f27a0 | ||
|
|
c13b7e743d | ||
|
|
5e61ef5351 | ||
|
|
79f44d353b | ||
|
|
e22e3f98ef | ||
|
|
14d4594d71 | ||
|
|
899500307c | ||
|
|
50527f15b8 | ||
|
|
94218efc5e | ||
|
|
cf9ff9fb1f | ||
|
|
81410ea4ae | ||
|
|
2add9f0f30 | ||
|
|
8bbc5625b7 | ||
|
|
ccc2032c50 | ||
|
|
df3d04fa26 | ||
|
|
4c5c76e51e | ||
|
|
a3db764783 | ||
|
|
80b2214af3 | ||
|
|
96ef714ca8 | ||
|
|
d808bdf985 | ||
|
|
c448e5d429 | ||
|
|
d592c943f0 | ||
|
|
d90336d710 | ||
|
|
c135464530 | ||
|
|
45a360f498 | ||
|
|
0fad496a0e | ||
|
|
7642a146cc | ||
|
|
d1633381f4 | ||
|
|
2825a41d02 | ||
|
|
c86d2da631 | ||
|
|
99d2433283 | ||
|
|
1650d50c72 |
No files matched your search
@@ -1,19 +0,0 @@
|
||||
# Copy to .env.play when you want to upload the store listing.
|
||||
# Do not commit .env.play or the service-account JSON.
|
||||
PLAY_PACKAGE_NAME=xyz.waozi.inbe
|
||||
PLAY_SERVICE_ACCOUNT_JSON=/absolute/path/to/google-play-service-account.json
|
||||
PLAY_LANGUAGE=en-US
|
||||
PLAY_METADATA_IMAGES_DIR=fastlane/metadata/android/en-US/images
|
||||
PLAY_IMAGE_TYPES=phoneScreenshots,sevenInchScreenshots,tenInchScreenshots
|
||||
PLAY_DELETE_EXISTING=1
|
||||
# Short and full descriptions from every locale folder here. 0 skips text.
|
||||
PLAY_METADATA_DIR=fastlane/metadata/android
|
||||
PLAY_LISTING_TEXT=1
|
||||
# Optional public/unlisted, embeddable YouTube video for PLAY_LANGUAGE.
|
||||
# Leave empty to preserve the existing video.
|
||||
PLAY_VIDEO_URL=
|
||||
|
||||
# Default is validate-only and discards the draft edit.
|
||||
# Set to 1 only when you want the uploaded screenshots committed to Play.
|
||||
# Uploads require make screenshot-review, screenshot-export and play-preflight.
|
||||
PLAY_COMMIT=0
|
||||
@@ -1,8 +0,0 @@
|
||||
unpackaged_assets/**/*.ogg filter=lfs diff=lfs merge=lfs -text
|
||||
test-fixtures/audio/*.mp3 filter=lfs diff=lfs merge=lfs -text
|
||||
themes/catalog_*.css whitespace=-blank-at-eof
|
||||
design/lists-redesign/*.png filter=lfs diff=lfs merge=lfs -text
|
||||
design/sun-salutation/face-redesign/*.png filter=lfs diff=lfs merge=lfs -text
|
||||
design/sun-salutation/face-redesign/*.mp4 filter=lfs diff=lfs merge=lfs -text
|
||||
# Vendored three.js keeps its upstream formatting.
|
||||
site/static/assets/radio/three*.js -whitespace
|
||||
@@ -1,47 +0,0 @@
|
||||
name: Breeze build
|
||||
on:
|
||||
push:
|
||||
branches: [master]
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
profile:
|
||||
description: Quick compiles the Linux app. Full also runs the local tests.
|
||||
required: true
|
||||
type: choice
|
||||
options: [quick, full]
|
||||
default: quick
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
concurrency:
|
||||
group: breeze-build-${{ gitea.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
linux:
|
||||
name: Linux native
|
||||
if: gitea.ref == 'refs/heads/master'
|
||||
runs-on: build-native-breeze
|
||||
timeout-minutes: 60
|
||||
env:
|
||||
BREEZE_PROFILE: ${{ gitea.event_name == 'push' && 'quick' || inputs.profile }}
|
||||
steps:
|
||||
- name: Check out the current pushed commit from Build
|
||||
id: native
|
||||
env:
|
||||
BUILD_NATIVE_SOURCE_TOKEN: ${{ github.token }}
|
||||
run: /usr/local/libexec/gitea-native-build checkout
|
||||
- name: Fetch locked Ziran packages
|
||||
if: steps.native.outputs.current == 'true'
|
||||
run: /usr/local/libexec/gitea-native-build run sh scripts/packages.sh --locked
|
||||
- name: Build the desktop app
|
||||
if: steps.native.outputs.current == 'true'
|
||||
run: |
|
||||
/usr/local/libexec/gitea-native-build run bash -ec '
|
||||
make -j"$JOBS" PACKAGE_FLAGS=--locked native
|
||||
ccache --show-stats || true
|
||||
'
|
||||
- name: Run the retained local tests
|
||||
if: steps.native.outputs.current == 'true' && env.BREEZE_PROFILE == 'full'
|
||||
run: /usr/local/libexec/gitea-native-build run bash -ec 'make -j"$JOBS" PACKAGE_FLAGS=--locked test'
|
||||
@@ -1,168 +0,0 @@
|
||||
name: Cloudflare Pages
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [master]
|
||||
pull_request:
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: breeze-pages-${{ gitea.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
site:
|
||||
name: Build and verify the site
|
||||
if: gitea.event_name == 'pull_request' || gitea.ref == 'refs/heads/master'
|
||||
# Keep deployments on the same Build slot as its web artifact cache.
|
||||
runs-on: build-breeze
|
||||
# A cold build bootstraps pinned Ziran and Emscripten before compiling WASM.
|
||||
timeout-minutes: 120
|
||||
env:
|
||||
SITE_ASSET_VERSION: ${{ gitea.sha }}
|
||||
steps:
|
||||
- name: Check out Breeze from Gitea
|
||||
uses: https://github.com/actions/checkout@v4
|
||||
env:
|
||||
GIT_LFS_SKIP_SMUDGE: '1'
|
||||
with:
|
||||
persist-credentials: false
|
||||
|
||||
- name: Fetch the website's audio from Gitea LFS
|
||||
run: sh site/fetch-meditation-audio.sh
|
||||
|
||||
- name: Check preinstalled Node.js 22
|
||||
id: node-check
|
||||
run: |
|
||||
if command -v node >/dev/null 2>&1 && node -v | grep -q '^v22\.'; then
|
||||
echo "Using preinstalled $(node -v)"
|
||||
echo "ready=true" >> "$GITHUB_OUTPUT"
|
||||
else
|
||||
echo "ready=false" >> "$GITHUB_OUTPUT"
|
||||
fi
|
||||
|
||||
- name: Set up Node.js
|
||||
if: steps.node-check.outputs.ready != 'true'
|
||||
uses: https://github.com/actions/setup-node@v4
|
||||
with:
|
||||
node-version: 22
|
||||
|
||||
- name: Identify exact web build inputs
|
||||
id: web-inputs
|
||||
run: |
|
||||
key=$(sh site/web-build-key.sh)
|
||||
printf 'key=%s\n' "$key" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Restore the source-built web app
|
||||
id: web-restore
|
||||
uses: https://github.com/actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830
|
||||
continue-on-error: true
|
||||
with:
|
||||
path: build/dist/web
|
||||
key: breeze-web-${{ runner.os }}-${{ runner.arch }}-${{ steps.web-inputs.outputs.key }}
|
||||
|
||||
- name: Check the cached web build
|
||||
id: web-cache
|
||||
env:
|
||||
WEB_INPUT_KEY: ${{ steps.web-inputs.outputs.key }}
|
||||
run: |
|
||||
if sh site/web-build-receipt.sh verify build/dist/web "$WEB_INPUT_KEY" 2>/dev/null; then
|
||||
echo 'Reusing the verified web build for these inputs'
|
||||
echo 'ready=true' >> "$GITHUB_OUTPUT"
|
||||
else
|
||||
echo 'Building the web app for these inputs'
|
||||
echo 'ready=false' >> "$GITHUB_OUTPUT"
|
||||
fi
|
||||
|
||||
- name: Install site build dependencies
|
||||
run: USER="$(id -un)" .github/scripts/install-apt-packages.sh .github/apt/empty-packages.txt apt-utils gnupg ripgrep unzip zip zstd
|
||||
|
||||
- name: Install web build dependencies
|
||||
if: steps.web-cache.outputs.ready != 'true'
|
||||
run: USER="$(id -un)" .github/scripts/install-apt-packages.sh .github/apt/web-packages.txt python3-pil
|
||||
|
||||
- name: Fetch locked Ziran packages
|
||||
if: steps.web-cache.outputs.ready != 'true'
|
||||
uses: ./.github/actions/ziran-packages
|
||||
|
||||
- name: Set up the pinned Emscripten SDK
|
||||
if: steps.web-cache.outputs.ready != 'true'
|
||||
uses: ./.github/actions/emscripten
|
||||
|
||||
- name: Build the web app from this revision
|
||||
if: steps.web-cache.outputs.ready != 'true'
|
||||
env:
|
||||
WEB_INPUT_KEY: ${{ steps.web-inputs.outputs.key }}
|
||||
run: |
|
||||
set -eu
|
||||
rm -f build/dist/web/index.html build/dist/web/index.js build/dist/web/index.wasm
|
||||
make -j2 PACKAGE_FLAGS=--locked WEB_CACHE_BUSTER="$WEB_INPUT_KEY" build/dist/web/index.html
|
||||
sh site/web-build-receipt.sh write build/dist/web "$WEB_INPUT_KEY"
|
||||
|
||||
- name: Verify the exact web app artifact
|
||||
env:
|
||||
WEB_INPUT_KEY: ${{ steps.web-inputs.outputs.key }}
|
||||
run: sh site/web-build-receipt.sh verify build/dist/web "$WEB_INPUT_KEY"
|
||||
|
||||
- name: Save the verified web build for the next deployment
|
||||
if: gitea.event_name != 'pull_request' && steps.web-cache.outputs.ready != 'true' && steps.web-restore.outputs.cache-hit != 'true'
|
||||
uses: https://github.com/actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830
|
||||
continue-on-error: true
|
||||
with:
|
||||
path: build/dist/web
|
||||
key: breeze-web-${{ runner.os }}-${{ runner.arch }}-${{ steps.web-inputs.outputs.key }}
|
||||
|
||||
- name: Fetch the pinned site icons from Gitea
|
||||
run: |
|
||||
set -eu
|
||||
kryon_dir="$PWD/build/site-kryon"
|
||||
sh site/fetch-kryon-icons.sh "$kryon_dir"
|
||||
printf 'KRYON_DIR=%s\n' "$kryon_dir" >> "$GITHUB_ENV"
|
||||
|
||||
- name: Select the verified web app origin
|
||||
if: gitea.event_name != 'pull_request'
|
||||
run: |
|
||||
set -eu
|
||||
host=innerbreeze.org
|
||||
if ! sh site/check-account-origin.sh "$host"; then
|
||||
host=inbe.waozi.xyz
|
||||
sh site/check-account-origin.sh "$host"
|
||||
fi
|
||||
printf 'SITE_APP_HOST=%s\n' "$host" >> "$GITHUB_ENV"
|
||||
|
||||
- name: Build site with the source-built web app and signed download repository
|
||||
env:
|
||||
APT_SIGNING_KEY: ${{ gitea.event_name != 'pull_request' && secrets.APT_SIGNING_KEY || '' }}
|
||||
run: SITE_WEB_DIR="$PWD/build/dist/web" sh site/build-production.sh
|
||||
|
||||
- name: Test website routes, assets and Telegram bridge
|
||||
run: |
|
||||
node tests/site_assets_test.mjs
|
||||
sh tests/site_web_build_test.sh
|
||||
# The APT fixture is designed to check package discovery without root.
|
||||
if [ "$(id -u)" -eq 0 ]; then
|
||||
runuser -u nobody -- sh tests/apt_repo_test.sh
|
||||
else
|
||||
sh tests/apt_repo_test.sh
|
||||
fi
|
||||
node tests/telegram_bridge_test.mjs
|
||||
|
||||
- name: Deploy current master to Cloudflare Pages
|
||||
if: gitea.event_name != 'pull_request'
|
||||
env:
|
||||
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
|
||||
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
|
||||
WRANGLER_SEND_METRICS: 'false'
|
||||
REVISION: ${{ gitea.sha }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
test "$(git rev-parse HEAD)" = "$REVISION"
|
||||
test "$(git ls-remote origin refs/heads/master | cut -f1)" = "$REVISION"
|
||||
: "${CLOUDFLARE_API_TOKEN:?Missing Gitea Pages deployment token}"
|
||||
: "${CLOUDFLARE_ACCOUNT_ID:?Missing Gitea Pages account ID}"
|
||||
# Verify the public domain and the selected app origin before uploading.
|
||||
curl -fsS --max-time 25 https://innerbreeze.org/ -o /dev/null
|
||||
sh site/check-account-origin.sh "$SITE_APP_HOST"
|
||||
npm exec --yes [email protected] -- wrangler pages deploy build/site \
|
||||
--project-name=inbe --branch=master --commit-hash="$REVISION" --commit-dirty=false
|
||||
sh site/verify-deployment.sh "$REVISION"
|
||||
@@ -1,5 +0,0 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
scripts/check-secrets.py --staged
|
||||
scripts/check-file-size.py --staged
|
||||
@@ -1,18 +0,0 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
tmp=$(mktemp "${TMPDIR:-/tmp}/inbe-pre-push.XXXXXX")
|
||||
trap 'rm -f "$tmp"' EXIT
|
||||
cat > "$tmp"
|
||||
|
||||
if command -v git-lfs >/dev/null 2>&1; then
|
||||
git lfs pre-push "$@" < "$tmp"
|
||||
elif git lfs version >/dev/null 2>&1; then
|
||||
git lfs pre-push "$@" < "$tmp"
|
||||
else
|
||||
printf '%s\n' "This repository uses Git LFS, but git-lfs is not available." >&2
|
||||
exit 2
|
||||
fi
|
||||
|
||||
scripts/check-secrets.py --pre-push "$@" < "$tmp"
|
||||
scripts/pre-push-checks.py < "$tmp"
|
||||
@@ -1,42 +0,0 @@
|
||||
name: Set up Emscripten
|
||||
description: >
|
||||
Install the Emscripten SDK version named in .github/emscripten-version and
|
||||
put it on PATH. The SDK, including the system libraries and ports it builds
|
||||
on first use, is cached per version, so a job only downloads it when the
|
||||
pinned version changes.
|
||||
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
- name: Read the pinned Emscripten version
|
||||
id: version
|
||||
shell: bash
|
||||
run: echo "version=$(tr -d '[:space:]' < .github/emscripten-version)" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Restore the Emscripten SDK
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ~/emsdk
|
||||
key: emsdk-${{ runner.os }}-${{ runner.arch }}-${{ steps.version.outputs.version }}-${{ hashFiles('scripts/ensure-emscripten-zlib.sh') }}
|
||||
restore-keys: |
|
||||
emsdk-${{ runner.os }}-${{ runner.arch }}-${{ steps.version.outputs.version }}-
|
||||
|
||||
- name: Install and activate Emscripten
|
||||
shell: bash
|
||||
env:
|
||||
EMSCRIPTEN_VERSION: ${{ steps.version.outputs.version }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
if [ ! -x "$HOME/emsdk/emsdk" ]; then
|
||||
rm -rf "$HOME/emsdk"
|
||||
git clone --depth 1 https://github.com/emscripten-core/emsdk.git "$HOME/emsdk"
|
||||
fi
|
||||
if [ ! -x "$HOME/emsdk/upstream/emscripten/emcc" ]; then
|
||||
"$HOME/emsdk/emsdk" install "$EMSCRIPTEN_VERSION"
|
||||
fi
|
||||
"$HOME/emsdk/emsdk" activate "$EMSCRIPTEN_VERSION"
|
||||
echo "EMSDK=$HOME/emsdk" >> "$GITHUB_ENV"
|
||||
echo "EM_CONFIG=$HOME/emsdk/.emscripten" >> "$GITHUB_ENV"
|
||||
echo "INBE_NODE_BIN=$(dirname "$(command -v node)")" >> "$GITHUB_ENV"
|
||||
echo "$HOME/emsdk/upstream/emscripten" >> "$GITHUB_PATH"
|
||||
bash scripts/ensure-emscripten-zlib.sh "$HOME/emsdk/upstream/emscripten/embuilder"
|
||||
@@ -1,65 +0,0 @@
|
||||
name: Fetch Ziran packages
|
||||
description: >
|
||||
Fetch the packages pinned in ziran.lock. The built Ziran compiler is cached
|
||||
by the runner image and the toolchain commit, so bumping another package
|
||||
such as Kryon keeps it; the package checkouts are cached by the runner image
|
||||
and the whole lock and fall back to the previous checkouts, so a bump
|
||||
fetches only what changed.
|
||||
|
||||
inputs:
|
||||
save-toolchain:
|
||||
description: >
|
||||
Save the built compiler to the cache. A job that only fetches packages
|
||||
must not, or it would store a toolchain cache without the compiler.
|
||||
default: 'true'
|
||||
|
||||
runs:
|
||||
using: composite
|
||||
steps:
|
||||
- name: Read the Ziran toolchain commit
|
||||
id: toolchain
|
||||
shell: sh
|
||||
run: |
|
||||
commit=$(python3 -c 'import json; print(json.load(open("ziran.lock"))["toolchain"]["commit"])')
|
||||
echo "commit=$commit" >> "$GITHUB_OUTPUT"
|
||||
# A compiler built on a newer image needs its newer C library, so
|
||||
# images do not share one: ubuntu-22.04 cannot run a glibc 2.39 build.
|
||||
libc=$(getconf GNU_LIBC_VERSION 2>/dev/null | tr ' ' '-' || true)
|
||||
echo "system=${ImageOS:-local}-${libc:-nolibc}" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Restore the Ziran toolchain
|
||||
if: inputs.save-toolchain == 'true'
|
||||
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
|
||||
with:
|
||||
path: |
|
||||
build/ziran-bootstrap
|
||||
build/ziran-toolchain
|
||||
key: ziran-toolchain-${{ runner.os }}-${{ runner.arch }}-${{ steps.toolchain.outputs.system }}-${{ steps.toolchain.outputs.commit }}
|
||||
restore-keys: |
|
||||
ziran-toolchain-${{ runner.os }}-${{ runner.arch }}-${{ steps.toolchain.outputs.system }}-
|
||||
|
||||
- name: Restore the Ziran toolchain without saving it
|
||||
if: inputs.save-toolchain != 'true'
|
||||
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
|
||||
with:
|
||||
path: |
|
||||
build/ziran-bootstrap
|
||||
build/ziran-toolchain
|
||||
key: ziran-toolchain-${{ runner.os }}-${{ runner.arch }}-${{ steps.toolchain.outputs.system }}-${{ steps.toolchain.outputs.commit }}
|
||||
restore-keys: |
|
||||
ziran-toolchain-${{ runner.os }}-${{ runner.arch }}-${{ steps.toolchain.outputs.system }}-
|
||||
|
||||
# Package checkouts can hold programs built inside them, such as the
|
||||
# Ziran an Apps controller build compiles for its own lock, so they are
|
||||
# kept per runner image as well.
|
||||
- name: Restore the package sources
|
||||
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
|
||||
with:
|
||||
path: ~/.cache/ziran/sources
|
||||
key: ziran-sources-${{ runner.os }}-${{ runner.arch }}-${{ steps.toolchain.outputs.system }}-${{ hashFiles('ziran.lock') }}
|
||||
restore-keys: |
|
||||
ziran-sources-${{ runner.os }}-${{ runner.arch }}-${{ steps.toolchain.outputs.system }}-
|
||||
|
||||
- name: Fetch Ziran packages
|
||||
shell: sh
|
||||
run: sh scripts/packages.sh --locked
|
||||
@@ -1,4 +0,0 @@
|
||||
platforms;android-36
|
||||
build-tools;35.0.0
|
||||
ndk;28.2.13676358
|
||||
cmake;3.22.1
|
||||
@@ -1,7 +0,0 @@
|
||||
python3-fonttools
|
||||
nasm
|
||||
# dav1d (the AVIF decoder) builds with Meson and Ninja.
|
||||
meson
|
||||
ninja-build
|
||||
# The app build decodes every guide narration clip with ffmpeg to check it.
|
||||
ffmpeg
|
||||
@@ -1 +0,0 @@
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
build-essential
|
||||
ca-certificates
|
||||
curl
|
||||
dpkg
|
||||
libcurl4-openssl-dev
|
||||
libdrm2
|
||||
libegl1
|
||||
libgbm1
|
||||
libgl1
|
||||
libgl1-mesa-dri
|
||||
libglvnd0
|
||||
libgtk-3-dev
|
||||
libx11-6
|
||||
libx11-dev
|
||||
libxext6
|
||||
libsdl2-2.0-0
|
||||
libsdl2-dev
|
||||
patchelf
|
||||
pkg-config
|
||||
python3-fonttools
|
||||
podman
|
||||
rpm
|
||||
x11-utils
|
||||
xvfb
|
||||
zip
|
||||
nasm
|
||||
# dav1d (the AVIF decoder) builds with Meson and Ninja.
|
||||
meson
|
||||
ninja-build
|
||||
# The app build decodes every guide narration clip with ffmpeg to check it.
|
||||
ffmpeg
|
||||
@@ -1,34 +0,0 @@
|
||||
build-essential
|
||||
apt-utils
|
||||
gnupg
|
||||
ffmpeg
|
||||
ca-certificates
|
||||
desktop-file-utils
|
||||
libcurl4-openssl-dev
|
||||
ripgrep
|
||||
zlib1g-dev
|
||||
libdrm-dev
|
||||
libegl1-mesa-dev
|
||||
libgbm-dev
|
||||
libgles2-mesa-dev
|
||||
libsdl2-dev
|
||||
pkg-config
|
||||
python3-fonttools
|
||||
python3-numpy
|
||||
python3-pil
|
||||
python3-requests
|
||||
python3-scipy
|
||||
xvfb
|
||||
xauth
|
||||
xdotool
|
||||
x11-apps
|
||||
x11-utils
|
||||
xclip
|
||||
sqlite3
|
||||
imagemagick
|
||||
|
||||
python3-cryptography
|
||||
nasm
|
||||
# dav1d (the AVIF decoder) builds with Meson and Ninja.
|
||||
meson
|
||||
ninja-build
|
||||
@@ -1,8 +0,0 @@
|
||||
build-essential
|
||||
cmake
|
||||
zlib1g-dev
|
||||
zip
|
||||
tcl
|
||||
python3-fonttools
|
||||
# The app build decodes every guide narration clip with ffmpeg to check it.
|
||||
ffmpeg
|
||||
@@ -1,14 +0,0 @@
|
||||
build-essential
|
||||
gcc-mingw-w64-x86-64-win32
|
||||
g++-mingw-w64-x86-64-win32
|
||||
zlib1g-dev
|
||||
libz-mingw-w64-dev
|
||||
zip
|
||||
nsis
|
||||
python3-fonttools
|
||||
nasm
|
||||
# dav1d (the AVIF decoder) builds with Meson and Ninja.
|
||||
meson
|
||||
ninja-build
|
||||
# The app build decodes every guide narration clip with ffmpeg to check it.
|
||||
ffmpeg
|
||||
@@ -1 +0,0 @@
|
||||
6.0.10
|
||||
@@ -1,18 +0,0 @@
|
||||
# Files over 1 MB that may be committed (scripts/check-file-size.py runs in
|
||||
# the pre-commit hook and in CI). Only files the app ships or its build reads
|
||||
# belong here; drafts, renders and design explorations go in the ignored
|
||||
# backup/ folder, and large media can go in Git LFS (see .gitattributes).
|
||||
|
||||
# Lumi and the default profile picture
|
||||
assets/lumi/mascot.png
|
||||
assets/profile-pictures/flowers.png
|
||||
# Narration receipts the practice packages are built from
|
||||
design/tai-chi/narration-receipt.json
|
||||
design/tai-chi/narration-male-receipt.json
|
||||
design/astral-projection/bruce-narration-receipt.json
|
||||
# Exact digest-bound Arcade library artwork shipped for offline browsing.
|
||||
apps/bundled/arcade.games/3db3d137e3e15f7bada0cab75751f33d92005e3bc28dded7a1419b1f06e6a1e0.zx
|
||||
apps/bundled/arcade.games/83471e1e310ffbac2972bf5d85e7072da2812c6a3d7efb9d8beff7873ca973e1.zx
|
||||
apps/bundled/arcade.games/a2cdbe88ec6220d89b105e60d37b4c1e910506cfd7df5875e2e55a3021b4c366.zx
|
||||
# The Radio page's three.js runtime on the website.
|
||||
site/static/assets/radio/three.core.js
|
||||
@@ -1 +0,0 @@
|
||||
docker.io/library/ubuntu@sha256:fe81560990fae86dc4743202b2cb4d3df98d0bcf949173cecef15ce1127ef852
|
||||
@@ -1,10 +0,0 @@
|
||||
#!/bin/sh
|
||||
# The same package and real-browser checks as CI's Build Browser Add-ons job.
|
||||
set -eu
|
||||
export YUE_DESKTOP_RECOVERY=0
|
||||
unset DISPLAY WAYLAND_DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS
|
||||
make package-unpackaged-assets chrome-web-store firefox-addons firefox-addons-lint
|
||||
test -f build/dist/inbe-chrome-web-store.zip
|
||||
test -f build/dist/inbe-firefox-addons.zip
|
||||
make web-smoke-test
|
||||
LIBGL_ALWAYS_SOFTWARE=1 make web-smoke-test-firefox
|
||||
@@ -1,29 +0,0 @@
|
||||
#!/bin/sh
|
||||
# Reset only the server's private overlay, never its canonical checkout.
|
||||
set -eu
|
||||
server=/sync-server
|
||||
filesystem=$(stat -f -c %T "$server")
|
||||
if [ "$filesystem" != overlayfs ]; then
|
||||
echo "release-ready: sync server is not a private overlay" >&2
|
||||
exit 2
|
||||
fi
|
||||
commit=$(cat .github/sync-test-server-commit)
|
||||
python3 -c "$RELEASE_READY_SNAPSHOT" "$server" "$commit"
|
||||
expected=$(git -c safe.directory="$server" -C "$server" rev-parse HEAD:vendor/liboqs)
|
||||
actual=$(git -c safe.directory="$server/vendor/liboqs" -C "$server/vendor/liboqs" rev-parse HEAD)
|
||||
if [ "$expected" != "$actual" ]; then
|
||||
echo "release-ready: canonical Mesh's liboqs must match the CI pin" >&2
|
||||
exit 2
|
||||
fi
|
||||
if [ -n "$(git -c safe.directory="$server/vendor/liboqs" -C "$server/vendor/liboqs" status --porcelain --untracked-files=all)" ]; then
|
||||
echo "release-ready: canonical Mesh's liboqs must be pristine" >&2
|
||||
exit 2
|
||||
fi
|
||||
# Emscripten's PATH entry holds a cmake directory, which make's own command
|
||||
# lookup would try to run instead of the cmake program. The server generates
|
||||
# its Go with Ziran, Breeze's own toolchain.
|
||||
make /src/build/packages/ziran/build/bin/zi2c
|
||||
make -C "$server" BUILD_DIR="$server/build" CMAKE="$(command -v cmake)" \
|
||||
ZIRAN=/src/build/packages/ziran/build/bin/ziran build
|
||||
MESH_BIN="$server/mesh" make sync-server-test
|
||||
git -c safe.directory="$server" -C "$server" diff --exit-code "$commit" -- .
|
||||
@@ -1,64 +0,0 @@
|
||||
# The Test job's machine for `make release-ready`: the runner's Ubuntu, the
|
||||
# packages CI installs for native/browser tests, its pinned SDK and Bun.
|
||||
# scripts/release-ready.sh has Harmony's container service run this recipe as
|
||||
# root on the pinned base image (.github/local-ci/base-image), with the
|
||||
# candidate's .github folder at /run/harmony-container/context.tar, and commit
|
||||
# the result with these settings:
|
||||
# EM_NODE_JS=/usr/local/bin/bun EMSDK_NODE=/usr/local/bin/bun
|
||||
# EM_CONFIG=/opt/emsdk/.emscripten
|
||||
# PATH=/opt/emsdk/upstream/emscripten:/usr/local/go/bin:/usr/local/bin:/usr/bin:/bin
|
||||
set -eu
|
||||
BUN_VERSION=1.4.2
|
||||
BUN_SHA256=36368faef7527875d5ffa52e53cd48021741f2a83eb6208a8dd64068d422a913
|
||||
GO_VERSION=1.24.4
|
||||
|
||||
context=/tmp/inbe-ci-context
|
||||
mkdir -p "$context"
|
||||
tar -xf /run/harmony-container/context.tar -C "$context"
|
||||
|
||||
# The hosted runner also ships git, Git LFS, curl, cmake, zip, jq, OpenSSL's
|
||||
# headers, libsodium, D-Bus, Java 21, Go and the Android SDK
|
||||
# (scripts/release-ready.sh mounts this machine's).
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
apt-get update
|
||||
# shellcheck disable=SC2046
|
||||
apt-get install -y --no-install-recommends \
|
||||
git git-lfs python3 curl xz-utils make cmake zip unzip jq file libssl-dev \
|
||||
libsodium23 dbus openjdk-21-jdk-headless \
|
||||
libgtk-3-0t64 libasound2t64 libdbus-glib-1-2 libxt6t64 libxtst6 libpci3 \
|
||||
$(grep -hv '^#' "$context/apt/test-packages.txt" "$context/apt/web-packages.txt" \
|
||||
"$context/apt/windows-packages.txt" | cut -d: -f2- | sort -u | tr '\n' ' ')
|
||||
if [ -x /usr/bin/x86_64-w64-mingw32-gcc-win32 ]; then
|
||||
update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-win32
|
||||
fi
|
||||
curl -fsSL https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -o /tmp/chrome.deb
|
||||
apt-get install -y --no-install-recommends /tmp/chrome.deb
|
||||
rm -rf /var/lib/apt/lists/* /tmp/chrome.deb
|
||||
|
||||
# Bun only: nothing in the image executes Node, including the SDK's cache bootstrap.
|
||||
mkdir -p /opt/js-runtime
|
||||
curl -fsSL "https://github.com/oven-sh/bun/releases/download/bun-v${BUN_VERSION}/bun-linux-x64.zip" \
|
||||
-o /opt/js-runtime/bun.zip
|
||||
printf '%s %s\n' "$BUN_SHA256" /opt/js-runtime/bun.zip | sha256sum -c -
|
||||
unzip -q /opt/js-runtime/bun.zip -d /opt/js-runtime
|
||||
mv /opt/js-runtime/bun-linux-x64/bun /usr/local/bin/bun
|
||||
rm -rf /opt/js-runtime/bun.zip /opt/js-runtime/bun-linux-x64
|
||||
bun --version
|
||||
export EM_NODE_JS=/usr/local/bin/bun EMSDK_NODE=/usr/local/bin/bun
|
||||
|
||||
mkdir -p /opt/emsdk /opt/firefox
|
||||
curl -fsSL https://github.com/emscripten-core/emsdk/archive/refs/heads/main.tar.gz \
|
||||
| tar -xz -C /opt/emsdk --strip-components=1
|
||||
emscripten=$(cat "$context/emscripten-version")
|
||||
/opt/emsdk/emsdk install "$emscripten"
|
||||
/opt/emsdk/emsdk activate "$emscripten"
|
||||
/opt/emsdk/upstream/emscripten/embuilder build zlib
|
||||
chmod -R a+rwX /opt/emsdk/upstream/emscripten/cache
|
||||
curl -fsSL 'https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en-US' \
|
||||
| tar -xJ -C /opt/firefox --strip-components=1
|
||||
ln -s /opt/firefox/firefox /usr/local/bin/firefox
|
||||
|
||||
curl -fsSL "https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar -xz -C /usr/local
|
||||
ln -s /usr/local/go/bin/go /usr/local/bin/go
|
||||
/usr/local/go/bin/go version
|
||||
rm -rf "$context"
|
||||
@@ -1,132 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Install the pinned SDK components, retrying downloads in fresh staging areas."""
|
||||
from pathlib import Path
|
||||
import argparse
|
||||
import os
|
||||
import re
|
||||
import shutil
|
||||
import subprocess
|
||||
import tempfile
|
||||
import time
|
||||
import xml.etree.ElementTree as ET
|
||||
import zipfile
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[2]
|
||||
|
||||
|
||||
def component_path(root, package):
|
||||
if not re.fullmatch(r"(?:platforms;android-[0-9]+|(?:build-tools|ndk|cmake);[0-9]+\.[0-9]+\.[0-9]+)", package):
|
||||
raise ValueError("invalid pinned SDK component: " + package)
|
||||
return root.joinpath(*package.split(";"))
|
||||
|
||||
|
||||
def valid(root, package):
|
||||
directory = component_path(root, package)
|
||||
try:
|
||||
document = ET.parse(directory / "package.xml")
|
||||
if not any(element.tag.rsplit("}", 1)[-1] == "localPackage" and
|
||||
element.get("path") == package for element in document.iter()):
|
||||
return False
|
||||
kind, version = package.split(";")
|
||||
if kind == "platforms":
|
||||
with zipfile.ZipFile(directory / "android.jar") as archive:
|
||||
return archive.testzip() is None
|
||||
properties = (directory / "source.properties").read_text()
|
||||
if not re.search(r"^Pkg\.Revision\s*=\s*" + re.escape(version) + r"\s*$", properties, re.M):
|
||||
return False
|
||||
if kind == "cmake":
|
||||
command = [directory / "bin/cmake", "--version"]
|
||||
elif kind == "build-tools":
|
||||
command = [directory / "aapt2", "version"]
|
||||
else:
|
||||
command = [next(directory.glob("toolchains/llvm/prebuilt/*/bin/clang")), "--version"]
|
||||
result = subprocess.run(command, capture_output=True, text=True, timeout=15)
|
||||
if result.returncode != 0:
|
||||
return False
|
||||
if kind == "cmake":
|
||||
expected = "cmake version " + re.escape(version) + r"(?:-[0-9A-Za-z.]+)?"
|
||||
return re.fullmatch(expected, result.stdout.splitlines()[0]) is not None
|
||||
return True
|
||||
except (OSError, UnicodeError, ET.ParseError, zipfile.BadZipFile, StopIteration, IndexError,
|
||||
subprocess.TimeoutExpired):
|
||||
return False
|
||||
|
||||
|
||||
def merge_licenses(source, destination):
|
||||
"""Keep runner-owned permissions and accepted licence hashes intact."""
|
||||
if not source.is_dir():
|
||||
return
|
||||
destination.mkdir(exist_ok=True)
|
||||
for license_file in source.iterdir():
|
||||
if not license_file.is_file():
|
||||
continue
|
||||
target = destination / license_file.name
|
||||
accepted = target.read_text().splitlines() if target.exists() else []
|
||||
additions = [line for line in license_file.read_text().splitlines()
|
||||
if line.strip() and line not in accepted]
|
||||
if not additions:
|
||||
continue
|
||||
# copytree/copy2 also chmod and set timestamps. Hosted SDK licences
|
||||
# can be writable but owned by root, so metadata copying fails.
|
||||
with target.open("a") as output:
|
||||
output.write("\n" + "\n".join(additions) + "\n")
|
||||
|
||||
|
||||
def install(root, packages, manager, sleep=time.sleep):
|
||||
root = Path(root).resolve()
|
||||
manager = Path(manager).resolve(strict=True)
|
||||
root.mkdir(parents=True, exist_ok=True)
|
||||
for package in packages:
|
||||
destination = component_path(root, package)
|
||||
if valid(root, package):
|
||||
print("Android SDK: verified cached " + package, flush=True)
|
||||
continue
|
||||
for attempt in range(1, 4):
|
||||
print(f"Android SDK: install {package}, attempt {attempt}/3", flush=True)
|
||||
# sdkmanager keeps partial archives beneath its SDK root. A new
|
||||
# stage guarantees that a corrupt ZIP cannot survive the retry.
|
||||
with tempfile.TemporaryDirectory(prefix=".inbe-sdk-", dir=root) as temporary:
|
||||
stage = Path(temporary)
|
||||
if (root / "licenses").is_dir():
|
||||
shutil.copytree(root / "licenses", stage / "licenses")
|
||||
environment = dict(os.environ, ANDROID_HOME=str(stage), ANDROID_SDK_ROOT=str(stage))
|
||||
try:
|
||||
result = subprocess.run([manager, "--sdk_root=" + str(stage), package],
|
||||
input=b"y\n" * 128, env=environment, timeout=600)
|
||||
except subprocess.TimeoutExpired:
|
||||
result = None
|
||||
if result is not None and result.returncode == 0 and valid(stage, package):
|
||||
source = component_path(stage, package)
|
||||
destination.parent.mkdir(parents=True, exist_ok=True)
|
||||
if destination.exists():
|
||||
destination.rename(stage / "incomplete-component")
|
||||
source.rename(destination)
|
||||
merge_licenses(stage / "licenses", root / "licenses")
|
||||
if not valid(root, package):
|
||||
raise RuntimeError("SDK component failed validation after installation: " + package)
|
||||
break
|
||||
print("Android SDK: rejected incomplete or invalid " + package, flush=True)
|
||||
if attempt == 3:
|
||||
raise RuntimeError("Android SDK download failed after three fresh attempts: " + package)
|
||||
sleep(attempt * 2)
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument("--sdk-root", type=Path,
|
||||
default=os.environ.get("ANDROID_SDK_ROOT") or os.environ.get("ANDROID_HOME"))
|
||||
parser.add_argument("--sdkmanager", type=Path)
|
||||
parser.add_argument("--packages", type=Path, default=ROOT / ".github/android-sdk-packages.txt")
|
||||
args = parser.parse_args()
|
||||
if args.sdk_root is None:
|
||||
parser.error("ANDROID_SDK_ROOT or ANDROID_HOME must name the job's SDK")
|
||||
manager = args.sdkmanager or args.sdk_root / "cmdline-tools/latest/bin/sdkmanager"
|
||||
if args.sdkmanager is None and not manager.is_file():
|
||||
manager = Path(shutil.which("sdkmanager") or manager)
|
||||
packages = [line.strip() for line in args.packages.read_text().splitlines()
|
||||
if line.strip() and not line.lstrip().startswith("#")]
|
||||
install(args.sdk_root, packages, manager)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -1,90 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
if [ "$#" -lt 1 ]; then
|
||||
echo "usage: $0 PACKAGE_FILE [EXTRA_PACKAGE ...]" >&2
|
||||
exit 2
|
||||
fi
|
||||
|
||||
package_file="$1"
|
||||
shift
|
||||
|
||||
if [ ! -f "$package_file" ]; then
|
||||
echo "package file not found: $package_file" >&2
|
||||
exit 2
|
||||
fi
|
||||
|
||||
mapfile -t raw_packages < "$package_file"
|
||||
packages=()
|
||||
for package in "${raw_packages[@]}" "$@"; do
|
||||
if [ -z "$package" ] || [[ "$package" == \#* ]]; then
|
||||
continue
|
||||
fi
|
||||
packages+=("$package")
|
||||
done
|
||||
|
||||
missing=()
|
||||
for package in "${packages[@]}"; do
|
||||
if ! dpkg-query -W -f='${Status}\n' "$package" 2>/dev/null | grep -qx 'install ok installed'; then
|
||||
missing+=("$package")
|
||||
fi
|
||||
done
|
||||
if [ "${#missing[@]}" -eq 0 ]; then
|
||||
echo "All ${#packages[@]} requested apt packages are already installed; skipping apt-get."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
APT_CACHE_DIR="${APT_CACHE_DIR:-/tmp/apt-cache}"
|
||||
apt_arch="$(dpkg --print-architecture)"
|
||||
ubuntu_archive="https://archive.ubuntu.com/ubuntu"
|
||||
if [ "$apt_arch" = "arm64" ]; then
|
||||
ubuntu_archive="http://ports.ubuntu.com/ubuntu-ports"
|
||||
fi
|
||||
codename="$(
|
||||
. /etc/os-release
|
||||
printf '%s' "${VERSION_CODENAME:-jammy}"
|
||||
)"
|
||||
|
||||
# GitHub-hosted Ubuntu runners sometimes use an Azure mirrorlist that stalls.
|
||||
# Pin Ubuntu packages to the canonical archive before running apt. arm64
|
||||
# packages live on ports.ubuntu.com, not archive.ubuntu.com.
|
||||
if [ -f /etc/apt/apt-mirrors.txt ]; then
|
||||
printf '%s\n' "$ubuntu_archive" | sudo tee /etc/apt/apt-mirrors.txt >/dev/null
|
||||
fi
|
||||
|
||||
while IFS= read -r -d '' source_file; do
|
||||
sudo sed -i \
|
||||
-e "s|mirror+file:/etc/apt/apt-mirrors.txt|$ubuntu_archive|g" \
|
||||
-e "s|http://azure.archive.ubuntu.com/ubuntu|$ubuntu_archive|g" \
|
||||
-e "s|https://azure.archive.ubuntu.com/ubuntu|$ubuntu_archive|g" \
|
||||
-e "s|http://archive.ubuntu.com/ubuntu|$ubuntu_archive|g" \
|
||||
-e "s|https://archive.ubuntu.com/ubuntu|$ubuntu_archive|g" \
|
||||
-e "s|http://ports.ubuntu.com/ubuntu-ports|$ubuntu_archive|g" \
|
||||
-e "s|https://ports.ubuntu.com/ubuntu-ports|$ubuntu_archive|g" \
|
||||
"$source_file"
|
||||
done < <(find /etc/apt -type f \( -name '*.list' -o -name '*.sources' \) -print0)
|
||||
|
||||
sudo tee /etc/apt/sources.list.d/ubuntu.sources >/dev/null <<EOF
|
||||
Types: deb
|
||||
URIs: $ubuntu_archive
|
||||
Suites: $codename ${codename}-updates ${codename}-backports ${codename}-security
|
||||
Components: main restricted universe multiverse
|
||||
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
|
||||
EOF
|
||||
|
||||
mkdir -p "$APT_CACHE_DIR/partial"
|
||||
sudo rm -rf /var/lib/apt/lists/*
|
||||
sudo apt-get \
|
||||
-o Acquire::Retries=3 \
|
||||
-o Acquire::http::Timeout=20 \
|
||||
-o Acquire::https::Timeout=20 \
|
||||
update
|
||||
if [ "${#missing[@]}" -gt 0 ]; then
|
||||
sudo apt-get \
|
||||
-o Acquire::Retries=3 \
|
||||
-o Acquire::http::Timeout=20 \
|
||||
-o Acquire::https::Timeout=20 \
|
||||
-o Dir::Cache::archives="$APT_CACHE_DIR" \
|
||||
install -y "${missing[@]}"
|
||||
fi
|
||||
sudo chown -R "$USER:$USER" "$APT_CACHE_DIR"
|
||||
@@ -1 +0,0 @@
|
||||
35159302be6f9011c3934636c6c200eec785ff5b
|
||||
@@ -1,176 +0,0 @@
|
||||
name: Android Moto APK
|
||||
|
||||
"on":
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
source_commit:
|
||||
description: Full commit hash whose Release checks passed
|
||||
required: true
|
||||
verified_run:
|
||||
description: Release run with successful Secret Scan and Test jobs
|
||||
required: true
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
actions: read
|
||||
|
||||
jobs:
|
||||
android:
|
||||
name: Build signed Moto APK
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 60
|
||||
steps:
|
||||
- name: Require passing checks for the exact source commit
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
SOURCE_COMMIT: ${{ inputs.source_commit }}
|
||||
VERIFIED_RUN: ${{ inputs.verified_run }}
|
||||
run: |
|
||||
python3 - <<'PY'
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
|
||||
commit = os.environ['SOURCE_COMMIT']
|
||||
run_id = os.environ['VERIFIED_RUN']
|
||||
repository = os.environ['GITHUB_REPOSITORY']
|
||||
if not re.fullmatch(r'[0-9a-f]{40}', commit):
|
||||
raise SystemExit('A full, immutable source commit is required')
|
||||
if not re.fullmatch(r'[0-9]+', run_id):
|
||||
raise SystemExit('A numeric Release run ID is required')
|
||||
|
||||
def api(path):
|
||||
return json.loads(subprocess.check_output(['gh', 'api', path], text=True))
|
||||
|
||||
run = api(f'repos/{repository}/actions/runs/{run_id}')
|
||||
if run['head_sha'] != commit or run['path'] != '.github/workflows/release.yml':
|
||||
raise SystemExit('The Release checks must belong to the requested source commit')
|
||||
jobs = api(f'repos/{repository}/actions/runs/{run_id}/jobs?per_page=100')['jobs']
|
||||
for name in ('Secret Scan', 'Test (0/3)', 'Test (1/3)', 'Test (2/3)'):
|
||||
checks = [job for job in jobs if job['name'] == name]
|
||||
if len(checks) != 1 or checks[0]['conclusion'] != 'success':
|
||||
raise SystemExit(f'{name} must have passed before signing')
|
||||
print('Verified passing Secret Scan and all three Test shards for ' + commit)
|
||||
PY
|
||||
|
||||
- name: Checkout verified source
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
ref: ${{ inputs.source_commit }}
|
||||
fetch-depth: 1
|
||||
|
||||
- name: Fetch Ziran packages
|
||||
uses: ./.github/actions/ziran-packages
|
||||
|
||||
- name: Set up Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 22
|
||||
|
||||
- name: Set up JDK 21
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
distribution: temurin
|
||||
java-version: '21'
|
||||
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v3
|
||||
|
||||
- name: Cache Android SDK packages
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
${{ env.ANDROID_HOME }}/platforms/android-36
|
||||
${{ env.ANDROID_HOME }}/build-tools/35.0.0
|
||||
${{ env.ANDROID_HOME }}/ndk/28.2.13676358
|
||||
${{ env.ANDROID_HOME }}/cmake/3.22.1
|
||||
key: android-sdk-v2-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.github/android-sdk-packages.txt') }}
|
||||
restore-keys: |
|
||||
android-sdk-v2-${{ runner.os }}-${{ runner.arch }}-
|
||||
|
||||
- name: Verify and install Android SDK components
|
||||
timeout-minutes: 20
|
||||
run: python3 .github/scripts/install-android-sdk.py
|
||||
|
||||
- name: Install Android build dependencies
|
||||
timeout-minutes: 15
|
||||
run: .github/scripts/install-apt-packages.sh .github/apt/android-packages.txt
|
||||
|
||||
- name: Prepare Android signing key
|
||||
env:
|
||||
KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
umask 077
|
||||
mkdir -p ~/.android
|
||||
printf '%s' "$KEYSTORE_BASE64" | base64 -d > ~/.android/inbe-release.keystore
|
||||
|
||||
- name: Copy Android assets
|
||||
run: ./scripts/copy-android-assets.sh
|
||||
|
||||
- name: Build signed ARMv7 release APK
|
||||
env:
|
||||
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
|
||||
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
|
||||
SOURCE_COMMIT: ${{ inputs.source_commit }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
python3 - <<'PY'
|
||||
import importlib.util
|
||||
import os
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
spec = importlib.util.spec_from_file_location('phone_check', 'scripts/phone-check.py')
|
||||
check = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(check)
|
||||
revision = os.environ['SOURCE_COMMIT']
|
||||
assert subprocess.check_output(['git', 'rev-parse', 'HEAD'], text=True).strip() == revision
|
||||
assert check.app_tree(Path.cwd()) == check.app_tree(Path.cwd(), revision), 'App source differs from candidate'
|
||||
PY
|
||||
./droid/gradlew -p droid assembleRelease \
|
||||
-Papp.onlyAbi=armeabi-v7a \
|
||||
-Pkeystore.path="$HOME/.android/inbe-release.keystore" \
|
||||
-Pkeystore.alias="$KEY_ALIAS" \
|
||||
-Pkeystore.password="$KEYSTORE_PASSWORD" \
|
||||
--stacktrace
|
||||
VERSION=$(python3 scripts/check-version.py --print-version)
|
||||
mkdir -p build/release/moto
|
||||
cp droid/app/build/outputs/apk/release/app-armeabi-v7a-release.apk "build/release/moto/inbe-$VERSION-moto.apk"
|
||||
"$ANDROID_HOME/build-tools/35.0.0/apksigner" verify --print-certs "build/release/moto/inbe-$VERSION-moto.apk"
|
||||
printf '%s\n' "$SOURCE_COMMIT" > build/release/moto/source-commit.txt
|
||||
(
|
||||
cd build/release/moto
|
||||
sha256sum "inbe-$VERSION-moto.apk" > "inbe-$VERSION-moto.apk.sha256"
|
||||
)
|
||||
python3 - <<'PY'
|
||||
import hashlib
|
||||
import importlib.util
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
spec = importlib.util.spec_from_file_location('phone_check', 'scripts/phone-check.py')
|
||||
check = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(check)
|
||||
root = Path.cwd()
|
||||
revision = os.environ['SOURCE_COMMIT']
|
||||
content = check.app_tree(root, revision)
|
||||
assert check.app_tree(root) == content, 'App source changed during build'
|
||||
apk = next(Path('build/release/moto').glob('inbe-*-moto.apk'))
|
||||
receipt = dict(schema=1, status='passed', source_commit=revision, app_tree=content,
|
||||
apk=dict(sha256=hashlib.sha256(apk.read_bytes()).hexdigest(), **check.apk_identity(apk)),
|
||||
workflow_run=os.environ['GITHUB_SERVER_URL'] + '/' + os.environ['GITHUB_REPOSITORY'] +
|
||||
'/actions/runs/' + os.environ['GITHUB_RUN_ID'])
|
||||
(apk.parent / 'build-receipt.json').write_text(json.dumps(receipt, indent=2) + '\n')
|
||||
PY
|
||||
|
||||
- name: Remove signing key
|
||||
if: always()
|
||||
run: rm -f ~/.android/inbe-release.keystore
|
||||
|
||||
- name: Upload signed Moto APK
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: android-moto
|
||||
path: build/release/moto/*
|
||||
if-no-files-found: error
|
||||
@@ -0,0 +1,103 @@
|
||||
name: Android Build
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
release:
|
||||
name: Build Release APK
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Set up JDK 21
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
distribution: 'temurin'
|
||||
java-version: '21'
|
||||
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v3
|
||||
|
||||
- name: Grant execute permission for gradlew
|
||||
run: chmod +x droid/gradlew
|
||||
|
||||
- name: Create keystore directory
|
||||
run: mkdir -p ~/.android
|
||||
|
||||
- name: Decode Keystore
|
||||
env:
|
||||
KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
|
||||
run: |
|
||||
echo "$KEYSTORE_BASE64" | base64 -d > ~/.android/flint-release.keystore
|
||||
echo "Keystore decoded successfully"
|
||||
|
||||
- name: Copy Assets to Android Project
|
||||
run: ./scripts/copy-android-assets.sh
|
||||
|
||||
- name: Build Release APK
|
||||
working-directory: ./droid
|
||||
env:
|
||||
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
|
||||
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
|
||||
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
|
||||
run: |
|
||||
./gradlew assembleRelease \
|
||||
-Pkeystore.password="$KEYSTORE_PASSWORD" \
|
||||
-Pkeystore.path="/home/runner/.android/flint-release.keystore" \
|
||||
--stacktrace
|
||||
|
||||
- name: Rename APK
|
||||
run: |
|
||||
VERSION=$(grep "versionName" droid/app/build.gradle | awk '{print $2}' | tr -d '"')
|
||||
find droid/app/build/outputs/apk/release -name "*-universal-release.apk" -exec cp {} inbe-$VERSION.apk \; 2>/dev/null || true
|
||||
|
||||
- name: Upload APK to Artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: release-apk
|
||||
path: inbe-*.apk
|
||||
if-no-files-found: warn
|
||||
|
||||
- name: Create and Push Tag (if new version)
|
||||
id: tag_version
|
||||
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
|
||||
run: |
|
||||
VERSION=$(grep "versionName" droid/app/build.gradle | awk '{print $2}' | tr -d '"')
|
||||
TAG="v$VERSION"
|
||||
if git rev-parse "$TAG" >/dev/null 2>&1; then
|
||||
echo "Tag $TAG exists, skipping"
|
||||
echo "tag_pushed=false" >> $GITHUB_OUTPUT
|
||||
else
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||
git tag -a "$TAG" -m "Release $VERSION"
|
||||
git push origin "$TAG"
|
||||
echo "tag_pushed=true" >> $GITHUB_OUTPUT
|
||||
echo "tag_name=$TAG" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Create GitHub Release
|
||||
if: steps.tag_version.outputs.tag_pushed == 'true'
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
tag_name: ${{ steps.tag_version.outputs.tag_name }}
|
||||
files: inbe-*.apk
|
||||
generate_release_notes: true
|
||||
draft: false
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
@@ -1,63 +0,0 @@
|
||||
name: Sign bundled Arcade content
|
||||
|
||||
# The established publisher key is currently held only by this repository's
|
||||
# GitHub secret. This manual repair signs the checked-in catalog's immutable
|
||||
# content descriptors and exports them; it never publishes an app release.
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
catalog_sha256:
|
||||
description: Exact SHA-256 of the bundled Arcade catalog being repaired
|
||||
required: true
|
||||
type: string
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
sign:
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 5
|
||||
steps:
|
||||
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
|
||||
- name: Load the pinned Apps release API
|
||||
run: |
|
||||
python3 - <<'PY'
|
||||
from hashlib import sha256
|
||||
import json
|
||||
from pathlib import Path
|
||||
import urllib.request
|
||||
package = next(p for p in json.loads(Path('ziran.lock').read_text())['packages'] if p['name'].lower() == 'apps')
|
||||
if package['url'] != 'https://git.waozi.xyz/waozi/apps.git' or package['commit'] != 'c18e70b434456823a5d332255d78b48064f12de3':
|
||||
raise SystemExit('Review the changed Apps pin before signing content')
|
||||
url = 'https://git.waozi.xyz/waozi/apps/raw/commit/' + package['commit'] + '/scripts/node_release.py'
|
||||
request = urllib.request.Request(url, headers={'User-Agent': 'Breeze-content-signing/1'})
|
||||
with urllib.request.urlopen(request, timeout=30) as response:
|
||||
source = response.read(1048577)
|
||||
if sha256(source).hexdigest() != '6b02a862edcd0d1f966cf168f762a6e91dcb3eaae4bacd555c096ad25ceebffe':
|
||||
raise SystemExit('Pinned Apps release API bytes differ')
|
||||
path = Path('build/content-signing-api/node_release.py')
|
||||
path.parent.mkdir(parents=True, exist_ok=True)
|
||||
path.write_bytes(source)
|
||||
PY
|
||||
- name: Install signature library
|
||||
run: python3 -m pip install cryptography
|
||||
- name: Test content signing
|
||||
env:
|
||||
APPS_RELEASE_API: build/content-signing-api/node_release.py
|
||||
run: python3 tests/arcade_content_sign_test.py
|
||||
- name: Sign only the requested catalog's content
|
||||
env:
|
||||
INBE_PACKAGE_SIGNING_KEY: ${{ secrets.INBE_PACKAGE_SIGNING_KEY }}
|
||||
KEY_ID: ${{ vars.INBE_PACKAGE_KEY_ID }}
|
||||
CATALOG_SHA256: ${{ inputs.catalog_sha256 }}
|
||||
run: |
|
||||
python3 scripts/sign-arcade-content.py --catalog-sha256 "$CATALOG_SHA256" \
|
||||
--key-id "$KEY_ID" --release-api build/content-signing-api/node_release.py \
|
||||
--output build/arcade-content-signatures
|
||||
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
|
||||
with:
|
||||
name: arcade-content-signatures
|
||||
path: build/arcade-content-signatures/*.zx.release-v2.json
|
||||
if-no-files-found: error
|
||||
retention-days: 30
|
||||
@@ -1,264 +0,0 @@
|
||||
name: CI
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.sha }}
|
||||
cancel-in-progress: false
|
||||
|
||||
jobs:
|
||||
secret-scan:
|
||||
name: Secret Scan
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Fetch Ziran packages
|
||||
uses: ./.github/actions/ziran-packages
|
||||
with:
|
||||
save-toolchain: 'false'
|
||||
|
||||
- name: Check Version Consistency
|
||||
run: |
|
||||
python3 scripts/check-version.py
|
||||
python3 tests/version_test.py
|
||||
|
||||
- name: Scan Tracked Files and History
|
||||
run: |
|
||||
set -euo pipefail
|
||||
python3 scripts/check-secrets.py --working-tree
|
||||
python3 scripts/check-secrets.py --history
|
||||
|
||||
# The pre-commit hook runs the same check on staged files.
|
||||
- name: Refuse new files over 1 MB
|
||||
env:
|
||||
BEFORE: ${{ github.event.before }}
|
||||
BASE_REF: ${{ github.base_ref }}
|
||||
run: |
|
||||
set -eu
|
||||
if [ -n "$BASE_REF" ]; then
|
||||
base=$(git merge-base "origin/$BASE_REF" HEAD)
|
||||
elif [ -n "$BEFORE" ] && git cat-file -e "$BEFORE^{commit}" 2>/dev/null; then
|
||||
base=$BEFORE
|
||||
else
|
||||
base=HEAD~1
|
||||
fi
|
||||
python3 scripts/check-file-size.py --since "$base"
|
||||
|
||||
google-free:
|
||||
name: Google libraries only in the gplay edition
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
# The normal and F-Droid builds read no Google library or plugin; only
|
||||
# gplay-scoped configurations and gplay files may name one.
|
||||
- name: Keep Google libraries out of the normal and F-Droid build files
|
||||
uses: kryonlabs/kryon/.github/actions/google-free@7217475dfa7f462939e47e3f0bc918aef248b179
|
||||
|
||||
guard-package-urls:
|
||||
name: Package URLs are public HTTPS
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
# Plain checkout on purpose: the guard must not depend on fetching
|
||||
# the packages it validates (an SSH URL would break that fetch).
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Reject submodules and non-HTTPS package URLs
|
||||
run: |
|
||||
set -eu
|
||||
if [ -f .gitmodules ]; then
|
||||
echo "::error::Dependencies are Ziran packages in ziran.toml, not submodules"
|
||||
exit 1
|
||||
fi
|
||||
bad=$(grep -nE '^[[:space:]]*git[[:space:]]*=' ziran.toml \
|
||||
| grep -vE '^[0-9]+:[[:space:]]*git[[:space:]]*=[[:space:]]*"https://' || true)
|
||||
if [ -n "$bad" ]; then
|
||||
echo "::error::Non-HTTPS package URL(s) break fresh clones and CI:$bad"
|
||||
exit 1
|
||||
fi
|
||||
echo "all package URLs HTTPS - ok"
|
||||
|
||||
test:
|
||||
# make test split across runners; each shard is a third of its targets.
|
||||
name: Test (${{ matrix.shard }}/3)
|
||||
runs-on: ubuntu-latest
|
||||
# Secret Scan runs beside the tests; nothing here publishes, so it need not gate them.
|
||||
needs:
|
||||
- guard-package-urls
|
||||
timeout-minutes: 60
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
shard: [0, 1, 2]
|
||||
env:
|
||||
APT_CACHE_DIR: /tmp/apt-cache
|
||||
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 1
|
||||
lfs: true
|
||||
|
||||
- name: Fetch Ziran packages
|
||||
uses: ./.github/actions/ziran-packages
|
||||
|
||||
- name: Set up Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 22
|
||||
|
||||
- name: Set up Java
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
distribution: temurin
|
||||
java-version: '21'
|
||||
|
||||
- name: Cache Test apt packages
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ${{ env.APT_CACHE_DIR }}
|
||||
key: test-apt-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.github/apt/test-packages.txt') }}
|
||||
restore-keys: |
|
||||
test-apt-${{ runner.os }}-${{ runner.arch }}-
|
||||
|
||||
- name: Install Test Dependencies
|
||||
timeout-minutes: 15
|
||||
run: .github/scripts/install-apt-packages.sh .github/apt/test-packages.txt
|
||||
|
||||
- name: Run Tests
|
||||
run: sh scripts/test-shard.sh ${{ matrix.shard }} 3
|
||||
|
||||
- name: Read sync test server revision
|
||||
if: matrix.shard == 0
|
||||
id: sync-test-server
|
||||
run: echo "revision=$(cat .github/sync-test-server-commit)" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Check out sync test server
|
||||
if: matrix.shard == 0
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
repository: ziranlang/mesh
|
||||
# Includes signed photo copies (blobs) and the private Lumi
|
||||
# collection used for shared account activity.
|
||||
ref: ${{ steps.sync-test-server.outputs.revision }}
|
||||
path: .test-server
|
||||
submodules: recursive
|
||||
|
||||
- name: Set up Go for sync test server
|
||||
if: matrix.shard == 0
|
||||
uses: actions/setup-go@v5
|
||||
with:
|
||||
go-version-file: .test-server/go.mod
|
||||
cache-dependency-path: .test-server/go.sum
|
||||
|
||||
- name: Verify sync and recovery
|
||||
if: matrix.shard == 0
|
||||
run: |
|
||||
# The server generates its Go with Ziran, Breeze's own toolchain.
|
||||
make "$GITHUB_WORKSPACE/build/packages/ziran/build/bin/zi2c"
|
||||
make -C .test-server build ZIRAN="$GITHUB_WORKSPACE/build/packages/ziran/build/bin/ziran"
|
||||
make sync-server-test MESH_BIN="$GITHUB_WORKSPACE/.test-server/mesh"
|
||||
|
||||
browser-addons:
|
||||
# Builds the web app once, packages it for Chrome and Firefox, and runs
|
||||
# the smoke test in both browsers. It runs beside the tests; a failure in
|
||||
# either still fails the run.
|
||||
name: Build Browser Add-ons
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 60
|
||||
needs:
|
||||
- guard-package-urls
|
||||
env:
|
||||
APT_CACHE_DIR: /tmp/apt-cache
|
||||
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 1
|
||||
lfs: true
|
||||
|
||||
- name: Fetch Ziran packages
|
||||
uses: ./.github/actions/ziran-packages
|
||||
|
||||
- name: Set up Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 22
|
||||
|
||||
- name: Cache Web apt packages
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ${{ env.APT_CACHE_DIR }}
|
||||
key: web-apt-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.github/apt/web-packages.txt') }}
|
||||
restore-keys: |
|
||||
web-apt-${{ runner.os }}-${{ runner.arch }}-
|
||||
|
||||
- name: Install Web Dependencies
|
||||
timeout-minutes: 15
|
||||
run: .github/scripts/install-apt-packages.sh .github/apt/web-packages.txt python3-pil
|
||||
|
||||
- name: Set up Emscripten
|
||||
uses: ./.github/actions/emscripten
|
||||
|
||||
- name: Build Chrome and Firefox ZIPs
|
||||
run: |
|
||||
set -euo pipefail
|
||||
export PATH="$INBE_NODE_BIN:$PATH"
|
||||
node --version
|
||||
make package-unpackaged-assets
|
||||
make chrome-web-store
|
||||
test -f build/dist/inbe-chrome-web-store.zip
|
||||
make firefox-addons
|
||||
test -f build/dist/inbe-firefox-addons.zip
|
||||
make firefox-addons-lint
|
||||
|
||||
# The web build renders on canvas, so this is also the canvas smoke
|
||||
# test.
|
||||
- name: Run Web Smoke Test (Chrome)
|
||||
run: |
|
||||
set -euo pipefail
|
||||
export PATH="$INBE_NODE_BIN:$PATH"
|
||||
make web-smoke-test
|
||||
|
||||
- name: Install Firefox (Mozilla build)
|
||||
timeout-minutes: 15
|
||||
run: |
|
||||
set -euo pipefail
|
||||
.github/scripts/install-apt-packages.sh .github/apt/empty-packages.txt \
|
||||
xvfb libgl1-mesa-dri libgl1 libegl1 mesa-utils || true
|
||||
.github/scripts/install-apt-packages.sh .github/apt/empty-packages.txt \
|
||||
libgtk-3-0t64 libx11-xcb1 libxcb-shm0 libasound2t64 libdbus-glib-1-2 \
|
||||
libxt6t64 libxtst6 libpci3 || \
|
||||
.github/scripts/install-apt-packages.sh .github/apt/empty-packages.txt \
|
||||
libgtk-3-0 libx11-xcb1 libxcb-shm0 libasound2 libdbus-glib-1-2 libxt6 libxtst6 libpci3
|
||||
curl -sL "https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en-US" \
|
||||
-o "$HOME/firefox.tar.xz"
|
||||
tar -xJf "$HOME/firefox.tar.xz" -C "$HOME"
|
||||
test -x "$HOME/firefox/firefox"
|
||||
echo "$HOME/firefox" >> "$GITHUB_PATH"
|
||||
|
||||
- name: Run Web Smoke Test (Firefox)
|
||||
env:
|
||||
LIBGL_ALWAYS_SOFTWARE: '1'
|
||||
run: |
|
||||
set -euo pipefail
|
||||
export PATH="$INBE_NODE_BIN:$PATH"
|
||||
xvfb-run -a --server-args="-screen 0 1280x1024x24" make web-smoke-test-firefox
|
||||
@@ -1,89 +0,0 @@
|
||||
name: F-Droid
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [master]
|
||||
pull_request:
|
||||
branches: [master]
|
||||
schedule:
|
||||
- cron: '23 7 * * *'
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
revision:
|
||||
description: Exact committed candidate (defaults to the triggering commit)
|
||||
required: false
|
||||
type: string
|
||||
workflow_call:
|
||||
inputs:
|
||||
revision:
|
||||
required: false
|
||||
type: string
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: F-Droid security and clean build
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 90
|
||||
container:
|
||||
# Official F-Droid buildserver, pinned for repeatable verification.
|
||||
image: registry.gitlab.com/fdroid/fdroidserver@sha256:1ea8bef1820bff06c2974e31b4fc4c79c364cd24231b86e71fa4b926797e0dac
|
||||
steps:
|
||||
- name: Require an immutable candidate
|
||||
env:
|
||||
CANDIDATE: ${{ inputs.revision || github.sha }}
|
||||
shell: bash
|
||||
run: |
|
||||
if ! [[ "$CANDIDATE" =~ ^[0-9a-f]{40}$ ]]; then
|
||||
echo "::error::revision must be a full commit ID, never a branch or tag"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Checkout's LFS support requires git-lfs inside the job container.
|
||||
- name: Install recipe dependencies
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install -y --no-install-recommends build-essential jimsh libssl-dev meson nasm ninja-build python3-fonttools ffmpeg openjdk-21-jdk-headless fdroidserver git-lfs
|
||||
update-alternatives --set java /usr/lib/jvm/java-21-openjdk-amd64/bin/java
|
||||
|
||||
- name: Checkout candidate
|
||||
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
|
||||
with:
|
||||
ref: ${{ inputs.revision || github.sha }}
|
||||
path: build/xyz.waozi.inbe
|
||||
lfs: true
|
||||
persist-credentials: false
|
||||
|
||||
- name: Verify and install Android SDK components
|
||||
timeout-minutes: 20
|
||||
run: |
|
||||
python3 build/xyz.waozi.inbe/.github/scripts/install-android-sdk.py \
|
||||
--sdk-root /opt/android-sdk --sdkmanager "$(command -v sdkmanager)"
|
||||
|
||||
- name: Build and scan with F-Droid without cached package sources
|
||||
run: python3 build/xyz.waozi.inbe/scripts/check-fdroid.py
|
||||
|
||||
# F-Droid's scanner checked the source; its APK must hold no Google
|
||||
# library either.
|
||||
- name: Keep Google libraries out of F-Droid's APK
|
||||
uses: kryonlabs/kryon/.github/actions/google-free@7217475dfa7f462939e47e3f0bc918aef248b179
|
||||
with:
|
||||
packages: tmp/*.apk
|
||||
source: ''
|
||||
|
||||
- name: Preserve APK, exact metadata and scanner evidence
|
||||
if: always()
|
||||
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
|
||||
with:
|
||||
name: fdroid-unsigned
|
||||
path: |
|
||||
tmp/*.apk
|
||||
logs/
|
||||
metadata/
|
||||
build/xyz.waozi.inbe/build/outputs/logs/
|
||||
build/xyz.waozi.inbe/droid/app/build/intermediates/native_debug_metadata/
|
||||
build/xyz.waozi.inbe/droid/app/build/intermediates/merged_native_libs/
|
||||
if-no-files-found: error
|
||||
retention-days: 7
|
||||
@@ -1,91 +0,0 @@
|
||||
name: Node app follower
|
||||
|
||||
# Arcade releases reach Waozi's node by themselves. Arcade's Game updates
|
||||
# workflow attaches each new release (node-arcade-VERSION) when a game
|
||||
# publishes an update; this checks every fifteen minutes for a release newer
|
||||
# than the version the node serves and publishes it through the Node app
|
||||
# release job, which signs exactly those bytes with the package key.
|
||||
on:
|
||||
schedule:
|
||||
- cron: '12,27,42,57 * * * *'
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
concurrency:
|
||||
group: node-app-follower
|
||||
cancel-in-progress: false
|
||||
|
||||
jobs:
|
||||
check:
|
||||
name: Find an Arcade release the node does not serve
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 10
|
||||
outputs:
|
||||
publish: ${{ steps.release.outputs.publish }}
|
||||
commit: ${{ steps.release.outputs.commit }}
|
||||
tag: ${{ steps.release.outputs.tag }}
|
||||
sha256: ${{ steps.release.outputs.sha256 }}
|
||||
steps:
|
||||
- name: Compare Arcade's newest release with the node
|
||||
id: release
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: |
|
||||
python3 - <<'PY'
|
||||
import hashlib, json, os, re, subprocess, time, urllib.error, urllib.request
|
||||
def gh(*args):
|
||||
return subprocess.check_output(['gh', *args], text=True).strip()
|
||||
def number(version):
|
||||
return tuple(map(int, version.split('.')))
|
||||
releases = json.loads(gh('release', 'list', '--repo', 'waozixyz/arcade', '--limit', '50',
|
||||
'--json', 'tagName,isDraft'))
|
||||
tags = [item['tagName'] for item in releases if not item['isDraft'] and
|
||||
re.fullmatch(r'node-arcade-\d+\.\d+\.\d+', item['tagName'])]
|
||||
tag = max(tags, key=lambda name: number(name.removeprefix('node-arcade-')))
|
||||
def latest():
|
||||
# Cloudflare answers 52x while it briefly cannot reach the node;
|
||||
# retry those for a few minutes before calling the node down.
|
||||
request = urllib.request.Request(
|
||||
os.environ.get('NODE_LATEST_URL', 'https://api.waozi.xyz/api/v2/packages/inbe.arcade/latest?bucket=0&format=zx'),
|
||||
headers={'User-Agent': 'Inbe-Publisher/1.0', 'Cache-Control': 'no-cache'})
|
||||
waits = [int(wait) for wait in os.environ.get('NODE_RETRY_WAITS', '15 30 60 90').split()]
|
||||
for attempt in range(len(waits) + 1):
|
||||
try:
|
||||
with urllib.request.urlopen(request, timeout=30) as response:
|
||||
return json.load(response)['version']
|
||||
except (urllib.error.URLError, TimeoutError, ConnectionError) as error:
|
||||
if isinstance(error, urllib.error.HTTPError) and error.code < 500:
|
||||
raise
|
||||
if attempt == len(waits):
|
||||
raise
|
||||
print(f'The node did not answer ({error}); retrying in {waits[attempt]}s.')
|
||||
time.sleep(waits[attempt])
|
||||
live = latest()
|
||||
with open(os.environ['GITHUB_OUTPUT'], 'a') as output:
|
||||
if number(tag.removeprefix('node-arcade-')) <= number(live):
|
||||
print(f'The node already serves Arcade {live}; newest release is {tag}.')
|
||||
output.write('publish=false\n')
|
||||
raise SystemExit(0)
|
||||
commit = gh('api', f'repos/waozixyz/arcade/commits/{tag}', '--jq', '.sha')
|
||||
subprocess.run(['gh', 'release', 'download', tag, '--repo', 'waozixyz/arcade',
|
||||
'--pattern', 'arcade.zx', '--dir', 'bundle'], check=True)
|
||||
with open('bundle/arcade.zx', 'rb') as bundle:
|
||||
digest = hashlib.sha256(bundle.read()).hexdigest()
|
||||
print(f'Publishing {tag} ({commit}, arcade.zx {digest}); the node serves {live}.')
|
||||
output.write(f'publish=true\ncommit={commit}\ntag={tag}\nsha256={digest}\n')
|
||||
PY
|
||||
|
||||
publish:
|
||||
name: Publish it to Waozi's node
|
||||
needs: check
|
||||
if: needs.check.outputs.publish == 'true'
|
||||
uses: ./.github/workflows/node-app-release.yml
|
||||
with:
|
||||
app: arcade
|
||||
repository: waozixyz/arcade
|
||||
commit: ${{ needs.check.outputs.commit }}
|
||||
tag: ${{ needs.check.outputs.tag }}
|
||||
sha256: ${{ needs.check.outputs.sha256 }}
|
||||
secrets: inherit
|
||||
@@ -1,183 +0,0 @@
|
||||
name: Node app release
|
||||
|
||||
# Publishes one app the node offers that is built and checked in its own
|
||||
# repository, such as Arcade from Shovey's publisher. That publisher builds
|
||||
# the bundle, runs its screen checks, records the version in its repository's
|
||||
# apps/versions.json and attaches the checked bundle to a GitHub release
|
||||
# there. This workflow signs exactly those bytes with the package key, which
|
||||
# lives only in this repository's secrets, uploads the release to Waozi's
|
||||
# node and verifies what the node serves.
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
app:
|
||||
description: The app's name in its ledger, such as arcade
|
||||
required: true
|
||||
type: string
|
||||
repository:
|
||||
description: Repository whose commit records the release, such as waozixyz/arcade
|
||||
required: true
|
||||
type: string
|
||||
commit:
|
||||
description: Full commit in that repository whose apps/versions.json names the release
|
||||
required: true
|
||||
type: string
|
||||
tag:
|
||||
description: GitHub release in that repository with the checked bundle attached as APP.zx
|
||||
required: true
|
||||
type: string
|
||||
sha256:
|
||||
description: SHA-256 of the checked bundle; any other bytes are refused
|
||||
required: true
|
||||
type: string
|
||||
package_path:
|
||||
description: Directory containing the app's Ziran package
|
||||
default: '.'
|
||||
type: string
|
||||
ledger_path:
|
||||
description: Release ledger relative to that package directory
|
||||
default: apps/versions.json
|
||||
type: string
|
||||
# The node app follower publishes each new release through this same job.
|
||||
workflow_call:
|
||||
inputs:
|
||||
app:
|
||||
description: The app's name in its ledger, such as arcade
|
||||
required: true
|
||||
type: string
|
||||
repository:
|
||||
description: Repository whose commit records the release, such as waozixyz/arcade
|
||||
required: true
|
||||
type: string
|
||||
commit:
|
||||
description: Full commit in that repository whose apps/versions.json names the release
|
||||
required: true
|
||||
type: string
|
||||
tag:
|
||||
description: GitHub release in that repository with the checked bundle attached as APP.zx
|
||||
required: true
|
||||
type: string
|
||||
sha256:
|
||||
description: SHA-256 of the checked bundle; any other bytes are refused
|
||||
required: true
|
||||
type: string
|
||||
package_path:
|
||||
description: Directory containing the app's Ziran package
|
||||
default: '.'
|
||||
type: string
|
||||
ledger_path:
|
||||
description: Release ledger relative to that package directory
|
||||
default: apps/versions.json
|
||||
type: string
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
concurrency:
|
||||
group: inbe-package-publishing
|
||||
cancel-in-progress: false
|
||||
|
||||
jobs:
|
||||
release:
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
steps:
|
||||
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
|
||||
- name: Check separate-game archive validation
|
||||
run: python3 tests/node_app_games_test.py
|
||||
- name: Check the request
|
||||
env:
|
||||
APP: ${{ inputs.app }}
|
||||
REPOSITORY: ${{ inputs.repository }}
|
||||
COMMIT: ${{ inputs.commit }}
|
||||
TAG: ${{ inputs.tag }}
|
||||
SHA256: ${{ inputs.sha256 }}
|
||||
PACKAGE_PATH: ${{ inputs.package_path }}
|
||||
LEDGER_PATH: ${{ inputs.ledger_path }}
|
||||
run: |
|
||||
python3 - <<'PY'
|
||||
import os, re
|
||||
checks = {'APP': r'[a-z][a-z0-9-]{0,63}', 'REPOSITORY': r'waozixyz/[A-Za-z0-9._-]+',
|
||||
'COMMIT': r'[0-9a-f]{40}', 'TAG': r'[A-Za-z0-9._-]{1,100}', 'SHA256': r'[0-9a-f]{64}'}
|
||||
for name, pattern in checks.items():
|
||||
if not re.fullmatch(pattern, os.environ[name]):
|
||||
raise SystemExit(f'{name} is not valid')
|
||||
path_pattern = r'[A-Za-z0-9_-][A-Za-z0-9._-]*(?:/[A-Za-z0-9_-][A-Za-z0-9._-]*)*'
|
||||
for name in ('PACKAGE_PATH', 'LEDGER_PATH'):
|
||||
value = os.environ[name]
|
||||
if name == 'PACKAGE_PATH' and value == '.':
|
||||
continue
|
||||
if not re.fullmatch(path_pattern, value):
|
||||
raise SystemExit(f'{name} is not a relative package path')
|
||||
PY
|
||||
- name: Fetch the release record, the publisher and the checked bundle
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
APP: ${{ inputs.app }}
|
||||
REPOSITORY: ${{ inputs.repository }}
|
||||
COMMIT: ${{ inputs.commit }}
|
||||
TAG: ${{ inputs.tag }}
|
||||
SHA256: ${{ inputs.sha256 }}
|
||||
PACKAGE_PATH: ${{ inputs.package_path }}
|
||||
run: |
|
||||
set -eu
|
||||
work="$RUNNER_TEMP/node-app"
|
||||
mkdir -p "$work/bundles"
|
||||
git init -q "$work/source"
|
||||
git -C "$work/source" fetch -q --depth 1 "https://github.com/$REPOSITORY.git" "$COMMIT"
|
||||
git -C "$work/source" checkout -q FETCH_HEAD
|
||||
# The Apps publisher at the commit the release's own lock pins.
|
||||
apps=$(python3 -c 'import json,sys; print(next(p["commit"] for p in json.load(open(sys.argv[1]))["packages"] if p["url"].rstrip("/").removesuffix(".git").endswith("waozixyz/apps")))' "$work/source/$PACKAGE_PATH/ziran.lock")
|
||||
git init -q "$work/apps"
|
||||
git -C "$work/apps" fetch -q --depth 1 https://github.com/waozixyz/apps.git "$apps"
|
||||
git -C "$work/apps" checkout -q FETCH_HEAD
|
||||
gh release download "$TAG" --repo "$REPOSITORY" --pattern "$APP.zx" --dir "$work/bundles"
|
||||
echo "$SHA256 $work/bundles/$APP.zx" | sha256sum --check --strict
|
||||
python3 scripts/node_app_games.py --bundle "$work/bundles/$APP.zx" --list > "$work/required-games.txt"
|
||||
if [ -s "$work/required-games.txt" ]; then
|
||||
gh release download "$TAG" --repo "$REPOSITORY" --pattern "$APP.games.tar" --dir "$work/bundles"
|
||||
python3 scripts/node_app_games.py --bundle "$work/bundles/$APP.zx" \
|
||||
--archive "$work/bundles/$APP.games.tar" --output "$work/bundles/$APP.games"
|
||||
fi
|
||||
- name: Install signing dependencies
|
||||
run: sudo apt-get update && sudo apt-get install -y python3-cryptography
|
||||
- name: Configure publisher
|
||||
env:
|
||||
SIGNING_KEY: ${{ secrets.INBE_PACKAGE_SIGNING_KEY }}
|
||||
SSH_KEY: ${{ secrets.INBE_NODE_SSH_KEY }}
|
||||
SSH_HOSTS: ${{ secrets.INBE_NODE_KNOWN_HOSTS }}
|
||||
run: |
|
||||
python3 - <<'PY'
|
||||
import os
|
||||
from pathlib import Path
|
||||
directory = Path(os.environ['RUNNER_TEMP']) / 'inbe-publisher'
|
||||
directory.mkdir(mode=0o700)
|
||||
for filename, name in (('publisher.pem', 'SIGNING_KEY'), ('node.key', 'SSH_KEY'), ('known_hosts', 'SSH_HOSTS')):
|
||||
if not os.environ.get(name):
|
||||
raise SystemExit(f'{name} is not configured')
|
||||
path = directory / filename
|
||||
path.write_text(os.environ[name] + '\n')
|
||||
path.chmod(0o600)
|
||||
PY
|
||||
- name: Sign, publish to Waozi's Mesh node and verify
|
||||
env:
|
||||
APP: ${{ inputs.app }}
|
||||
KEY_ID: ${{ vars.INBE_PACKAGE_KEY_ID }}
|
||||
TARGET: ${{ secrets.INBE_NODE_SSH_TARGET }}
|
||||
STORE: ${{ secrets.INBE_NODE_PACKAGE_STORE }}
|
||||
PACKAGE_PATH: ${{ inputs.package_path }}
|
||||
LEDGER_PATH: ${{ inputs.ledger_path }}
|
||||
run: |
|
||||
set -eu
|
||||
work="$RUNNER_TEMP/node-app"
|
||||
export INBE_SSH_IDENTITY="$RUNNER_TEMP/inbe-publisher/node.key"
|
||||
export INBE_SSH_KNOWN_HOSTS="$RUNNER_TEMP/inbe-publisher/known_hosts"
|
||||
python3 "$work/apps/scripts/node_release.py" --store "$work/releases" --node-app "$APP" \
|
||||
--key "$RUNNER_TEMP/inbe-publisher/publisher.pem" --key-id "$KEY_ID" \
|
||||
--publishers apps/publishers.json --app-ledger "$work/source/$PACKAGE_PATH/$LEDGER_PATH" \
|
||||
--bundle-directory "$work/bundles" \
|
||||
--ssh-target "$TARGET" --remote-store "$STORE" --verify-origin https://api.waozi.xyz
|
||||
- name: Remove signing material
|
||||
if: always()
|
||||
run: rm -rf "$RUNNER_TEMP/inbe-publisher"
|
||||
@@ -1,147 +0,0 @@
|
||||
name: App packages
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [master]
|
||||
paths:
|
||||
- 'apps/**'
|
||||
- 'assets/**'
|
||||
- 'locales/**'
|
||||
- 'themes/**'
|
||||
- 'scripts/prepare-package-assets.py'
|
||||
- 'src/**'
|
||||
- 'scripts/build-apps.sh'
|
||||
- 'scripts/build-node-apps.sh'
|
||||
- 'scripts/package-release.py'
|
||||
- 'scripts/practice_content.py'
|
||||
- 'scripts/practice_media.py'
|
||||
- 'design/tai-chi/narration*.json'
|
||||
- 'design/tai-chi/text/**'
|
||||
- 'scripts/generate-package-versions.py'
|
||||
- 'scripts/update-package-version.py'
|
||||
- 'scripts/check-package-versions.py'
|
||||
- 'scripts/check-package-publishers.py'
|
||||
- 'scripts/package-manifests.py'
|
||||
- 'tests/package_manifests_test.py'
|
||||
- 'tests/package_upload_test.py'
|
||||
- 'tests/package_versions_test.py'
|
||||
- 'tests/package_workflow_test.py'
|
||||
- 'tests/package_release_test.py'
|
||||
- 'tests/package_manager_host.c'
|
||||
- 'tests/package_manager_behavior.zi'
|
||||
- 'ziran.lock'
|
||||
- '.github/workflows/packages.yml'
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
concurrency:
|
||||
group: inbe-package-publishing
|
||||
cancel-in-progress: false
|
||||
|
||||
jobs:
|
||||
packages:
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 30
|
||||
steps:
|
||||
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
|
||||
- uses: ./.github/actions/ziran-packages
|
||||
- name: Install signing and test dependencies
|
||||
run: |
|
||||
sudo apt-get update && sudo apt-get install -y python3-cryptography python3-fonttools
|
||||
.github/scripts/install-apt-packages.sh .github/apt/test-packages.txt
|
||||
- name: Build independent packages and check signatures
|
||||
run: |
|
||||
make package-version-test
|
||||
make package-workflow-test
|
||||
make package-manifest-test
|
||||
make package-upload-test
|
||||
make apps node-apps build-laws
|
||||
python3 tests/package_release_test.py
|
||||
- name: Run new packages in the last released app
|
||||
run: python3 tests/package_compat_test.py --skip-forward
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ github.token }}
|
||||
- name: Configure publisher
|
||||
id: publisher
|
||||
env:
|
||||
SIGNING_KEY: ${{ secrets.INBE_PACKAGE_SIGNING_KEY }}
|
||||
KEY_ID: ${{ vars.INBE_PACKAGE_KEY_ID }}
|
||||
SSH_KEY: ${{ secrets.INBE_NODE_SSH_KEY }}
|
||||
SSH_HOSTS: ${{ secrets.INBE_NODE_KNOWN_HOSTS }}
|
||||
TARGET: ${{ secrets.INBE_NODE_SSH_TARGET }}
|
||||
STORE: ${{ secrets.INBE_NODE_PACKAGE_STORE }}
|
||||
run: |
|
||||
python3 - <<'PY'
|
||||
import os
|
||||
from pathlib import Path
|
||||
signing = all(os.environ.get(name) for name in ('SIGNING_KEY', 'KEY_ID'))
|
||||
configured = signing and all(os.environ.get(name) for name in ('SSH_KEY', 'SSH_HOSTS', 'TARGET', 'STORE'))
|
||||
with open(os.environ['GITHUB_OUTPUT'], 'a') as output:
|
||||
output.write('signing=' + str(signing).lower() + '\n')
|
||||
output.write('configured=' + str(configured).lower() + '\n')
|
||||
if signing:
|
||||
directory = Path(os.environ['RUNNER_TEMP']) / 'inbe-publisher'
|
||||
directory.mkdir(mode=0o700)
|
||||
files = [('publisher.pem', 'SIGNING_KEY')]
|
||||
if configured:
|
||||
files += [('node.key', 'SSH_KEY'), ('known_hosts', 'SSH_HOSTS')]
|
||||
for filename, name in files:
|
||||
path = directory / filename
|
||||
path.write_text(os.environ[name] + '\n')
|
||||
path.chmod(0o600)
|
||||
if signing and not configured:
|
||||
print('Node deployment is not configured; signed releases will be archived for installation on the node.')
|
||||
elif not signing:
|
||||
print('Signing is not configured; unsigned build artifacts will be archived without publication.')
|
||||
PY
|
||||
- name: Sign app releases
|
||||
if: steps.publisher.outputs.signing == 'true'
|
||||
env:
|
||||
KEY_ID: ${{ vars.INBE_PACKAGE_KEY_ID }}
|
||||
run: |
|
||||
python3 scripts/check-package-publishers.py
|
||||
python3 scripts/package-release.py --store build/package-releases \
|
||||
--key "$RUNNER_TEMP/inbe-publisher/publisher.pem" --key-id "$KEY_ID"
|
||||
- name: Sign and publish to Waozi's Mesh node
|
||||
if: steps.publisher.outputs.configured == 'true'
|
||||
env:
|
||||
KEY_ID: ${{ vars.INBE_PACKAGE_KEY_ID }}
|
||||
TARGET: ${{ secrets.INBE_NODE_SSH_TARGET }}
|
||||
STORE: ${{ secrets.INBE_NODE_PACKAGE_STORE }}
|
||||
run: |
|
||||
export INBE_SSH_IDENTITY="$RUNNER_TEMP/inbe-publisher/node.key"
|
||||
export INBE_SSH_KNOWN_HOSTS="$RUNNER_TEMP/inbe-publisher/known_hosts"
|
||||
python3 scripts/package-release.py --store build/package-releases \
|
||||
--key "$RUNNER_TEMP/inbe-publisher/publisher.pem" --key-id "$KEY_ID" \
|
||||
--ssh-target "$TARGET" --remote-store "$STORE" \
|
||||
--verify-origin https://api.waozi.xyz
|
||||
# Each app the node offers publishes on its own when its ledger names a
|
||||
# newer release; the node keeps its newest three releases for rollback.
|
||||
- name: Publish new releases of the apps the node offers
|
||||
if: steps.publisher.outputs.configured == 'true'
|
||||
env:
|
||||
KEY_ID: ${{ vars.INBE_PACKAGE_KEY_ID }}
|
||||
TARGET: ${{ secrets.INBE_NODE_SSH_TARGET }}
|
||||
STORE: ${{ secrets.INBE_NODE_PACKAGE_STORE }}
|
||||
run: |
|
||||
export INBE_SSH_IDENTITY="$RUNNER_TEMP/inbe-publisher/node.key"
|
||||
export INBE_SSH_KNOWN_HOSTS="$RUNNER_TEMP/inbe-publisher/known_hosts"
|
||||
python3 scripts/package-release.py --node-apps --store build/package-releases \
|
||||
--key "$RUNNER_TEMP/inbe-publisher/publisher.pem" --key-id "$KEY_ID" \
|
||||
--ssh-target "$TARGET" --remote-store "$STORE" \
|
||||
--verify-origin https://api.waozi.xyz
|
||||
- name: Archive packages
|
||||
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
|
||||
with:
|
||||
name: inbe-app-packages
|
||||
path: |
|
||||
build/inbe.zx
|
||||
build/apps/*.zx
|
||||
build/node-apps/*.zx
|
||||
build/package-releases/
|
||||
if-no-files-found: error
|
||||
- name: Remove signing material
|
||||
if: always()
|
||||
run: rm -rf "$RUNNER_TEMP/inbe-publisher"
|
||||
@@ -1,31 +0,0 @@
|
||||
name: Refresh Gitea Pages after release
|
||||
|
||||
on:
|
||||
workflow_run:
|
||||
workflows: [Release]
|
||||
types: [completed]
|
||||
branches: [master]
|
||||
|
||||
permissions: {}
|
||||
|
||||
jobs:
|
||||
refresh-gitea-after-release:
|
||||
name: Refresh Gitea Pages after a successful release
|
||||
if: github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Dispatch the current Gitea master workflow
|
||||
env:
|
||||
BREEZE_PAGES_DISPATCH_TOKEN: ${{ secrets.BREEZE_PAGES_DISPATCH_TOKEN }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
if [ -z "$BREEZE_PAGES_DISPATCH_TOKEN" ]; then
|
||||
echo '::warning::BREEZE_PAGES_DISPATCH_TOKEN is missing'
|
||||
exit 0
|
||||
fi
|
||||
curl --fail-with-body --silent --show-error --max-time 30 \
|
||||
--request POST \
|
||||
--header "Authorization: token $BREEZE_PAGES_DISPATCH_TOKEN" \
|
||||
--header 'Content-Type: application/json' \
|
||||
--data '{"ref":"master"}' \
|
||||
'https://git.waozi.xyz/api/v1/repos/waozi/breeze/actions/workflows/pages.yml/dispatches'
|
||||
@@ -1,60 +0,0 @@
|
||||
name: Publish Amazon Appstore
|
||||
|
||||
# Retries the Amazon Appstore upload and submission for an already published
|
||||
# release. The Release workflow runs the same script for every new version.
|
||||
"on":
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: Published release version, such as 2.1.60
|
||||
required: true
|
||||
type: string
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
publish:
|
||||
name: Upload release APK to Amazon Appstore
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 30
|
||||
env:
|
||||
AMAZON_CLIENT_ID: ${{ secrets.AMAZON_CLIENT_ID }}
|
||||
AMAZON_CLIENT_SECRET: ${{ secrets.AMAZON_CLIENT_SECRET }}
|
||||
AMAZON_APP_ID: ${{ secrets.AMAZON_APP_ID }}
|
||||
VERSION: ${{ inputs.version }}
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Download the published release APK
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
if ! [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
||||
echo "::error::version must be numeric, such as 2.1.60"
|
||||
exit 1
|
||||
fi
|
||||
apk="inbe-$VERSION.apk"
|
||||
mkdir -p build/release/android
|
||||
gh release download "v$VERSION" --repo "$GITHUB_REPOSITORY" --pattern "$apk" --dir build/release/android
|
||||
expected=$(gh release view "v$VERSION" --repo "$GITHUB_REPOSITORY" --json assets \
|
||||
--jq ".assets[] | select(.name == \"$apk\") | .digest")
|
||||
actual="sha256:$(sha256sum "build/release/android/$apk" | cut -d' ' -f1)"
|
||||
if [ "$actual" != "$expected" ]; then
|
||||
echo "::error::$apk digest $actual does not match the release asset $expected"
|
||||
exit 1
|
||||
fi
|
||||
echo "Verified $apk $actual"
|
||||
|
||||
- name: Set up Node
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '24'
|
||||
|
||||
- name: Upload APK to Amazon Appstore
|
||||
env:
|
||||
AMAZON_RELEASE_FILE: build/release/android/inbe-${{ inputs.version }}.apk
|
||||
run: node scripts/upload-amazon-appstore.mjs
|
||||
@@ -1,292 +0,0 @@
|
||||
name: Publish OpenStore
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
revision:
|
||||
description: Exact committed source to build (defaults to the selected ref)
|
||||
required: false
|
||||
type: string
|
||||
build_only:
|
||||
description: Verify and archive the package without publishing it
|
||||
type: boolean
|
||||
default: false
|
||||
changelog:
|
||||
description: Changelog text for the OpenStore revision
|
||||
required: false
|
||||
default: ""
|
||||
channel:
|
||||
description: OpenStore channel
|
||||
required: false
|
||||
default: focal
|
||||
# Release-created tags/events do not start another workflow with GITHUB_TOKEN.
|
||||
workflow_run:
|
||||
workflows: [Release]
|
||||
types: [completed]
|
||||
branches: [master]
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
source:
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 5
|
||||
if: github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success'
|
||||
outputs:
|
||||
revision: ${{ steps.select.outputs.revision }}
|
||||
run: ${{ steps.select.outputs.run }}
|
||||
steps:
|
||||
- name: Select the immutable release source
|
||||
id: select
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
REQUESTED_REVISION: ${{ inputs.revision || github.sha }}
|
||||
OPENSTORE_CHANNEL: ${{ inputs.channel || 'focal' }}
|
||||
run: |
|
||||
python3 - <<'PY'
|
||||
import datetime
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import re
|
||||
import subprocess
|
||||
|
||||
def api(path):
|
||||
return json.loads(subprocess.check_output(["gh", "api", path]))
|
||||
|
||||
def timestamp(value):
|
||||
return datetime.datetime.fromisoformat(value.replace("Z", "+00:00"))
|
||||
|
||||
def finish(revision=""):
|
||||
with open(os.environ["GITHUB_OUTPUT"], "a") as output:
|
||||
output.write(f"revision={revision}\nrun={'true' if revision else 'false'}\n")
|
||||
raise SystemExit(0)
|
||||
|
||||
revision = os.environ["REQUESTED_REVISION"]
|
||||
if os.environ["GITHUB_EVENT_NAME"] == "workflow_run":
|
||||
event = json.loads(Path(os.environ["GITHUB_EVENT_PATH"]).read_text())
|
||||
repo = os.environ["GITHUB_REPOSITORY"]
|
||||
release = api(f"repos/{repo}/releases/latest")
|
||||
if release["draft"] or release["prerelease"] or timestamp(release["published_at"]) < timestamp(event["workflow_run"]["created_at"]):
|
||||
print("This run did not publish a new stable release; no OpenStore update.")
|
||||
finish()
|
||||
match = re.fullmatch(r"v(\d+)\.(\d+)\.(\d+)", release["tag_name"])
|
||||
assert match, "Expected a numeric published release"
|
||||
version = tuple(map(int, match.groups()))
|
||||
store = json.loads(subprocess.check_output([
|
||||
"curl", "--fail", "--silent", "--show-error", "--retry", "3",
|
||||
"https://open-store.io/api/v4/apps/inbe"]))
|
||||
assert store.get("success"), "OpenStore metadata lookup failed"
|
||||
for item in store["data"].get("revisions", []):
|
||||
existing = re.fullmatch(r"(\d+)\.(\d+)\.(\d+)", item.get("version", ""))
|
||||
if item.get("channel") == os.environ["OPENSTORE_CHANNEL"] and item.get("architecture") == "arm64" and existing and tuple(map(int, existing.groups())) >= version:
|
||||
print("OpenStore already has this release or a newer one.")
|
||||
finish()
|
||||
revision = api(f"repos/{repo}/commits/{release['tag_name']}")["sha"]
|
||||
assert re.fullmatch(r"[0-9a-f]{40}", revision), "An exact commit is required"
|
||||
finish(revision)
|
||||
PY
|
||||
|
||||
publish:
|
||||
needs: source
|
||||
if: needs.source.outputs.run == 'true'
|
||||
concurrency:
|
||||
# Skipped source checks and diagnostics cannot replace a pending release.
|
||||
group: openstore-${{ inputs.channel || 'focal' }}-${{ inputs.build_only && 'verify' || 'publish' }}
|
||||
cancel-in-progress: false
|
||||
runs-on: ubuntu-24.04
|
||||
# The published focal channel must use Focal's ARM64 libc and libraries.
|
||||
container: clickable/ci-20.04-arm64@sha256:c6227ffcdb2abb50101a8469dd2a8df3ffd9208e04a3e07e351db63d36bec5d6
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
timeout-minutes: 90
|
||||
|
||||
env:
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
# Ziran runs on the builder; only Click artifacts use the cross compiler.
|
||||
CC: gcc
|
||||
CXX: g++
|
||||
OPENSTORE_APP_ID: inbe
|
||||
OPENSTORE_CHANNEL: ${{ github.event.inputs.channel || 'focal' }}
|
||||
CHANGELOG: ${{ github.event.inputs.changelog || github.event.release.name || github.event.release.tag_name || '' }}
|
||||
|
||||
steps:
|
||||
- name: Require an immutable source
|
||||
env:
|
||||
CANDIDATE: ${{ needs.source.outputs.revision }}
|
||||
run: |
|
||||
[[ "$CANDIDATE" =~ ^[0-9a-f]{40}$ ]] || { echo 'An exact commit is required'; exit 1; }
|
||||
|
||||
- name: Install the Focal build environment
|
||||
run: |
|
||||
set -euo pipefail
|
||||
apt-get update
|
||||
apt-get install -y --no-install-recommends \
|
||||
build-essential binutils-aarch64-linux-gnu ca-certificates ccache \
|
||||
click curl gcc-aarch64-linux-gnu git git-lfs jq make patchelf \
|
||||
perl pkg-config tcl xz-utils zlib1g-dev libbz2-1.0 libffi7 liblzma5 \
|
||||
libsqlite3-0 libssl-dev \
|
||||
libsdl2-dev:arm64 libssl-dev:arm64 zlib1g-dev:arm64 \
|
||||
libcairo2-dev:arm64 libpango1.0-dev:arm64 libfontconfig1-dev:arm64 \
|
||||
libfreetype6-dev:arm64 libglib2.0-dev:arm64 libx11-dev:arm64
|
||||
apt-get install -y --no-install-recommends libwayland-bin \
|
||||
libwayland-dev:arm64 libxkbcommon-dev:arm64 libpulse-dev:arm64 libdbus-1-dev:arm64
|
||||
|
||||
- name: Set up build Python for Focal
|
||||
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
|
||||
with:
|
||||
# Last upstream Actions build that supports Ubuntu 20.04.
|
||||
python-version: '3.12.10'
|
||||
|
||||
- name: Install current build tools
|
||||
run: |
|
||||
# The project uses GNU Make 4.3+ function/comment parsing.
|
||||
python3 -m pip install cmake==3.28.4 fonttools==4.58.5 gnumake==4.4.1
|
||||
make --version
|
||||
|
||||
- name: Build Focal TLS libraries
|
||||
run: |
|
||||
set -euo pipefail
|
||||
# The locked Curl requires OpenSSL 3. Build its current LTS for
|
||||
# Focal instead of importing a newer distribution's libc.
|
||||
tls_source="$RUNNER_TEMP/inbe-openssl"
|
||||
mkdir -p "$tls_source"
|
||||
curl --fail --location --retry 3 \
|
||||
https://github.com/openssl/openssl/releases/download/openssl-3.5.9/openssl-3.5.9.tar.gz \
|
||||
--output "$tls_source/source.tar.gz"
|
||||
printf '%s %s\n' \
|
||||
603f5602e2eef00d77fbd429d34dcd5822bb301757a1bc9cdb24c670f1eb859a \
|
||||
"$tls_source/source.tar.gz" | sha256sum --check -
|
||||
tar -xzf "$tls_source/source.tar.gz" -C "$tls_source"
|
||||
cd "$tls_source/openssl-3.5.9"
|
||||
./Configure linux-aarch64 --cross-compile-prefix=aarch64-linux-gnu- \
|
||||
--prefix=/opt/inbe-openssl --libdir=lib --openssldir=/etc/ssl shared no-tests
|
||||
make -j2 build_sw
|
||||
make install_sw
|
||||
cp LICENSE.txt /opt/inbe-openssl/lib/OpenSSL-LICENSE.txt
|
||||
|
||||
- name: Build Focal SDL with Wayland
|
||||
run: |
|
||||
set -euo pipefail
|
||||
sdl_source="$RUNNER_TEMP/inbe-sdl2"
|
||||
mkdir -p "$sdl_source"
|
||||
curl --fail --location --retry 3 \
|
||||
https://github.com/libsdl-org/SDL/releases/download/release-2.32.10/SDL2-2.32.10.tar.gz \
|
||||
--output "$sdl_source/source.tar.gz"
|
||||
printf '%s %s\n' \
|
||||
5f5993c530f084535c65a6879e9b26ad441169b3e25d789d83287040a9ca5165 \
|
||||
"$sdl_source/source.tar.gz" | sha256sum --check -
|
||||
tar -xzf "$sdl_source/source.tar.gz" -C "$sdl_source"
|
||||
unset PKG_CONFIG_PATH
|
||||
export PKG_CONFIG_LIBDIR=/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig
|
||||
cmake_bin="$(python3 -c 'import cmake; print(cmake.CMAKE_BIN_DIR + "/cmake")')"
|
||||
"$cmake_bin" -S "$sdl_source/SDL2-2.32.10" -B "$sdl_source/build" \
|
||||
-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=aarch64 \
|
||||
-DCMAKE_C_COMPILER=/usr/bin/aarch64-linux-gnu-gcc \
|
||||
-DCMAKE_BUILD_TYPE=MinSizeRel \
|
||||
-DCMAKE_INSTALL_PREFIX=/opt/inbe-sdl2 -DCMAKE_INSTALL_LIBDIR=lib \
|
||||
-DSDL_SHARED=ON -DSDL_STATIC=OFF -DSDL_TEST=OFF \
|
||||
-DSDL_WAYLAND=ON -DSDL_WAYLAND_SHARED=ON -DSDL_WAYLAND_LIBDECOR=OFF \
|
||||
-DSDL_X11=ON -DSDL_KMSDRM=OFF -DSDL_OPENGL=OFF -DSDL_OPENGLES=ON \
|
||||
-DSDL_PULSEAUDIO=ON -DSDL_ALSA=OFF
|
||||
grep -q '^#define SDL_VIDEO_DRIVER_WAYLAND 1' "$sdl_source/build/SDL_config.h.intermediate"
|
||||
"$cmake_bin" --build "$sdl_source/build" --parallel 2
|
||||
"$cmake_bin" --install "$sdl_source/build"
|
||||
cp "$sdl_source/SDL2-2.32.10/LICENSE.txt" /opt/inbe-sdl2/lib/SDL2-LICENSE.txt
|
||||
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
ref: ${{ needs.source.outputs.revision }}
|
||||
fetch-depth: 0
|
||||
lfs: true
|
||||
|
||||
- name: Fetch Ziran packages
|
||||
uses: ./.github/actions/ziran-packages
|
||||
|
||||
- name: Scan Tracked Files and History
|
||||
run: |
|
||||
set -euo pipefail
|
||||
# The SDK container runs under a different UID from the checkout.
|
||||
git config --global --add safe.directory "$GITHUB_WORKSPACE"
|
||||
git ls-files -z >/dev/null
|
||||
python3 scripts/check-secrets.py --working-tree
|
||||
python3 scripts/check-secrets.py --history
|
||||
|
||||
- name: Build Click package
|
||||
run: |
|
||||
set -euo pipefail
|
||||
# Absolute paths: CMake cross builds do not resolve bare tool names
|
||||
# (CMAKE_AR=aarch64-linux-gnu-ar ends up NOTFOUND and the liboqs
|
||||
# archive step fails with "No such file or directory").
|
||||
export AARCH64_CC="$(command -v aarch64-linux-gnu-gcc)"
|
||||
export AARCH64_AR="$(command -v aarch64-linux-gnu-ar)"
|
||||
export AARCH64_RANLIB="$(command -v aarch64-linux-gnu-ranlib)"
|
||||
export OPENSSL_ROOT_DIR=/opt/inbe-openssl
|
||||
# Cross builds cannot autodetect the device's CA store.
|
||||
export CMAKE_TOOLCHAIN_FILE="$RUNNER_TEMP/inbe-focal-arm64.cmake"
|
||||
cat > "$CMAKE_TOOLCHAIN_FILE" <<'CMAKE'
|
||||
set(CMAKE_SYSTEM_NAME Linux)
|
||||
set(CMAKE_SYSTEM_PROCESSOR aarch64)
|
||||
set(CMAKE_C_COMPILER /usr/bin/aarch64-linux-gnu-gcc)
|
||||
set(OPENSSL_ROOT_DIR /opt/inbe-openssl CACHE PATH "Focal-built TLS")
|
||||
set(CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt CACHE FILEPATH "Device CA bundle")
|
||||
set(CURL_CA_PATH /etc/ssl/certs CACHE PATH "Device CA directory")
|
||||
CMAKE
|
||||
unset PKG_CONFIG_PATH
|
||||
export AARCH64_PKG_CONFIG_PATH=/opt/inbe-openssl/lib/pkgconfig:/opt/inbe-sdl2/lib/pkgconfig:/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig
|
||||
export PKG_CONFIG_LIBDIR="$AARCH64_PKG_CONFIG_PATH"
|
||||
# Kryon's desktop host: SDL2 windows drawn with Cairo and Pango.
|
||||
desktop_host_packages="sdl2 cairo freetype2 pangocairo fontconfig gio-2.0 x11"
|
||||
export AARCH64_DESKTOP_HOST_CFLAGS="$(pkg-config --cflags $desktop_host_packages)"
|
||||
# Search bundled TLS and SDL before the SDK's older system copies.
|
||||
export AARCH64_DESKTOP_HOST_LDLIBS="-L/opt/inbe-openssl/lib $(pkg-config --libs $desktop_host_packages)"
|
||||
click_curl_dir="$PWD/vendor-builds/click/arm64/curl"
|
||||
export AARCH64_KRYON_CURL_CFLAGS="-DCURL_STATICLIB -I$click_curl_dir/include"
|
||||
export AARCH64_KRYON_CURL_LDLIBS="$click_curl_dir/lib/libcurl.a -L/opt/inbe-openssl/lib -lssl -lcrypto -lz -lpthread"
|
||||
# The framework supplies graphics libraries for the device's GPU.
|
||||
atomic_runtime="$("$AARCH64_CC" -print-file-name=libatomic.so.1)"
|
||||
export AARCH64_CLICK_RUNTIME_LIBS="$(pkg-config --variable=libdir sdl2)/libSDL2-2.0.so.0 /opt/inbe-sdl2/lib/SDL2-LICENSE.txt /opt/inbe-openssl/lib/libssl.so.3 /opt/inbe-openssl/lib/libcrypto.so.3 /opt/inbe-openssl/lib/OpenSSL-LICENSE.txt $atomic_runtime /usr/lib/aarch64-linux-gnu/libz.so.1"
|
||||
for runtime_file in $AARCH64_CLICK_RUNTIME_LIBS; do
|
||||
test -f "$runtime_file"
|
||||
done
|
||||
# Make otherwise prefers the SDK's older /usr/bin/cmake.
|
||||
export CMAKE="$(python3 -c 'import cmake; print(cmake.CMAKE_BIN_DIR + "/cmake")')"
|
||||
"$CMAKE" --version
|
||||
make CMAKE="$CMAKE" LDFLAGS="-Wl,--gc-sections -s -L/opt/inbe-openssl/lib" CLICK_ARCH=arm64 click
|
||||
python3 scripts/check-click-abi.py build/dist/click/*.click
|
||||
|
||||
- name: Show package contents
|
||||
run: |
|
||||
set -euo pipefail
|
||||
click_file="$(ls -t build/dist/click/*.click | head -1)"
|
||||
echo "Built $click_file"
|
||||
dpkg-deb --contents "$click_file" | grep -E 'manifest.json|inbe.png|metainfo|inbe.desktop'
|
||||
|
||||
- name: Archive the verified package source and digest
|
||||
run: |
|
||||
mkdir -p build/release/openstore
|
||||
cp build/dist/click/*.click build/release/openstore/
|
||||
git rev-parse HEAD > build/release/openstore/source-commit.txt
|
||||
cd build/release/openstore
|
||||
sha256sum *.click > SHA256SUMS
|
||||
|
||||
- name: Preserve Click artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: openstore-click
|
||||
path: build/release/openstore/*
|
||||
if-no-files-found: error
|
||||
|
||||
- name: Publish to OpenStore
|
||||
if: ${{ !inputs.build_only }}
|
||||
env:
|
||||
OPENSTORE_API_KEY: ${{ secrets.OPENSTORE_API_KEY }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
version="$(python3 scripts/check-version.py --print-version)"
|
||||
python3 scripts/check-phone-check.py "$version" --revision "$(git rev-parse HEAD)"
|
||||
click_file="$(ls -t build/dist/click/*.click | head -1)"
|
||||
scripts/publish-openstore.sh "$click_file"
|
||||
File diff suppressed because it is too large.
Load diff
-43
@@ -8,29 +8,16 @@
|
||||
.claude/
|
||||
.local/
|
||||
.codex/
|
||||
.zcode
|
||||
.agents/
|
||||
.kryon-ide-state
|
||||
.cache/
|
||||
.ccache
|
||||
*.wasm
|
||||
build/
|
||||
/backup/
|
||||
/work/
|
||||
/notes/
|
||||
/output/
|
||||
tmp/
|
||||
vendor-builds/
|
||||
node_modules
|
||||
*.nix-defexpr
|
||||
*.npm
|
||||
*.nix-profile
|
||||
.claude.json
|
||||
.bash_history
|
||||
.env
|
||||
.env.play
|
||||
.secrets/
|
||||
/inbe.log
|
||||
|
||||
|
||||
*.exe
|
||||
@@ -39,9 +26,6 @@ node_modules
|
||||
/main
|
||||
!droid/app/src/main
|
||||
droid/app/src/main/assets
|
||||
droid/app/src/gplay/google-services.json
|
||||
droid/*.apk
|
||||
droid/*.aab
|
||||
|
||||
.direnv/
|
||||
.node-repl-history
|
||||
@@ -61,36 +45,9 @@ Captures/
|
||||
Thumbs.db
|
||||
*.bak
|
||||
*.swp
|
||||
*.core
|
||||
|
||||
local.properties
|
||||
*.o
|
||||
*.9
|
||||
*.8
|
||||
*.a
|
||||
__pycache__/
|
||||
*.py[cod]
|
||||
|
||||
/pro/
|
||||
.kotlin/
|
||||
ziran.local.toml
|
||||
|
||||
# Sun salutation reference videos and frames, and check images; the
|
||||
# renderers write their videos and frames under build/.
|
||||
design/sun-salutation/*/reference.mp4
|
||||
design/sun-salutation/*/reference-*.png
|
||||
design/sun-salutation/generated-video-cut/source.mp4
|
||||
design/sun-salutation/girl-parts/head-layers-check.png
|
||||
.wrangler/
|
||||
|
||||
# Video and promo working material stays local (owner 2026-10-23).
|
||||
/design/promo-film/
|
||||
/design/videos/
|
||||
/design/lumi-promo/
|
||||
|
||||
# Sun Salutation motion exported for the three.js lab (render-sun-salutation-live.py --motion).
|
||||
/design/tai-chi/lab/
|
||||
|
||||
# Generated Android test classes and Gradle fixtures.
|
||||
/tests/android-diary-photo/bin/
|
||||
/tests/android-text-selection/bin/
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
[submodule "vendor/raylib"]
|
||||
path = vendor/raylib
|
||||
url = https://github.com/raysan5/raylib.git
|
||||
[submodule "vendor/rini"]
|
||||
path = vendor/rini
|
||||
url = https://github.com/raysan5/rini.git
|
||||
[submodule "vendor/flint"]
|
||||
path = vendor/flint
|
||||
url = https://github.com/waozixyz/flint
|
||||
[submodule "vendor/otfchop"]
|
||||
path = vendor/otfchop
|
||||
url = https://github.com/waozixyz/otfchop
|
||||
@@ -1,108 +0,0 @@
|
||||
# Inbe repository rules
|
||||
|
||||
## Ownership and releases
|
||||
|
||||
- Dependencies are Ziran packages pinned in `ziran.toml`/`ziran.lock` and
|
||||
linked under `build/packages/`; there is no `vendor/`. Never edit a package
|
||||
checkout. Change Kryon (or any dependency) in its own repository on `master`,
|
||||
commit and push there, then run `ziran update NAME` here and commit
|
||||
`ziran.lock`. Run `make package-check` after dependency changes. For local
|
||||
debugging, map a package to a working repository in the ignored
|
||||
`ziran.local.toml`; release builds use `PACKAGE_FLAGS=--locked`.
|
||||
- Practice media (pictures, course data, recordings) lives in the
|
||||
`practices` package (waozixyz/practices), not under
|
||||
`assets/`. Commit media there, then update the lock here.
|
||||
- Bump versions only for a release actually being made. Until then, note
|
||||
every change under one `## [Unreleased]` section of `CHANGELOG.md` (and of
|
||||
`apps/<app>/CHANGELOG.md`); App packages waits for the next version. At
|
||||
release, number that section, then run `./update_version.sh`.
|
||||
The canonical macros are `APP_VERSION_STRING`, `APP_VERSION_MAJOR`,
|
||||
`APP_VERSION_MINOR`, and `APP_VERSION_PATCH`; do not create aliases.
|
||||
Only the GitHub Actions release workflow creates or pushes release tags.
|
||||
- A new version publishes only with a passing phone check of its exact app
|
||||
content (`app_tree` over `APP_PATHS` in `scripts/phone-check.py`). Release
|
||||
with `RELEASE_READY_REVISION=COMMIT make release-ready`, then
|
||||
`make release REVISION=COMMIT APK=PATH BUILD_RECEIPT=PATH` with the development
|
||||
Moto connected. The APK and its provenance come from the same fixed-source
|
||||
overlay. Master, locks and peer edits keep changing freely. The release
|
||||
commit retains the tested source; if master advanced, a merge preserves
|
||||
all newer source and history. The workflow can release that exact commit
|
||||
through its `revision` input. Never freeze the checkout for testing.
|
||||
See [docs/apps.md](docs/apps.md#verification).
|
||||
- Packages declare the oldest host interface they run on (`host_api` per app
|
||||
in `apps/versions.json`); the host runs `oldest_host_api` to `host_api`.
|
||||
Raise `host_api` when the host interface changes and `oldest_host_api` only
|
||||
when it can no longer run older packages. `make package-compat-test` runs
|
||||
the node's packages in this build and new packages in the last release.
|
||||
`zx_revision` there is the ZX executable revision the host runs; update
|
||||
checks send it and the node offers only packages whose `.zx` header has
|
||||
it, and the publisher refuses a payload of another revision. Change it
|
||||
with the Ziran pin, together with `oldest_host_api` and `host_api`.
|
||||
- Goal (owner, 2026-10-11): every app updates through its own package
|
||||
without a new APK. Work toward it in small steps alongside requested work;
|
||||
discuss larger moves with the owner first. Put app screens, rules and text
|
||||
in `apps/<app>/`, not in the host under `src/`. Practices draws its
|
||||
screen layouts in `apps/practice/`; its native figure painters and
|
||||
platform effects remain host capabilities (see [docs/apps.md](docs/apps.md)).
|
||||
Keep the host interface small and generic (storage, network, locale,
|
||||
platform effects), because
|
||||
each new host call needs an APK before a package can use it. Apps share
|
||||
data only through the host interface, never another app's internals.
|
||||
- Translate changed strings in every affected locale; no English placeholders.
|
||||
- Keep Breeze/Lumi/store notes to 2–3 short core, Practices or Habits lines, without links or Android versions; game changes belong only in their package changelogs.
|
||||
- `make locale-translated-test` fails on any locale string that still equals
|
||||
its English text. Translate it; add it to `tests/locale_same_as_english.txt`
|
||||
only when it is a real brand name, loanword, or format string.
|
||||
|
||||
## Machine-checked contracts
|
||||
|
||||
- `make build-laws` is mandatory for native, web, and Windows artifacts;
|
||||
Gradle and CMake enforce the same version and proof checks independently.
|
||||
Never bypass a failed gate.
|
||||
- Laws are Ziran `#law` obligations checked by `ziran check`. Retry behavior
|
||||
lives in `src/app/sync_retry.zi` with its laws in `sync_retry_laws.zi`;
|
||||
private-data names live in `src/storage/storage_layout.zi` with laws in
|
||||
`storage_layout_laws.zi`. Change the implementation freely, but do not
|
||||
weaken laws to make an implementation pass. Contract changes require
|
||||
explicit product intent and separate review from implementation changes.
|
||||
- Run `make proof-test sync-recovery-test version-test` for these contracts.
|
||||
Coverage, trust boundaries, and the next proof migrations are described in
|
||||
[docs/build-laws.md](docs/build-laws.md).
|
||||
|
||||
## Public UI and sync boundaries
|
||||
|
||||
- Use Kryon's namespaced widgets directly, each imported by package
|
||||
(`Text :: #import "kryon/text";`): `Text.Draw(session, Text.Props)`,
|
||||
`Image.Draw(session, Image.Props)` and `Button.Draw(session, Button.Props)`.
|
||||
Semantic images use the same `Image` surface; file pictures come with
|
||||
`kryon/image` and button icons with `kryon/icon`. No positional Text,
|
||||
`Kryon`/`Widgets` facades, legacy drawing calls, alternate widgets, or thin
|
||||
local forwarding wrappers. Keep meaningful compositions and gestures; use
|
||||
standard `Checkbox.Draw` and `Toggle.Draw`.
|
||||
Run `make clean-text-api-check button-api-check` for UI changes.
|
||||
- If a required widget capability is missing, implement the reusable primitive
|
||||
upstream first. Do not work around it in Inbe or generated code.
|
||||
- Use sync protocol v6 and the clean Kryon API; no new `Ksync` names or wrappers.
|
||||
Remove old wire projections and format fallbacks as the storage and sync
|
||||
modules are converted to current Ziran. Keep the current protocol and data
|
||||
model in Inbe rather than adding compatibility adapters.
|
||||
- Keep on-disk schema and user-data upgrade paths. Convert their implementation
|
||||
to checked Ziran; do not delete a migration merely because it handles an old
|
||||
database. An upgrade must preserve existing data, and its replacement needs
|
||||
a test using an older database fixture before the prior path is removed.
|
||||
- A `.zi` filename is not a completed migration. All owned application
|
||||
behavior, including storage upgrades, must compile as current Ziran. Prefer
|
||||
direct Ziran foreign imports for native libraries; migrate owned C adapters
|
||||
as Ziran gains the required ABI support. Never keep application policy in C.
|
||||
|
||||
## Product behavior and readability
|
||||
|
||||
- Desktop focus loss must not pause practices, freeze animation, suppress
|
||||
updates, or enter the mobile background-timer path. Preserve mobile/web
|
||||
lifecycle handling and explicit user pause as separate behavior.
|
||||
- Preserve hover, press, and focus transitions. Session audio controls have
|
||||
44-unit targets (24-unit icons plus 10-unit padding), scaled and spaced.
|
||||
- Lists starts with list tabs, without a separate title bar or dropdown.
|
||||
- Use descriptive names, explicit control flow, and focused helpers. Never
|
||||
compress multiple statements, branches, declarations, or checks onto one line.
|
||||
Format changed source, inspect the final diff, and run `git diff --check`.
|
||||
-1380
File diff suppressed because it is too large.
Load diff
@@ -1,31 +0,0 @@
|
||||
# Contributing to Inner Breeze
|
||||
|
||||
Report a bug through Lumi's feedback card in the app or
|
||||
[GitHub Issues](https://github.com/waozixyz/breeze/issues). Include the app version,
|
||||
platform, steps to reproduce, what you expected, and what happened. Keep account
|
||||
keys, private conversations and personal practice data out of public reports.
|
||||
For a security issue, use [Security](SECURITY.md).
|
||||
|
||||
## Development
|
||||
|
||||
Build with `make native apps`. Dependencies and the Ziran toolchain are pinned
|
||||
in `ziran.lock`; see [build guide](docs/building.md) for other platforms. Read
|
||||
[AGENTS.md](AGENTS.md) for repository conventions and
|
||||
[app packages](docs/apps.md) for module ownership.
|
||||
|
||||
Keep a change focused. Put app UI in its owning package, reusable Kryon changes
|
||||
in Kryon, and compiler changes in Ziran. Preserve existing data and upgrade
|
||||
paths. Translate changed app strings in every supported locale.
|
||||
|
||||
Run the tests that exercise the changed behavior and `git diff --check`.
|
||||
For UI changes, run `make clean-text-api-check button-api-check` and the relevant
|
||||
private-display UI tests. `make test` and `make visual-test` are the CI gates.
|
||||
Android adapter tests need Java 21 and Android SDK platform 36; set
|
||||
`ANDROID_SDK_ROOT` to your SDK directory.
|
||||
Visual tests create disposable profiles and private displays; they must never
|
||||
use your desktop or personal profile. See [verification](docs/apps.md#verification)
|
||||
for the additional exact-source phone and release checks.
|
||||
|
||||
In a pull request, explain the user-visible change and list the checks you ran,
|
||||
including any platform you could not verify. A build or a commit does not
|
||||
publish a release.
|
||||
@@ -1 +0,0 @@
|
||||
include Makefile
|
||||
@@ -1,28 +1,21 @@
|
||||
BSD 3-Clause License
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2026, waozi
|
||||
Copyright (c) 2026 waozi
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice, this
|
||||
list of conditions and the following disclaimer.
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
|
||||
3. Neither the name of the copyright holder nor the names of its contributors
|
||||
may be used to endorse or promote products derived from this software without
|
||||
specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
@@ -1,858 +1,7 @@
|
||||
.DEFAULT_GOAL := all
|
||||
|
||||
APP_NAME := inbe
|
||||
# The program people run; package, store and data names keep APP_NAME.
|
||||
APP_EXECUTABLE := breeze
|
||||
APP_TITLE := Inner Breeze
|
||||
# `make install` installs the production desktop app for this user.
|
||||
PREFIX ?= $(HOME)/.local
|
||||
ANDROID_APP_ID := xyz.waozi.inbe
|
||||
ANDROID_DEBUG_APP_ID := $(ANDROID_APP_ID).debug
|
||||
ANDROID_ACTIVITY := xyz.waozi.inbe.MainActivity
|
||||
FLINT_DIR ?= vendor/flint
|
||||
FLINT_PROJECT ?= flint.toml
|
||||
ANDROID_ACTIVITY ?= xyz.waozi.inbe.MainActivity
|
||||
|
||||
CC ?= cc
|
||||
CMAKE ?= $(shell if [ -x /usr/bin/cmake ]; then echo /usr/bin/cmake; else command -v cmake; fi)
|
||||
GRADLE ?= droid/gradlew
|
||||
ADB ?= adb
|
||||
UNAME_S := $(shell uname -s)
|
||||
UNAME_M := $(shell uname -m)
|
||||
NATIVE_PLATFORM := $(if $(filter FreeBSD,$(UNAME_S)),freebsd,$(if $(filter Linux,$(UNAME_S)),linux,$(shell printf '%s' "$(UNAME_S)" | tr '[:upper:]' '[:lower:]')))
|
||||
ARCH := $(if $(filter amd64,$(UNAME_M)),x86_64,$(UNAME_M))
|
||||
ANDROID_SDK ?= $(if $(ANDROID_SDK_ROOT),$(ANDROID_SDK_ROOT),$(if $(ANDROID_HOME),$(ANDROID_HOME),$(shell sed -n 's/^sdk\.dir=//p' droid/local.properties 2>/dev/null | head -n 1)))
|
||||
ANDROID_CMAKE_DIR ?= $(ANDROID_SDK)/cmake/3.22.1
|
||||
ANDROID_AAPT2 ?= $(shell if [ -n "$(ANDROID_SDK)" ]; then find "$(ANDROID_SDK)/build-tools" -mindepth 2 -maxdepth 2 -type f -name aapt2 -perm -111 2>/dev/null | sort | tail -n 1; fi)
|
||||
ANDROID_GRADLE_ARGS := $(if $(ANDROID_AAPT2),-Pandroid.aapt2FromMavenOverride="$(ANDROID_AAPT2)",)
|
||||
ANDROID_JAVA_HOME ?= $(shell for dir in "$(JAVA_HOME)" /usr/local/openjdk21 /usr/lib/jvm/java-21-openjdk-amd64 /usr/lib/jvm/java-21-openjdk /usr/local/openjdk17 /usr/lib/jvm/java-17-openjdk-amd64 /usr/lib/jvm/java-17-openjdk; do if [ -x "$$dir/bin/java" ]; then printf "%s\n" "$$dir"; break; fi; done)
|
||||
ANDROID_GRADLE_ENV := env -u ANDROID_HOME $(if $(ANDROID_JAVA_HOME),JAVA_HOME="$(ANDROID_JAVA_HOME)" PATH="$(ANDROID_JAVA_HOME)/bin:$$PATH")
|
||||
ANDROID_KEYSTORE ?= $(HOME)/.android/kryon-release.keystore
|
||||
ANDROID_KEY_ALIAS ?= breathing-key
|
||||
|
||||
BUILD_DIR := build
|
||||
|
||||
# Dependencies and the Ziran toolchain are pinned in ziran.lock and linked
|
||||
# under build/packages/<name>. Make refreshes the links before reading the rest
|
||||
# of this file whenever the manifest, lock or local overrides change. PACKAGE_FLAGS=--locked
|
||||
# ignores ziran.local.toml overrides for release builds.
|
||||
PACKAGE_FLAGS ?=
|
||||
export PACKAGE_FLAGS
|
||||
PACKAGES_MK := $(BUILD_DIR)/packages.mk
|
||||
PACKAGE_OVERRIDES := $(wildcard ziran.local.toml)
|
||||
$(PACKAGES_MK): ziran.toml ziran.lock $(PACKAGE_OVERRIDES) scripts/packages.sh
|
||||
sh scripts/packages.sh $(PACKAGE_FLAGS)
|
||||
printf 'PACKAGES_READY := 1\nPACKAGES_RESOLUTION := %s|%s\n' '$(strip $(PACKAGE_FLAGS))' '$(PACKAGE_OVERRIDES)' > $@
|
||||
ifneq ($(filter-out clean distclean,$(or $(MAKECMDGOALS),all)),)
|
||||
include $(PACKAGES_MK)
|
||||
# The same directory holds local and locked links. Reselect when the caller
|
||||
# switches mode or removes an override file, even if the lock is unchanged.
|
||||
ifneq ($(strip $(PACKAGE_FLAGS))|$(PACKAGE_OVERRIDES),$(PACKAGES_RESOLUTION))
|
||||
.PHONY: packages-reselect
|
||||
$(PACKAGES_MK): packages-reselect
|
||||
endif
|
||||
endif
|
||||
|
||||
.PHONY: packages
|
||||
packages: $(PACKAGES_MK)
|
||||
|
||||
ZIRAN_DIR := build/packages/ziran
|
||||
# Project mode selects tools from the pinned checkout. Build that same stack
|
||||
# here so source checks and C generation cannot use different compiler builds.
|
||||
ZIRAN_BUILD_DIR := $(abspath $(ZIRAN_DIR)/build)
|
||||
KRYON_LIBRARY_BUILD_DIR := $(abspath $(BUILD_DIR)/kryon-library)
|
||||
ZI2C_BIN := $(ZIRAN_BUILD_DIR)/bin/zi2c
|
||||
ZIRAN_BIN := $(ZIRAN_BUILD_DIR)/bin/ziran
|
||||
ZI2ZIR_BIN := $(ZIRAN_BUILD_DIR)/bin/zi2zir
|
||||
ZI_CHECK_STAMP := $(BUILD_DIR)/zi-check/native.fresh
|
||||
# Package commands are Ziran sources too. Changes there must rebuild the same
|
||||
# toolchain as compiler and runtime changes, including local package overrides.
|
||||
ZIRAN_SOURCES := $(shell find $(ZIRAN_DIR)/cmd $(ZIRAN_DIR)/bootstrap \
|
||||
$(ZIRAN_DIR)/include $(ZIRAN_DIR)/std -type f \
|
||||
\( -name '*.zi' -o -name '*.c' -o -name '*.h' \) 2>/dev/null) \
|
||||
$(ZIRAN_DIR)/Makefile $(wildcard $(ZIRAN_DIR)/*.mk) $(ZIRAN_DIR)/VERSION
|
||||
BUILD_OBJ_DIR := $(BUILD_DIR)/obj
|
||||
BUILD_BIN_DIR := $(BUILD_DIR)/bin
|
||||
BUILD_DIST_DIR := $(BUILD_DIR)/dist
|
||||
VENDOR_BUILD_DIR := vendor-builds
|
||||
NATIVE_OBJ_DIR := $(BUILD_OBJ_DIR)/$(NATIVE_PLATFORM)
|
||||
NATIVE_BIN_DIR := $(BUILD_BIN_DIR)/$(NATIVE_PLATFORM)
|
||||
NATIVE_DIST_DIR := $(BUILD_DIST_DIR)/$(NATIVE_PLATFORM)
|
||||
NATIVE_VENDOR_BUILD_DIR := $(VENDOR_BUILD_DIR)/$(NATIVE_PLATFORM)/$(ARCH)
|
||||
LINUX_OBJ_DIR := $(BUILD_OBJ_DIR)/linux
|
||||
LINUX_BIN_DIR := $(BUILD_BIN_DIR)/linux
|
||||
LINUX_DIST_DIR := $(BUILD_DIST_DIR)/linux
|
||||
LINUX_APPIMAGE_BUILD_DIR := $(BUILD_OBJ_DIR)/appimage/linux
|
||||
LINUX_APPDIR := $(LINUX_APPIMAGE_BUILD_DIR)/$(APP_NAME).AppDir
|
||||
LINUX_APPIMAGE_DIR := packaging/linux/appimage
|
||||
LINUX_APPIMAGE_APPRUN := $(LINUX_APPIMAGE_DIR)/AppRun
|
||||
LINUX_APPIMAGE_DESKTOP := $(LINUX_APPIMAGE_DIR)/$(APP_NAME).desktop
|
||||
LINUX_APPIMAGE_ICON := $(LINUX_APPIMAGE_DIR)/$(APP_NAME).png
|
||||
LINUX_APPIMAGE_APPDATA := $(LINUX_APPIMAGE_DIR)/$(APP_NAME).appdata.xml
|
||||
|
||||
# Desktop install configuration for the kryon-provided install suite
|
||||
# (mk/package-freebsd.mk: install / install-user / uninstall / stage).
|
||||
# Without these the install ships a bare binary -- no menu entry, no icon.
|
||||
# Everything the app needs ships inside the executable (UI_EMBEDDED_ONLY=1).
|
||||
APP_ID := $(ANDROID_APP_ID)
|
||||
APP_DESKTOP := $(LINUX_APPIMAGE_DESKTOP)
|
||||
APP_METAINFO := $(LINUX_APPIMAGE_APPDATA)
|
||||
APP_ICON := $(LINUX_APPIMAGE_ICON)
|
||||
APP_DESKTOP_EXEC := $(PREFIX)/bin/$(APP_EXECUTABLE)
|
||||
|
||||
DEB_BUILD_DIR := $(BUILD_OBJ_DIR)/deb
|
||||
DEB_ROOT := $(DEB_BUILD_DIR)/root
|
||||
DEB_DIST_DIR := $(BUILD_DIST_DIR)/deb
|
||||
DEB_ARCH ?= $(if $(filter x86_64 amd64,$(ARCH)),amd64,$(if $(filter aarch64 arm64,$(ARCH)),arm64,$(ARCH)))
|
||||
DEB_BIN_SOURCE ?=
|
||||
DEB_BIN_INPUT = $(if $(strip $(DEB_BIN_SOURCE)),$(DEB_BIN_SOURCE),$(if $(filter linux,$(NATIVE_PLATFORM)),$(TARGET),))
|
||||
DEB_PACKAGE_NAME ?= $(APP_NAME)
|
||||
DEB_MAINTAINER ?= $(APP_MAINTAINER)
|
||||
DEB_SECTION ?= utils
|
||||
DEB_PRIORITY ?= optional
|
||||
DEB_DEPENDS ?= libc6, libsdl2-2.0-0, libgtk-3-0, libcurl4, libdrm2, libgbm1, libegl1, libgles2, libglx0, hicolor-icon-theme
|
||||
DEB_TARGET = $(DEB_DIST_DIR)/$(DEB_PACKAGE_NAME)_$(APP_VERSION)_$(DEB_ARCH).deb
|
||||
DEB_TARGET_PREREQS = Makefile $(LINUX_APPIMAGE_DESKTOP) $(LINUX_APPIMAGE_ICON) $(LINUX_APPIMAGE_APPDATA) $(VERSION_FILE) $(if $(filter linux,$(NATIVE_PLATFORM)),$(TARGET),)
|
||||
RPM_BUILD_DIR := $(BUILD_OBJ_DIR)/rpm
|
||||
RPM_TOPDIR := $(RPM_BUILD_DIR)/rpmbuild
|
||||
RPM_DIST_DIR := $(BUILD_DIST_DIR)/rpm
|
||||
RPM_ARCH ?= $(if $(filter x86_64 amd64,$(ARCH)),x86_64,$(if $(filter aarch64 arm64,$(ARCH)),aarch64,$(ARCH)))
|
||||
RPM_BIN_SOURCE ?=
|
||||
RPM_BIN_INPUT = $(if $(strip $(RPM_BIN_SOURCE)),$(RPM_BIN_SOURCE),$(if $(filter linux,$(NATIVE_PLATFORM)),$(TARGET),))
|
||||
RPM_PACKAGE_NAME ?= $(APP_NAME)
|
||||
RPM_RELEASE ?= 1
|
||||
RPM_LICENSE ?= BSD-3-Clause
|
||||
RPM_REQUIRES ?= glibc, SDL2, gtk3, libcurl, libdrm, mesa-libgbm, mesa-libEGL, mesa-libGLES, libglvnd-glx, hicolor-icon-theme
|
||||
RPM_SPEC := $(RPM_BUILD_DIR)/$(RPM_PACKAGE_NAME).spec
|
||||
RPM_TARGET = $(RPM_DIST_DIR)/$(RPM_PACKAGE_NAME)-$(APP_VERSION)-$(RPM_RELEASE).$(RPM_ARCH).rpm
|
||||
RPM_TARGET_PREREQS = Makefile $(LINUX_APPIMAGE_DESKTOP) $(LINUX_APPIMAGE_ICON) $(LINUX_APPIMAGE_APPDATA) $(VERSION_FILE) $(if $(filter linux,$(NATIVE_PLATFORM)),$(TARGET),)
|
||||
PODMAN ?= $(shell if [ "$(UNAME_S)" = "FreeBSD" ] && [ "$$(id -u)" != "0" ]; then \
|
||||
if command -v doas >/dev/null 2>&1; then printf 'doas podman'; \
|
||||
elif command -v sudo >/dev/null 2>&1; then printf 'sudo podman'; \
|
||||
else printf 'podman'; fi; \
|
||||
else printf 'podman'; fi)
|
||||
PODMAN_RUN_PLATFORM ?= $(if $(filter FreeBSD,$(UNAME_S)),--os linux --arch amd64,)
|
||||
PODMAN_RUN_NETWORK ?= $(if $(filter FreeBSD,$(UNAME_S)),--network host,)
|
||||
SNAP_BUILD_DIR := $(BUILD_OBJ_DIR)/snap
|
||||
SNAP_DIST_DIR := $(BUILD_DIST_DIR)/snap
|
||||
SNAP_IMAGE ?= ghcr.io/canonical/snapcraft:8_core22
|
||||
SNAP_ENTRYPOINT ?= /bin/sh
|
||||
SNAP_APT_CACHE_VOLUME ?= $(APP_NAME)-snap-apt-cache
|
||||
SNAP_ROOT_CACHE_VOLUME ?= $(APP_NAME)-snap-root-cache
|
||||
SNAP_CACHE_VOLUMES := $(SNAP_APT_CACHE_VOLUME) $(SNAP_ROOT_CACHE_VOLUME)
|
||||
SNAP_TARGET = $(SNAP_DIST_DIR)/$(APP_NAME)_$(APP_VERSION)_$(ARCH).snap
|
||||
FLATPAK_BUILD_DIR := $(BUILD_OBJ_DIR)/flatpak
|
||||
FLATPAK_DIST_DIR := $(BUILD_DIST_DIR)/flatpak
|
||||
FLATPAK_IMAGE ?= ghcr.io/flathub-infra/flatpak-github-actions:gnome-46
|
||||
FLATPAK_MANIFEST = packaging/flatpak/$(APP_ID).yml
|
||||
FLATPAK_TARGET = $(FLATPAK_DIST_DIR)/$(APP_NAME)-$(APP_VERSION)-$(ARCH).flatpak
|
||||
APP_ID := $(ANDROID_APP_ID)
|
||||
APP_COMMENT := Syncable breathing, meditation, and habit practice app
|
||||
APP_DESC := Inner Breeze is a free, open-source practice app for breathing, meditation, and habit tracking.
|
||||
APP_CATEGORIES := Utility;Education;
|
||||
APP_MAINTAINER := Waozi <[email protected]>
|
||||
APP_WWW := https://inbe.waozi.xyz/
|
||||
APP_ORIGIN := games/inbe
|
||||
APP_LICENSE := BSD3CLAUSE
|
||||
APP_DESKTOP := $(LINUX_APPIMAGE_DESKTOP)
|
||||
APP_ICON := $(LINUX_APPIMAGE_ICON)
|
||||
APP_DESKTOP_ID := $(APP_ID)
|
||||
APP_ICON_NAME := $(APP_ID)
|
||||
APP_ICON_SIZE := 512x512
|
||||
APP_METAINFO := $(LINUX_APPIMAGE_APPDATA)
|
||||
FREEBSD_PKG_DEPS := curl:ftp/curl gtk3:x11-toolkits/gtk30 hicolor-icon-theme:misc/hicolor-icon-theme libdrm:graphics/libdrm mesa-libs:graphics/mesa-libs sdl2:devel/sdl20 sqlite3:databases/sqlite3
|
||||
CLICK_PACKAGE ?= inbe
|
||||
CLICK_ID ?= inbe
|
||||
CLICK_TITLE ?= $(APP_TITLE)
|
||||
CLICK_MAINTAINER ?= Waozi <[email protected]>
|
||||
CLICK_ARCH ?= arm64
|
||||
CLICK_FRAMEWORK ?= ubuntu-sdk-20.04
|
||||
CLICK_POLICY_VERSION ?= 20.04
|
||||
CLICK_INCLUDE_METAINFO ?= 1
|
||||
CLICK_DIR := packaging/click
|
||||
CLICK_RUNNER := $(CLICK_DIR)/run-inbe.sh
|
||||
CLICK_BUILD_DIR := $(BUILD_OBJ_DIR)/click/$(CLICK_ARCH)
|
||||
CLICK_ROOT := $(CLICK_BUILD_DIR)/$(CLICK_PACKAGE)
|
||||
CLICK_CONTROL_DIR := $(CLICK_BUILD_DIR)/control
|
||||
CLICK_BIN_DIR := $(BUILD_BIN_DIR)/click/$(CLICK_ARCH)
|
||||
CLICK_DIST_DIR := $(BUILD_DIST_DIR)/click
|
||||
CLICK_TARGET = $(CLICK_DIST_DIR)/$(CLICK_PACKAGE)_$(APP_VERSION)_$(CLICK_ARCH).click
|
||||
CLICK_BIN := $(CLICK_BIN_DIR)/$(APP_NAME)
|
||||
CLICK_BIN_INPUT := $(if $(strip $(CLICK_BIN_SOURCE)),$(CLICK_BIN_SOURCE),$(CLICK_BIN))
|
||||
# Kryon's desktop host links the same picture and audio codecs on Ubuntu
|
||||
# Touch, built for its ARM64 target.
|
||||
CLICK_VENDOR_DIR := $(VENDOR_BUILD_DIR)/click/$(CLICK_ARCH)
|
||||
CLICK_WEBP_A := $(CLICK_VENDOR_DIR)/kryon-webp/libkryonwebp.a
|
||||
CLICK_AVIF_A := $(CLICK_VENDOR_DIR)/kryon-avif/avif/libavif.a
|
||||
CLICK_AOM_A := $(CLICK_VENDOR_DIR)/kryon-avif/aom/libaom.a
|
||||
CLICK_AUDIO_DIR := $(CLICK_VENDOR_DIR)/audio-codecs
|
||||
CLICK_OPUS_A := $(CLICK_AUDIO_DIR)/libopus/libopus.a
|
||||
CLICK_MP3_A := $(CLICK_AUDIO_DIR)/libziran_mp3.a
|
||||
CLICK_VORBIS_LIBS := $(CLICK_AUDIO_DIR)/libvorbisfile.a $(CLICK_AUDIO_DIR)/libvorbis.a $(CLICK_AUDIO_DIR)/libogg.a
|
||||
CLICK_CODEC_LIBS := $(CLICK_WEBP_A) $(CLICK_AVIF_A) $(CLICK_AOM_A) $(CLICK_MP3_A) $(CLICK_VORBIS_LIBS) $(CLICK_OPUS_A)
|
||||
CLICK_CMAKE_CROSS := -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=aarch64 \
|
||||
-DCMAKE_C_COMPILER=$(AARCH64_CC) -DCMAKE_AR=$(AARCH64_AR) -DCMAKE_RANLIB=$(AARCH64_RANLIB) \
|
||||
-DCMAKE_BUILD_TYPE=Release
|
||||
CLICK_LIBOQS_BUILD_DIR := $(VENDOR_BUILD_DIR)/click/$(CLICK_ARCH)/liboqs
|
||||
CLICK_LIBOQS_A := $(CLICK_LIBOQS_BUILD_DIR)/lib/liboqs.a
|
||||
CLICK_LIBOQS_INCLUDE := -I$(CLICK_LIBOQS_BUILD_DIR)/include
|
||||
CLICK_PATCHELF_INTERPRETER ?= /lib/ld-linux-aarch64.so.1
|
||||
CLICK_RUNTIME_LIBS ?= $(AARCH64_CLICK_RUNTIME_LIBS)
|
||||
AARCH64_CC ?= $(shell command -v aarch64-linux-gnu-gcc 2>/dev/null || command -v aarch64-linux-musl-gcc 2>/dev/null)
|
||||
AARCH64_AR ?= $(shell command -v aarch64-linux-gnu-ar 2>/dev/null || command -v aarch64-linux-musl-ar 2>/dev/null)
|
||||
AARCH64_RANLIB ?= $(shell command -v aarch64-linux-gnu-ranlib 2>/dev/null || command -v aarch64-linux-musl-ranlib 2>/dev/null)
|
||||
WINDOWS_OBJ_DIR := $(BUILD_OBJ_DIR)/windows
|
||||
WINDOWS_BIN_DIR := $(BUILD_BIN_DIR)/windows
|
||||
WINDOWS_DIST_DIR := $(BUILD_DIST_DIR)/windows
|
||||
ANDROID_BUILD_DIR := $(BUILD_DIR)/android
|
||||
WEB_OBJ_DIR := $(BUILD_OBJ_DIR)/web
|
||||
WEB_DIST_DIR := $(BUILD_DIST_DIR)/web
|
||||
CHROME_WEB_STORE_DIR := $(BUILD_DIST_DIR)/chrome-web-store
|
||||
VERSION_FILE := src/core/version.h
|
||||
APP_VERSION := $(shell awk '/APP_VERSION_STRING/ { print $$3; exit }' $(VERSION_FILE) 2>/dev/null | tr -d '"')
|
||||
|
||||
KRYON_DIR ?= build/packages/kryon
|
||||
CSS_DIR ?= build/packages/css
|
||||
OQS_DIR ?= build/packages/oqs
|
||||
WEBP_BUILD_DIR := $(NATIVE_VENDOR_BUILD_DIR)/kryon-webp
|
||||
WEBP_A := $(WEBP_BUILD_DIR)/libkryonwebp.a
|
||||
AVIF_BUILD_DIR := $(NATIVE_VENDOR_BUILD_DIR)/kryon-avif
|
||||
AVIF_A := $(AVIF_BUILD_DIR)/avif/libavif.a
|
||||
AOM_A := $(AVIF_BUILD_DIR)/aom/libaom.a
|
||||
# Kryon's codec recipes come from the codec packages in this app's lock.
|
||||
# Kryon resolves the rest (dav1d) with this build's ziran, which CI runners
|
||||
# do not have on PATH.
|
||||
IMAGE_PACKAGE_DIRS := -DKRYON_WEBP_PACKAGE_DIR="$(abspath build/packages/webp)" -DKRYON_AVIF_PACKAGE_DIR="$(abspath build/packages/avif)" -DZIRAN_BIN="$(ZIRAN_BIN)"
|
||||
WIN64_ARCH := x86_64
|
||||
WIN64_CC ?= $(or $(WIN_CC),x86_64-w64-mingw32-gcc)
|
||||
WIN64_AR ?= $(or $(WIN_AR),x86_64-w64-mingw32-ar)
|
||||
WIN64_RANLIB ?= $(or $(WIN_RANLIB),x86_64-w64-mingw32-ranlib)
|
||||
WIN64_STRIP ?= $(or $(WIN_STRIP),x86_64-w64-mingw32-strip)
|
||||
WIN64_WINDRES ?= x86_64-w64-mingw32-windres
|
||||
WIN64_CMAKE_SYSTEM_PROCESSOR ?= x86_64
|
||||
WIN64_CC_PATH := $(shell command -v $(WIN64_CC) 2>/dev/null || printf '%s' $(WIN64_CC))
|
||||
WIN64_AR_PATH := $(shell command -v $(WIN64_AR) 2>/dev/null || printf '%s' $(WIN64_AR))
|
||||
WIN64_RANLIB_PATH := $(shell command -v $(WIN64_RANLIB) 2>/dev/null || printf '%s' $(WIN64_RANLIB))
|
||||
WIN64_CURL_BUILD_DIR := $(VENDOR_BUILD_DIR)/windows/$(WIN64_ARCH)/curl
|
||||
WIN64_CURL_INCLUDE_DIR := $(WIN64_CURL_BUILD_DIR)/include
|
||||
WIN64_CURL_A := $(WIN64_CURL_BUILD_DIR)/lib/libcurl.a
|
||||
WIN64_LIBOQS_BUILD_DIR := $(VENDOR_BUILD_DIR)/windows/$(WIN64_ARCH)/liboqs
|
||||
WIN64_LIBOQS_A := $(WIN64_LIBOQS_BUILD_DIR)/lib/liboqs.a
|
||||
WIN64_LIBOQS_INCLUDE := -I$(WIN64_LIBOQS_BUILD_DIR)/include
|
||||
WIN64_RESOURCE := $(BUILD_OBJ_DIR)/windows/$(WIN64_ARCH)/$(APP_NAME).res
|
||||
|
||||
KRYON_ICON_DIR := icons
|
||||
KRYON_ICON_FILES := $(shell find $(KRYON_DIR)/$(KRYON_ICON_DIR) -path '*/review/*' -prune -o -type f \( -name '*.webp' -o -name '*.png' -o -name '*.json' \) -print 2>/dev/null | LC_ALL=C sort)
|
||||
KRYON_GENERATED_INCLUDE_DIR := $(BUILD_OBJ_DIR)/kryon/generated/include
|
||||
KRYON_GENERATED_SRC_DIR := $(BUILD_OBJ_DIR)/kryon/generated/src
|
||||
KRYON_UI_ZI := $(addprefix $(KRYON_DIR)/src/ui/,$(shell cat $(KRYON_DIR)/src/ui/modules.txt))
|
||||
KRYON_UI_C := $(patsubst $(KRYON_DIR)/src/ui/%.zi,$(KRYON_GENERATED_SRC_DIR)/ui/%.c,$(KRYON_UI_ZI))
|
||||
KRYON_UI_H := $(KRYON_UI_C:.c=.h)
|
||||
KRYON_UI_STAMP := $(KRYON_GENERATED_SRC_DIR)/ui/.fresh
|
||||
KRYON_CSS_ZI := $(wildcard $(CSS_DIR)/src/*.zi)
|
||||
KRYON_CSS_C := $(patsubst $(CSS_DIR)/src/%.zi,$(KRYON_GENERATED_SRC_DIR)/css/%.c,$(KRYON_CSS_ZI))
|
||||
KRYON_CSS_H := $(KRYON_CSS_C:.c=.h)
|
||||
KRYON_CSS_STAMP := $(KRYON_GENERATED_SRC_DIR)/css/.fresh
|
||||
KRYON_ICON_ASSETS_C := $(KRYON_GENERATED_SRC_DIR)/ui/ui_icon_assets.c
|
||||
KRYON_ICON_NAMES_C := $(KRYON_GENERATED_SRC_DIR)/ui/ui_icon_names.c
|
||||
KRYON_ICON_TYPES_H := $(KRYON_GENERATED_INCLUDE_DIR)/ui_icon_types.h
|
||||
KRYON_SRCS := $(filter-out $(KRYON_DIR)/src/ui/ui_icon_assets.c $(KRYON_DIR)/src/ui/ui_icon_names.c,$(shell find $(KRYON_DIR)/src -type f -name '*.c' | LC_ALL=C sort)) $(KRYON_ICON_ASSETS_C) $(KRYON_ICON_NAMES_C) $(KRYON_UI_C) $(KRYON_CSS_C)
|
||||
KRYON_SYNC_ICONS := $(KRYON_DIR)/scripts/sync-icons.sh
|
||||
WEB_SHARED_ICON_SHEETS := platforms language tiles
|
||||
# Inbe's desktop uses Kryon's SDL and Cairo desktop host, not its libdraw,
|
||||
# terminal or Plan 9 hosts.
|
||||
KRYON_SRCS := $(filter-out $(KRYON_DIR)/src/backend/libdraw_%.c $(KRYON_DIR)/src/backend/termi_%.c \
|
||||
$(KRYON_DIR)/src/platform/plan9/%.c,$(KRYON_SRCS))
|
||||
# The web build uses kryon's Canvas2D backend directly, with no WebGL.
|
||||
KRYON_WEB_SRCS := $(KRYON_SRCS)
|
||||
KRYON_WEB_SRCS := $(filter-out $(KRYON_DIR)/src/backend/dom_%.c,$(KRYON_WEB_SRCS))
|
||||
KRYON_WINDOWS_SRCS := $(filter-out $(KRYON_DIR)/src/file_dialog/file_dialog.c,$(KRYON_SRCS))
|
||||
KRYON_CLICK_SRCS := $(filter-out $(KRYON_DIR)/src/file_dialog/file_dialog.c,$(KRYON_SRCS))
|
||||
KRYON_INCLUDE := -I$(KRYON_GENERATED_INCLUDE_DIR) -I$(KRYON_GENERATED_SRC_DIR) -I$(KRYON_DIR)/include -I$(KRYON_DIR)/src/ui -I$(KRYON_DIR)/src/platform -I$(KRYON_DIR)/src/backend -I$(KRYON_GENERATED_SRC_DIR)/runtime
|
||||
KRYON_INCLUDE += -I$(ZIRAN_DIR)/include
|
||||
KRYON_SYNC_ACCOUNT_C := $(KRYON_DIR)/src/sync/sync_account.c
|
||||
KRYON_SYNC_C := $(KRYON_DIR)/src/sync/sync.c
|
||||
KRYON_SYNC_TRANSPORT_C := $(KRYON_DIR)/src/sync/sync_transport.c
|
||||
KRYON_SYNC_ACCOUNT_H := $(KRYON_DIR)/include/sync/account.h
|
||||
KRYON_VENDOR_BUILD_DIR := $(NATIVE_VENDOR_BUILD_DIR)
|
||||
KRYON_LIBOQS_BUILD_DIR := $(KRYON_VENDOR_BUILD_DIR)/liboqs
|
||||
KRYON_WEB_LIBOQS_BUILD_DIR := $(VENDOR_BUILD_DIR)/web/liboqs
|
||||
KRYON_CURL_BUILD_DIR := $(KRYON_VENDOR_BUILD_DIR)/curl
|
||||
KRYON_CURL_REQUIRE_WEBSOCKETS := 1
|
||||
KRYON_CURL_EXTRA_CMAKE_FLAGS := \
|
||||
-DCURL_DISABLE_WEBSOCKETS=OFF \
|
||||
-DCURL_DISABLE_INSTALL=OFF \
|
||||
-DCURL_DISABLE_DICT=ON \
|
||||
-DCURL_DISABLE_FILE=ON \
|
||||
-DCURL_DISABLE_FTP=ON \
|
||||
-DCURL_DISABLE_GOPHER=ON \
|
||||
-DCURL_DISABLE_IMAP=ON \
|
||||
-DCURL_DISABLE_MQTT=ON \
|
||||
-DCURL_DISABLE_POP3=ON \
|
||||
-DCURL_DISABLE_RTSP=ON \
|
||||
-DCURL_DISABLE_SMTP=ON \
|
||||
-DCURL_DISABLE_TELNET=ON \
|
||||
-DCURL_DISABLE_TFTP=ON \
|
||||
-DCURL_DISABLE_LIBCURL_OPTION=ON \
|
||||
-DCURL_ZLIB=OFF \
|
||||
-DCURL_BROTLI=OFF \
|
||||
-DCURL_ZSTD=OFF
|
||||
# breathing is a UI-only app: drop the 2D physics subsystem (Box2D) entirely.
|
||||
# := on purpose: this is a property of the app, not a knob. Setting it to 1
|
||||
# would also require linking $(KRYON_PHYSICS_DEPS) (libbox2d), which this
|
||||
# Makefile does not wire up -- so a ?= here would invite a broken build.
|
||||
# The filter is applied to every variant below; KRYON_WEB/WINDOWS/CLICK_SRCS
|
||||
# were snapshotted from KRYON_SRCS above (before this filter), so re-apply it
|
||||
# to keep the kryon physics .c files (which need box2d.h) out of every build.
|
||||
KRYON_WITH_PHYSICS := 0
|
||||
include mk/sync.mk
|
||||
include mk/audio-codecs.mk
|
||||
KRYON_INCLUDE += $(KRYON_PHYSICS_CPPFLAGS)
|
||||
KRYON_SRCS := $(filter-out $(KRYON_PHYSICS_SRCS),$(KRYON_SRCS))
|
||||
KRYON_WEB_SRCS := $(filter-out $(KRYON_PHYSICS_SRCS),$(KRYON_WEB_SRCS))
|
||||
KRYON_WINDOWS_SRCS := $(filter-out $(KRYON_PHYSICS_SRCS),$(KRYON_WINDOWS_SRCS))
|
||||
KRYON_CLICK_SRCS := $(filter-out $(KRYON_PHYSICS_SRCS),$(KRYON_CLICK_SRCS))
|
||||
KRYON_LIBOQS_CPU_FEATURE_CMAKE_FLAGS ?= \
|
||||
-DOQS_USE_ADX_INSTRUCTIONS=OFF \
|
||||
-DOQS_USE_AES_INSTRUCTIONS=OFF \
|
||||
-DOQS_USE_AVX_INSTRUCTIONS=OFF \
|
||||
-DOQS_USE_AVX2_INSTRUCTIONS=OFF \
|
||||
-DOQS_USE_AVX512_INSTRUCTIONS=OFF \
|
||||
-DOQS_USE_AVX512BW_INSTRUCTIONS=OFF \
|
||||
-DOQS_USE_AVX512DQ_INSTRUCTIONS=OFF \
|
||||
-DOQS_USE_AVX512F_INSTRUCTIONS=OFF \
|
||||
-DOQS_USE_BMI1_INSTRUCTIONS=OFF \
|
||||
-DOQS_USE_BMI2_INSTRUCTIONS=OFF \
|
||||
-DOQS_USE_FMA_INSTRUCTIONS=OFF \
|
||||
-DOQS_USE_PCLMULQDQ_INSTRUCTIONS=OFF \
|
||||
-DOQS_USE_POPCNT_INSTRUCTIONS=OFF \
|
||||
-DOQS_USE_SSE_INSTRUCTIONS=OFF \
|
||||
-DOQS_USE_SSE2_INSTRUCTIONS=OFF \
|
||||
-DOQS_USE_SSE3_INSTRUCTIONS=OFF \
|
||||
-DOQS_USE_VPCLMULQDQ_INSTRUCTIONS=OFF
|
||||
CURL_DIR := $(KRYON_CURL_DIR)
|
||||
CURL_BUILD_DIR := $(KRYON_CURL_BUILD_DIR)
|
||||
CURL_INCLUDE_DIR := $(KRYON_CURL_INCLUDE_DIR)
|
||||
CURL_LIB_DIR := $(KRYON_CURL_LIB_DIR)
|
||||
CURL_SO := $(KRYON_CURL_SO)
|
||||
CURL_PROTOCOL_CHECK := $(KRYON_CURL_PROTOCOL_CHECK)
|
||||
KRYON_CURL_VERSION_NUM ?= $(shell printf '%b\n' '\043include <curl/curlver.h>' 'LIBCURL_VERSION_NUM' | $(CC) -I$(KRYON_CURL_DIR)/include -E -P - 2>/dev/null | tail -n 1)
|
||||
# Lazy on purpose: := would run the preprocessor above at parse time on every
|
||||
# invocation (make clean included). The only consumer is the version guard in
|
||||
# the NEEDS_NATIVE_ENV block, which expands this only for build goals.
|
||||
KRYON_CURL_VERSION_HEX = $(patsubst 0x%,%,$(KRYON_CURL_VERSION_NUM))
|
||||
SQLITE_DIR := build/packages/sqlite
|
||||
SQLITE_BUILD_DIR := $(VENDOR_BUILD_DIR)/sqlite
|
||||
SQLITE_AMALGAMATION_C := $(SQLITE_BUILD_DIR)/sqlite3.c
|
||||
SQLITE_AMALGAMATION_H := $(SQLITE_BUILD_DIR)/sqlite3.h
|
||||
SQLITE_SRC := $(SQLITE_AMALGAMATION_C)
|
||||
SQLITE_INCLUDE := -I$(SQLITE_BUILD_DIR)
|
||||
LIBOQS_DIR := $(KRYON_LIBOQS_DIR)
|
||||
LIBOQS_BUILD_DIR := $(KRYON_LIBOQS_BUILD_DIR)
|
||||
LIBOQS_A := $(KRYON_LIBOQS_A)
|
||||
LIBOQS_INCLUDE := $(KRYON_LIBOQS_INCLUDE)
|
||||
WEB_LIBOQS_BUILD_DIR := $(KRYON_WEB_LIBOQS_BUILD_DIR)
|
||||
WEB_LIBOQS_A := $(KRYON_WEB_LIBOQS_A)
|
||||
WEB_LIBOQS_INCLUDE := -I$(WEB_LIBOQS_BUILD_DIR)/include
|
||||
TEST_BIN_DIR := $(BUILD_BIN_DIR)/tests
|
||||
RUNTIME_ASSET_CFLAGS := -DHAS_LIBCURL=1 $(KRYON_CURL_CFLAGS)
|
||||
RUNTIME_ASSET_LDLIBS := $(KRYON_CURL_LDLIBS)
|
||||
STORAGE_CORE_SRCS = $(KRY_GEN_DIR)/src/storage/json.c $(KRY_GEN_DIR)/src/storage/storage_core.c $(KRY_GEN_DIR)/src/storage/storage_habits.c $(KRY_GEN_DIR)/src/storage/storage_habit_materialize.c $(KRY_GEN_DIR)/src/storage/storage_habit_sync.c
|
||||
|
||||
MONOCYPHER_DIR := build/packages/monocypher/src
|
||||
MONOCYPHER_SRCS := $(MONOCYPHER_DIR)/monocypher.c \
|
||||
$(MONOCYPHER_DIR)/optional/monocypher-ed25519.c
|
||||
|
||||
APP_SRCS := \
|
||||
$(sort $(wildcard src/app/*.c)) \
|
||||
$(MONOCYPHER_SRCS)
|
||||
|
||||
# Kryon's tray loads GTK and AppIndicator with dlopen only when the tray opens
|
||||
# (APP_NO_TRAY=1 skips it), preferring a StatusNotifierItem and falling back
|
||||
# to a GTK status icon, so nothing tray-related is compiled in or linked.
|
||||
ifneq ($(filter linux freebsd,$(NATIVE_PLATFORM)),)
|
||||
DESKTOP_TRAY_DEFINE := DESKTOP_TRAY_ENABLED
|
||||
endif
|
||||
# The native desktop runs on Kryon's desktop host: SDL2 windows and input,
|
||||
# Cairo and Pango raster, Kryon's audio mixer.
|
||||
# Kryon's desktop raster decodes WebP with the libwebp archive this build
|
||||
# links (KRYON_WEBP_LINKED). Its linked AVIF path imports a module the pinned
|
||||
# avif package does not export yet, so AVIF still loads libkryonavif.so.
|
||||
ZI_NATIVE_DEFINES := PLATFORM_DESKTOP DESKTOP_HOST KRYON_WEBP_LINKED $(DESKTOP_TRAY_DEFINE)
|
||||
# Ziran preprocessing must see the libc choice used by the native C compiler.
|
||||
NATIVE_GLIBC := $(shell printf '#include <stdlib.h>\n' | $(CC) -dM -E - 2>/dev/null | grep -q '^\#define __GLIBC__ ' && printf yes)
|
||||
ifeq ($(NATIVE_GLIBC),yes)
|
||||
ZI_NATIVE_DEFINES += __GLIBC__
|
||||
endif
|
||||
ifneq ($(filter aarch64 arm64,$(ARCH)),)
|
||||
ZI_NATIVE_DEFINES += __aarch64__
|
||||
else ifneq ($(filter x86_64 amd64,$(ARCH)),)
|
||||
ZI_NATIVE_DEFINES += __x86_64__
|
||||
else ifneq ($(filter i386 i486 i586 i686 x86,$(ARCH)),)
|
||||
ZI_NATIVE_DEFINES += __i386__
|
||||
endif
|
||||
ifeq ($(NATIVE_PLATFORM),freebsd)
|
||||
ZI_NATIVE_DEFINES += __FreeBSD__
|
||||
endif
|
||||
ifeq ($(NATIVE_PLATFORM),darwin)
|
||||
ZI_NATIVE_DEFINES += __APPLE__
|
||||
endif
|
||||
# Kryon's test driver is test code, so the app is built without it. The UI
|
||||
# tests drive the app, so they need a build made with KRYON_TEST_DRIVER set,
|
||||
# for example `KRYON_TEST_DRIVER=1 make tai-chi-ui-test`; setting or clearing
|
||||
# it regenerates the app. A build without it stops with that instruction when
|
||||
# a test runs it.
|
||||
ifneq ($(KRYON_TEST_DRIVER),)
|
||||
ZI_NATIVE_DEFINES += KRYON_TEST_DRIVER
|
||||
endif
|
||||
|
||||
# No in-process GTK anywhere else either: the system theme uses kryon's
|
||||
# built-in palettes, and native file dialogs prefer xdg-desktop-portal through
|
||||
# GIO before falling back to zenity/kdialog/yad. Embedded in a host such as
|
||||
# Harmony, the Linux build reads the host's theme from its X11 window.
|
||||
SYSTEM_THEME_CFLAGS :=
|
||||
SYSTEM_THEME_LDLIBS := $(if $(filter linux,$(NATIVE_PLATFORM)),-lX11,)
|
||||
|
||||
LOCALE_FILES := $(wildcard locales/*.txt)
|
||||
# Local builds can select verified Practices source and media through the
|
||||
# same directory. Locked builds always take both from the resolved package.
|
||||
PRACTICE_PACKAGE_MEDIA := build/packages/practices
|
||||
PRACTICE_MEDIA := $(PRACTICE_PACKAGE_MEDIA)
|
||||
ifneq ($(filter --locked,$(PACKAGE_FLAGS)),)
|
||||
ifneq ($(abspath $(PRACTICE_MEDIA)),$(abspath $(PRACTICE_PACKAGE_MEDIA)))
|
||||
$(error PRACTICE_MEDIA cannot override the Practices package in a locked build)
|
||||
endif
|
||||
endif
|
||||
export PRACTICE_MEDIA
|
||||
PRACTICE_MEDIA_STAMP := $(BUILD_DIR)/practice-media-source
|
||||
PRACTICE_FIGURE_DIR := $(BUILD_DIR)/practice-figure
|
||||
PRACTICE_FIGURE_MODULES := $(PRACTICE_MEDIA_STAMP) $(wildcard $(PRACTICE_MEDIA)/figure/*.zi) scripts/stage-practice-figure.py
|
||||
IMAGE_FILES := assets/app/icon.webp $(PRACTICE_MEDIA)/whm/1.webp $(PRACTICE_MEDIA)/whm/2.webp $(PRACTICE_MEDIA)/meditation/1.webp assets/pet/egg1.png $(wildcard $(PRACTICE_MEDIA)/*/banner*.webp) $(wildcard $(PRACTICE_MEDIA)/sunsalutation/characters/*/*.png) $(wildcard $(PRACTICE_MEDIA)/taichi/*.png $(PRACTICE_MEDIA)/taichi/*/*.png) $(PRACTICE_MEDIA)/taichi/course.tch
|
||||
SOUND_FILES := $(wildcard assets/sounds/*.ogg)
|
||||
FONT_SUBSET_DIR := assets/fonts/subset
|
||||
FONT_SUBSET_CORPUS := locales assets/fonts/input_common.txt assets/fonts/ui_symbols.txt $(PRACTICE_MEDIA)/astral_projection/text $(PRACTICE_MEDIA)/workout/text
|
||||
FONT_FILES := \
|
||||
$(FONT_SUBSET_DIR)/NotoSans-App-Regular.ttf \
|
||||
$(FONT_SUBSET_DIR)/NotoSansSC-App-Regular.otf \
|
||||
$(FONT_SUBSET_DIR)/NotoSansJP-App-Regular.otf \
|
||||
$(FONT_SUBSET_DIR)/NotoSansKR-App-Regular.otf \
|
||||
$(FONT_SUBSET_DIR)/NotoSansTC-App-Regular.otf
|
||||
EMBEDDED_ASSETS_C := $(BUILD_OBJ_DIR)/$(APP_NAME)_embedded_assets.c
|
||||
STYLE_FILES := $(wildcard $(CSS_DIR)/styles/*.css) \
|
||||
$(wildcard assets/styles/*.css) \
|
||||
$(wildcard themes/catalog_*.css)
|
||||
IMAGE_FILES += assets/app/icon-sky-cradle.webp assets/app/icon-ink-and-air.webp
|
||||
IMAGE_FILES += assets/social/telegram.svg $(wildcard assets/social/*.png assets/social/*.webp)
|
||||
IMAGE_FILES += $(KRYON_DIR)/icons/ui.webp $(KRYON_DIR)/icons/pfp.webp
|
||||
APP_BUNDLES := $(addprefix $(BUILD_DIR)/apps/,lists.zx habits.zx practices.zx diary.zx lumi.zx leaderboard.zx)
|
||||
INBE_BUNDLE := $(BUILD_DIR)/inbe.zx
|
||||
INBE_FULL_BUNDLE := $(BUILD_DIR)/inbe-full.zx
|
||||
APP_SOURCES := $(shell find apps src/apps -name '*.zi' | LC_ALL=C sort) src/core/types.zi src/core/breath_timing.zi $(wildcard src/practices/patterns/*rules.zi) src/practices/patterns/patterns_clock.zi src/practices/patterns/patterns_types.zi src/practices/sun_salutation/sun_salutation_rules.zi src/practices/meditation/meditation_timing.zi
|
||||
APP_RESOURCES := $(shell rg --files assets/habits assets/lists assets/diary assets/lumi assets/mcp assets/navigation assets/apps/icons 2>/dev/null)
|
||||
APP_RESOURCES += $(shell find -L $(PRACTICE_MEDIA) -type f -not -path '*/.git/*' 2>/dev/null) $(shell rg --files design/tai-chi/text 2>/dev/null) apps/practice/content.json $(wildcard design/tai-chi/narration*.json design/workout/narration*.json design/narration/*.json) $(wildcard design/sun-salutation/narration/*.json) $(wildcard design/sun-salutation/narration/text/*.txt design/sun-salutation/narration/text-female/*.txt) $(wildcard design/lumi-guide/*.json) $(wildcard design/astral-projection/*.json) scripts/practice_content.py scripts/practice_media.py scripts/tai_chi_preview.py apps/practice/course_access.zi scripts/generate-lumi-guide-narration.py
|
||||
APP_RESOURCES += assets/app/practice-clouds.rg $(wildcard design/lumi-guide/text-female/*.txt)
|
||||
APP_RESOURCES += $(wildcard apps/*/achievements.json) $(wildcard apps/*/achievement-locales/*.json)
|
||||
APP_RESOURCES += $(wildcard assets/*/sidebar.shape)
|
||||
|
||||
APPS_BUNDLE ?= build/apps-ui/apps.zx
|
||||
EMBEDDED_ASSET_FILES := apps/publishers.json $(INBE_BUNDLE) assets/app/icon.webp
|
||||
KRY_GEN_DIR := $(BUILD_DIR)/kryon/generated
|
||||
# Dependencies are imported as PACKAGE/Module through their linked packages.
|
||||
ZI_PACKAGE_PATHS := $(shell sh scripts/package-paths.sh)
|
||||
ZI_SRCS := $(shell find src -type f -name '*.zi' 2>/dev/null | LC_ALL=C sort) apps/practice/hold_reminder.zi apps/practice/whm_controls.zi $(wildcard apps/practice/astral_projection*.zi) $(wildcard apps/practice/workout*.zi) $(wildcard apps/practice/sun_salutation*.zi)
|
||||
GAME2D_DIR := build/packages/game2d
|
||||
GAME2D_MODULES := $(wildcard $(GAME2D_DIR)/src/*/*.zi)
|
||||
MESH_CLIENT_DIR ?= build/packages/mesh-client
|
||||
MESH_CLIENT_MODULES := $(wildcard $(MESH_CLIENT_DIR)/*.zi)
|
||||
ZIRAN_STD_MODULES := $(wildcard $(ZIRAN_DIR)/std/*.zi)
|
||||
KRYON_ZI_MODULES := $(shell find $(KRYON_DIR)/src -type f -name '*.zi' | LC_ALL=C sort)
|
||||
KRY_GEN_SRCS := $(patsubst %.zi,$(KRY_GEN_DIR)/%.c,$(ZI_SRCS))
|
||||
KRY_GEN_SRCS += $(addprefix $(KRY_GEN_DIR)/,account.c auth.c authorization.c authorization_owner.c delegated.c async_delegated.c envelope.c byte_text_linux.c \
|
||||
c_string.c client.c date_parse.c date_time.c events.c json_scan.c net_http_curl_linux.c \
|
||||
net_ws_curl_linux.c social.c sync.c \
|
||||
text.c text_buffer.c transaction.c update.c url.c wire.c)
|
||||
KRY_GEN_HDRS := $(patsubst %.zi,$(KRY_GEN_DIR)/%.h,$(ZI_SRCS))
|
||||
KRY_GEN_STAMP := $(KRY_GEN_DIR)/.fresh
|
||||
# The defines the C was generated with, outside the pruned output directory.
|
||||
KRY_GEN_DEFINES := $(BUILD_DIR)/kryon/generated-defines.txt
|
||||
WEB_GEN_DIR := $(BUILD_DIR)/kryon/generated-web
|
||||
WEB_GEN_SRCS := $(patsubst $(KRY_GEN_DIR)/%,$(WEB_GEN_DIR)/%,$(KRY_GEN_SRCS))
|
||||
WEB_GEN_STAMP := $(WEB_GEN_DIR)/.fresh
|
||||
WINDOWS_GEN_DIR := $(BUILD_DIR)/kryon/generated-windows
|
||||
WINDOWS_GEN_SRCS := $(patsubst $(KRY_GEN_DIR)/%,$(WINDOWS_GEN_DIR)/%,$(KRY_GEN_SRCS))
|
||||
WINDOWS_GEN_STAMP := $(WINDOWS_GEN_DIR)/.fresh
|
||||
# The Unix clock provider is generated only for the native app. Web and
|
||||
# Windows source lists above retain their platform clock implementations.
|
||||
KRY_GEN_SRCS += $(KRY_GEN_DIR)/date_time_linux.c
|
||||
SRC := $(APP_SRCS) $(KRY_GEN_STAMP) $(EMBEDDED_ASSETS_C)
|
||||
GENERATED_NATIVE_C = $(shell find $(KRY_GEN_DIR) -type f -name '*.c' | LC_ALL=C sort)
|
||||
WINDOWS_SRC := $(APP_SRCS) $(EMBEDDED_ASSETS_C)
|
||||
GENERATED_WINDOWS_C = $(shell find $(WINDOWS_GEN_DIR) -type f -name '*.c' | LC_ALL=C sort)
|
||||
WEB_APP_SRCS := $(APP_SRCS)
|
||||
WEB_SRC := $(WEB_APP_SRCS) $(EMBEDDED_ASSETS_C)
|
||||
GENERATED_WEB_C = $(shell find $(WEB_GEN_DIR) -type f -name '*.c' | LC_ALL=C sort)
|
||||
|
||||
APP_INCLUDE := -Isrc -Isrc/app -Isrc/core -Isrc/screens -Isrc/screens/settings -Isrc/practices -Isrc/practices/whm -Isrc/practices/meditation -Isrc/practices/sun_salutation -Isrc/practices/tai_chi -Isrc/storage -Isrc/platform -Isrc/platform/android -Isrc/third_party
|
||||
APP_INCLUDE += -iquote$(KRY_GEN_DIR)
|
||||
APP_INCLUDE += $(foreach dir,$(sort $(dir $(ZI_SRCS))),-iquote$(KRY_GEN_DIR)/$(dir))
|
||||
APP_INCLUDE += $(KRYON_INCLUDE)
|
||||
APP_INCLUDE += -I$(MONOCYPHER_DIR) -I$(MONOCYPHER_DIR)/optional
|
||||
WEB_APP_INCLUDE = $(filter-out -iquote$(KRY_GEN_DIR)%,$(APP_INCLUDE)) \
|
||||
-iquote$(WEB_GEN_DIR) \
|
||||
$(foreach dir,$(sort $(dir $(ZI_SRCS))),-iquote$(WEB_GEN_DIR)/$(dir))
|
||||
WINDOWS_APP_INCLUDE = $(filter-out -iquote$(KRY_GEN_DIR)%,$(APP_INCLUDE)) \
|
||||
-iquote$(WINDOWS_GEN_DIR) \
|
||||
$(foreach dir,$(sort $(dir $(ZI_SRCS))),-iquote$(WINDOWS_GEN_DIR)/$(dir))
|
||||
SYNC_RETRY_SOURCE := src/app/sync_retry.zi
|
||||
STORAGE_LAYOUT_HEADER := tests/storage_layout.h
|
||||
LAW_MODULES := src/app/sync_retry_laws.zi src/app/practice_lifecycle_laws.zi \
|
||||
src/app/modal_rules_laws.zi \
|
||||
src/app/sync_recovery_policy_laws.zi src/storage/habit_merge_laws.zi \
|
||||
src/storage/sync_restore_laws.zi src/storage/storage_layout_laws.zi \
|
||||
src/guide_laws.zi src/apps/node_app_input_laws.zi
|
||||
# Kryon's desktop host windows through SDL.
|
||||
ZI_NATIVE_DEFINES += NATIVE_WINDOW_HAVE_SDL
|
||||
APP_GIO_CFLAGS ?= $(shell pkg-config --cflags gio-2.0 2>/dev/null)
|
||||
APP_GIO_LDLIBS ?= $(shell pkg-config --libs gio-2.0 2>/dev/null)
|
||||
ZI_NATIVE_DEFINES += $(if $(strip $(APP_GIO_LDLIBS)),APP_HAVE_GIO,)
|
||||
|
||||
COMMON_CFLAGS := -Wall -Wextra -Os -D_DEFAULT_SOURCE -D_GNU_SOURCE -ffunction-sections -fdata-sections -DSUPPORT_FILEFORMAT_JPG=1 -DUI_EMBEDDED_ONLY=1 -DNATIVE_WINDOW_HAVE_SDL -DKRYON_WITH_SYNC=1
|
||||
CFLAGS := $(COMMON_CFLAGS) -std=c99 $(RUNTIME_ASSET_CFLAGS) $(SYSTEM_THEME_CFLAGS) $(KRYON_NOTIFICATION_CPPFLAGS) $(KRYON_NOTIFICATION_CFLAGS)
|
||||
NATIVE_SYSTEM_LDLIBS := $(KRYON_NOTIFICATION_LDLIBS) -lz -lm -lpthread -latomic $(if $(filter linux,$(NATIVE_PLATFORM)),-ldl -lrt -lEGL -lGLESv2 -lGLX,) $(SYSTEM_THEME_LDLIBS)
|
||||
WINDOWS_CFLAGS := -Wall -Wextra -std=c99 -Os -D_DEFAULT_SOURCE -D_GNU_SOURCE -ffunction-sections -fdata-sections -DSUPPORT_FILEFORMAT_JPG=1 -DUI_EMBEDDED_ONLY=1 -DKRYON_WITH_SYNC=1
|
||||
WEB_CFLAGS := $(filter-out -Os -DNATIVE_WINDOW_HAVE_SDL,$(COMMON_CFLAGS)) -O2 -std=gnu99
|
||||
CLICK_CFLAGS := -Wall -Wextra -std=c99 -Os -D_DEFAULT_SOURCE -D_GNU_SOURCE -ffunction-sections -fdata-sections -DSUPPORT_FILEFORMAT_JPG=1 -DUI_EMBEDDED_ONLY=1 -DDISABLE_KRYON_FILE_DIALOG -DHAS_LIBCURL=1 -DKRYON_WITH_SYNC=1 $(AARCH64_KRYON_CURL_CFLAGS)
|
||||
LDFLAGS := -Wl,--gc-sections -s
|
||||
WINDOWS_LDFLAGS := -Wl,--gc-sections -static -static-libgcc -mwindows
|
||||
WINDOWS_LDLIBS := -lgdi32 -lwinmm -luser32 -lshell32 -lole32 -lcomdlg32 -lcomctl32 -luuid -lwininet -lws2_32 -liphlpapi -lcrypt32 -lsecur32 -lbcrypt -ladvapi32 -lz -lm -latomic -lpthread
|
||||
ifneq ($(strip $(MCFGTHREADS)),)
|
||||
WIN64_THREAD_LDFLAGS := -L$(MCFGTHREADS)/lib
|
||||
else
|
||||
WIN64_THREAD_LDFLAGS :=
|
||||
endif
|
||||
|
||||
BINARY_NAME := $(APP_EXECUTABLE)-$(NATIVE_PLATFORM)-$(ARCH)
|
||||
TARGET := $(NATIVE_BIN_DIR)/$(BINARY_NAME)
|
||||
# Native sources compile to per-file objects through mk/native-objects.mk.
|
||||
NATIVE_OBJ_DIR := $(abspath $(BUILD_OBJ_DIR)/native)
|
||||
# Native objects build on half of the CPUs at low priority, so the desktop
|
||||
# and other work keep the machine. `NATIVE_JOBS=N` and `NATIVE_NICE=` override.
|
||||
NATIVE_JOBS ?= $(shell n=$$(nproc 2>/dev/null || echo 4); n=$$((n / 2)); \
|
||||
[ $$n -lt 1 ] && n=1; echo $$n)
|
||||
NATIVE_NICE ?= nice -n 10
|
||||
NATIVE_COMPILE_FLAGS = $(KRYON_NATIVE_CFLAGS) $(APP_INCLUDE) $(KRYON_INCLUDE) \
|
||||
-iquote$(KRYON_LIBRARY_BUILD_DIR)/c $(SQLITE_INCLUDE) $(LIBOQS_INCLUDE) \
|
||||
$(KRYON_NATIVE_BACKEND_CFLAGS) -DHAS_LIBOQS=1
|
||||
WIN64_BINARY_NAME := $(APP_EXECUTABLE)-windows-$(WIN64_ARCH).exe
|
||||
WIN64_TARGET := $(WINDOWS_BIN_DIR)/$(WIN64_ARCH)/$(WIN64_BINARY_NAME)
|
||||
WINDOWS_DIST := $(WINDOWS_DIST_DIR)/$(APP_NAME)-windows.zip
|
||||
APPIMAGE_NAME := $(APP_NAME)-linux-$(ARCH).AppImage
|
||||
APPIMAGE_TARGET := $(LINUX_DIST_DIR)/$(APPIMAGE_NAME)
|
||||
APPIMAGE_INTERPRETER ?= $(if $(filter x86_64 amd64,$(ARCH)),/lib64/ld-linux-x86-64.so.2,$(if $(filter aarch64 arm64,$(ARCH)),/lib/ld-linux-aarch64.so.1,))
|
||||
LINUXDEPLOY ?= linuxdeploy
|
||||
WEB_EMSDK_BIN ?= $(HOME)/emsdk/upstream/emscripten
|
||||
WEB_CC ?= $(if $(wildcard $(WEB_EMSDK_BIN)/emcc),$(WEB_EMSDK_BIN)/emcc,emcc)
|
||||
WEB_AR ?= $(if $(wildcard $(WEB_EMSDK_BIN)/emar),$(WEB_EMSDK_BIN)/emar,emar)
|
||||
WEB_RANLIB ?= $(if $(wildcard $(WEB_EMSDK_BIN)/emranlib),$(WEB_EMSDK_BIN)/emranlib,emranlib)
|
||||
WEB_EMCMAKE ?= $(if $(wildcard $(WEB_EMSDK_BIN)/emcmake),$(WEB_EMSDK_BIN)/emcmake,emcmake)
|
||||
ifneq ($(wildcard $(WEB_EMSDK_BIN)/emcc),)
|
||||
export PATH := $(WEB_EMSDK_BIN):$(PATH)
|
||||
endif
|
||||
|
||||
KRYON_NATIVE_CFLAGS := $(CFLAGS)
|
||||
$(WEBP_A): ziran.lock $(KRYON_DIR)/cmake/WebP.cmake $(KRYON_DIR)/cmake/ImagePackages.cmake $(KRYON_DIR)/cmake/webp/CMakeLists.txt $(wildcard build/packages/webp/native/*.cmake build/packages/libwebp/src/*/*.c build/packages/libwebp/src/*/*.h) | $(ZIRAN_BIN)
|
||||
$(CMAKE) -S $(KRYON_DIR)/cmake/webp -B $(WEBP_BUILD_DIR) -DWEBP_DIR="$(abspath build/packages/libwebp)" $(IMAGE_PACKAGE_DIRS) -DCMAKE_BUILD_TYPE=Release
|
||||
$(CMAKE) --build $(WEBP_BUILD_DIR) --target kryonwebp --parallel 2
|
||||
|
||||
$(AVIF_A) $(AOM_A) &: ziran.lock $(KRYON_DIR)/cmake/AVIF.cmake $(KRYON_DIR)/cmake/ImagePackages.cmake $(KRYON_DIR)/cmake/avif/CMakeLists.txt $(wildcard build/packages/avif/native/*.cmake) | $(ZIRAN_BIN)
|
||||
$(CMAKE) -S $(KRYON_DIR)/cmake/avif -B $(AVIF_BUILD_DIR) -DAVIF_DIR="$(abspath build/packages/libavif)" -DAOM_DIR="$(abspath build/packages/libaom)" $(IMAGE_PACKAGE_DIRS) -DCMAKE_BUILD_TYPE=Release
|
||||
$(CMAKE) --build $(AVIF_BUILD_DIR) --target avif_static aom --parallel 2
|
||||
@test -s "$(AVIF_A)" && test -s "$(AOM_A)"
|
||||
@touch -c "$(AVIF_A)" "$(AOM_A)"
|
||||
|
||||
include mk/native-desktop.mk
|
||||
|
||||
WEB_CACHE_BUSTER ?= $(shell if git diff --quiet --ignore-submodules HEAD -- 2>/dev/null; then git rev-parse --short HEAD 2>/dev/null; else date +%s; fi)
|
||||
WEB_CACHE_BUSTER := $(WEB_CACHE_BUSTER)
|
||||
WEB_TARGET := $(WEB_DIST_DIR)/index.html
|
||||
WEB_APP_SCRIPT := <script>window.__inbeRenderer="canvas";window.__inbeLoadApp("index.js?v=$(WEB_CACHE_BUSTER)")</script>
|
||||
WEB_JS_TARGET := $(WEB_DIST_DIR)/index.js
|
||||
WEB_BOOT_JS := src/web_boot.js
|
||||
WEB_HOST_JS := src/web_host.js scripts/telegram_host.js
|
||||
# Kryon's canvas hosts are Ziran modules on Ziran's web bridge; its runtime is the only JS they need.
|
||||
WEB_CANVAS_HOST_JS := $(ZIRAN_DIR)/web/ziran_web.js
|
||||
WEB_HOST_JS += $(WEB_CANVAS_HOST_JS)
|
||||
# Canvas-only web build: Kryon's HTML5 Canvas2D Tier A backend. The app and
|
||||
# support libraries are still Emscripten/WASM, including sync/liboqs for
|
||||
# sync-account parity.
|
||||
WEB_CANVAS_DIR := $(BUILD_DIST_DIR)/web-canvas
|
||||
WEB_CANVAS_TARGET := $(WEB_CANVAS_DIR)/index.html
|
||||
WEB_CANVAS_APP_SCRIPT := <script>window.__inbeRenderer="canvas";window.__inbeLoadApp("index.js?v=$(WEB_CACHE_BUSTER)")</script>
|
||||
KRYON_CANVAS_SRCS := $(filter-out $(KRYON_DIR)/src/backend/dom_%.c,$(KRYON_SRCS))
|
||||
WEB_DIST_ZIP := $(BUILD_DIST_DIR)/$(APP_NAME)-web.zip
|
||||
WEB_SMOKE_BROWSER ?= auto
|
||||
WEB_SMOKE_TEST := scripts/web-smoke-test.mjs
|
||||
WEB_SIDE_BY_SIDE_TEST := scripts/web-side-by-side-test.sh
|
||||
WEB_APP_URL ?= https://inbe.waozi.xyz/
|
||||
CHROME_WEB_STORE_ZIP := $(BUILD_DIST_DIR)/$(APP_NAME)-chrome-web-store.zip
|
||||
CHROME_WEB_STORE_MANIFEST := packaging/chrome-web-store/manifest.json
|
||||
CHROME_WEB_STORE_WORKER := packaging/chrome-web-store/service_worker.js
|
||||
CHROME_WEB_STORE_EXTENSION_BOOT := packaging/chrome-web-store/extension_boot.js
|
||||
CHROME_WEB_STORE_EXTENSION_APP := packaging/chrome-web-store/extension_app.js
|
||||
CHROME_WEB_STORE_EXTENSION_CANVAS_APP := packaging/chrome-web-store/extension_canvas_app.js
|
||||
CHROME_WEB_STORE_ICON_DIR := packaging/chrome-web-store/icons
|
||||
CHROME_WEB_STORE_ICONS := \
|
||||
$(CHROME_WEB_STORE_ICON_DIR)/icon-16.png \
|
||||
$(CHROME_WEB_STORE_ICON_DIR)/icon-32.png \
|
||||
$(CHROME_WEB_STORE_ICON_DIR)/icon-48.png \
|
||||
$(CHROME_WEB_STORE_ICON_DIR)/icon-128.png
|
||||
FIREFOX_ADDONS_DIR := $(BUILD_DIST_DIR)/firefox-addons
|
||||
FIREFOX_ADDONS_ZIP := $(BUILD_DIST_DIR)/$(APP_NAME)-firefox-addons.zip
|
||||
FIREFOX_ADDONS_SOURCE_ZIP := $(BUILD_DIST_DIR)/$(APP_NAME)-firefox-addons-source.zip
|
||||
FIREFOX_ADDONS_MANIFEST := packaging/firefox-addons/manifest.json
|
||||
FIREFOX_ADDONS_BACKGROUND := packaging/firefox-addons/background.js
|
||||
FIREFOX_ADDONS_LOADER := packaging/firefox-addons/extension_loader.js
|
||||
FIREFOX_ADDONS_INDEX := $(FIREFOX_ADDONS_DIR)/index.html
|
||||
FIREFOX_ADDONS_APP_SCRIPT := <script src="extension_loader.js"></script>
|
||||
FIREFOX_ADDONS_ICON_DIR := $(CHROME_WEB_STORE_ICON_DIR)
|
||||
FIREFOX_ADDONS_ICONS := $(CHROME_WEB_STORE_ICONS)
|
||||
ADDONS_LINTER ?= npx --yes addons-linter
|
||||
WEB_ASSET_FILES := $(filter-out web-assets/dl/% web-assets/canvas_index.html,$(shell find web-assets site-icons -type f 2>/dev/null))
|
||||
UNPACKAGED_AUDIO_DIR := unpackaged_assets/audio
|
||||
UNPACKAGED_AUDIO_FILES := $(shell find $(UNPACKAGED_AUDIO_DIR) -type f 2>/dev/null)
|
||||
MEDITATION_AUDIO_ZIP := web-assets/dl/breathing-meditation-audio-v1.zip
|
||||
MEDITATION_AUDIO_TRACKS := \
|
||||
Elijah_K/deep-meditation.ogg \
|
||||
Elijah_K/path-of-meditation.ogg \
|
||||
Elijah_K/truth-of-silence.ogg
|
||||
|
||||
include mk/package-freebsd.mk
|
||||
|
||||
.PHONY: web-canvas web-canvas-smoke-test web-compare-test web-side-by-side-test all native install install-user uninstall stage package-freebsd deb package-deb deb-check rpm package-rpm rpm-check snap package-snap snap-cache-clean flatpak package-flatpak podman-check validate-desktop run run-fresh screenshot test ci dist appimage click click-verify vendor-prebuilds vendor-prebuilds-native vendor-prebuilds-web vendor-prebuilds-windows font-subsets font-bundle-check clean clean-linux clean-native clean-vendor-builds windows-setup windows-setup-check android-avd android-audio-e2e android-check-keystore android-copy-assets android-copy-debug-apks android-copy-release-apks android-copy-fdroid-apk android-copy-bundle android-smoke android-local-properties android-debug android-release android-bundle android-install android-install-release android-clean android-rebuild validate-meditation-audio package-unpackaged-assets windows-runtime-assets-check windows windows64 web web-tools-check web-smoke-test web-smoke-test-firefox web-smoke-test-librewolf site site-release-assets-check chrome-web-store chrome-web-store-test firefox-addons firefox-addons-lint firefox-addons-source-zip verify-firefox-addons sync-web-icons
|
||||
.PHONY: zi-check
|
||||
.PHONY: clean-text-api-check package-check secret-check secret-check-history hooks-install
|
||||
.NOTPARALLEL: all native test visual-test ci zi-check dist windows windows64 android-release android-bundle click deb package-deb rpm package-rpm snap package-snap flatpak package-flatpak
|
||||
|
||||
all: native
|
||||
|
||||
# Tests take the whole toolchain directory, so every tool rebuilds together;
|
||||
# mixing a new zi2zir with an old ziran fails on the ZIR version.
|
||||
ZIRAN_TOOLS := $(addprefix $(ZIRAN_BUILD_DIR)/bin/,zi2c zi2zir zi2zx zi2go ziran)
|
||||
|
||||
$(ZI2C_BIN) $(ZIRAN_BUILD_DIR)/libziran.a &: $(ZIRAN_SOURCES) ziran.lock
|
||||
$(MAKE) -C $(ZIRAN_DIR) BUILD_DIR=$(ZIRAN_BUILD_DIR) $(ZIRAN_TOOLS) $(ZIRAN_BUILD_DIR)/libziran.a
|
||||
|
||||
$(ZIRAN_BIN): $(ZI2C_BIN)
|
||||
|
||||
zi-check: $(ZI_CHECK_STAMP) | build-laws
|
||||
|
||||
$(ZI_CHECK_STAMP): $(PACKAGES_MK) ziran.lock $(wildcard ziran.local.toml build/packages/*/ziran.toml) Makefile scripts/check-zi-sources.py scripts/package-paths.sh $(KRYON_DIR)/ziran.toml $(ZIRAN_BIN) \
|
||||
$(ZI_SRCS) $(PRACTICE_FIGURE_MODULES) $(MESH_CLIENT_MODULES) $(wildcard build/packages/entity/src/*.zi) $(ZIRAN_STD_MODULES) \
|
||||
$(KRYON_UI_ZI) $(KRYON_CSS_ZI) $(GAME2D_MODULES) | build-laws
|
||||
@ZI_CHECK_DEFINES="$(ZI_NATIVE_DEFINES)" python3 scripts/check-zi-sources.py $(ZIRAN_BIN)
|
||||
@mkdir -p $(dir $@)
|
||||
@touch $@
|
||||
|
||||
.PHONY: kryon-library-check
|
||||
kryon-library-check: $(KRYON_LIBRARY_BUILD_DIR)/libkryon.a
|
||||
|
||||
$(KRYON_LIBRARY_BUILD_DIR)/libkryon.a: $(KRYON_UI_ZI) $(KRYON_DIR)/src/ui/modules.txt $(KRYON_DIR)/Makefile $(ZI2C_BIN)
|
||||
$(MAKE) -C $(KRYON_DIR) BUILD_DIR=$(KRYON_LIBRARY_BUILD_DIR) \
|
||||
ZIRAN_DIR=$(abspath $(ZIRAN_DIR)) ZIRAN_BUILD_DIR=$(ZIRAN_BUILD_DIR) \
|
||||
$(KRYON_LIBRARY_BUILD_DIR)/libkryon.a
|
||||
|
||||
# Kryon's desktop decoder opens AVIF through libkryonavif.so beside the
|
||||
# program, from Kryon's pinned renderer-desktop artifact.
|
||||
NATIVE_AVIF_LIBRARY := $(NATIVE_BIN_DIR)/libkryonavif.so
|
||||
$(NATIVE_AVIF_LIBRARY): ziran.lock | $(ZIRAN_BIN)
|
||||
mkdir -p $(dir $@)
|
||||
@set -eu; descriptor=$$($(ZIRAN_BIN) pkg artifact kryon:renderer-desktop \
|
||||
--platform linux-$(ARCH)-gnu); cp "$$(dirname "$$descriptor")/lib/libkryonavif.so" $@
|
||||
|
||||
native: $(TARGET) $(NATIVE_AVIF_LIBRARY)
|
||||
|
||||
# Generate Kryon's checked Ziran modules into Inbe's build tree.
|
||||
$(KRYON_UI_STAMP): Makefile $(ZI2C_BIN) $(KRYON_UI_ZI) $(KRYON_DIR)/src/ui/modules.txt
|
||||
mkdir -p $(dir $@)
|
||||
$(ZI2C_BIN) --no-main --root $(KRYON_DIR)/src/ui \
|
||||
-o $(dir $@) $(KRYON_UI_ZI)
|
||||
touch $@
|
||||
|
||||
$(KRYON_UI_C) $(KRYON_UI_H): $(KRYON_UI_STAMP)
|
||||
@test -f $@
|
||||
|
||||
$(KRYON_CSS_STAMP): Makefile $(ZI2C_BIN) $(KRYON_CSS_ZI) $(KRYON_DIR)/src/ui/modules.txt
|
||||
mkdir -p $(dir $@)
|
||||
$(ZI2C_BIN) --no-main --root $(CSS_DIR)/src \
|
||||
--module-path $(KRYON_DIR)/src/ui --module-path kryon=$(KRYON_DIR)/src/ui --module-path kryon=$(KRYON_DIR)/src/backend \
|
||||
-o $(dir $@) $(KRYON_CSS_ZI)
|
||||
touch $@
|
||||
|
||||
$(KRYON_CSS_C) $(KRYON_CSS_H): $(KRYON_CSS_STAMP)
|
||||
@test -f $@
|
||||
|
||||
# Rewritten only when the defines change, so setting or clearing one such as
|
||||
# KRYON_TEST_DRIVER regenerates the C and an unchanged build regenerates none.
|
||||
$(KRY_GEN_DEFINES): FORCE
|
||||
@mkdir -p $(dir $@)
|
||||
@printf '%s\n' '$(ZI_NATIVE_DEFINES)' > $@.new
|
||||
@if cmp -s $@.new $@; then rm -f $@.new; else mv $@.new $@; fi
|
||||
|
||||
$(PRACTICE_MEDIA_STAMP): FORCE
|
||||
@mkdir -p $(dir $@)
|
||||
@printf '%s\n' '$(abspath $(PRACTICE_MEDIA))' > $@.new
|
||||
@if cmp -s $@.new $@; then rm -f $@.new; else mv $@.new $@; fi
|
||||
|
||||
$(KRY_GEN_STAMP): $(wildcard ziran.local.toml build/packages/*/ziran.toml) Makefile ziran.lock scripts/package-paths.sh $(KRYON_DIR)/ziran.toml $(ZI2C_BIN) $(ZI_SRCS) $(PRACTICE_FIGURE_MODULES) $(KRYON_ZI_MODULES) $(GAME2D_MODULES) $(MESH_CLIENT_MODULES) $(wildcard build/packages/entity/src/*.zi) $(ZIRAN_STD_MODULES) $(SYNC_RETRY_SOURCE) $(KRY_GEN_DEFINES) | build-laws zi-check
|
||||
# --prune-stale removes generated files this run no longer writes, so an
|
||||
# obsolete header/code pair never survives. Unchanged files keep their
|
||||
# timestamps, so only C that actually changed recompiles.
|
||||
mkdir -p $(KRY_GEN_DIR)
|
||||
python3 scripts/stage-practice-figure.py
|
||||
sh scripts/run-ziran.sh $(ZIRAN_BIN) build --target=c --project --offline $(PACKAGE_FLAGS) \
|
||||
--module-path $(PRACTICE_FIGURE_DIR) --no-main --prune-stale --root . \
|
||||
$(foreach define,$(ZI_NATIVE_DEFINES),--define $(define)) \
|
||||
-o $(KRY_GEN_DIR) $(ZI_SRCS)
|
||||
touch $@
|
||||
|
||||
$(KRY_GEN_SRCS) $(KRY_GEN_HDRS): $(KRY_GEN_STAMP)
|
||||
|
||||
vendor-prebuilds: vendor-prebuilds-native vendor-prebuilds-web vendor-prebuilds-windows
|
||||
|
||||
vendor-prebuilds-native: $(KRYON_NATIVE_BACKEND_DEPS) $(SQLITE_AMALGAMATION_C) $(SQLITE_AMALGAMATION_H) $(LIBOQS_A) $(CURL_PROTOCOL_CHECK)
|
||||
|
||||
vendor-prebuilds-web: web-tools-check $(SQLITE_AMALGAMATION_C) $(SQLITE_AMALGAMATION_H) $(WEB_LIBOQS_A)
|
||||
|
||||
vendor-prebuilds-windows: $(WIN64_CURL_A) $(WIN64_LIBOQS_A) $(SQLITE_AMALGAMATION_C) $(SQLITE_AMALGAMATION_H)
|
||||
|
||||
run: $(TARGET)
|
||||
@root="$${XDG_DATA_HOME:-$$HOME/.local/share}/inbe-debug"; \
|
||||
APP_DATA_ROOT="$$root" ./$(TARGET)
|
||||
|
||||
run-fresh: $(TARGET)
|
||||
@root=$$(mktemp -d /tmp/$(APP_NAME)-fresh.XXXXXX); \
|
||||
echo "APP_DATA_ROOT=$$root"; \
|
||||
APP_FORCE_DARK_MODE=1 APP_DATA_ROOT="$$root" ./$(TARGET)
|
||||
|
||||
$(sort $(BUILD_OBJ_DIR) $(NATIVE_OBJ_DIR) $(NATIVE_BIN_DIR) $(NATIVE_DIST_DIR) $(LINUX_BIN_DIR) $(LINUX_DIST_DIR) $(LINUX_APPIMAGE_BUILD_DIR) $(DEB_BUILD_DIR) $(DEB_DIST_DIR) $(RPM_BUILD_DIR) $(RPM_DIST_DIR) $(SNAP_BUILD_DIR) $(SNAP_DIST_DIR) $(FLATPAK_BUILD_DIR) $(FLATPAK_DIST_DIR) $(CLICK_BIN_DIR) $(CLICK_BUILD_DIR) $(CLICK_DIST_DIR) $(WINDOWS_DIST_DIR) $(ANDROID_BUILD_DIR) $(TEST_BIN_DIR) $(WEB_OBJ_DIR) $(WEB_DIST_DIR) $(CHROME_WEB_STORE_DIR) $(FIREFOX_ADDONS_DIR)):
|
||||
mkdir -p $@
|
||||
|
||||
FORCE:
|
||||
|
||||
.PHONY: theme-catalog-bundle-check
|
||||
theme-catalog-bundle-check:
|
||||
@cmp themes/catalog_light.css $(KRYON_DIR)/themes/catalog_light.css
|
||||
@cmp themes/catalog_dark.css $(KRYON_DIR)/themes/catalog_dark.css
|
||||
|
||||
$(EMBEDDED_ASSETS_C): Makefile $(EMBEDDED_ASSET_FILES) $(APPS_BUNDLE) scripts/embed-app-assets.py src/app/assets_host.h | $(BUILD_OBJ_DIR) theme-catalog-bundle-check
|
||||
python3 scripts/embed-app-assets.py $@ $(EMBEDDED_ASSET_FILES) --apps-controller "$(APPS_BUNDLE)"
|
||||
|
||||
$(KRYON_ICON_ASSETS_C) $(KRYON_ICON_NAMES_C) $(KRYON_ICON_TYPES_H): $(KRYON_ICON_FILES) $(KRYON_DIR)/scripts/embed-icon-sheets.py | $(BUILD_OBJ_DIR)
|
||||
cd $(KRYON_DIR) && python3 scripts/embed-icon-sheets.py "$(KRYON_ICON_DIR)" \
|
||||
"$(abspath $(KRYON_ICON_ASSETS_C))" \
|
||||
--types-output "$(abspath $(KRYON_ICON_TYPES_H))" \
|
||||
--names-output "$(abspath $(KRYON_ICON_NAMES_C))"
|
||||
|
||||
$(SQLITE_AMALGAMATION_C) $(SQLITE_AMALGAMATION_H): $(SQLITE_DIR)/configure $(SQLITE_DIR)/manifest | $(BUILD_OBJ_DIR)
|
||||
mkdir -p $(SQLITE_BUILD_DIR)
|
||||
cd $(SQLITE_BUILD_DIR) && $(abspath $(SQLITE_DIR))/configure
|
||||
$(MAKE) -C $(SQLITE_BUILD_DIR) sqlite3.c sqlite3.h
|
||||
|
||||
$(TARGET): $(ZIRAN_BUILD_DIR)/libziran.a Makefile $(SRC) $(SQLITE_SRC) $(SQLITE_AMALGAMATION_H) $(FONT_FILES) $(EMBEDDED_ASSETS_C) $(KRYON_NATIVE_BACKEND_DEPS) $(LIBOQS_A) $(CURL_PROTOCOL_CHECK) | $(NATIVE_BIN_DIR)
|
||||
$(TARGET): | zi-check
|
||||
$(shell mkdir -p $(NATIVE_OBJ_DIR))
|
||||
$(file >$(NATIVE_OBJ_DIR)/inputs.mk,NATIVE_SOURCES := $(APP_SRCS) $(GENERATED_NATIVE_C) $(EMBEDDED_ASSETS_C) $(SQLITE_SRC))
|
||||
$(file >>$(NATIVE_OBJ_DIR)/inputs.mk,NATIVE_CFLAGS := $(NATIVE_COMPILE_FLAGS))
|
||||
+@$(NATIVE_NICE) $(MAKE) --no-print-directory -f mk/native-objects.mk \
|
||||
$(if $(filter -j%,$(MAKEFLAGS)),,-j$(NATIVE_JOBS)) \
|
||||
CC='$(CC)' OBJ_DIR=$(NATIVE_OBJ_DIR)
|
||||
$(CC) $(KRYON_NATIVE_CFLAGS) \
|
||||
-o $@.next \
|
||||
@$(NATIVE_OBJ_DIR)/objects.rsp \
|
||||
$(ZIRAN_BUILD_DIR)/libziran.a \
|
||||
$(KRYON_NATIVE_BACKEND_LIBS) \
|
||||
$(LIBOQS_A) \
|
||||
$(KRYON_NATIVE_BACKEND_LDLIBS) \
|
||||
$(RUNTIME_ASSET_LDLIBS) \
|
||||
$(NATIVE_SYSTEM_LDLIBS) \
|
||||
$(LDFLAGS)
|
||||
mv -f $@.next $@
|
||||
$(if $(filter linux,$(NATIVE_PLATFORM)),python3 scripts/check-package-size.py $@,)
|
||||
|
||||
clean:
|
||||
rm -rf build
|
||||
|
||||
clean-linux:
|
||||
rm -rf $(LINUX_OBJ_DIR) $(LINUX_BIN_DIR) $(LINUX_DIST_DIR)
|
||||
|
||||
clean-native:
|
||||
rm -rf $(NATIVE_OBJ_DIR) $(NATIVE_BIN_DIR) $(NATIVE_DIST_DIR) $(NATIVE_VENDOR_BUILD_DIR)
|
||||
|
||||
clean-vendor-builds:
|
||||
rm -rf $(VENDOR_BUILD_DIR)
|
||||
|
||||
NEEDS_DEB_NATIVE := $(if $(strip $(DEB_BIN_SOURCE)),,$(if $(filter linux,$(NATIVE_PLATFORM)),$(filter deb package-deb,$(MAKECMDGOALS))))
|
||||
NEEDS_RPM_NATIVE := $(if $(strip $(RPM_BIN_SOURCE)),,$(if $(filter linux,$(NATIVE_PLATFORM)),$(filter rpm package-rpm,$(MAKECMDGOALS))))
|
||||
NEEDS_NATIVE_ENV := $(if $(MAKECMDGOALS),$(filter all native install install-user stage package-freebsd run run-fresh dist appimage vendor-prebuilds vendor-prebuilds-native,$(MAKECMDGOALS)) $(NEEDS_DEB_NATIVE) $(NEEDS_RPM_NATIVE),native)
|
||||
# A fresh tree (a container or snap build) has not fetched the packages yet,
|
||||
# and make reads this whole file before it fetches them and reads it again.
|
||||
# Check the build environment on that second read, against real sources.
|
||||
ifeq ($(PACKAGES_READY),1)
|
||||
ifneq ($(strip $(NEEDS_NATIVE_ENV)),)
|
||||
ifeq ($(strip $(DESKTOP_HOST_LDLIBS)),)
|
||||
$(error DESKTOP_HOST_LDLIBS is not set. Install pkg-config metadata for $(DESKTOP_HOST_PKGS), or set DESKTOP_HOST_CFLAGS and DESKTOP_HOST_LDLIBS explicitly)
|
||||
endif
|
||||
ifeq ($(strip $(KRYON_CURL_LDLIBS)),)
|
||||
$(error libcurl metadata is missing. Install libcurl pkg-config metadata or set KRYON_CURL_CFLAGS/KRYON_CURL_LDLIBS explicitly)
|
||||
endif
|
||||
ifneq ($(shell v='$(KRYON_CURL_VERSION_HEX)'; if [ "$$v" = 075600 ] || [ "$$v" \> 075600 ]; then echo yes; fi),yes)
|
||||
$(error libcurl >= 7.86.0 is required for websocket sync; found LIBCURL_VERSION_NUM=$(KRYON_CURL_VERSION_NUM))
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
include mk/laws.mk
|
||||
include mk/apps.mk
|
||||
include mk/windows.mk
|
||||
include mk/web.mk
|
||||
include mk/android.mk
|
||||
include mk/packaging.mk
|
||||
include mk/site.mk
|
||||
include mk/release.mk
|
||||
include mk/tools.mk
|
||||
|
||||
# Validate before producing release packages, including direct artifact targets.
|
||||
$(APPIMAGE_TARGET) $(DEB_TARGET) $(RPM_TARGET) $(SNAP_TARGET) $(FLATPAK_TARGET) $(CLICK_TARGET) $(CHROME_WEB_STORE_ZIP) $(FIREFOX_ADDONS_ZIP): | version-check
|
||||
android-release android-bundle android-copy-release-apks android-copy-fdroid-apk android-copy-bundle windows-setup site: version-check
|
||||
|
||||
# Actual artifacts are gated too, including direct and incremental builds.
|
||||
$(TARGET) $(WIN64_TARGET) $(WEB_JS_TARGET) $(WEB_CANVAS_TARGET): $(SYNC_RETRY_SOURCE) | build-laws
|
||||
|
||||
BUNDLE_RUNTIME_INPUTS := $(wildcard $(ZIRAN_DIR)/cmd/zir/*.[ch]) $(ZIRAN_DIR)/Makefile scripts/build-bundle-runtime.py
|
||||
WEB_BUNDLE_RUNTIME := $(abspath $(BUILD_DIR)/bundle-runtime/web/libziran.a)
|
||||
WINDOWS_BUNDLE_RUNTIME := $(abspath $(BUILD_DIR)/bundle-runtime/windows/libziran.a)
|
||||
CLICK_BUNDLE_RUNTIME := $(abspath $(BUILD_DIR)/bundle-runtime/click/libziran.a)
|
||||
$(WEB_BUNDLE_RUNTIME): $(BUNDLE_RUNTIME_INPUTS)
|
||||
python3 scripts/build-bundle-runtime.py --source $(ZIRAN_DIR) --output $(dir $@) --cc '$(WEB_CC)' --ar '$(WEB_AR)' --objcopy true --flags='-O2' --wasm
|
||||
$(WINDOWS_BUNDLE_RUNTIME): $(BUNDLE_RUNTIME_INPUTS)
|
||||
python3 scripts/build-bundle-runtime.py --source $(ZIRAN_DIR) --output $(dir $@) --cc '$(WIN64_CC)' --ar '$(WIN64_AR)' --objcopy x86_64-w64-mingw32-objcopy
|
||||
$(CLICK_BUNDLE_RUNTIME): $(BUNDLE_RUNTIME_INPUTS)
|
||||
python3 scripts/build-bundle-runtime.py --source $(ZIRAN_DIR) --output $(dir $@) --cc '$(AARCH64_CC)' --ar '$(AARCH64_AR)' --objcopy aarch64-linux-gnu-objcopy
|
||||
$(WIN64_TARGET): $(WINDOWS_BUNDLE_RUNTIME)
|
||||
$(WEB_JS_TARGET) $(WEB_CANVAS_TARGET): $(WEB_BUNDLE_RUNTIME)
|
||||
$(CLICK_BIN): $(CLICK_BUNDLE_RUNTIME)
|
||||
|
||||
# Build fragments affect the artifacts even when Makefile itself is unchanged.
|
||||
BUILD_MAKEFILES := $(filter-out mk/tests-%.mk,$(MAKEFILE_LIST)) mk/native-objects.mk
|
||||
$(TARGET) $(KRY_GEN_STAMP) $(WINDOWS_GEN_STAMP) $(WEB_GEN_STAMP) $(WIN64_TARGET) $(WEB_JS_TARGET) $(WEB_TARGET) $(WEB_CANVAS_TARGET) $(INBE_BUNDLE) $(INBE_FULL_BUNDLE) $(APP_BUNDLES): $(BUILD_MAKEFILES)
|
||||
|
||||
# UI prerequisites are expanded only after all artifact paths are defined.
|
||||
include mk/tests-lumi.mk
|
||||
include mk/tests-checks.mk
|
||||
include mk/tests-storage.mk
|
||||
include mk/tests-practices.mk
|
||||
include mk/tests-platform.mk
|
||||
include mk/tests-app.mk
|
||||
include mk/tests-android.mk
|
||||
include mk/tests-web.mk
|
||||
include mk/tests-apps.mk
|
||||
include mk/tests-ui.mk
|
||||
include mk/tests-benchmark.mk
|
||||
include mk/tests-suite.mk
|
||||
include $(FLINT_DIR)/mk/project.mk
|
||||
@@ -1,80 +1,101 @@
|
||||
<p align="center">
|
||||
<img src="assets/app/readme-banner.png" alt="Inner Breeze" width="100%">
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<a href="https://play.google.com/store/apps/details?id=xyz.waozi.inbe">
|
||||
<img src="assets/app/badge-google-play.png" alt="Get it on Google Play" height="56">
|
||||
</a>
|
||||
<a href="https://f-droid.org/packages/xyz.waozi.inbe/">
|
||||
<img src="assets/app/badge-f-droid.png" alt="Get it on F-Droid" height="56">
|
||||
</a>
|
||||
</p>
|
||||
|
||||
# Inner Breeze
|
||||
|
||||
Free, open-source apps for breathing, meditation, habits and everyday life.
|
||||
Use them offline, keep your data on your device, and optionally connect an
|
||||
account to sync across devices.
|
||||
Inner Breeze - A free, open-source guided breathing meditation app based on the Wim Hof method.
|
||||
|
||||
[Download the latest release](https://github.com/waozixyz/breeze/releases/latest)
|
||||
· [What's new](CHANGELOG.md)
|
||||
## Features
|
||||
|
||||
## Make space for yourself
|
||||
- Guided breathing sessions with visual and audio cues
|
||||
- Configurable breath counts and hold times
|
||||
- Session history with local storage
|
||||
- 8 color themes (Forest, Ocean, Sky, Sunset, Lavender - each with light/dark variants)
|
||||
- Sound effects (breath in/out, bell)
|
||||
- Fullscreen mode with proper DPI scaling
|
||||
- Touch-optimized UI for mobile devices
|
||||
|
||||
- **Practice:** guided breathing, meditation, Astral Projection, Sun Salutation,
|
||||
a 7-Minute Workout, with animated guides and optional narration.
|
||||
- **Habits:** track daily goals, practices and habits you want to avoid; follow
|
||||
your history and choose your own rewards.
|
||||
- **Diary and Photos:** write, reflect and keep pictures together, with shared
|
||||
photo storage and automatic compression of new uploads.
|
||||
- **Lists:** organize tasks and share lists with friends, choosing who can
|
||||
read, edit or manage them.
|
||||
- **Lumi:** a firefly companion for starting practices, managing habits and
|
||||
changing your app. Offline commands work without an AI connection.
|
||||
- **Your apps:** arrange Apps as a list or grid, choose colours and icons,
|
||||
listen to ambient Radio, and explore Arcade games and achievements.
|
||||
- **Profile:** compare practice and game rankings with friends in Leaderboard.
|
||||
Only installed apps, ranked practices and installed games appear there.
|
||||
## Building
|
||||
|
||||
## A look inside
|
||||
inbe uses [raylib](https://github.com/raysan5/raylib) and requires a Nix development environment.
|
||||
|
||||
<p align="center">
|
||||
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/01-apps.png" alt="Apps you can arrange and personalize" width="30%">
|
||||
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/03-practice-home.png" alt="Guided breathing and movement practices" width="30%">
|
||||
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/04-sun-salutation.png" alt="Animated Sun Salutation practice" width="30%">
|
||||
</p>
|
||||
<p align="center"><em>Apps · Practices · Sun Salutation</em></p>
|
||||
### Prerequisites
|
||||
|
||||
<p align="center">
|
||||
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/05-habits.png" alt="Habit goals and daily history" width="30%">
|
||||
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/07-diary.png" alt="Diary for everyday reflection" width="30%">
|
||||
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/02-lumi-customize.png" alt="Lumi helping customize Inner Breeze" width="30%">
|
||||
</p>
|
||||
<p align="center"><em>Habits · Diary · Lumi</em></p>
|
||||
- [Nix](https://nixos.org/download.html) with flakes enabled
|
||||
- For Android builds: Java 17+ JDK
|
||||
|
||||
Tai Chi is an optional Dew unlock outside Google Play.
|
||||
### Native Build
|
||||
|
||||
## Your data and choices
|
||||
```bash
|
||||
# Enter the development shell
|
||||
nix develop
|
||||
|
||||
Your data is stored locally. Account sync is optional. Lumi starts offline;
|
||||
connecting an AI provider asks for your agreement to the data sharing shown
|
||||
in the app. Use Inner Breeze's service or configure your own provider.
|
||||
# Build for your current platform (Linux x86_64/aarch64)
|
||||
flint build native
|
||||
|
||||
[Privacy policy](https://inbe.waozi.xyz/privacy.html)
|
||||
· [Account recovery and sync](docs/SYNC_RECOVERY.md)
|
||||
· [Appearance](docs/appearance.md)
|
||||
|
||||
## Build and contribute
|
||||
|
||||
```sh
|
||||
make native
|
||||
make run
|
||||
# Run
|
||||
flint run native
|
||||
```
|
||||
|
||||
See the [build guide](docs/building.md) for Android, web, dependencies and tests,
|
||||
the [F-Droid checks](docs/fdroid.md), and
|
||||
[Contributing](CONTRIBUTING.md) to report bugs or make changes.
|
||||
[Report security issues privately](SECURITY.md).
|
||||
### Cross-Platform Builds
|
||||
|
||||
BSD 3-Clause. See [LICENSE](LICENSE).
|
||||
```bash
|
||||
# Linux (both architectures)
|
||||
flint build linux
|
||||
|
||||
# Windows (x86_64/i686, OpenGL and software renderer variants, from Linux)
|
||||
flint build windows
|
||||
|
||||
# Android debug APK
|
||||
flint build android
|
||||
|
||||
# WebAssembly
|
||||
flint build web
|
||||
|
||||
# Release/package artifacts
|
||||
flint dist linux # Linux tar.gz with all Linux arch binaries
|
||||
flint dist windows # Windows zip with all Windows arch/renderer binaries
|
||||
flint dist android # Signed release APK
|
||||
flint dist itch # Build release artifacts and publish to itch.io
|
||||
flint dist # Full release flow
|
||||
```
|
||||
|
||||
### Android Emulator Testing
|
||||
|
||||
For automated testing with camera notch (cutout) support:
|
||||
|
||||
```bash
|
||||
# Enter the development shell and run everything automatically
|
||||
nix develop
|
||||
./scripts/emulator.sh # Creates and launches the test AVD
|
||||
flint run android # Builds, installs, and launches the app
|
||||
```
|
||||
|
||||
This single script handles:
|
||||
- AVD creation (if missing)
|
||||
- Emulator launch
|
||||
- APK build
|
||||
- App installation and launch
|
||||
|
||||
The AVD is configured with:
|
||||
- **Device**: Pixel 6 (punch-hole camera style)
|
||||
- **Display**: 1080×2400 @ 420dpi
|
||||
- **RAM**: 4GB with hardware acceleration
|
||||
- **Cutout**: Punch-hole camera for testing window insets
|
||||
|
||||
### Platform-Specific Notes
|
||||
|
||||
- **Linux**: Requires SDL2 runtime libraries
|
||||
- **Windows**: Standalone executable, no dependencies
|
||||
- **Android**: Requires Android NDK in the development shell
|
||||
- **Web**: Requires Emscripten toolchain
|
||||
|
||||
## Project Structure
|
||||
|
||||
- `src/` - Main application code (raylib frontend)
|
||||
- `libinbe/` - Core meditation logic (platform-agnostic)
|
||||
- `assets/` - Images and sounds
|
||||
- `themes/` - Color theme definitions
|
||||
- `droid/` - Android build configuration
|
||||
- `vendor/raylib/` - raylib submodule
|
||||
|
||||
## License
|
||||
|
||||
MIT - see [LICENSE](LICENSE)
|
||||
-10
@@ -1,10 +0,0 @@
|
||||
# Reporting a security issue
|
||||
|
||||
Email [[email protected]](mailto:[email protected]) privately with the affected
|
||||
Inner Breeze version, platform, reproduction steps and expected impact.
|
||||
Use a disposable account or sample data when possible. Do not include private
|
||||
keys, API keys or other people's data.
|
||||
|
||||
Use [GitHub Issues](https://github.com/waozixyz/breeze/issues) for ordinary bugs.
|
||||
Please keep unpatched security details out of public reports while the issue
|
||||
is investigated.
|
||||
@@ -1,15 +0,0 @@
|
||||
{
|
||||
"arcade": {
|
||||
"id": "inbe.arcade",
|
||||
"version": "0.7.126",
|
||||
"host_api": 43,
|
||||
"key_id": "inbe-2026-10",
|
||||
"bundled": true,
|
||||
"path": "apps/bundled/arcade.zx",
|
||||
"bytes": 10156,
|
||||
"sha256": "8879f61329c401b72fa843f7b92d520c65214598738f6cdafa73471454947f76",
|
||||
"source": "https://git.waozi.xyz/waozi/arcade",
|
||||
"source_commit": "fc3eb2b65f5ea84e30de86b2a1c6c3dc7c643c07",
|
||||
"sequence": 205
|
||||
}
|
||||
}
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
@@ -1,199 +0,0 @@
|
||||
# Changelog
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
- Show synced edits for the open day as they arrive and preserve text still being edited.
|
||||
|
||||
- Read and edit formatted Diary entries with inline photos.
|
||||
|
||||
- Compare full-size AVIF copies with adjustable quality and storage totals; reopen image storage from the wrench in Diary or Photos.
|
||||
|
||||
## [1.3.27] - 2026-11-05
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.63.
|
||||
|
||||
## [1.3.26] - 2026-11-02
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.62.
|
||||
|
||||
## [1.3.25] - 2026-10-29
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.61.
|
||||
|
||||
## [1.3.24] - 2026-10-29
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.60.
|
||||
|
||||
## [1.3.23] - 2026-10-28
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.59.
|
||||
|
||||
## [1.3.22] - 2026-10-28
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.58.
|
||||
|
||||
## [1.3.21] - 2026-10-28
|
||||
|
||||
- Open each day’s photos from a gallery icon, attach photos with the paperclip, and keep the entry’s layout steady while browsing its gallery.
|
||||
|
||||
## [1.3.20] - 2026-10-28
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.56.
|
||||
|
||||
## [1.3.19] - 2026-10-27
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.55.
|
||||
|
||||
## [1.3.18] - 2026-10-27
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.54.
|
||||
|
||||
## [1.3.17] - 2026-10-27
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.53.
|
||||
|
||||
## [1.3.16] - 2026-10-27
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.52.
|
||||
|
||||
## [1.3.15] - 2026-10-26
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.51.
|
||||
|
||||
## [1.3.14] - 2026-10-26
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.50.
|
||||
|
||||
## [1.3.13] - 2026-10-25
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.49.
|
||||
|
||||
## [1.3.12] - 2026-10-25
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.48.
|
||||
|
||||
## [1.3.11] - 2026-10-25
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.47.
|
||||
|
||||
## [1.3.10] - 2026-10-24
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.46.
|
||||
|
||||
## [1.3.9] - 2026-10-23
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.45.
|
||||
|
||||
## [1.3.8] - 2026-10-23
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.44.
|
||||
|
||||
## [1.3.7] - 2026-10-23
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.43.
|
||||
|
||||
## [1.3.6] - 2026-10-22
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.42.
|
||||
|
||||
## [1.3.5] - 2026-10-22
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.41.
|
||||
|
||||
## [1.3.4] - 2026-10-22
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.40.
|
||||
|
||||
## [1.3.3] - 2026-10-22
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.39.
|
||||
|
||||
## [1.3.2] - 2026-10-21
|
||||
|
||||
- Give each achievement its own meaningful icon.
|
||||
- Maintenance release for Inner Breeze 2.1.38.
|
||||
|
||||
## [1.3.1] - 2026-10-20
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.37.
|
||||
|
||||
## [1.3.0] - 2026-10-18
|
||||
|
||||
- Run the same Diary package in Inner Breeze, Werkzeug, or its own desktop window.
|
||||
- Keep entry editing, undo and redo with Diary, while the host provides private documents and available photo and spelling services.
|
||||
- The previous and next day arrows sit right beside the date.
|
||||
|
||||
## [1.2.0] - 2026-10-17
|
||||
|
||||
### Changed
|
||||
- An entry is Markdown. Headings, **bold**, *italic*, links, lists and quotes show styled, and their marks appear on the line you are editing.
|
||||
- Photos sit inside the entry, where you add them, with text before or after them on their line. Each one is saved to your photo library, the one Photos shows, under the day it was taken, and the entry links to it there. Delete a photo's Markdown to take it out of the entry.
|
||||
- Show gallery under each day's entry opens that day's photos, which scroll sideways. Tap one to put it in the entry at the cursor.
|
||||
- Photos from older entries appear inside the entry, after its text.
|
||||
|
||||
## [1.1.12] - 2026-10-17
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.35.
|
||||
|
||||
## [1.1.11] - 2026-10-17
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.34.
|
||||
|
||||
## [1.1.10] - 2026-10-13
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.33.
|
||||
|
||||
## [1.1.9] - 2026-10-11
|
||||
|
||||
### Changed
|
||||
- Scrollbars use your theme's colours and show how much of the page is in view.
|
||||
|
||||
## [1.1.8] - 2026-10-10
|
||||
|
||||
### Added
|
||||
- Correct the spelling of an entry with one button. Inner Breeze sends the entry to the Waozi node, which returns it with only misspelled words corrected. It uses the same daily online allowance as Lumi.
|
||||
- Undo and redo buttons, so a correction or any other change can be taken back.
|
||||
|
||||
### Changed
|
||||
- A title bar shows the date in the middle, between the previous and next day. Today and the calendar sit together on the left, and the entry's tools are compact buttons on the right, leaving more room for writing.
|
||||
- The entry reaches the bottom of the screen; a notice takes room below it only while it is shown.
|
||||
|
||||
## [1.1.7] - 2026-10-10
|
||||
|
||||
### Changed
|
||||
- When a photo is not on this device, for example because your sync node does not store photos, the entry shows where the photo is instead of an empty space.
|
||||
|
||||
## [1.1.6] - 2026-10-10
|
||||
|
||||
### Changed
|
||||
- Show **bold** text as bold. The ** marks appear only on the line you are editing, so you can still change them.
|
||||
|
||||
## [1.1.5] - 2026-10-10
|
||||
### Changed
|
||||
- Save your writing quietly, without a "Waiting to save…" note below the entry.
|
||||
|
||||
## [1.1.4] - 2026-10-08
|
||||
|
||||
- Keep date limits working when Diary updates on existing Inbe installations.
|
||||
|
||||
## [1.1.3] - 2026-10-08
|
||||
|
||||
- Keep the journal on today or earlier dates and show an empty editor without a writing prompt.
|
||||
- Open the same account-synced Diary from Inner Breeze and Harmony, preserving earlier entries and photos.
|
||||
|
||||
## [1.1.2] - 2026-10-07
|
||||
|
||||
- Keep app labels and content visible after updating Inner Breeze.
|
||||
|
||||
## [1.1.1] - 2026-10-06
|
||||
|
||||
- Use Apps consistently in the app and its independently delivered package.
|
||||
|
||||
## [1.1.0] - 2026-10-06
|
||||
|
||||
- The journal editor and calendar can update independently through the Diary package.
|
||||
- Attach and browse photos in daily entries, including photos imported from Harmony. Removing an attachment preserves its original private file.
|
||||
|
||||
## [1.0.0] - 2026-10-06
|
||||
|
||||
- First independently versioned Diary module.
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_diary_days_1_title": "Deník · 1 dnů",
|
||||
"achievement_diary_days_1_description": "Vykonejte tuto aktivitu v 1 různých dnech: neprázdný uložený zápis do deníku.",
|
||||
"achievement_diary_days_3_title": "Deník · 3 dnů",
|
||||
"achievement_diary_days_3_description": "Vykonejte tuto aktivitu v 3 různých dnech: neprázdný uložený zápis do deníku.",
|
||||
"achievement_diary_days_7_title": "Deník · 7 dnů",
|
||||
"achievement_diary_days_7_description": "Vykonejte tuto aktivitu v 7 různých dnech: neprázdný uložený zápis do deníku.",
|
||||
"achievement_diary_days_14_title": "Deník · 14 dnů",
|
||||
"achievement_diary_days_14_description": "Vykonejte tuto aktivitu v 14 různých dnech: neprázdný uložený zápis do deníku.",
|
||||
"achievement_diary_days_30_title": "Deník · 30 dnů",
|
||||
"achievement_diary_days_30_description": "Vykonejte tuto aktivitu v 30 různých dnech: neprázdný uložený zápis do deníku.",
|
||||
"achievement_diary_days_60_title": "Deník · 60 dnů",
|
||||
"achievement_diary_days_60_description": "Vykonejte tuto aktivitu v 60 různých dnech: neprázdný uložený zápis do deníku.",
|
||||
"achievement_diary_days_100_title": "Deník · 100 dnů",
|
||||
"achievement_diary_days_100_description": "Vykonejte tuto aktivitu v 100 různých dnech: neprázdný uložený zápis do deníku.",
|
||||
"achievement_diary_days_180_title": "Deník · 180 dnů",
|
||||
"achievement_diary_days_180_description": "Vykonejte tuto aktivitu v 180 různých dnech: neprázdný uložený zápis do deníku.",
|
||||
"achievement_diary_days_365_title": "Deník · 365 dnů",
|
||||
"achievement_diary_days_365_description": "Vykonejte tuto aktivitu v 365 různých dnech: neprázdný uložený zápis do deníku.",
|
||||
"achievement_diary_weeks_2_title": "Deník · 2 týdnů",
|
||||
"achievement_diary_weeks_2_description": "Vykonejte tuto aktivitu v 2 různých týdnech od pondělí do neděle: neprázdný uložený zápis do deníku.",
|
||||
"achievement_diary_weeks_4_title": "Deník · 4 týdnů",
|
||||
"achievement_diary_weeks_4_description": "Vykonejte tuto aktivitu v 4 různých týdnech od pondělí do neděle: neprázdný uložený zápis do deníku.",
|
||||
"achievement_diary_weeks_12_title": "Deník · 12 týdnů",
|
||||
"achievement_diary_weeks_12_description": "Vykonejte tuto aktivitu v 12 různých týdnech od pondělí do neděle: neprázdný uložený zápis do deníku.",
|
||||
"achievement_diary_weeks_26_title": "Deník · 26 týdnů",
|
||||
"achievement_diary_weeks_26_description": "Vykonejte tuto aktivitu v 26 různých týdnech od pondělí do neděle: neprázdný uložený zápis do deníku.",
|
||||
"achievement_diary_months_3_title": "Deník · 3 měsíců",
|
||||
"achievement_diary_months_3_description": "Vykonejte tuto aktivitu v 3 různých kalendářních měsících: neprázdný uložený zápis do deníku.",
|
||||
"achievement_diary_months_6_title": "Deník · 6 měsíců",
|
||||
"achievement_diary_months_6_description": "Vykonejte tuto aktivitu v 6 různých kalendářních měsících: neprázdný uložený zápis do deníku.",
|
||||
"achievement_diary_months_12_title": "Deník · 12 měsíců",
|
||||
"achievement_diary_months_12_description": "Vykonejte tuto aktivitu v 12 různých kalendářních měsících: neprázdný uložený zápis do deníku.",
|
||||
"achievement_diary_photo_days_1_title": "Deník · 1 dnů",
|
||||
"achievement_diary_photo_days_1_description": "Vykonejte tuto aktivitu v 1 různých dnech: uložený zápis do deníku s platnou fotografií.",
|
||||
"achievement_diary_photo_days_5_title": "Deník · 5 dnů",
|
||||
"achievement_diary_photo_days_5_description": "Vykonejte tuto aktivitu v 5 různých dnech: uložený zápis do deníku s platnou fotografií.",
|
||||
"achievement_diary_photo_days_20_title": "Deník · 20 dnů",
|
||||
"achievement_diary_photo_days_20_description": "Vykonejte tuto aktivitu v 20 různých dnech: uložený zápis do deníku s platnou fotografií.",
|
||||
"achievement_diary_return_14_title": "Deník · 14 dnů přestávky",
|
||||
"achievement_diary_return_14_description": "Vraťte se po alespoň 14 celých dnech bez této aktivity: neprázdný uložený zápis do deníku."
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_diary_days_1_title": "Tagebuch · 1 Tage",
|
||||
"achievement_diary_days_1_description": "Führe dies an 1 unterschiedlichen Tagen aus: ein gespeicherter Tagebucheintrag mit Inhalt.",
|
||||
"achievement_diary_days_3_title": "Tagebuch · 3 Tage",
|
||||
"achievement_diary_days_3_description": "Führe dies an 3 unterschiedlichen Tagen aus: ein gespeicherter Tagebucheintrag mit Inhalt.",
|
||||
"achievement_diary_days_7_title": "Tagebuch · 7 Tage",
|
||||
"achievement_diary_days_7_description": "Führe dies an 7 unterschiedlichen Tagen aus: ein gespeicherter Tagebucheintrag mit Inhalt.",
|
||||
"achievement_diary_days_14_title": "Tagebuch · 14 Tage",
|
||||
"achievement_diary_days_14_description": "Führe dies an 14 unterschiedlichen Tagen aus: ein gespeicherter Tagebucheintrag mit Inhalt.",
|
||||
"achievement_diary_days_30_title": "Tagebuch · 30 Tage",
|
||||
"achievement_diary_days_30_description": "Führe dies an 30 unterschiedlichen Tagen aus: ein gespeicherter Tagebucheintrag mit Inhalt.",
|
||||
"achievement_diary_days_60_title": "Tagebuch · 60 Tage",
|
||||
"achievement_diary_days_60_description": "Führe dies an 60 unterschiedlichen Tagen aus: ein gespeicherter Tagebucheintrag mit Inhalt.",
|
||||
"achievement_diary_days_100_title": "Tagebuch · 100 Tage",
|
||||
"achievement_diary_days_100_description": "Führe dies an 100 unterschiedlichen Tagen aus: ein gespeicherter Tagebucheintrag mit Inhalt.",
|
||||
"achievement_diary_days_180_title": "Tagebuch · 180 Tage",
|
||||
"achievement_diary_days_180_description": "Führe dies an 180 unterschiedlichen Tagen aus: ein gespeicherter Tagebucheintrag mit Inhalt.",
|
||||
"achievement_diary_days_365_title": "Tagebuch · 365 Tage",
|
||||
"achievement_diary_days_365_description": "Führe dies an 365 unterschiedlichen Tagen aus: ein gespeicherter Tagebucheintrag mit Inhalt.",
|
||||
"achievement_diary_weeks_2_title": "Tagebuch · 2 Wochen",
|
||||
"achievement_diary_weeks_2_description": "Führe dies in 2 unterschiedlichen Kalenderwochen von Montag bis Sonntag aus: ein gespeicherter Tagebucheintrag mit Inhalt.",
|
||||
"achievement_diary_weeks_4_title": "Tagebuch · 4 Wochen",
|
||||
"achievement_diary_weeks_4_description": "Führe dies in 4 unterschiedlichen Kalenderwochen von Montag bis Sonntag aus: ein gespeicherter Tagebucheintrag mit Inhalt.",
|
||||
"achievement_diary_weeks_12_title": "Tagebuch · 12 Wochen",
|
||||
"achievement_diary_weeks_12_description": "Führe dies in 12 unterschiedlichen Kalenderwochen von Montag bis Sonntag aus: ein gespeicherter Tagebucheintrag mit Inhalt.",
|
||||
"achievement_diary_weeks_26_title": "Tagebuch · 26 Wochen",
|
||||
"achievement_diary_weeks_26_description": "Führe dies in 26 unterschiedlichen Kalenderwochen von Montag bis Sonntag aus: ein gespeicherter Tagebucheintrag mit Inhalt.",
|
||||
"achievement_diary_months_3_title": "Tagebuch · 3 Monate",
|
||||
"achievement_diary_months_3_description": "Führe dies in 3 unterschiedlichen Kalendermonaten aus: ein gespeicherter Tagebucheintrag mit Inhalt.",
|
||||
"achievement_diary_months_6_title": "Tagebuch · 6 Monate",
|
||||
"achievement_diary_months_6_description": "Führe dies in 6 unterschiedlichen Kalendermonaten aus: ein gespeicherter Tagebucheintrag mit Inhalt.",
|
||||
"achievement_diary_months_12_title": "Tagebuch · 12 Monate",
|
||||
"achievement_diary_months_12_description": "Führe dies in 12 unterschiedlichen Kalendermonaten aus: ein gespeicherter Tagebucheintrag mit Inhalt.",
|
||||
"achievement_diary_photo_days_1_title": "Tagebuch · 1 Tage",
|
||||
"achievement_diary_photo_days_1_description": "Führe dies an 1 unterschiedlichen Tagen aus: ein gespeicherter Tagebucheintrag mit gültigem Foto.",
|
||||
"achievement_diary_photo_days_5_title": "Tagebuch · 5 Tage",
|
||||
"achievement_diary_photo_days_5_description": "Führe dies an 5 unterschiedlichen Tagen aus: ein gespeicherter Tagebucheintrag mit gültigem Foto.",
|
||||
"achievement_diary_photo_days_20_title": "Tagebuch · 20 Tage",
|
||||
"achievement_diary_photo_days_20_description": "Führe dies an 20 unterschiedlichen Tagen aus: ein gespeicherter Tagebucheintrag mit gültigem Foto.",
|
||||
"achievement_diary_return_14_title": "Tagebuch · 14 Tage Pause",
|
||||
"achievement_diary_return_14_description": "Kehre nach mindestens 14 ganzen Tagen ohne diese Aktivität zurück: ein gespeicherter Tagebucheintrag mit Inhalt."
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_diary_days_1_title": "First page",
|
||||
"achievement_diary_days_1_description": "Do this on 1 distinct dates: a nonempty saved diary entry.",
|
||||
"achievement_diary_days_3_title": "Three pages",
|
||||
"achievement_diary_days_3_description": "Do this on 3 distinct dates: a nonempty saved diary entry.",
|
||||
"achievement_diary_days_7_title": "Seven pages",
|
||||
"achievement_diary_days_7_description": "Do this on 7 distinct dates: a nonempty saved diary entry.",
|
||||
"achievement_diary_days_14_title": "Fourteen pages",
|
||||
"achievement_diary_days_14_description": "Do this on 14 distinct dates: a nonempty saved diary entry.",
|
||||
"achievement_diary_days_30_title": "Thirty pages",
|
||||
"achievement_diary_days_30_description": "Do this on 30 distinct dates: a nonempty saved diary entry.",
|
||||
"achievement_diary_days_60_title": "Sixty pages",
|
||||
"achievement_diary_days_60_description": "Do this on 60 distinct dates: a nonempty saved diary entry.",
|
||||
"achievement_diary_days_100_title": "One hundred pages",
|
||||
"achievement_diary_days_100_description": "Do this on 100 distinct dates: a nonempty saved diary entry.",
|
||||
"achievement_diary_days_180_title": "An unfolding story",
|
||||
"achievement_diary_days_180_description": "Do this on 180 distinct dates: a nonempty saved diary entry.",
|
||||
"achievement_diary_days_365_title": "A year of pages",
|
||||
"achievement_diary_days_365_description": "Do this on 365 distinct dates: a nonempty saved diary entry.",
|
||||
"achievement_diary_weeks_2_title": "Two weeks remembered",
|
||||
"achievement_diary_weeks_2_description": "Do this in 2 distinct Monday–Sunday calendar weeks: a nonempty saved diary entry.",
|
||||
"achievement_diary_weeks_4_title": "Four weeks remembered",
|
||||
"achievement_diary_weeks_4_description": "Do this in 4 distinct Monday–Sunday calendar weeks: a nonempty saved diary entry.",
|
||||
"achievement_diary_weeks_12_title": "Twelve weeks remembered",
|
||||
"achievement_diary_weeks_12_description": "Do this in 12 distinct Monday–Sunday calendar weeks: a nonempty saved diary entry.",
|
||||
"achievement_diary_weeks_26_title": "Twenty-six weeks remembered",
|
||||
"achievement_diary_weeks_26_description": "Do this in 26 distinct Monday–Sunday calendar weeks: a nonempty saved diary entry.",
|
||||
"achievement_diary_months_3_title": "Three months remembered",
|
||||
"achievement_diary_months_3_description": "Do this in 3 distinct calendar months: a nonempty saved diary entry.",
|
||||
"achievement_diary_months_6_title": "Six months remembered",
|
||||
"achievement_diary_months_6_description": "Do this in 6 distinct calendar months: a nonempty saved diary entry.",
|
||||
"achievement_diary_months_12_title": "Twelve months remembered",
|
||||
"achievement_diary_months_12_description": "Do this in 12 distinct calendar months: a nonempty saved diary entry.",
|
||||
"achievement_diary_photo_days_1_title": "A picture in your story",
|
||||
"achievement_diary_photo_days_1_description": "Do this on 1 distinct dates: a saved diary entry containing a valid photo.",
|
||||
"achievement_diary_photo_days_5_title": "Five illustrated days",
|
||||
"achievement_diary_photo_days_5_description": "Do this on 5 distinct dates: a saved diary entry containing a valid photo.",
|
||||
"achievement_diary_photo_days_20_title": "Twenty illustrated days",
|
||||
"achievement_diary_photo_days_20_description": "Do this on 20 distinct dates: a saved diary entry containing a valid photo.",
|
||||
"achievement_diary_return_14_title": "A new page again",
|
||||
"achievement_diary_return_14_description": "Return after at least 14 full days without this activity: a nonempty saved diary entry."
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_diary_days_1_title": "Diario · 1 días",
|
||||
"achievement_diary_days_1_description": "Realiza esto en 1 fechas distintas: una entrada de diario guardada con contenido.",
|
||||
"achievement_diary_days_3_title": "Diario · 3 días",
|
||||
"achievement_diary_days_3_description": "Realiza esto en 3 fechas distintas: una entrada de diario guardada con contenido.",
|
||||
"achievement_diary_days_7_title": "Diario · 7 días",
|
||||
"achievement_diary_days_7_description": "Realiza esto en 7 fechas distintas: una entrada de diario guardada con contenido.",
|
||||
"achievement_diary_days_14_title": "Diario · 14 días",
|
||||
"achievement_diary_days_14_description": "Realiza esto en 14 fechas distintas: una entrada de diario guardada con contenido.",
|
||||
"achievement_diary_days_30_title": "Diario · 30 días",
|
||||
"achievement_diary_days_30_description": "Realiza esto en 30 fechas distintas: una entrada de diario guardada con contenido.",
|
||||
"achievement_diary_days_60_title": "Diario · 60 días",
|
||||
"achievement_diary_days_60_description": "Realiza esto en 60 fechas distintas: una entrada de diario guardada con contenido.",
|
||||
"achievement_diary_days_100_title": "Diario · 100 días",
|
||||
"achievement_diary_days_100_description": "Realiza esto en 100 fechas distintas: una entrada de diario guardada con contenido.",
|
||||
"achievement_diary_days_180_title": "Diario · 180 días",
|
||||
"achievement_diary_days_180_description": "Realiza esto en 180 fechas distintas: una entrada de diario guardada con contenido.",
|
||||
"achievement_diary_days_365_title": "Diario · 365 días",
|
||||
"achievement_diary_days_365_description": "Realiza esto en 365 fechas distintas: una entrada de diario guardada con contenido.",
|
||||
"achievement_diary_weeks_2_title": "Diario · 2 semanas",
|
||||
"achievement_diary_weeks_2_description": "Realiza esto en 2 semanas naturales distintas, de lunes a domingo: una entrada de diario guardada con contenido.",
|
||||
"achievement_diary_weeks_4_title": "Diario · 4 semanas",
|
||||
"achievement_diary_weeks_4_description": "Realiza esto en 4 semanas naturales distintas, de lunes a domingo: una entrada de diario guardada con contenido.",
|
||||
"achievement_diary_weeks_12_title": "Diario · 12 semanas",
|
||||
"achievement_diary_weeks_12_description": "Realiza esto en 12 semanas naturales distintas, de lunes a domingo: una entrada de diario guardada con contenido.",
|
||||
"achievement_diary_weeks_26_title": "Diario · 26 semanas",
|
||||
"achievement_diary_weeks_26_description": "Realiza esto en 26 semanas naturales distintas, de lunes a domingo: una entrada de diario guardada con contenido.",
|
||||
"achievement_diary_months_3_title": "Diario · 3 meses",
|
||||
"achievement_diary_months_3_description": "Realiza esto en 3 meses naturales distintos: una entrada de diario guardada con contenido.",
|
||||
"achievement_diary_months_6_title": "Diario · 6 meses",
|
||||
"achievement_diary_months_6_description": "Realiza esto en 6 meses naturales distintos: una entrada de diario guardada con contenido.",
|
||||
"achievement_diary_months_12_title": "Diario · 12 meses",
|
||||
"achievement_diary_months_12_description": "Realiza esto en 12 meses naturales distintos: una entrada de diario guardada con contenido.",
|
||||
"achievement_diary_photo_days_1_title": "Diario · 1 días",
|
||||
"achievement_diary_photo_days_1_description": "Realiza esto en 1 fechas distintas: una entrada guardada del diario con una foto válida.",
|
||||
"achievement_diary_photo_days_5_title": "Diario · 5 días",
|
||||
"achievement_diary_photo_days_5_description": "Realiza esto en 5 fechas distintas: una entrada guardada del diario con una foto válida.",
|
||||
"achievement_diary_photo_days_20_title": "Diario · 20 días",
|
||||
"achievement_diary_photo_days_20_description": "Realiza esto en 20 fechas distintas: una entrada guardada del diario con una foto válida.",
|
||||
"achievement_diary_return_14_title": "Diario · 14 días de pausa",
|
||||
"achievement_diary_return_14_description": "Vuelve después de al menos 14 días completos sin esta actividad: una entrada de diario guardada con contenido."
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_diary_days_1_title": "Journal · 1 jours",
|
||||
"achievement_diary_days_1_description": "Faites ceci à 1 dates distinctes : une entrée de journal enregistrée avec du contenu.",
|
||||
"achievement_diary_days_3_title": "Journal · 3 jours",
|
||||
"achievement_diary_days_3_description": "Faites ceci à 3 dates distinctes : une entrée de journal enregistrée avec du contenu.",
|
||||
"achievement_diary_days_7_title": "Journal · 7 jours",
|
||||
"achievement_diary_days_7_description": "Faites ceci à 7 dates distinctes : une entrée de journal enregistrée avec du contenu.",
|
||||
"achievement_diary_days_14_title": "Journal · 14 jours",
|
||||
"achievement_diary_days_14_description": "Faites ceci à 14 dates distinctes : une entrée de journal enregistrée avec du contenu.",
|
||||
"achievement_diary_days_30_title": "Journal · 30 jours",
|
||||
"achievement_diary_days_30_description": "Faites ceci à 30 dates distinctes : une entrée de journal enregistrée avec du contenu.",
|
||||
"achievement_diary_days_60_title": "Journal · 60 jours",
|
||||
"achievement_diary_days_60_description": "Faites ceci à 60 dates distinctes : une entrée de journal enregistrée avec du contenu.",
|
||||
"achievement_diary_days_100_title": "Journal · 100 jours",
|
||||
"achievement_diary_days_100_description": "Faites ceci à 100 dates distinctes : une entrée de journal enregistrée avec du contenu.",
|
||||
"achievement_diary_days_180_title": "Journal · 180 jours",
|
||||
"achievement_diary_days_180_description": "Faites ceci à 180 dates distinctes : une entrée de journal enregistrée avec du contenu.",
|
||||
"achievement_diary_days_365_title": "Journal · 365 jours",
|
||||
"achievement_diary_days_365_description": "Faites ceci à 365 dates distinctes : une entrée de journal enregistrée avec du contenu.",
|
||||
"achievement_diary_weeks_2_title": "Journal · 2 semaines",
|
||||
"achievement_diary_weeks_2_description": "Faites ceci au cours de 2 semaines civiles distinctes, du lundi au dimanche : une entrée de journal enregistrée avec du contenu.",
|
||||
"achievement_diary_weeks_4_title": "Journal · 4 semaines",
|
||||
"achievement_diary_weeks_4_description": "Faites ceci au cours de 4 semaines civiles distinctes, du lundi au dimanche : une entrée de journal enregistrée avec du contenu.",
|
||||
"achievement_diary_weeks_12_title": "Journal · 12 semaines",
|
||||
"achievement_diary_weeks_12_description": "Faites ceci au cours de 12 semaines civiles distinctes, du lundi au dimanche : une entrée de journal enregistrée avec du contenu.",
|
||||
"achievement_diary_weeks_26_title": "Journal · 26 semaines",
|
||||
"achievement_diary_weeks_26_description": "Faites ceci au cours de 26 semaines civiles distinctes, du lundi au dimanche : une entrée de journal enregistrée avec du contenu.",
|
||||
"achievement_diary_months_3_title": "Journal · 3 mois",
|
||||
"achievement_diary_months_3_description": "Faites ceci au cours de 3 mois civils distincts : une entrée de journal enregistrée avec du contenu.",
|
||||
"achievement_diary_months_6_title": "Journal · 6 mois",
|
||||
"achievement_diary_months_6_description": "Faites ceci au cours de 6 mois civils distincts : une entrée de journal enregistrée avec du contenu.",
|
||||
"achievement_diary_months_12_title": "Journal · 12 mois",
|
||||
"achievement_diary_months_12_description": "Faites ceci au cours de 12 mois civils distincts : une entrée de journal enregistrée avec du contenu.",
|
||||
"achievement_diary_photo_days_1_title": "Journal · 1 jours",
|
||||
"achievement_diary_photo_days_1_description": "Faites ceci à 1 dates distinctes : une entrée de journal enregistrée contenant une photo valide.",
|
||||
"achievement_diary_photo_days_5_title": "Journal · 5 jours",
|
||||
"achievement_diary_photo_days_5_description": "Faites ceci à 5 dates distinctes : une entrée de journal enregistrée contenant une photo valide.",
|
||||
"achievement_diary_photo_days_20_title": "Journal · 20 jours",
|
||||
"achievement_diary_photo_days_20_description": "Faites ceci à 20 dates distinctes : une entrée de journal enregistrée contenant une photo valide.",
|
||||
"achievement_diary_return_14_title": "Journal · 14 jours de pause",
|
||||
"achievement_diary_return_14_description": "Revenez après au moins 14 journées entières sans cette activité : une entrée de journal enregistrée avec du contenu."
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_diary_days_1_title": "日記 · 1 日",
|
||||
"achievement_diary_days_1_description": "異なる1日で行う:内容のある保存済みの日記。",
|
||||
"achievement_diary_days_3_title": "日記 · 3 日",
|
||||
"achievement_diary_days_3_description": "異なる3日で行う:内容のある保存済みの日記。",
|
||||
"achievement_diary_days_7_title": "日記 · 7 日",
|
||||
"achievement_diary_days_7_description": "異なる7日で行う:内容のある保存済みの日記。",
|
||||
"achievement_diary_days_14_title": "日記 · 14 日",
|
||||
"achievement_diary_days_14_description": "異なる14日で行う:内容のある保存済みの日記。",
|
||||
"achievement_diary_days_30_title": "日記 · 30 日",
|
||||
"achievement_diary_days_30_description": "異なる30日で行う:内容のある保存済みの日記。",
|
||||
"achievement_diary_days_60_title": "日記 · 60 日",
|
||||
"achievement_diary_days_60_description": "異なる60日で行う:内容のある保存済みの日記。",
|
||||
"achievement_diary_days_100_title": "日記 · 100 日",
|
||||
"achievement_diary_days_100_description": "異なる100日で行う:内容のある保存済みの日記。",
|
||||
"achievement_diary_days_180_title": "日記 · 180 日",
|
||||
"achievement_diary_days_180_description": "異なる180日で行う:内容のある保存済みの日記。",
|
||||
"achievement_diary_days_365_title": "日記 · 365 日",
|
||||
"achievement_diary_days_365_description": "異なる365日で行う:内容のある保存済みの日記。",
|
||||
"achievement_diary_weeks_2_title": "日記 · 2 週間",
|
||||
"achievement_diary_weeks_2_description": "月曜から日曜までの異なる2暦週で行う:内容のある保存済みの日記。",
|
||||
"achievement_diary_weeks_4_title": "日記 · 4 週間",
|
||||
"achievement_diary_weeks_4_description": "月曜から日曜までの異なる4暦週で行う:内容のある保存済みの日記。",
|
||||
"achievement_diary_weeks_12_title": "日記 · 12 週間",
|
||||
"achievement_diary_weeks_12_description": "月曜から日曜までの異なる12暦週で行う:内容のある保存済みの日記。",
|
||||
"achievement_diary_weeks_26_title": "日記 · 26 週間",
|
||||
"achievement_diary_weeks_26_description": "月曜から日曜までの異なる26暦週で行う:内容のある保存済みの日記。",
|
||||
"achievement_diary_months_3_title": "日記 · 3 か月",
|
||||
"achievement_diary_months_3_description": "異なる3暦月で行う:内容のある保存済みの日記。",
|
||||
"achievement_diary_months_6_title": "日記 · 6 か月",
|
||||
"achievement_diary_months_6_description": "異なる6暦月で行う:内容のある保存済みの日記。",
|
||||
"achievement_diary_months_12_title": "日記 · 12 か月",
|
||||
"achievement_diary_months_12_description": "異なる12暦月で行う:内容のある保存済みの日記。",
|
||||
"achievement_diary_photo_days_1_title": "日記 · 1 日",
|
||||
"achievement_diary_photo_days_1_description": "異なる1日で行う:有効な写真を含む保存済みの日記。",
|
||||
"achievement_diary_photo_days_5_title": "日記 · 5 日",
|
||||
"achievement_diary_photo_days_5_description": "異なる5日で行う:有効な写真を含む保存済みの日記。",
|
||||
"achievement_diary_photo_days_20_title": "日記 · 20 日",
|
||||
"achievement_diary_photo_days_20_description": "異なる20日で行う:有効な写真を含む保存済みの日記。",
|
||||
"achievement_diary_return_14_title": "日記 · 14 日間の休止",
|
||||
"achievement_diary_return_14_description": "この活動をしない日が丸14日以上続いた後に再開する:内容のある保存済みの日記。"
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_diary_days_1_title": "일기 · 1 일",
|
||||
"achievement_diary_days_1_description": "서로 다른 1일에 수행하세요: 내용이 있는 저장된 일기.",
|
||||
"achievement_diary_days_3_title": "일기 · 3 일",
|
||||
"achievement_diary_days_3_description": "서로 다른 3일에 수행하세요: 내용이 있는 저장된 일기.",
|
||||
"achievement_diary_days_7_title": "일기 · 7 일",
|
||||
"achievement_diary_days_7_description": "서로 다른 7일에 수행하세요: 내용이 있는 저장된 일기.",
|
||||
"achievement_diary_days_14_title": "일기 · 14 일",
|
||||
"achievement_diary_days_14_description": "서로 다른 14일에 수행하세요: 내용이 있는 저장된 일기.",
|
||||
"achievement_diary_days_30_title": "일기 · 30 일",
|
||||
"achievement_diary_days_30_description": "서로 다른 30일에 수행하세요: 내용이 있는 저장된 일기.",
|
||||
"achievement_diary_days_60_title": "일기 · 60 일",
|
||||
"achievement_diary_days_60_description": "서로 다른 60일에 수행하세요: 내용이 있는 저장된 일기.",
|
||||
"achievement_diary_days_100_title": "일기 · 100 일",
|
||||
"achievement_diary_days_100_description": "서로 다른 100일에 수행하세요: 내용이 있는 저장된 일기.",
|
||||
"achievement_diary_days_180_title": "일기 · 180 일",
|
||||
"achievement_diary_days_180_description": "서로 다른 180일에 수행하세요: 내용이 있는 저장된 일기.",
|
||||
"achievement_diary_days_365_title": "일기 · 365 일",
|
||||
"achievement_diary_days_365_description": "서로 다른 365일에 수행하세요: 내용이 있는 저장된 일기.",
|
||||
"achievement_diary_weeks_2_title": "일기 · 2 주",
|
||||
"achievement_diary_weeks_2_description": "월요일부터 일요일까지의 서로 다른 2개 달력 주에 수행하세요: 내용이 있는 저장된 일기.",
|
||||
"achievement_diary_weeks_4_title": "일기 · 4 주",
|
||||
"achievement_diary_weeks_4_description": "월요일부터 일요일까지의 서로 다른 4개 달력 주에 수행하세요: 내용이 있는 저장된 일기.",
|
||||
"achievement_diary_weeks_12_title": "일기 · 12 주",
|
||||
"achievement_diary_weeks_12_description": "월요일부터 일요일까지의 서로 다른 12개 달력 주에 수행하세요: 내용이 있는 저장된 일기.",
|
||||
"achievement_diary_weeks_26_title": "일기 · 26 주",
|
||||
"achievement_diary_weeks_26_description": "월요일부터 일요일까지의 서로 다른 26개 달력 주에 수행하세요: 내용이 있는 저장된 일기.",
|
||||
"achievement_diary_months_3_title": "일기 · 3 개월",
|
||||
"achievement_diary_months_3_description": "서로 다른 3개 달력 월에 수행하세요: 내용이 있는 저장된 일기.",
|
||||
"achievement_diary_months_6_title": "일기 · 6 개월",
|
||||
"achievement_diary_months_6_description": "서로 다른 6개 달력 월에 수행하세요: 내용이 있는 저장된 일기.",
|
||||
"achievement_diary_months_12_title": "일기 · 12 개월",
|
||||
"achievement_diary_months_12_description": "서로 다른 12개 달력 월에 수행하세요: 내용이 있는 저장된 일기.",
|
||||
"achievement_diary_photo_days_1_title": "일기 · 1 일",
|
||||
"achievement_diary_photo_days_1_description": "서로 다른 1일에 수행하세요: 유효한 사진이 포함된 저장된 일기.",
|
||||
"achievement_diary_photo_days_5_title": "일기 · 5 일",
|
||||
"achievement_diary_photo_days_5_description": "서로 다른 5일에 수행하세요: 유효한 사진이 포함된 저장된 일기.",
|
||||
"achievement_diary_photo_days_20_title": "일기 · 20 일",
|
||||
"achievement_diary_photo_days_20_description": "서로 다른 20일에 수행하세요: 유효한 사진이 포함된 저장된 일기.",
|
||||
"achievement_diary_return_14_title": "일기 · 14 일의 휴식",
|
||||
"achievement_diary_return_14_description": "이 활동 없이 온전히 14일 이상 지난 뒤 돌아오세요: 내용이 있는 저장된 일기."
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_diary_days_1_title": "Diário · 1 dias",
|
||||
"achievement_diary_days_1_description": "Faça isto em 1 datas distintas: uma entrada de diário guardada com conteúdo.",
|
||||
"achievement_diary_days_3_title": "Diário · 3 dias",
|
||||
"achievement_diary_days_3_description": "Faça isto em 3 datas distintas: uma entrada de diário guardada com conteúdo.",
|
||||
"achievement_diary_days_7_title": "Diário · 7 dias",
|
||||
"achievement_diary_days_7_description": "Faça isto em 7 datas distintas: uma entrada de diário guardada com conteúdo.",
|
||||
"achievement_diary_days_14_title": "Diário · 14 dias",
|
||||
"achievement_diary_days_14_description": "Faça isto em 14 datas distintas: uma entrada de diário guardada com conteúdo.",
|
||||
"achievement_diary_days_30_title": "Diário · 30 dias",
|
||||
"achievement_diary_days_30_description": "Faça isto em 30 datas distintas: uma entrada de diário guardada com conteúdo.",
|
||||
"achievement_diary_days_60_title": "Diário · 60 dias",
|
||||
"achievement_diary_days_60_description": "Faça isto em 60 datas distintas: uma entrada de diário guardada com conteúdo.",
|
||||
"achievement_diary_days_100_title": "Diário · 100 dias",
|
||||
"achievement_diary_days_100_description": "Faça isto em 100 datas distintas: uma entrada de diário guardada com conteúdo.",
|
||||
"achievement_diary_days_180_title": "Diário · 180 dias",
|
||||
"achievement_diary_days_180_description": "Faça isto em 180 datas distintas: uma entrada de diário guardada com conteúdo.",
|
||||
"achievement_diary_days_365_title": "Diário · 365 dias",
|
||||
"achievement_diary_days_365_description": "Faça isto em 365 datas distintas: uma entrada de diário guardada com conteúdo.",
|
||||
"achievement_diary_weeks_2_title": "Diário · 2 semanas",
|
||||
"achievement_diary_weeks_2_description": "Faça isto em 2 semanas de calendário distintas, de segunda a domingo: uma entrada de diário guardada com conteúdo.",
|
||||
"achievement_diary_weeks_4_title": "Diário · 4 semanas",
|
||||
"achievement_diary_weeks_4_description": "Faça isto em 4 semanas de calendário distintas, de segunda a domingo: uma entrada de diário guardada com conteúdo.",
|
||||
"achievement_diary_weeks_12_title": "Diário · 12 semanas",
|
||||
"achievement_diary_weeks_12_description": "Faça isto em 12 semanas de calendário distintas, de segunda a domingo: uma entrada de diário guardada com conteúdo.",
|
||||
"achievement_diary_weeks_26_title": "Diário · 26 semanas",
|
||||
"achievement_diary_weeks_26_description": "Faça isto em 26 semanas de calendário distintas, de segunda a domingo: uma entrada de diário guardada com conteúdo.",
|
||||
"achievement_diary_months_3_title": "Diário · 3 meses",
|
||||
"achievement_diary_months_3_description": "Faça isto em 3 meses de calendário distintos: uma entrada de diário guardada com conteúdo.",
|
||||
"achievement_diary_months_6_title": "Diário · 6 meses",
|
||||
"achievement_diary_months_6_description": "Faça isto em 6 meses de calendário distintos: uma entrada de diário guardada com conteúdo.",
|
||||
"achievement_diary_months_12_title": "Diário · 12 meses",
|
||||
"achievement_diary_months_12_description": "Faça isto em 12 meses de calendário distintos: uma entrada de diário guardada com conteúdo.",
|
||||
"achievement_diary_photo_days_1_title": "Diário · 1 dias",
|
||||
"achievement_diary_photo_days_1_description": "Faça isto em 1 datas distintas: uma entrada guardada do diário com uma fotografia válida.",
|
||||
"achievement_diary_photo_days_5_title": "Diário · 5 dias",
|
||||
"achievement_diary_photo_days_5_description": "Faça isto em 5 datas distintas: uma entrada guardada do diário com uma fotografia válida.",
|
||||
"achievement_diary_photo_days_20_title": "Diário · 20 dias",
|
||||
"achievement_diary_photo_days_20_description": "Faça isto em 20 datas distintas: uma entrada guardada do diário com uma fotografia válida.",
|
||||
"achievement_diary_return_14_title": "Diário · 14 dias de pausa",
|
||||
"achievement_diary_return_14_description": "Regresse após pelo menos 14 dias completos sem esta atividade: uma entrada de diário guardada com conteúdo."
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_diary_days_1_title": "Дневник · 1 дней",
|
||||
"achievement_diary_days_1_description": "Сделайте это в 1 разных датах: сохранённая запись в дневнике с содержимым.",
|
||||
"achievement_diary_days_3_title": "Дневник · 3 дней",
|
||||
"achievement_diary_days_3_description": "Сделайте это в 3 разных датах: сохранённая запись в дневнике с содержимым.",
|
||||
"achievement_diary_days_7_title": "Дневник · 7 дней",
|
||||
"achievement_diary_days_7_description": "Сделайте это в 7 разных датах: сохранённая запись в дневнике с содержимым.",
|
||||
"achievement_diary_days_14_title": "Дневник · 14 дней",
|
||||
"achievement_diary_days_14_description": "Сделайте это в 14 разных датах: сохранённая запись в дневнике с содержимым.",
|
||||
"achievement_diary_days_30_title": "Дневник · 30 дней",
|
||||
"achievement_diary_days_30_description": "Сделайте это в 30 разных датах: сохранённая запись в дневнике с содержимым.",
|
||||
"achievement_diary_days_60_title": "Дневник · 60 дней",
|
||||
"achievement_diary_days_60_description": "Сделайте это в 60 разных датах: сохранённая запись в дневнике с содержимым.",
|
||||
"achievement_diary_days_100_title": "Дневник · 100 дней",
|
||||
"achievement_diary_days_100_description": "Сделайте это в 100 разных датах: сохранённая запись в дневнике с содержимым.",
|
||||
"achievement_diary_days_180_title": "Дневник · 180 дней",
|
||||
"achievement_diary_days_180_description": "Сделайте это в 180 разных датах: сохранённая запись в дневнике с содержимым.",
|
||||
"achievement_diary_days_365_title": "Дневник · 365 дней",
|
||||
"achievement_diary_days_365_description": "Сделайте это в 365 разных датах: сохранённая запись в дневнике с содержимым.",
|
||||
"achievement_diary_weeks_2_title": "Дневник · 2 недель",
|
||||
"achievement_diary_weeks_2_description": "Сделайте это в 2 разных календарных неделях с понедельника по воскресенье: сохранённая запись в дневнике с содержимым.",
|
||||
"achievement_diary_weeks_4_title": "Дневник · 4 недель",
|
||||
"achievement_diary_weeks_4_description": "Сделайте это в 4 разных календарных неделях с понедельника по воскресенье: сохранённая запись в дневнике с содержимым.",
|
||||
"achievement_diary_weeks_12_title": "Дневник · 12 недель",
|
||||
"achievement_diary_weeks_12_description": "Сделайте это в 12 разных календарных неделях с понедельника по воскресенье: сохранённая запись в дневнике с содержимым.",
|
||||
"achievement_diary_weeks_26_title": "Дневник · 26 недель",
|
||||
"achievement_diary_weeks_26_description": "Сделайте это в 26 разных календарных неделях с понедельника по воскресенье: сохранённая запись в дневнике с содержимым.",
|
||||
"achievement_diary_months_3_title": "Дневник · 3 месяцев",
|
||||
"achievement_diary_months_3_description": "Сделайте это в 3 разных календарных месяцах: сохранённая запись в дневнике с содержимым.",
|
||||
"achievement_diary_months_6_title": "Дневник · 6 месяцев",
|
||||
"achievement_diary_months_6_description": "Сделайте это в 6 разных календарных месяцах: сохранённая запись в дневнике с содержимым.",
|
||||
"achievement_diary_months_12_title": "Дневник · 12 месяцев",
|
||||
"achievement_diary_months_12_description": "Сделайте это в 12 разных календарных месяцах: сохранённая запись в дневнике с содержимым.",
|
||||
"achievement_diary_photo_days_1_title": "Дневник · 1 дней",
|
||||
"achievement_diary_photo_days_1_description": "Сделайте это в 1 разных датах: сохранённая дневниковая запись с корректной фотографией.",
|
||||
"achievement_diary_photo_days_5_title": "Дневник · 5 дней",
|
||||
"achievement_diary_photo_days_5_description": "Сделайте это в 5 разных датах: сохранённая дневниковая запись с корректной фотографией.",
|
||||
"achievement_diary_photo_days_20_title": "Дневник · 20 дней",
|
||||
"achievement_diary_photo_days_20_description": "Сделайте это в 20 разных датах: сохранённая дневниковая запись с корректной фотографией.",
|
||||
"achievement_diary_return_14_title": "Дневник · 14 дней перерыва",
|
||||
"achievement_diary_return_14_description": "Вернитесь после как минимум 14 полных дней без этой активности: сохранённая запись в дневнике с содержимым."
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_diary_days_1_title": "日记 · 1 天",
|
||||
"achievement_diary_days_1_description": "在1个不同日期进行:已保存且有内容的日记。",
|
||||
"achievement_diary_days_3_title": "日记 · 3 天",
|
||||
"achievement_diary_days_3_description": "在3个不同日期进行:已保存且有内容的日记。",
|
||||
"achievement_diary_days_7_title": "日记 · 7 天",
|
||||
"achievement_diary_days_7_description": "在7个不同日期进行:已保存且有内容的日记。",
|
||||
"achievement_diary_days_14_title": "日记 · 14 天",
|
||||
"achievement_diary_days_14_description": "在14个不同日期进行:已保存且有内容的日记。",
|
||||
"achievement_diary_days_30_title": "日记 · 30 天",
|
||||
"achievement_diary_days_30_description": "在30个不同日期进行:已保存且有内容的日记。",
|
||||
"achievement_diary_days_60_title": "日记 · 60 天",
|
||||
"achievement_diary_days_60_description": "在60个不同日期进行:已保存且有内容的日记。",
|
||||
"achievement_diary_days_100_title": "日记 · 100 天",
|
||||
"achievement_diary_days_100_description": "在100个不同日期进行:已保存且有内容的日记。",
|
||||
"achievement_diary_days_180_title": "日记 · 180 天",
|
||||
"achievement_diary_days_180_description": "在180个不同日期进行:已保存且有内容的日记。",
|
||||
"achievement_diary_days_365_title": "日记 · 365 天",
|
||||
"achievement_diary_days_365_description": "在365个不同日期进行:已保存且有内容的日记。",
|
||||
"achievement_diary_weeks_2_title": "日记 · 2 周",
|
||||
"achievement_diary_weeks_2_description": "在2个不同的周一至周日自然周进行:已保存且有内容的日记。",
|
||||
"achievement_diary_weeks_4_title": "日记 · 4 周",
|
||||
"achievement_diary_weeks_4_description": "在4个不同的周一至周日自然周进行:已保存且有内容的日记。",
|
||||
"achievement_diary_weeks_12_title": "日记 · 12 周",
|
||||
"achievement_diary_weeks_12_description": "在12个不同的周一至周日自然周进行:已保存且有内容的日记。",
|
||||
"achievement_diary_weeks_26_title": "日记 · 26 周",
|
||||
"achievement_diary_weeks_26_description": "在26个不同的周一至周日自然周进行:已保存且有内容的日记。",
|
||||
"achievement_diary_months_3_title": "日记 · 3 个月",
|
||||
"achievement_diary_months_3_description": "在3个不同自然月进行:已保存且有内容的日记。",
|
||||
"achievement_diary_months_6_title": "日记 · 6 个月",
|
||||
"achievement_diary_months_6_description": "在6个不同自然月进行:已保存且有内容的日记。",
|
||||
"achievement_diary_months_12_title": "日记 · 12 个月",
|
||||
"achievement_diary_months_12_description": "在12个不同自然月进行:已保存且有内容的日记。",
|
||||
"achievement_diary_photo_days_1_title": "日记 · 1 天",
|
||||
"achievement_diary_photo_days_1_description": "在1个不同日期进行:包含有效照片且已保存的日记。",
|
||||
"achievement_diary_photo_days_5_title": "日记 · 5 天",
|
||||
"achievement_diary_photo_days_5_description": "在5个不同日期进行:包含有效照片且已保存的日记。",
|
||||
"achievement_diary_photo_days_20_title": "日记 · 20 天",
|
||||
"achievement_diary_photo_days_20_description": "在20个不同日期进行:包含有效照片且已保存的日记。",
|
||||
"achievement_diary_return_14_title": "日记 · 14 天间隔",
|
||||
"achievement_diary_return_14_description": "至少有连续14个完整日期未进行此活动后再次进行:已保存且有内容的日记。"
|
||||
}
|
||||
@@ -1,326 +0,0 @@
|
||||
{
|
||||
"schema": 1,
|
||||
"app": "inbe.diary",
|
||||
"achievements": [
|
||||
{
|
||||
"id": "diary.days.1",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "days",
|
||||
"target": 1,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_days_1_title",
|
||||
"description_key": "achievement_diary_days_1_description",
|
||||
"title": "First page",
|
||||
"description": "Save 1 qualifying diary day.",
|
||||
"icon": "assets/diary/icons/diary.days.1.shape",
|
||||
"icon_source": "mingcute_regular_pencil"
|
||||
},
|
||||
{
|
||||
"id": "diary.days.3",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "days",
|
||||
"target": 3,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_days_3_title",
|
||||
"description_key": "achievement_diary_days_3_description",
|
||||
"title": "Three pages",
|
||||
"description": "Save 3 qualifying diary days.",
|
||||
"icon": "assets/diary/icons/diary.days.3.shape",
|
||||
"icon_source": "mingcute_regular_notebook"
|
||||
},
|
||||
{
|
||||
"id": "diary.days.7",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "days",
|
||||
"target": 7,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_days_7_title",
|
||||
"description_key": "achievement_diary_days_7_description",
|
||||
"title": "Seven pages",
|
||||
"description": "Save 7 qualifying diary days.",
|
||||
"icon": "assets/diary/icons/diary.days.7.shape",
|
||||
"icon_source": "mingcute_regular_quill_pen"
|
||||
},
|
||||
{
|
||||
"id": "diary.days.14",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "days",
|
||||
"target": 14,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_days_14_title",
|
||||
"description_key": "achievement_diary_days_14_description",
|
||||
"title": "Fourteen pages",
|
||||
"description": "Save 14 qualifying diary days.",
|
||||
"icon": "assets/diary/icons/diary.days.14.shape",
|
||||
"icon_source": "mingcute_regular_book_2"
|
||||
},
|
||||
{
|
||||
"id": "diary.days.30",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "days",
|
||||
"target": 30,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_days_30_title",
|
||||
"description_key": "achievement_diary_days_30_description",
|
||||
"title": "Thirty pages",
|
||||
"description": "Save 30 qualifying diary days.",
|
||||
"icon": "assets/diary/icons/diary.days.30.shape",
|
||||
"icon_source": "mingcute_regular_book"
|
||||
},
|
||||
{
|
||||
"id": "diary.days.60",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "days",
|
||||
"target": 60,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_days_60_title",
|
||||
"description_key": "achievement_diary_days_60_description",
|
||||
"title": "Sixty pages",
|
||||
"description": "Save 60 qualifying diary days.",
|
||||
"icon": "assets/diary/icons/diary.days.60.shape",
|
||||
"icon_source": "mingcute_regular_book_3"
|
||||
},
|
||||
{
|
||||
"id": "diary.days.100",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "days",
|
||||
"target": 100,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_days_100_title",
|
||||
"description_key": "achievement_diary_days_100_description",
|
||||
"title": "One hundred pages",
|
||||
"description": "Save 100 qualifying diary days.",
|
||||
"icon": "assets/diary/icons/diary.days.100.shape",
|
||||
"icon_source": "mingcute_regular_book_5"
|
||||
},
|
||||
{
|
||||
"id": "diary.days.180",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "days",
|
||||
"target": 180,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_days_180_title",
|
||||
"description_key": "achievement_diary_days_180_description",
|
||||
"title": "An unfolding story",
|
||||
"description": "Save 180 qualifying diary days.",
|
||||
"icon": "assets/diary/icons/diary.days.180.shape",
|
||||
"icon_source": "mingcute_regular_book_6"
|
||||
},
|
||||
{
|
||||
"id": "diary.days.365",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "days",
|
||||
"target": 365,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_days_365_title",
|
||||
"description_key": "achievement_diary_days_365_description",
|
||||
"title": "A year of pages",
|
||||
"description": "Save 365 qualifying diary days.",
|
||||
"icon": "assets/diary/icons/diary.days.365.shape",
|
||||
"icon_source": "mingcute_regular_bookmarks"
|
||||
},
|
||||
{
|
||||
"id": "diary.weeks.2",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "weeks",
|
||||
"target": 2,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_weeks_2_title",
|
||||
"description_key": "achievement_diary_weeks_2_description",
|
||||
"title": "Two weeks remembered",
|
||||
"description": "Write in 2 distinct weeks.",
|
||||
"icon": "assets/diary/icons/diary.weeks.2.shape",
|
||||
"icon_source": "mingcute_regular_calendar_week"
|
||||
},
|
||||
{
|
||||
"id": "diary.weeks.4",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "weeks",
|
||||
"target": 4,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_weeks_4_title",
|
||||
"description_key": "achievement_diary_weeks_4_description",
|
||||
"title": "Four weeks remembered",
|
||||
"description": "Write in 4 distinct weeks.",
|
||||
"icon": "assets/diary/icons/diary.weeks.4.shape",
|
||||
"icon_source": "mingcute_regular_calendar_month"
|
||||
},
|
||||
{
|
||||
"id": "diary.weeks.12",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "weeks",
|
||||
"target": 12,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_weeks_12_title",
|
||||
"description_key": "achievement_diary_weeks_12_description",
|
||||
"title": "Twelve weeks remembered",
|
||||
"description": "Write in 12 distinct weeks.",
|
||||
"icon": "assets/diary/icons/diary.weeks.12.shape",
|
||||
"icon_source": "mingcute_regular_calendar_3"
|
||||
},
|
||||
{
|
||||
"id": "diary.weeks.26",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "weeks",
|
||||
"target": 26,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_weeks_26_title",
|
||||
"description_key": "achievement_diary_weeks_26_description",
|
||||
"title": "Twenty-six weeks remembered",
|
||||
"description": "Write in 26 distinct weeks.",
|
||||
"icon": "assets/diary/icons/diary.weeks.26.shape",
|
||||
"icon_source": "mingcute_regular_calendar"
|
||||
},
|
||||
{
|
||||
"id": "diary.months.3",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "months",
|
||||
"target": 3,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_months_3_title",
|
||||
"description_key": "achievement_diary_months_3_description",
|
||||
"title": "Three months remembered",
|
||||
"description": "Write in 3 distinct months.",
|
||||
"icon": "assets/diary/icons/diary.months.3.shape",
|
||||
"icon_source": "mingcute_regular_notebook_2"
|
||||
},
|
||||
{
|
||||
"id": "diary.months.6",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "months",
|
||||
"target": 6,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_months_6_title",
|
||||
"description_key": "achievement_diary_months_6_description",
|
||||
"title": "Six months remembered",
|
||||
"description": "Write in 6 distinct months.",
|
||||
"icon": "assets/diary/icons/diary.months.6.shape",
|
||||
"icon_source": "mingcute_regular_bookmark"
|
||||
},
|
||||
{
|
||||
"id": "diary.months.12",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "months",
|
||||
"target": 12,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_months_12_title",
|
||||
"description_key": "achievement_diary_months_12_description",
|
||||
"title": "Twelve months remembered",
|
||||
"description": "Write in 12 distinct months.",
|
||||
"icon": "assets/diary/icons/diary.months.12.shape",
|
||||
"icon_source": "mingcute_regular_bookmark_edit"
|
||||
},
|
||||
{
|
||||
"id": "diary.photo_days.1",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "days",
|
||||
"target": 1,
|
||||
"variant": "photo",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_photo_days_1_title",
|
||||
"description_key": "achievement_diary_photo_days_1_description",
|
||||
"title": "A picture in your story",
|
||||
"description": "Save a valid photo on 1 diary day.",
|
||||
"icon": "assets/diary/icons/diary.photo_days.1.shape",
|
||||
"icon_source": "mingcute_regular_photo_album"
|
||||
},
|
||||
{
|
||||
"id": "diary.photo_days.5",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "days",
|
||||
"target": 5,
|
||||
"variant": "photo",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_photo_days_5_title",
|
||||
"description_key": "achievement_diary_photo_days_5_description",
|
||||
"title": "Five illustrated days",
|
||||
"description": "Save valid photos on 5 distinct diary days.",
|
||||
"icon": "assets/diary/icons/diary.photo_days.5.shape",
|
||||
"icon_source": "mingcute_regular_photo_album_2"
|
||||
},
|
||||
{
|
||||
"id": "diary.photo_days.20",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "days",
|
||||
"target": 20,
|
||||
"variant": "photo",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_photo_days_20_title",
|
||||
"description_key": "achievement_diary_photo_days_20_description",
|
||||
"title": "Twenty illustrated days",
|
||||
"description": "Save valid photos on 20 distinct diary days.",
|
||||
"icon": "assets/diary/icons/diary.photo_days.20.shape",
|
||||
"icon_source": "mingcute_regular_camera_rotate"
|
||||
},
|
||||
{
|
||||
"id": "diary.return.14",
|
||||
"group": "diary",
|
||||
"metric": "diary",
|
||||
"rule": "return",
|
||||
"target": 14,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_diary_return_14_title",
|
||||
"description_key": "achievement_diary_return_14_description",
|
||||
"title": "A new page again",
|
||||
"description": "Save a diary day after a 14-day diary gap.",
|
||||
"icon": "assets/diary/icons/diary.return.14.shape",
|
||||
"icon_source": "mingcute_regular_pen_2"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,628 +0,0 @@
|
||||
// Date arithmetic and per-day documents moved from Harmony's original Diary.
|
||||
// File effects belong to the host; this bundle has no OS or database access.
|
||||
//
|
||||
// A day's document keeps Harmony's version 1:
|
||||
// {"version":1,"date":"YYYY-MM-DD","text":"...","photos":[...]}. The text is
|
||||
// the entry, in Markdown, and the only source of truth: its photos are embed
|
||||
// lines (diary_markdown.zi). "photos" lists the Diary files the text embeds,
|
||||
// for older versions, which show those photos below the entry.
|
||||
#import "json_scan"
|
||||
#import, file "diary_view.zi";
|
||||
#import, file "diary_date.zi";
|
||||
#import, file "diary_markdown.zi";
|
||||
#import "std/text"
|
||||
#import "vec"
|
||||
#import "byte_text_linux"
|
||||
#import, file "diary_types.zi";
|
||||
#import "kryon/app_context"
|
||||
#import "kryon/app_protocol"
|
||||
#import "date_parse"
|
||||
#import, file "diary_history.zi";
|
||||
#import, file "diary_spelling_mask.zi";
|
||||
#import, file "diary_ui_types.zi";
|
||||
#import, file "diary_wire.zi";
|
||||
|
||||
|
||||
ReadDiaryFile :: (name: string) -> DiaryFileResult {
|
||||
data := DocumentRead(name)
|
||||
status := DocumentStatus()
|
||||
return DiaryFileResult.{.data = data, .missing = status == DOCUMENT_MISSING,
|
||||
.succeeded = status != DOCUMENT_ERROR}
|
||||
}
|
||||
|
||||
DiaryClock :: () -> string {
|
||||
seconds := cast(s64)AppNow() + cast(s64)AppLocalOffset()
|
||||
date := CivilFromUnix(seconds)
|
||||
buffer: [19]u8
|
||||
unused WriteIsoDay(seconds, buffer[:10])
|
||||
buffer[10] = cast(u8)32
|
||||
unused DateWriteDigits(buffer[:], 11, date.hour, 2)
|
||||
buffer[13] = cast(u8)58
|
||||
unused DateWriteDigits(buffer[:], 14, date.minute, 2)
|
||||
buffer[16] = cast(u8)58
|
||||
unused DateWriteDigits(buffer[:], 17, date.second, 2)
|
||||
out: Vec(u8)
|
||||
BuilderPrint(*out, "%", TextFromBytes(buffer[:]))
|
||||
return BuilderFinish(out)
|
||||
}
|
||||
|
||||
Today :: () -> Date {
|
||||
clock := DiaryClock()
|
||||
if clock.count < 10 {
|
||||
return Date.{}
|
||||
}
|
||||
return ParseDate(clock[:10])
|
||||
}
|
||||
|
||||
Filename :: (date: Date) -> string {
|
||||
out: Vec(u8)
|
||||
BuilderPrint(*out, "%.json", ISO(date))
|
||||
return BuilderFinish(out)
|
||||
}
|
||||
|
||||
Decode :: (value: string, at: s32) -> string {
|
||||
bytes: Vec(u8)
|
||||
for index: 0..value.count {
|
||||
if !VecPush(bytes, cast(u8)0) {
|
||||
VecFree(bytes);
|
||||
return ""
|
||||
}
|
||||
}
|
||||
count := ReadStringText(value, at, VecSlice(bytes, 0, bytes.count))
|
||||
if count < 0 {
|
||||
VecFree(bytes);
|
||||
return ""
|
||||
}
|
||||
out: Vec(u8)
|
||||
BuilderPrint(*out, "%", TextFromBytes(VecSlice(bytes, 0, count)))
|
||||
VecFree(bytes)
|
||||
return BuilderFinish(out)
|
||||
}
|
||||
|
||||
Json :: (out: *Vec(u8), value: string) {
|
||||
BuilderPrint(out, "\"")
|
||||
for index: 0..value.count - 1 {
|
||||
byte := value[index]
|
||||
if byte == cast(u8)34 {
|
||||
BuilderPrint(out, "\\\"")
|
||||
}
|
||||
else if byte == cast(u8)92 {
|
||||
BuilderPrint(out, "\\\\")
|
||||
}
|
||||
else if byte == cast(u8)10 {
|
||||
BuilderPrint(out, "\\n")
|
||||
}
|
||||
else if byte == cast(u8)13 {
|
||||
BuilderPrint(out, "\\r")
|
||||
}
|
||||
else if byte == cast(u8)9 {
|
||||
BuilderPrint(out, "\\t")
|
||||
}
|
||||
else if byte < cast(u8)32 {
|
||||
BuilderPrint(out, " ")
|
||||
}
|
||||
else {
|
||||
BuilderPrint(out, "%", value[index:index + 1])
|
||||
}
|
||||
}
|
||||
BuilderPrint(out, "\"")
|
||||
}
|
||||
|
||||
Document :: (message: DiaryMessage) -> string {
|
||||
out: Vec(u8)
|
||||
BuilderPrint(*out, "{\"version\":1,\"date\":")
|
||||
Json(*out, ISO(Date.{message.year, message.month, message.day}))
|
||||
BuilderPrint(*out, ",\"text\":")
|
||||
Json(*out, message.text)
|
||||
BuilderPrint(*out, ",\"photos\":")
|
||||
PhotoMirror(*out, message.text)
|
||||
BuilderPrint(*out, "}")
|
||||
return BuilderFinish(out)
|
||||
}
|
||||
|
||||
// The "photos" list older versions show: each Diary file the text embeds,
|
||||
// once, in the order the text first names it. Photos of the media library
|
||||
// are no Diary files; older versions show their embed lines as text.
|
||||
PhotoMirror :: (out: *Vec(u8), text: string) {
|
||||
BuilderPrint(out, "[")
|
||||
written: s32 = 0
|
||||
embed := DiaryEmbedNext(text, 0)
|
||||
while embed.valid {
|
||||
file := DiaryEmbedTarget(text, embed)
|
||||
first := !embed.library
|
||||
earlier := DiaryEmbedNext(text, 0)
|
||||
while first && earlier.valid && earlier.start < embed.start {
|
||||
if !earlier.library && DiaryEmbedTarget(text, earlier) == file {
|
||||
first = false
|
||||
}
|
||||
earlier = DiaryEmbedNext(text, earlier.end)
|
||||
}
|
||||
if first {
|
||||
if written > 0 {
|
||||
BuilderPrint(out, ",")
|
||||
}
|
||||
BuilderPrint(out, "{\"file\":")
|
||||
Json(out, file)
|
||||
BuilderPrint(out, ",\"name\":")
|
||||
Json(out, DiaryEmbedAlt(text, embed))
|
||||
BuilderPrint(out, "}")
|
||||
written += 1
|
||||
}
|
||||
embed = DiaryEmbedNext(text, embed.end)
|
||||
}
|
||||
BuilderPrint(out, "]")
|
||||
}
|
||||
|
||||
// Photos an older version attached as Diary files and the text does not
|
||||
// embed yet, as embed lines after the text, in the document's order. Only
|
||||
// the text in memory changes: viewing a day writes nothing, and its first
|
||||
// real edit saves the embeds.
|
||||
Migrated :: (text: string, document: string) -> string {
|
||||
rows := FieldAt(document, 0, "photos")
|
||||
result := text
|
||||
for index: cast(s32)0..ArrayCount(document, rows) - 1 {
|
||||
row := ElementAt(document, rows, index)
|
||||
file := Decode(document, FieldAt(document, row, "file"))
|
||||
if DiaryEmbedReferences(result, file) {
|
||||
continue
|
||||
}
|
||||
destination: Vec(u8)
|
||||
BuilderPrint(*destination, "diary:%", file)
|
||||
line := DiaryEmbedLine(BuilderFinish(destination),
|
||||
Decode(document, FieldAt(document, row, "name")))
|
||||
result = DiaryEmbedAppend(result, line)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
// Puts the photo the host named, a library photo it just added or a Diary
|
||||
// file, on its own line at the caret: one edit, saved at once. The caret
|
||||
// starts at the end of a day's entry, so without a click the photo follows
|
||||
// the text.
|
||||
AttachPhoto :: (message: DiaryMessage) -> DiaryMessage {
|
||||
line := DiaryEmbedLine(message.attachment_file, message.attachment_name)
|
||||
if !OnOrBefore(Date.{message.year, message.month, message.day}, Today()) ||
|
||||
message.load_error || DiaryEmbedAt(line, 0).end != cast(s32)line.count {
|
||||
message.succeeded = false
|
||||
return message
|
||||
}
|
||||
edit := DiaryEmbedInsertion(message.text, message.cursor, line)
|
||||
message.action = DIARY_EDIT
|
||||
message.edit_start = edit.start
|
||||
message.edit_end = edit.end
|
||||
message.replacement = edit.replacement
|
||||
message = Apply(message)
|
||||
message.replacement = ""
|
||||
// An entry that cannot save keeps the photo and saves with its next edit.
|
||||
message = Save(message)
|
||||
return message
|
||||
}
|
||||
|
||||
Load :: (message: DiaryMessage, date: Date) -> DiaryMessage {
|
||||
if !OnOrBefore(date, Today()) {
|
||||
message.succeeded = false;
|
||||
return message
|
||||
}
|
||||
loaded := ReadDiaryFile(Filename(date))
|
||||
message.year = date.year
|
||||
message.month = date.month
|
||||
message.day = date.day
|
||||
message.text = ""
|
||||
message.document = loaded.data
|
||||
message.cursor = 0
|
||||
message.anchor = 0
|
||||
message.load_error = !loaded.succeeded
|
||||
message.saved = true
|
||||
if loaded.missing {
|
||||
message.load_error = false;
|
||||
return message
|
||||
}
|
||||
version := ReadNumber(loaded.data, FieldAt(loaded.data, 0, "version"))
|
||||
day := Decode(loaded.data, FieldAt(loaded.data, 0, "date"))
|
||||
text := FieldAt(loaded.data, 0, "text")
|
||||
if !version.valid || version.value != 1.0 || day != ISO(date) || text < 0 ||
|
||||
loaded.data[text] != cast(u8)34 ||
|
||||
ArrayCount(loaded.data, FieldAt(loaded.data, 0, "photos")) < 0 ||
|
||||
Space(loaded.data, ValueEnd(loaded.data, 0, 0)) != loaded.data.count {
|
||||
message.load_error = true
|
||||
return message
|
||||
}
|
||||
rows := FieldAt(loaded.data, 0, "photos")
|
||||
for index: cast(s32)0..ArrayCount(loaded.data, rows) - 1 {
|
||||
row := ElementAt(loaded.data, rows, index)
|
||||
file := Decode(loaded.data, FieldAt(loaded.data, row, "file"))
|
||||
label := FieldAt(loaded.data, row, "name")
|
||||
if !DiaryFileNameValid(file) || label < 0 || loaded.data[label] != cast(u8)34 {
|
||||
message.load_error = true
|
||||
return message
|
||||
}
|
||||
}
|
||||
message.text = Migrated(Decode(loaded.data, text), loaded.data)
|
||||
message.cursor = cast(s32)message.text.count
|
||||
message.anchor = message.cursor
|
||||
return message
|
||||
}
|
||||
|
||||
Save :: (message: DiaryMessage) -> DiaryMessage {
|
||||
if message.load_error || !OnOrBefore(Date.{message.year, message.month, message.day}, Today()) {
|
||||
message.succeeded = false;
|
||||
return message
|
||||
}
|
||||
if message.saved {
|
||||
return message
|
||||
}
|
||||
message.document = Document(message)
|
||||
message.saved = DocumentWrite(Filename(Date.{message.year, message.month, message.day}),
|
||||
message.document)
|
||||
message.succeeded = message.saved
|
||||
return message
|
||||
}
|
||||
|
||||
Apply :: (message: DiaryMessage) -> DiaryMessage {
|
||||
message.succeeded = true
|
||||
if message.action == DIARY_ROUTE {
|
||||
message.succeeded = true
|
||||
return message
|
||||
}
|
||||
if message.action == DIARY_LOAD {
|
||||
date := Date.{message.year, message.month, message.day}
|
||||
if !Valid(date) {
|
||||
date = Today()
|
||||
}
|
||||
return Load(message, date)
|
||||
}
|
||||
if message.action == DIARY_SAVE {
|
||||
return Save(message)
|
||||
}
|
||||
if message.action == DIARY_ATTACH {
|
||||
return AttachPhoto(message)
|
||||
}
|
||||
if message.action == DIARY_EDIT {
|
||||
if !OnOrBefore(Date.{message.year, message.month, message.day}, Today()) ||
|
||||
message.load_error || message.edit_start < 0 ||
|
||||
message.edit_end < message.edit_start || message.edit_end > message.text.count {
|
||||
message.succeeded = false
|
||||
return message
|
||||
}
|
||||
out: Vec(u8)
|
||||
BuilderPrint(*out, "%", message.text[0:message.edit_start])
|
||||
BuilderPrint(*out, "%", message.replacement)
|
||||
BuilderPrint(*out, "%", message.text[message.edit_end:message.text.count])
|
||||
message.text = BuilderFinish(out)
|
||||
message.cursor = message.edit_start + cast(s32)message.replacement.count
|
||||
message.anchor = message.cursor
|
||||
message.saved = false
|
||||
return message
|
||||
}
|
||||
if message.action != DIARY_CONTROL {
|
||||
message.succeeded = false;
|
||||
return message
|
||||
}
|
||||
if message.control == 29013 {
|
||||
clock := DiaryClock()
|
||||
if message.load_error || message.calendar || clock.count < 16 {
|
||||
message.succeeded = false
|
||||
return message
|
||||
}
|
||||
stamp: Vec(u8)
|
||||
BuilderPrint(*stamp, "**%**", clock[11:16])
|
||||
message.replacement = BuilderFinish(stamp)
|
||||
message.edit_start = ifx message.cursor < message.anchor then message.cursor else message.anchor
|
||||
message.edit_end = ifx message.cursor > message.anchor then message.cursor else message.anchor
|
||||
message.action = DIARY_EDIT
|
||||
return Apply(message)
|
||||
}
|
||||
if message.control == 29003 {
|
||||
message.calendar = !message.calendar
|
||||
message.month_year = message.year
|
||||
message.month_number = message.month
|
||||
} else if message.control == 29011 || message.control == 29012 {
|
||||
previous_year := message.month_year
|
||||
previous_month := message.month_number
|
||||
message.month_number += ifx message.control == 29011 then -1 else 1
|
||||
if message.month_number < 1 {
|
||||
message.month_number = 12;
|
||||
message.month_year -= 1
|
||||
}
|
||||
if message.month_number > 12 {
|
||||
message.month_number = 1;
|
||||
message.month_year += 1
|
||||
}
|
||||
if !OnOrBefore(Date.{message.month_year, message.month_number, 1}, Today()) {
|
||||
message.month_year = previous_year
|
||||
message.month_number = previous_month
|
||||
message.succeeded = false;
|
||||
return message
|
||||
}
|
||||
} else {
|
||||
before := message
|
||||
date := Date.{before.year, before.month, before.day}
|
||||
if message.control == 29001 {
|
||||
date = Next(date, -1)
|
||||
}
|
||||
else if message.control == 29002 {
|
||||
date = Next(date, 1)
|
||||
}
|
||||
else if message.control == 29004 {
|
||||
date = Today()
|
||||
}
|
||||
else if message.control >= 29101 && message.control <= 29131 {
|
||||
date = Date.{message.month_year, message.month_number, message.control - 29100}
|
||||
} else {
|
||||
message.succeeded = false;
|
||||
return message
|
||||
}
|
||||
if !OnOrBefore(date, Today()) {
|
||||
message.succeeded = false
|
||||
return message
|
||||
}
|
||||
message = Save(message)
|
||||
if !message.saved && !message.load_error {
|
||||
return message
|
||||
}
|
||||
message = Load(message, date)
|
||||
message.calendar = false
|
||||
}
|
||||
if message.calendar {
|
||||
if !Valid(Date.{message.month_year, message.month_number, 1}) {
|
||||
message.succeeded = false
|
||||
message.calendar = false
|
||||
return message
|
||||
}
|
||||
message.month_days = Days(message.month_year, message.month_number)
|
||||
message.month_weekday = Weekday(Date.{message.month_year, message.month_number, 1})
|
||||
for day: cast(s32)0..cast(s32)31 {
|
||||
message.marks[day] = cast(u8)0
|
||||
}
|
||||
for day: cast(s32)1..Days(message.month_year, message.month_number) {
|
||||
file := ReadDiaryFile(Filename(Date.{message.month_year, message.month_number, day}))
|
||||
text := FieldAt(file.data, 0, "text")
|
||||
has_text := text >= 0 && text + 1 < file.data.count && file.data[text + 1] != cast(u8)34
|
||||
message.marks[day] = ifx has_text ||
|
||||
ArrayCount(file.data, FieldAt(file.data, 0, "photos")) > 0 then cast(u8)1 else cast(u8)0
|
||||
}
|
||||
}
|
||||
return message
|
||||
}
|
||||
|
||||
entry: DiaryMessage;
|
||||
editor: DiaryUiFrame;
|
||||
loaded: bool;
|
||||
document_scope: string;
|
||||
document_revision: string;
|
||||
history: DiaryHistory;
|
||||
photo_waiting: bool;
|
||||
photo_day: Date;
|
||||
spelling_sent: string;
|
||||
spelling_day: Date;
|
||||
spelling_notice_until: float64;
|
||||
|
||||
DiarySpellingNotice :: (key: string) {
|
||||
editor.spelling_notice = key
|
||||
spelling_notice_until = editor.now + 6.0
|
||||
}
|
||||
|
||||
DiarySpellingPollService :: () {
|
||||
if !editor.spelling_busy || !AppSupports("text.correct.poll") { return }
|
||||
result := AppService("text.correct.poll", "")
|
||||
if !DiaryWireBool(result, "finished") { return }
|
||||
editor.spelling_busy = false
|
||||
same_day := entry.year == spelling_day.year && entry.month == spelling_day.month &&
|
||||
entry.day == spelling_day.day
|
||||
if !same_day { return }
|
||||
notice := DiaryWireString(result, FieldAt(result, 0, "notice"))
|
||||
if notice != "" {
|
||||
DiarySpellingNotice(notice)
|
||||
return
|
||||
}
|
||||
if entry.text != spelling_sent {
|
||||
DiarySpellingNotice("diary_spelling_error")
|
||||
return
|
||||
}
|
||||
corrected := DiarySpellingRestored(entry.text, DiaryWireString(result, FieldAt(result, 0, "text")))
|
||||
if corrected == "" && entry.text != "" {
|
||||
DiarySpellingNotice("diary_spelling_error")
|
||||
return
|
||||
}
|
||||
if corrected == entry.text {
|
||||
DiarySpellingNotice("diary_spelling_none")
|
||||
return
|
||||
}
|
||||
edit := DiaryHistoryEdit(entry.text, corrected)
|
||||
entry.action = DIARY_EDIT
|
||||
entry.edit_start = edit.start
|
||||
entry.edit_end = edit.end
|
||||
entry.replacement = edit.replacement
|
||||
entry = Apply(entry)
|
||||
entry.replacement = ""
|
||||
editor.save_at = editor.now
|
||||
DiaryHistoryObserve(*history, entry.year, entry.month, entry.day, entry.text, editor.now, false)
|
||||
}
|
||||
|
||||
DiarySpellingRequest :: () {
|
||||
if !editor.spelling_requested || editor.spelling_busy || !AppSupports("text.correct.start") { return }
|
||||
result := AppService("text.correct.start", DiarySpellingMasked(entry.text))
|
||||
notice := DiaryWireString(result, FieldAt(result, 0, "notice"))
|
||||
if notice != "" {
|
||||
DiarySpellingNotice(notice)
|
||||
return
|
||||
}
|
||||
editor.spelling_busy = DiaryWireBool(result, "busy")
|
||||
if editor.spelling_busy {
|
||||
spelling_sent = entry.text
|
||||
spelling_day = Date.{entry.year, entry.month, entry.day}
|
||||
editor.spelling_notice = ""
|
||||
}
|
||||
}
|
||||
|
||||
DiaryEnsureLoaded :: () {
|
||||
if !loaded {
|
||||
entry = Apply(DiaryMessage.{.action = DIARY_LOAD})
|
||||
loaded = entry.succeeded
|
||||
}
|
||||
}
|
||||
|
||||
DiaryRefreshPosition :: (position: s32, text: string) -> s32 {
|
||||
at := ifx position > text.count then cast(s32)text.count else position
|
||||
while at > 0 && at < text.count && DiaryContinuationByte(text[at]) {
|
||||
at -= 1
|
||||
}
|
||||
return at
|
||||
}
|
||||
|
||||
DiaryObserveDocuments :: (refresh: bool) {
|
||||
if !AppSupports("document.revision") {
|
||||
return
|
||||
}
|
||||
revision := AppService("document.revision", "")
|
||||
if revision == "" || revision == document_revision {
|
||||
return
|
||||
}
|
||||
separator := revision.count - 1
|
||||
while separator >= 0 && revision[separator] != cast(u8)58 {
|
||||
separator -= 1
|
||||
}
|
||||
if separator <= 0 {
|
||||
return
|
||||
}
|
||||
scope := revision[:separator]
|
||||
if document_scope != "" && scope != document_scope {
|
||||
// Keep the selected date, but never save or carry editor state from
|
||||
// another account into it.
|
||||
date := Date.{entry.year, entry.month, entry.day}
|
||||
entry = Apply(DiaryMessage.{.action = DIARY_LOAD, .year = date.year,
|
||||
.month = date.month, .day = date.day})
|
||||
loaded = entry.succeeded
|
||||
editor = DiaryUiFrame.{}
|
||||
DiaryHistoryClear(*history)
|
||||
photo_waiting = false
|
||||
spelling_sent = ""
|
||||
document_scope = scope
|
||||
document_revision = revision
|
||||
return
|
||||
}
|
||||
document_scope = scope
|
||||
if !refresh || (loaded && !entry.saved) {
|
||||
// Leave the revision pending while typing or retrying a failed save.
|
||||
return
|
||||
}
|
||||
document_revision = revision
|
||||
if !loaded {
|
||||
return
|
||||
}
|
||||
fresh := Load(entry, Date.{entry.year, entry.month, entry.day})
|
||||
// A manifest and its chunks may arrive on different sync pages. Keep
|
||||
// the current text until a later committed revision makes it readable.
|
||||
if fresh.load_error || (fresh.document == entry.document && !entry.load_error) {
|
||||
return
|
||||
}
|
||||
fresh.cursor = DiaryRefreshPosition(entry.cursor, fresh.text)
|
||||
fresh.anchor = DiaryRefreshPosition(entry.anchor, fresh.text)
|
||||
if fresh.text != entry.text {
|
||||
DiaryHistoryClear(*history)
|
||||
}
|
||||
entry = fresh
|
||||
}
|
||||
|
||||
DiaryHistoryApply :: (redo: bool) {
|
||||
changed := ifx redo then DiaryHistoryRedo(*history) else DiaryHistoryUndo(*history)
|
||||
if !changed { return }
|
||||
edit := DiaryHistoryEdit(entry.text, history.current)
|
||||
entry.action = DIARY_EDIT
|
||||
entry.edit_start = edit.start
|
||||
entry.edit_end = edit.end
|
||||
entry.replacement = edit.replacement
|
||||
entry = Apply(entry)
|
||||
entry.replacement = ""
|
||||
editor.save_at = editor.now
|
||||
}
|
||||
|
||||
DiaryPicked :: (result: string) {
|
||||
status := DiaryWireString(result, FieldAt(result, 0, "status"))
|
||||
photo_waiting = status == "pending"
|
||||
if status != "done" {
|
||||
editor.photo_error = status == "failed"
|
||||
return
|
||||
}
|
||||
if entry.year != photo_day.year || entry.month != photo_day.month || entry.day != photo_day.day {
|
||||
return
|
||||
}
|
||||
entry.action = DIARY_ATTACH
|
||||
entry.attachment_file = DiaryWireString(result, FieldAt(result, 0, "destination"))
|
||||
entry.attachment_name = DiaryWireString(result, FieldAt(result, 0, "name"))
|
||||
entry = Apply(entry)
|
||||
editor.photo_error = !entry.succeeded
|
||||
}
|
||||
|
||||
#program_export "DiaryMain"
|
||||
Main :: () -> s32 {
|
||||
mode := AppMode()
|
||||
if mode == APP_IDENTIFY {
|
||||
AppIdentity("inbe.diary")
|
||||
AppDescribe("Diary", "S1.8rr:M5 3H19V21H5ZM8 7H16M8 11H16M8 15H13")
|
||||
return APP_PROTOCOL
|
||||
}
|
||||
if mode == APP_COMMAND {
|
||||
DiaryObserveDocuments(false)
|
||||
entry = Apply(DiaryMessageDecode(AppCommand()))
|
||||
loaded = entry.year > 0
|
||||
AppReply(DiaryMessageEncode(entry))
|
||||
return 0
|
||||
}
|
||||
if mode == APP_SAVE {
|
||||
DiaryObserveDocuments(false)
|
||||
if loaded { entry = Save(entry) }
|
||||
AppReply(DiaryMessageEncode(entry))
|
||||
return ifx !loaded || entry.saved || entry.load_error then 0 else 1
|
||||
}
|
||||
if mode != APP_FRAME { return 0 }
|
||||
DiaryObserveDocuments(true)
|
||||
DiaryEnsureLoaded()
|
||||
bounds := AppBounds()
|
||||
editor.session = AppSession()
|
||||
editor.width = cast(s32)bounds.width
|
||||
editor.height = cast(s32)(bounds.y + bounds.height)
|
||||
editor.origin_x = cast(s32)bounds.x
|
||||
editor.origin_y = cast(s32)bounds.y
|
||||
editor.scale = AppScale()
|
||||
editor.font = AppFont()
|
||||
editor.now = AppAreaInput().now_seconds
|
||||
editor.input = AppAreaInput()
|
||||
editor.link_color = ifx AppDark() then cast(u32)0x9bc5e8ff else cast(u32)0x286d9cff
|
||||
editor.muted_color = ifx AppDark() then cast(u32)0xaaaeb3ff else cast(u32)0x62686eff
|
||||
editor.can_undo = history.undo_count > 0
|
||||
editor.can_redo = history.redo_count > 0
|
||||
editor.photo_requested = false
|
||||
editor.undo_requested = false
|
||||
editor.redo_requested = false
|
||||
editor.spelling_requested = false
|
||||
if editor.now >= spelling_notice_until { editor.spelling_notice = "" }
|
||||
DiarySpellingPollService()
|
||||
editor.clipboard_write = false
|
||||
if photo_waiting && AppSupports("media.pick.status") {
|
||||
DiaryPicked(AppService("media.pick.status", ""))
|
||||
}
|
||||
entry.action = DIARY_FRAME
|
||||
entry = DiaryView(entry, editor, Today())
|
||||
editor = DiaryObservedFrame()
|
||||
if entry.action != DIARY_FRAME { entry = Apply(entry) }
|
||||
if editor.undo_requested { DiaryHistoryApply(false) }
|
||||
if editor.redo_requested { DiaryHistoryApply(true) }
|
||||
DiarySpellingRequest()
|
||||
if editor.photo_requested && AppSupports("media.pick") {
|
||||
entry = Save(entry)
|
||||
if entry.saved {
|
||||
photo_day = Date.{entry.year, entry.month, entry.day}
|
||||
DiaryPicked(AppService("media.pick", AppLocale("diary_attach_photo")))
|
||||
}
|
||||
}
|
||||
if editor.clipboard_write {
|
||||
unused ClipboardCopy(editor.clipboard_text, 0)
|
||||
}
|
||||
if !entry.saved && editor.now >= editor.save_at { entry = Save(entry) }
|
||||
if loaded && !entry.load_error {
|
||||
DiaryHistoryObserve(*history, entry.year, entry.month, entry.day, entry.text, editor.now, true)
|
||||
}
|
||||
AppKeyboard(editor.focused)
|
||||
return 0
|
||||
}
|
||||
@@ -1,150 +0,0 @@
|
||||
// Diary decides whether a saved document contains a real entry or a valid
|
||||
// account photo. Achievement facts contain only its date and photo flag.
|
||||
#import "std/json_scan"
|
||||
#import "std/text_buffer"
|
||||
#import "std/byte_text_linux"
|
||||
#import "std/vec"
|
||||
#import, file "diary_markdown.zi";
|
||||
#import, file "../../src/storage/achievements.zi";
|
||||
#import, file "../../src/storage/achievement_records.zi";
|
||||
#import, file "../../src/storage/sqlite.zi";
|
||||
#import, file "../../src/storage/db.zi";
|
||||
#import, file "../../src/storage/state.zi";
|
||||
#import, file "../../src/storage/storage_core.zi";
|
||||
#import, file "../../src/storage/bundled_app_records.zi";
|
||||
#import, file "../../src/apps/diary_records.zi";
|
||||
#import, file "../../src/apps/media_store.zi";
|
||||
#import, file "../../src/apps/package_files.zi";
|
||||
#import, file "../../src/app/text_buffers.zi";
|
||||
|
||||
AchievementDiaryPhoto :: (target: string, library: bool) -> bool {
|
||||
if library {
|
||||
hash := MediaPlaceHash(target)
|
||||
if hash == "" { return false }
|
||||
item := MediaRead(hash)
|
||||
return item.valid && !item.trashed
|
||||
}
|
||||
if !DiaryFileNameValid(target) { return false }
|
||||
key := DiaryRecordKey(target)
|
||||
record := BundledAppRecordRead(key)
|
||||
defer { PackageFree(key); PackageFree(record) }
|
||||
return DiaryMediaParse(record).valid
|
||||
}
|
||||
|
||||
// A saved document's day, whether it shows a photo, and whether it is a
|
||||
// real entry: authored text or a valid photo. `day` is 0 when the name is
|
||||
// not a day's document.
|
||||
DiaryEntry :: struct {
|
||||
day: s32
|
||||
photo: bool
|
||||
qualified: bool
|
||||
}
|
||||
|
||||
DiaryEntryOf :: (name: string, document: string) -> DiaryEntry {
|
||||
entry: DiaryEntry
|
||||
if name.count != 15 || name[10:] != ".json" { return entry }
|
||||
day := AchievementParseDay(name[:10])
|
||||
if day == 0 || document.count > 16777216 { return entry }
|
||||
entry.day = day
|
||||
end := ValueEnd(document, Space(document, 0), 0)
|
||||
if end < 0 || Space(document, end) != document.count { return entry }
|
||||
version := ReadNumber(document, FieldAt(document, 0, "version"))
|
||||
date: [11]u8
|
||||
if !version.valid || version.value != 1 ||
|
||||
ReadStringText(document, FieldAt(document, 0, "date"), date[:]) != 10 ||
|
||||
TextUntilNul(date[:]) != name[:10] { return entry }
|
||||
decoded := ReadStringValue(document, FieldAt(document, 0, "text"), 16777216)
|
||||
if !decoded.valid { return entry }
|
||||
text := BuilderFinish(decoded.value)
|
||||
defer { PackageFree(text) }
|
||||
authored := false
|
||||
offset: s32 = 0
|
||||
while offset < text.count {
|
||||
embed := DiaryEmbedAt(text, offset)
|
||||
if embed.valid {
|
||||
if AchievementDiaryPhoto(DiaryEmbedTarget(text, embed), embed.library) { entry.photo = true }
|
||||
offset = embed.end
|
||||
continue
|
||||
}
|
||||
// A broken image by itself is not authored journal text.
|
||||
if text[offset] == #char "!" && offset + 1 < text.count && text[offset + 1] == #char "[" {
|
||||
while offset < text.count && text[offset] != cast(u8)10 { offset += 1 }
|
||||
continue
|
||||
}
|
||||
byte := text[offset]
|
||||
if byte > cast(u8)32 && byte != #char "*" && byte != #char "_" && byte != #char "#" &&
|
||||
byte != #char ">" && byte != #char "`" && byte != #char "~" && byte != #char "-" { authored = true }
|
||||
offset += 1
|
||||
}
|
||||
old_photos := FieldAt(document, 0, "photos")
|
||||
for index: cast(s32)0..ArrayCount(document, old_photos) - 1 {
|
||||
row := ElementAt(document, old_photos, index)
|
||||
file: [201]u8
|
||||
if ReadStringText(document, FieldAt(document, row, "file"), file[:]) > 0 &&
|
||||
AchievementDiaryPhoto(TextUntilNul(file[:]), false) { entry.photo = true }
|
||||
}
|
||||
entry.qualified = authored || entry.photo
|
||||
return entry
|
||||
}
|
||||
|
||||
// Records the day's fact and answers whether the day has a real entry.
|
||||
AchievementDiarySaved :: (name: string, document: string, live: bool = true) -> bool {
|
||||
entry := DiaryEntryOf(name, document)
|
||||
if entry.day == 0 { return false }
|
||||
unused AchievementRecord("diary", name, entry.day, 1, ifx entry.photo then "photo" else "", "", true, live,
|
||||
!entry.qualified)
|
||||
return entry.qualified
|
||||
}
|
||||
|
||||
AchievementDiaryBackfill :: (offset: s32) -> s32 {
|
||||
statement: *void
|
||||
if SqlitePrepareText(storage_db_handle(),
|
||||
"SELECT substr(key,17) FROM settings WHERE user_id=?1 AND key GLOB 'cell.diary.file.????-??-??.json' ORDER BY key LIMIT 128 OFFSET ?2",
|
||||
-1, *statement, null) != SQLITE_OK { return -1 }
|
||||
defer { SqliteFinalize(statement) }
|
||||
bind_text(statement, 1, AchievementOwner())
|
||||
SqliteBindInt(statement, 2, offset)
|
||||
rows: s32 = 0
|
||||
while SqliteStep(statement) == SQLITE_ROW {
|
||||
name := AppTextFromCString(SqliteColumnText(statement, 0), 96)
|
||||
document := DiaryRecordRead(name)
|
||||
unused AchievementDiarySaved(name, document, false)
|
||||
PackageFree(document)
|
||||
rows += 1
|
||||
}
|
||||
return rows
|
||||
}
|
||||
|
||||
// Every day of the account with a real entry, oldest first, from the synced
|
||||
// documents, so a newly linked habit brings its earlier days along. The
|
||||
// caller frees the list.
|
||||
DiaryWrittenDays :: () -> Vec(s32) {
|
||||
days: Vec(s32)
|
||||
offset: s32 = 0
|
||||
more := true
|
||||
while more {
|
||||
statement: *void
|
||||
if SqlitePrepareText(storage_db_handle(),
|
||||
"SELECT substr(key,17) FROM settings WHERE user_id=?1 AND key GLOB 'cell.diary.file.????-??-??.json' ORDER BY key LIMIT 128 OFFSET ?2",
|
||||
-1, *statement, null) != SQLITE_OK {
|
||||
break
|
||||
}
|
||||
bind_text(statement, 1, AchievementOwner())
|
||||
SqliteBindInt(statement, 2, offset)
|
||||
rows: s32 = 0
|
||||
while SqliteStep(statement) == SQLITE_ROW {
|
||||
name := AppTextFromCString(SqliteColumnText(statement, 0), 96)
|
||||
document := DiaryRecordRead(name)
|
||||
entry := DiaryEntryOf(name, document)
|
||||
PackageFree(document)
|
||||
if entry.qualified {
|
||||
unused VecPush(days, entry.day)
|
||||
}
|
||||
rows += 1
|
||||
}
|
||||
SqliteFinalize(statement)
|
||||
more = rows == 128
|
||||
offset += rows
|
||||
}
|
||||
return days
|
||||
}
|
||||
@@ -1,124 +0,0 @@
|
||||
#import "std/text"
|
||||
#import "vec"
|
||||
#import "byte_text_linux"
|
||||
|
||||
Date :: struct {
|
||||
year: s32;
|
||||
month: s32;
|
||||
day: s32;
|
||||
}
|
||||
|
||||
Leap :: (year: s32) -> bool {
|
||||
return year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)
|
||||
}
|
||||
|
||||
Days :: (year: s32, month: s32) -> s32 {
|
||||
lengths: [12]s32 = .[31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
|
||||
if month < 1 || month > 12 {
|
||||
return 0
|
||||
}
|
||||
if month == 2 && Leap(year) {
|
||||
return 29
|
||||
}
|
||||
return lengths[month - 1]
|
||||
}
|
||||
|
||||
Valid :: (date: Date) -> bool {
|
||||
return date.year >= 1 && date.year <= 9999 && date.month >= 1 &&
|
||||
date.month <= 12 && date.day >= 1 && date.day <= Days(date.year, date.month)
|
||||
}
|
||||
|
||||
Next :: (date: Date, delta: s32) -> Date {
|
||||
value := date
|
||||
if delta > 0 {
|
||||
value.day += 1
|
||||
if value.day > Days(value.year, value.month) {
|
||||
value.day = 1
|
||||
value.month += 1
|
||||
if value.month > 12 {
|
||||
value.month = 1;
|
||||
value.year += 1
|
||||
}
|
||||
}
|
||||
}
|
||||
if delta < 0 {
|
||||
value.day -= 1
|
||||
if value.day < 1 {
|
||||
value.month -= 1
|
||||
if value.month < 1 {
|
||||
value.month = 12;
|
||||
value.year -= 1
|
||||
}
|
||||
value.day = Days(value.year, value.month)
|
||||
}
|
||||
}
|
||||
return ifx Valid(value) then value else date
|
||||
}
|
||||
|
||||
Weekday :: (date: Date) -> s32 {
|
||||
year := date.year
|
||||
if date.month < 3 {
|
||||
year -= 1
|
||||
}
|
||||
offsets: [12]s32 = .[0, 3, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4]
|
||||
return (year + year / 4 - year / 100 + year / 400 +
|
||||
offsets[date.month - 1] + date.day + 6) % 7
|
||||
}
|
||||
|
||||
ISO :: (date: Date) -> string {
|
||||
bytes: [10]u8
|
||||
values: [3]s32 = .[date.year, date.month, date.day]
|
||||
starts: [3]s32 = .[0, 5, 8]
|
||||
lengths: [3]s32 = .[4, 2, 2]
|
||||
bytes[4] = cast(u8)45
|
||||
bytes[7] = cast(u8)45
|
||||
for index: cast(s32)0..cast(s32)2 {
|
||||
number := values[index]
|
||||
for digit: cast(s32)0..lengths[index] - 1 {
|
||||
bytes[starts[index] + lengths[index] - digit - 1] = cast(u8)(48 + number % 10)
|
||||
number /= 10
|
||||
}
|
||||
}
|
||||
out: Vec(u8)
|
||||
BuilderPrint(*out, "%", TextFromBytes(bytes[:]))
|
||||
return BuilderFinish(out)
|
||||
}
|
||||
|
||||
ParseDate :: (value: string) -> Date {
|
||||
date: Date
|
||||
if value.count != 10 || value[4] != cast(u8)45 || value[7] != cast(u8)45 {
|
||||
return date
|
||||
}
|
||||
for index: cast(s32)0..cast(s32)9 {
|
||||
if index == 4 || index == 7 {
|
||||
continue
|
||||
}
|
||||
if value[index] < cast(u8)48 || value[index] > cast(u8)57 {
|
||||
return Date.{}
|
||||
}
|
||||
number := cast(s32)value[index] - 48
|
||||
if index < 4 {
|
||||
date.year = date.year * 10 + number
|
||||
}
|
||||
else if index < 7 {
|
||||
date.month = date.month * 10 + number
|
||||
}
|
||||
else {
|
||||
date.day = date.day * 10 + number
|
||||
}
|
||||
}
|
||||
return ifx Valid(date) then date else Date.{}
|
||||
}
|
||||
|
||||
OnOrBefore :: (date: Date, limit: Date) -> bool {
|
||||
if !Valid(date) || !Valid(limit) {
|
||||
return false
|
||||
}
|
||||
if date.year != limit.year {
|
||||
return date.year < limit.year
|
||||
}
|
||||
if date.month != limit.month {
|
||||
return date.month < limit.month
|
||||
}
|
||||
return date.day <= limit.day
|
||||
}
|
||||
@@ -1,177 +0,0 @@
|
||||
// Undo and redo for the Diary entry on screen. The app retains immutable
|
||||
// snapshots; native callers own copies of their snapshots. Typing
|
||||
// within a moment is one step; a spelling correction, an undo and a redo are
|
||||
// steps of their own.
|
||||
#import "vec"
|
||||
#import "std/text"
|
||||
#import "byte_text_linux"
|
||||
|
||||
DIARY_HISTORY_DEPTH :: 64
|
||||
// Typing joins the open step until it pauses this long or the step is this
|
||||
// old, in seconds.
|
||||
DIARY_HISTORY_PAUSE :: 1.0
|
||||
DIARY_HISTORY_SPAN :: 5.0
|
||||
|
||||
DiaryHistory :: struct {
|
||||
year: s32
|
||||
month: s32
|
||||
day: s32
|
||||
// Owned copies, freed by DiaryHistoryFree.
|
||||
current: string
|
||||
undo: [DIARY_HISTORY_DEPTH]string
|
||||
undo_count: s32
|
||||
redo: [DIARY_HISTORY_DEPTH]string
|
||||
redo_count: s32
|
||||
typing: bool
|
||||
typed_at: float64
|
||||
step_started: float64
|
||||
}
|
||||
|
||||
// A replacement of text[start:end], as the Diary package applies edits.
|
||||
DiaryEdit :: struct {
|
||||
start: s32
|
||||
end: s32
|
||||
replacement: string
|
||||
}
|
||||
|
||||
#if !#defined(KRYON_HOSTED_UI) {
|
||||
c :: #system_library "c";
|
||||
DiaryHistoryFreeBytes :: (bytes: *u8) #foreign c "free";
|
||||
}
|
||||
|
||||
DiaryHistoryCopy :: (text: string) -> string {
|
||||
#if #defined(KRYON_HOSTED_UI) {
|
||||
return text
|
||||
} else {
|
||||
copy: Vec(u8)
|
||||
BuilderPrint(*copy, "%", text)
|
||||
return BuilderFinish(copy)
|
||||
}
|
||||
}
|
||||
|
||||
DiaryHistoryFree :: (value: string) {
|
||||
#if !#defined(KRYON_HOSTED_UI) {
|
||||
if value.count == 0 {
|
||||
return
|
||||
}
|
||||
bytes := cast(*TextDescriptor)(*value)
|
||||
DiaryHistoryFreeBytes(bytes.data)
|
||||
}
|
||||
}
|
||||
|
||||
DiaryHistoryPush :: (steps: []string, count: *s32, snapshot: string) {
|
||||
if count.* == cast(s32)steps.count {
|
||||
// The oldest step makes room for the newest.
|
||||
DiaryHistoryFree(steps[0])
|
||||
for index: cast(s32)1..count.* - 1 {
|
||||
steps[index - 1] = steps[index]
|
||||
}
|
||||
count.* -= 1
|
||||
}
|
||||
steps[count.*] = snapshot
|
||||
count.* += 1
|
||||
}
|
||||
|
||||
DiaryHistoryDropRedo :: (history: *DiaryHistory) {
|
||||
for index: cast(s32)0..history.redo_count - 1 {
|
||||
DiaryHistoryFree(history.redo[index])
|
||||
history.redo[index] = ""
|
||||
}
|
||||
history.redo_count = 0
|
||||
}
|
||||
|
||||
DiaryHistoryClear :: (history: *DiaryHistory) {
|
||||
DiaryHistoryFree(history.current)
|
||||
for index: cast(s32)0..history.undo_count - 1 {
|
||||
DiaryHistoryFree(history.undo[index])
|
||||
}
|
||||
DiaryHistoryDropRedo(history)
|
||||
history.* = DiaryHistory.{}
|
||||
}
|
||||
|
||||
// Records the entry as it is after a frame. Another day starts a new
|
||||
// history. typing is false for a change that must be its own step.
|
||||
DiaryHistoryObserve :: (history: *DiaryHistory, year: s32, month: s32, day: s32,
|
||||
text: string, now: float64, typing: bool) {
|
||||
if history.year != year || history.month != month || history.day != day {
|
||||
DiaryHistoryClear(history)
|
||||
history.year = year
|
||||
history.month = month
|
||||
history.day = day
|
||||
history.current = DiaryHistoryCopy(text)
|
||||
return
|
||||
}
|
||||
if history.current == text {
|
||||
return
|
||||
}
|
||||
joins := typing && history.typing &&
|
||||
now - history.typed_at < DIARY_HISTORY_PAUSE &&
|
||||
now - history.step_started < DIARY_HISTORY_SPAN
|
||||
if joins {
|
||||
DiaryHistoryFree(history.current)
|
||||
} else {
|
||||
DiaryHistoryPush(history.undo[:], *history.undo_count, history.current)
|
||||
history.step_started = now
|
||||
}
|
||||
DiaryHistoryDropRedo(history)
|
||||
history.current = DiaryHistoryCopy(text)
|
||||
history.typing = typing
|
||||
history.typed_at = now
|
||||
}
|
||||
|
||||
// Moves back one step. The history's current text becomes the text the host
|
||||
// then shows; false means there is nothing to undo.
|
||||
DiaryHistoryUndo :: (history: *DiaryHistory) -> bool {
|
||||
if history.undo_count == 0 {
|
||||
return false
|
||||
}
|
||||
history.undo_count -= 1
|
||||
DiaryHistoryPush(history.redo[:], *history.redo_count, history.current)
|
||||
history.current = history.undo[history.undo_count]
|
||||
history.undo[history.undo_count] = ""
|
||||
history.typing = false
|
||||
return true
|
||||
}
|
||||
|
||||
DiaryHistoryRedo :: (history: *DiaryHistory) -> bool {
|
||||
if history.redo_count == 0 {
|
||||
return false
|
||||
}
|
||||
history.redo_count -= 1
|
||||
DiaryHistoryPush(history.undo[:], *history.undo_count, history.current)
|
||||
history.current = history.redo[history.redo_count]
|
||||
history.redo[history.redo_count] = ""
|
||||
history.typing = false
|
||||
return true
|
||||
}
|
||||
|
||||
DiaryContinuationByte :: (byte: u8) -> bool {
|
||||
return (byte & cast(u8)192) == cast(u8)128
|
||||
}
|
||||
|
||||
// The smallest replacement that turns from into to, on whole UTF-8
|
||||
// characters, so the caret lands just after the changed text.
|
||||
DiaryHistoryEdit :: (from: string, to: string) -> DiaryEdit {
|
||||
shorter := ifx from.count < to.count then from.count else to.count
|
||||
prefix: s64 = 0
|
||||
while prefix < shorter && from[prefix] == to[prefix] {
|
||||
prefix += 1
|
||||
}
|
||||
while prefix > 0 &&
|
||||
((prefix < from.count && DiaryContinuationByte(from[prefix])) ||
|
||||
(prefix < to.count && DiaryContinuationByte(to[prefix]))) {
|
||||
prefix -= 1
|
||||
}
|
||||
suffix: s64 = 0
|
||||
while suffix < from.count - prefix && suffix < to.count - prefix &&
|
||||
from[from.count - 1 - suffix] == to[to.count - 1 - suffix] {
|
||||
suffix += 1
|
||||
}
|
||||
// The shared ending is the same bytes in both texts, so one check keeps
|
||||
// it on a character boundary in each.
|
||||
while suffix > 0 && DiaryContinuationByte(from[from.count - suffix]) {
|
||||
suffix -= 1
|
||||
}
|
||||
return DiaryEdit.{.start = cast(s32)prefix, .end = cast(s32)(from.count - suffix),
|
||||
.replacement = to[prefix:to.count - suffix]}
|
||||
}
|
||||
@@ -1,481 +0,0 @@
|
||||
// A Diary entry is Markdown. This module finds its photo embeds and the
|
||||
// CommonMark basics the editor previews, and makes the edits that add a
|
||||
// photo. It reads only the entry's text; files and the account's media
|
||||
// library belong to the host.
|
||||
//
|
||||
// An embed is a CommonMark image anywhere in a line whose destination is a
|
||||
// photo: `` for a photo of the account's
|
||||
// media library, which Photos shows too (the photo's day, its SHA-256 and
|
||||
// its type), or `` for a photo an older version attached
|
||||
// to the entry as a Diary file. Other images and text stay ordinary text.
|
||||
// An inserted photo gets a line of its own.
|
||||
#import "std/text"
|
||||
#import "vec"
|
||||
#import "byte_text_linux"
|
||||
Markdown :: #import "kryon/markdown_preview";
|
||||
|
||||
// Resolve Diary's media syntax for Kryon's shared Markdown editor. Keeping
|
||||
// one extra span lets the preview report its own image-capacity truncation.
|
||||
diary_images: [Markdown.PREVIEW_IMAGES + 1]Markdown.ImageSpan;
|
||||
|
||||
DiaryResolvedImages :: (text: string) -> []Markdown.ImageSpan {
|
||||
count: s32 = 0
|
||||
embed := DiaryEmbedNext(text, 0)
|
||||
while embed.valid && count < Markdown.PREVIEW_IMAGES + 1 {
|
||||
diary_images[count] = Markdown.ImageSpan.{.valid = true,
|
||||
.start = embed.start, .end = embed.end, .line_start = embed.line_start,
|
||||
.line_end = embed.line_end, .alt_end = embed.alt_end}
|
||||
count += 1
|
||||
embed = DiaryEmbedNext(text, embed.end)
|
||||
}
|
||||
return diary_images[:count]
|
||||
}
|
||||
|
||||
DIARY_EMBED_ALT_MAX :: 200
|
||||
DIARY_EMBED_NAME_MAX :: 200
|
||||
|
||||
DiaryEmbed :: struct {
|
||||
valid: bool
|
||||
// The image's bytes, from its `!` to its closing parenthesis.
|
||||
start: s32
|
||||
end: s32
|
||||
// Its line, without the line break.
|
||||
line_start: s32
|
||||
line_end: s32
|
||||
alt_start: s32
|
||||
alt_end: s32
|
||||
// The destination, without angle brackets, ends with its target: the
|
||||
// Diary file's name after `diary:`, or the whole library place.
|
||||
destination_start: s32
|
||||
target_start: s32
|
||||
target_end: s32
|
||||
// A photo of the account's media library (photos/...) or a Diary file
|
||||
// (diary:).
|
||||
library: bool
|
||||
}
|
||||
|
||||
// Replaces text[start:end]; the caret goes to cursor afterwards.
|
||||
DiaryEmbedEdit :: struct {
|
||||
start: s32
|
||||
end: s32
|
||||
replacement: string
|
||||
cursor: s32
|
||||
}
|
||||
|
||||
DiaryLineEnd :: (text: string, start: s32) -> s32 {
|
||||
end := start
|
||||
while end < cast(s32)text.count && text[end] != cast(u8)10 {
|
||||
end += 1
|
||||
}
|
||||
return end
|
||||
}
|
||||
|
||||
DiaryLineStart :: (text: string, at: s32) -> s32 {
|
||||
start := at
|
||||
if start > cast(s32)text.count {
|
||||
start = cast(s32)text.count
|
||||
}
|
||||
while start > 0 && text[start - 1] != cast(u8)10 {
|
||||
start -= 1
|
||||
}
|
||||
return start
|
||||
}
|
||||
|
||||
DiaryBlank :: (byte: u8) -> bool {
|
||||
return byte == cast(u8)32 || byte == cast(u8)9
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- embeds
|
||||
|
||||
// A Diary file name, as the host stores it.
|
||||
DiaryFileNameValid :: (name: string) -> bool {
|
||||
if name.count == 0 || name.count > DIARY_EMBED_NAME_MAX || name == "." || name == ".." {
|
||||
return false
|
||||
}
|
||||
for byte: name {
|
||||
digit := byte >= cast(u8)48 && byte <= cast(u8)57
|
||||
letter := byte >= cast(u8)97 && byte <= cast(u8)122
|
||||
if !digit && !letter && byte != cast(u8)45 && byte != cast(u8)46 {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
// A media library key: the photo's SHA-256 in lowercase hex.
|
||||
DiaryMediaKeyValid :: (key: string) -> bool {
|
||||
if key.count != 64 {
|
||||
return false
|
||||
}
|
||||
for byte: key {
|
||||
digit := byte >= cast(u8)48 && byte <= cast(u8)57
|
||||
letter := byte >= cast(u8)97 && byte <= cast(u8)102
|
||||
if !digit && !letter {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
DiaryDigits :: (value: string) -> bool {
|
||||
for byte: value {
|
||||
if byte < cast(u8)48 || byte > cast(u8)57 {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
// The photo types the library keeps.
|
||||
DiaryPhotoTypeValid :: (format: string) -> bool {
|
||||
return format == "jpg" || format == "png" || format == "webp" || format == "gif"
|
||||
}
|
||||
|
||||
// A library photo's place: photos/YYYY/MM/DD/<sha256>.<type>, its day as the
|
||||
// Photos gallery groups it.
|
||||
DiaryLibraryPathValid :: (path: string) -> bool {
|
||||
if path.count < 86 || path.count > 87 || path[:7] != "photos/" ||
|
||||
path[11] != #char "/" || path[14] != #char "/" || path[17] != #char "/" ||
|
||||
path[82] != #char "." {
|
||||
return false
|
||||
}
|
||||
if !DiaryDigits(path[7:11]) || !DiaryDigits(path[12:14]) || !DiaryDigits(path[15:17]) {
|
||||
return false
|
||||
}
|
||||
month := (cast(s32)path[12] - 48) * 10 + cast(s32)path[13] - 48
|
||||
day := (cast(s32)path[15] - 48) * 10 + cast(s32)path[16] - 48
|
||||
if month < 1 || month > 12 || day < 1 || day > 31 {
|
||||
return false
|
||||
}
|
||||
return DiaryMediaKeyValid(path[18:82]) && DiaryPhotoTypeValid(path[83:])
|
||||
}
|
||||
|
||||
// The place of a library photo taken or added on `day` (YYYY-MM-DD), or ""
|
||||
// when one of its parts is not valid.
|
||||
DiaryLibraryPath :: (day: string, hash: string, format: string) -> string {
|
||||
if day.count != 10 || day[4] != #char "-" || day[7] != #char "-" {
|
||||
return ""
|
||||
}
|
||||
out: Vec(u8)
|
||||
BuilderPrint(*out, "photos/%/%/%/%.%", day[:4], day[5:7], day[8:10], hash, format)
|
||||
path := BuilderFinish(out)
|
||||
if !DiaryLibraryPathValid(path) {
|
||||
return ""
|
||||
}
|
||||
return path
|
||||
}
|
||||
|
||||
// The photo at `at`, where an image's `!` stands, or an invalid embed. An
|
||||
// image follows CommonMark within one line: ``, with
|
||||
// spaces or tabs around the destination, an optional "title", 'title' or
|
||||
// (title) after it, and the destination in <angle brackets> or plain.
|
||||
// Escaped brackets may appear in ALT. Only a destination naming a photo, a
|
||||
// library place or a Diary file, makes it an embed.
|
||||
DiaryEmbedAt :: (text: string, at: s32) -> DiaryEmbed {
|
||||
embed: DiaryEmbed
|
||||
if at < 0 || at + 1 >= cast(s32)text.count || text[at] != #char "!" ||
|
||||
text[at + 1] != #char "[" {
|
||||
return embed
|
||||
}
|
||||
line_start := DiaryLineStart(text, at)
|
||||
line_end := DiaryLineEnd(text, at)
|
||||
if DiaryEscaped(text, at, line_start) {
|
||||
return embed
|
||||
}
|
||||
close := at + 2
|
||||
while close < line_end && text[close] != #char "]" {
|
||||
if text[close] == #char "[" {
|
||||
return embed
|
||||
}
|
||||
if text[close] == cast(u8)92 && close + 1 < line_end {
|
||||
close += 1
|
||||
}
|
||||
close += 1
|
||||
}
|
||||
if close + 1 >= line_end || text[close + 1] != #char "(" ||
|
||||
close - (at + 2) > DIARY_EMBED_ALT_MAX {
|
||||
return embed
|
||||
}
|
||||
cursor := DiarySkipBlank(text, close + 2, line_end)
|
||||
destination_start := cursor
|
||||
destination_end := cursor
|
||||
if cursor < line_end && text[cursor] == #char "<" {
|
||||
destination_start = cursor + 1
|
||||
destination_end = destination_start
|
||||
while destination_end < line_end && text[destination_end] != #char ">" &&
|
||||
text[destination_end] != #char "<" {
|
||||
destination_end += 1
|
||||
}
|
||||
if destination_end >= line_end || text[destination_end] != #char ">" {
|
||||
return embed
|
||||
}
|
||||
cursor = destination_end + 1
|
||||
} else {
|
||||
while cursor < line_end && text[cursor] > cast(u8)32 && text[cursor] != #char "(" &&
|
||||
text[cursor] != #char ")" {
|
||||
cursor += 1
|
||||
}
|
||||
destination_end = cursor
|
||||
}
|
||||
after := DiarySkipBlank(text, cursor, line_end)
|
||||
if after > cursor && after < line_end && (text[after] == cast(u8)34 ||
|
||||
text[after] == cast(u8)39 || text[after] == #char "(") {
|
||||
after = DiaryTitleEnd(text, after, line_end)
|
||||
if after < 0 {
|
||||
return embed
|
||||
}
|
||||
after = DiarySkipBlank(text, after, line_end)
|
||||
}
|
||||
if after >= line_end || text[after] != #char ")" {
|
||||
return embed
|
||||
}
|
||||
destination := text[destination_start:destination_end]
|
||||
target_start := destination_start
|
||||
library := false
|
||||
if destination.count > 6 && destination[:6] == "diary:" {
|
||||
target_start += 6
|
||||
if !DiaryFileNameValid(text[target_start:destination_end]) {
|
||||
return embed
|
||||
}
|
||||
} else if DiaryLibraryPathValid(destination) {
|
||||
library = true
|
||||
} else {
|
||||
return embed
|
||||
}
|
||||
embed.valid = true
|
||||
embed.start = at
|
||||
embed.end = after + 1
|
||||
embed.line_start = line_start
|
||||
embed.line_end = line_end
|
||||
embed.alt_start = at + 2
|
||||
embed.alt_end = close
|
||||
embed.destination_start = destination_start
|
||||
embed.target_start = target_start
|
||||
embed.target_end = destination_end
|
||||
embed.library = library
|
||||
return embed
|
||||
}
|
||||
|
||||
DiarySkipBlank :: (text: string, at: s32, end: s32) -> s32 {
|
||||
cursor := at
|
||||
while cursor < end && DiaryBlank(text[cursor]) {
|
||||
cursor += 1
|
||||
}
|
||||
return cursor
|
||||
}
|
||||
|
||||
// Where an image's title that opens at `at` ends, after its closing quote
|
||||
// or parenthesis, or -1 when it does not close on the line.
|
||||
DiaryTitleEnd :: (text: string, at: s32, end: s32) -> s32 {
|
||||
closing := text[at]
|
||||
if closing == #char "(" {
|
||||
closing = #char ")"
|
||||
}
|
||||
cursor := at + 1
|
||||
while cursor < end {
|
||||
if text[cursor] == cast(u8)92 && cursor + 1 < end {
|
||||
cursor += 2
|
||||
continue
|
||||
}
|
||||
if text[cursor] == closing {
|
||||
return cursor + 1
|
||||
}
|
||||
if text[at] == #char "(" && text[cursor] == #char "(" {
|
||||
return -1
|
||||
}
|
||||
cursor += 1
|
||||
}
|
||||
return -1
|
||||
}
|
||||
|
||||
// The first embed starting in text[from:to].
|
||||
DiaryEmbedIn :: (text: string, from: s32, to: s32) -> DiaryEmbed {
|
||||
at := from
|
||||
if at < 0 {
|
||||
at = 0
|
||||
}
|
||||
while at + 1 < to {
|
||||
if text[at] == #char "!" && text[at + 1] == #char "[" {
|
||||
embed := DiaryEmbedAt(text, at)
|
||||
if embed.valid {
|
||||
return embed
|
||||
}
|
||||
}
|
||||
at += 1
|
||||
}
|
||||
return DiaryEmbed.{}
|
||||
}
|
||||
|
||||
// The first embed starting at or after `from`.
|
||||
DiaryEmbedNext :: (text: string, from: s32) -> DiaryEmbed {
|
||||
return DiaryEmbedIn(text, from, cast(s32)text.count)
|
||||
}
|
||||
|
||||
// Whether the line starting at line_start holds photos and nothing else but
|
||||
// spaces, as an inserted photo's line does.
|
||||
DiaryImageLine :: (text: string, line_start: s32) -> bool {
|
||||
line_end := DiaryLineEnd(text, line_start)
|
||||
found := false
|
||||
at := line_start
|
||||
while at < line_end {
|
||||
if DiaryBlank(text[at]) || text[at] == cast(u8)13 {
|
||||
at += 1
|
||||
continue
|
||||
}
|
||||
embed := DiaryEmbedAt(text, at)
|
||||
if !embed.valid {
|
||||
return false
|
||||
}
|
||||
found = true
|
||||
at = embed.end
|
||||
}
|
||||
return found
|
||||
}
|
||||
|
||||
// A Diary file's name, or a library photo's whole path.
|
||||
DiaryEmbedTarget :: (text: string, embed: DiaryEmbed) -> string {
|
||||
return text[embed.target_start:embed.target_end]
|
||||
}
|
||||
|
||||
// What the embed links to: diary:FILE or the library place.
|
||||
DiaryEmbedDestination :: (text: string, embed: DiaryEmbed) -> string {
|
||||
return text[embed.destination_start:embed.target_end]
|
||||
}
|
||||
|
||||
DiaryEmbedAlt :: (text: string, embed: DiaryEmbed) -> string {
|
||||
return text[embed.alt_start:embed.alt_end]
|
||||
}
|
||||
|
||||
// Whether a diary: embed names this file.
|
||||
DiaryEmbedReferences :: (text: string, file: string) -> bool {
|
||||
embed := DiaryEmbedNext(text, 0)
|
||||
while embed.valid {
|
||||
if !embed.library && DiaryEmbedTarget(text, embed) == file {
|
||||
return true
|
||||
}
|
||||
embed = DiaryEmbedNext(text, embed.end)
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// The bytes of the UTF-8 character at index, or 0 when it is not valid.
|
||||
DiaryCharacterSize :: (value: string, index: s32) -> s32 {
|
||||
lead := value[index]
|
||||
size: s32 = 0
|
||||
if lead < cast(u8)128 {
|
||||
return 1
|
||||
}
|
||||
if lead >= cast(u8)194 && lead <= cast(u8)223 {
|
||||
size = 2
|
||||
} else if lead >= cast(u8)224 && lead <= cast(u8)239 {
|
||||
size = 3
|
||||
} else if lead >= cast(u8)240 && lead <= cast(u8)244 {
|
||||
size = 4
|
||||
} else {
|
||||
return 0
|
||||
}
|
||||
if index + size > cast(s32)value.count {
|
||||
return 0
|
||||
}
|
||||
for offset: cast(s32)1..size - 1 {
|
||||
if (value[index + offset] & cast(u8)192) != cast(u8)128 {
|
||||
return 0
|
||||
}
|
||||
}
|
||||
return size
|
||||
}
|
||||
|
||||
// An embed line linking to `destination`, diary:FILE or a library path. Its
|
||||
// name keeps whole characters up to the length limit; brackets, line breaks
|
||||
// and invalid bytes become spaces.
|
||||
DiaryEmbedLine :: (destination: string, name: string) -> string {
|
||||
out: Vec(u8)
|
||||
BuilderPrint(*out, "![")
|
||||
written: s32 = 0
|
||||
index: s32 = 0
|
||||
while index < cast(s32)name.count {
|
||||
size := DiaryCharacterSize(name, index)
|
||||
step := ifx size == 0 then 1 else size
|
||||
if written + step > DIARY_EMBED_ALT_MAX {
|
||||
break
|
||||
}
|
||||
byte := name[index]
|
||||
if size == 0 || (size == 1 && (byte == #char "[" || byte == #char "]" || byte < cast(u8)32)) {
|
||||
BuilderPrint(*out, " ")
|
||||
} else {
|
||||
BuilderPrint(*out, "%", name[index:index + size])
|
||||
}
|
||||
written += step
|
||||
index += step
|
||||
}
|
||||
BuilderPrint(*out, "](%)", destination)
|
||||
return BuilderFinish(out)
|
||||
}
|
||||
|
||||
// The text with an embed line added at its end. A blank line separates it
|
||||
// from text before it; embeds that follow each other share no blank line.
|
||||
DiaryEmbedAppend :: (text: string, line: string) -> string {
|
||||
out: Vec(u8)
|
||||
count := cast(s32)text.count
|
||||
BuilderPrint(*out, "%", text)
|
||||
if count == 0 {
|
||||
BuilderPrint(*out, "%", line)
|
||||
return BuilderFinish(out)
|
||||
}
|
||||
if text[count - 1] == cast(u8)10 {
|
||||
previous := DiaryLineStart(text, count - 1)
|
||||
after_embed := DiaryImageLine(text, previous)
|
||||
blank := count >= 2 && text[count - 2] == cast(u8)10
|
||||
if !after_embed && !blank {
|
||||
BuilderPrint(*out, "\n")
|
||||
}
|
||||
} else if DiaryImageLine(text, DiaryLineStart(text, count)) {
|
||||
BuilderPrint(*out, "\n")
|
||||
} else {
|
||||
BuilderPrint(*out, "\n\n")
|
||||
}
|
||||
BuilderPrint(*out, "%", line)
|
||||
return BuilderFinish(out)
|
||||
}
|
||||
|
||||
// The edit that puts an embed line at `at`, on a line of its own, with the
|
||||
// caret on the line after it.
|
||||
DiaryEmbedInsertion :: (text: string, at: s32, line: string) -> DiaryEmbedEdit {
|
||||
edit: DiaryEmbedEdit
|
||||
count := cast(s32)text.count
|
||||
start := at
|
||||
if start < 0 {
|
||||
start = 0
|
||||
}
|
||||
if start > count {
|
||||
start = count
|
||||
}
|
||||
while start > 0 && start < count && (text[start] & cast(u8)192) == cast(u8)128 {
|
||||
start -= 1
|
||||
}
|
||||
out: Vec(u8)
|
||||
if start > 0 && text[start - 1] != cast(u8)10 {
|
||||
BuilderPrint(*out, "\n")
|
||||
}
|
||||
BuilderPrint(*out, "%\n", line)
|
||||
edit.start = start
|
||||
edit.end = start
|
||||
// At a line break the edit takes it over, so the caret, which an edit
|
||||
// leaves after its replacement, starts the next line.
|
||||
if start < count && text[start] == cast(u8)10 {
|
||||
edit.end = start + 1
|
||||
}
|
||||
edit.replacement = BuilderFinish(out)
|
||||
edit.cursor = start + cast(s32)edit.replacement.count
|
||||
return edit
|
||||
}
|
||||
|
||||
DiaryEscaped :: (text: string, at: s32, from: s32) -> bool {
|
||||
slashes: s32 = 0
|
||||
cursor := at - 1
|
||||
while cursor >= from && text[cursor] == cast(u8)92 {
|
||||
slashes += 1
|
||||
cursor -= 1
|
||||
}
|
||||
return slashes % 2 == 1
|
||||
}
|
||||
@@ -1,111 +0,0 @@
|
||||
// Images never go to the spelling service, wherever they stand in a line:
|
||||
// each `` is sent as one object replacement character, U+FFFC,
|
||||
// so photo names, places and hashes stay on this device. The correction
|
||||
// gets each image back at its mark, in order. A correction that lost or
|
||||
// added a mark cannot be matched to the images, so it is refused.
|
||||
#import "vec"
|
||||
#import "std/text"
|
||||
#import "byte_text_linux"
|
||||
|
||||
DIARY_SPELLING_MARK :: "\xEF\xBF\xBC"
|
||||
|
||||
DiarySpellingLineEnd :: (text: string, start: s64) -> s64 {
|
||||
end := start
|
||||
while end < text.count && text[end] != cast(u8)10 {
|
||||
end += 1
|
||||
}
|
||||
return end
|
||||
}
|
||||
|
||||
// Where an image that starts at `at` ends, after its closing parenthesis,
|
||||
// or -1. It is read generously, `` on the same line,
|
||||
// so that whatever a destination holds stays masked.
|
||||
DiarySpellingImageEnd :: (text: string, at: s64) -> s64 {
|
||||
if at + 1 >= text.count || text[at] != cast(u8)33 || text[at + 1] != cast(u8)91 {
|
||||
return -1
|
||||
}
|
||||
line_end := DiarySpellingLineEnd(text, at)
|
||||
cursor := at + 2
|
||||
while cursor + 1 < line_end && (text[cursor] != cast(u8)93 || text[cursor + 1] != cast(u8)40) {
|
||||
cursor += 1
|
||||
}
|
||||
if cursor + 1 >= line_end {
|
||||
return -1
|
||||
}
|
||||
cursor += 2
|
||||
while cursor < line_end && text[cursor] != cast(u8)41 {
|
||||
cursor += 1
|
||||
}
|
||||
if cursor >= line_end {
|
||||
return -1
|
||||
}
|
||||
return cursor + 1
|
||||
}
|
||||
|
||||
// Whether a mark the text already holds starts at `at`.
|
||||
DiarySpellingMarkAt :: (text: string, at: s64) -> bool {
|
||||
mark := DIARY_SPELLING_MARK
|
||||
return at + mark.count <= text.count && text[at:at + mark.count] == mark
|
||||
}
|
||||
|
||||
// The bytes the mark at `at` stands for, ending where the next byte to read
|
||||
// is, or -1 when no mark starts there. A mark the entry held itself stands
|
||||
// for itself.
|
||||
DiarySpellingMasks :: (text: string, at: s64) -> s64 {
|
||||
if DiarySpellingMarkAt(text, at) {
|
||||
return at + DIARY_SPELLING_MARK.count
|
||||
}
|
||||
return DiarySpellingImageEnd(text, at)
|
||||
}
|
||||
|
||||
// The entry as the spelling service sees it: each image one mark.
|
||||
DiarySpellingMasked :: (text: string) -> string {
|
||||
out: Vec(u8)
|
||||
at: s64 = 0
|
||||
while at < text.count {
|
||||
end := DiarySpellingMasks(text, at)
|
||||
if end > at {
|
||||
BuilderPrint(*out, "%", DIARY_SPELLING_MARK)
|
||||
at = end
|
||||
continue
|
||||
}
|
||||
unused VecPush(out, text[at])
|
||||
at += 1
|
||||
}
|
||||
return BuilderFinish(out)
|
||||
}
|
||||
|
||||
// The correction with the original images back at their marks, or "" when
|
||||
// its marks no longer match the entry's.
|
||||
DiarySpellingRestored :: (original: string, corrected: string) -> string {
|
||||
out: Vec(u8)
|
||||
source: s64 = 0
|
||||
at: s64 = 0
|
||||
while at < corrected.count {
|
||||
if !DiarySpellingMarkAt(corrected, at) {
|
||||
unused VecPush(out, corrected[at])
|
||||
at += 1
|
||||
continue
|
||||
}
|
||||
// The next mark of the original and what it stands for.
|
||||
while source < original.count && DiarySpellingMasks(original, source) < 0 {
|
||||
source += 1
|
||||
}
|
||||
if source >= original.count {
|
||||
VecFree(out)
|
||||
return ""
|
||||
}
|
||||
end := DiarySpellingMasks(original, source)
|
||||
BuilderPrint(*out, "%", original[source:end])
|
||||
source = end
|
||||
at += DIARY_SPELLING_MARK.count
|
||||
}
|
||||
while source < original.count && DiarySpellingMasks(original, source) < 0 {
|
||||
source += 1
|
||||
}
|
||||
if source < original.count {
|
||||
VecFree(out)
|
||||
return ""
|
||||
}
|
||||
return BuilderFinish(out)
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
|
||||
DIARY_ROUTE :: 1
|
||||
DIARY_LOAD :: 2
|
||||
DIARY_SAVE :: 3
|
||||
DIARY_CONTROL :: 4
|
||||
DIARY_EDIT :: 5
|
||||
DIARY_ATTACH :: 6
|
||||
DIARY_FRAME :: 7
|
||||
|
||||
DiaryMessage :: struct {
|
||||
abi: s32
|
||||
action: s32
|
||||
control: s32
|
||||
year: s32
|
||||
month: s32
|
||||
day: s32
|
||||
month_year: s32
|
||||
month_number: s32
|
||||
month_days: s32
|
||||
month_weekday: s32
|
||||
screen: s32
|
||||
text: string
|
||||
document: string
|
||||
replacement: string
|
||||
edit_start: s32
|
||||
edit_end: s32
|
||||
cursor: s32
|
||||
anchor: s32
|
||||
// A photo for DIARY_ATTACH to embed at the caret: what the embed links
|
||||
// to, diary:FILE or a library photo's photos/YYYY/MM/DD/<sha256>.<type>,
|
||||
// and its name.
|
||||
attachment_file: string
|
||||
attachment_name: string
|
||||
calendar: bool
|
||||
saved: bool
|
||||
load_error: bool
|
||||
succeeded: bool
|
||||
marks: [32]u8
|
||||
}
|
||||
|
||||
DiaryFileResult :: struct {
|
||||
data: string
|
||||
missing: bool
|
||||
succeeded: bool
|
||||
}
|
||||
|
||||
DiaryMediaEntry :: struct {
|
||||
hash: string
|
||||
name: string
|
||||
day: string
|
||||
format: string
|
||||
}
|
||||
@@ -1,44 +0,0 @@
|
||||
#import "session"
|
||||
TextArea :: #import "kryon/text_area";
|
||||
|
||||
// Device observations and retained editor values, never native pointers.
|
||||
DiaryUiFrame :: struct {
|
||||
session: Session
|
||||
origin_x: s32
|
||||
origin_y: s32
|
||||
width: s32
|
||||
height: s32
|
||||
bottom: s32
|
||||
scale: float32
|
||||
font: s32
|
||||
now: float64
|
||||
input: TextArea.Input
|
||||
focused: bool
|
||||
selecting: bool
|
||||
scroll: s32
|
||||
calendar_scroll: s32
|
||||
page_scroll: s32
|
||||
// The gallery grid's vertical scroll and the day whose separate
|
||||
// gallery is open (year * 10000 + month * 100 + day), or 0.
|
||||
photos_scroll: s32
|
||||
photos_open_day: s32
|
||||
save_at: float64
|
||||
photo_error: bool
|
||||
photo_requested: bool
|
||||
// The theme's colors for links and for list and quote marks in the
|
||||
// entry's Markdown.
|
||||
link_color: u32
|
||||
muted_color: u32
|
||||
clipboard_write: bool
|
||||
clipboard_text: string
|
||||
// Undo, redo and spelling run in the host, which keeps the entry's
|
||||
// earlier versions and reaches the node.
|
||||
can_undo: bool
|
||||
can_redo: bool
|
||||
undo_requested: bool
|
||||
redo_requested: bool
|
||||
spelling_requested: bool
|
||||
spelling_busy: bool
|
||||
// A locale key while a spelling check has something to say.
|
||||
spelling_notice: string
|
||||
}
|
||||
@@ -1,537 +0,0 @@
|
||||
#import "geometry"
|
||||
#import, file "diary_date.zi";
|
||||
Box :: #import "kryon/box";
|
||||
Button :: #import "kryon/button";
|
||||
Image :: #import "kryon/image";
|
||||
Layout :: #import "kryon/layout";
|
||||
Press :: #import "kryon/press";
|
||||
Scroll :: #import "kryon/scroll";
|
||||
Text :: #import "kryon/text";
|
||||
TextArea :: #import "kryon/text_area";
|
||||
MarkdownEditor :: #import "kryon/markdown_editor";
|
||||
Markdown :: #import "kryon/markdown_preview";
|
||||
#import "text_measure"
|
||||
#import "control_props"
|
||||
#import "drawing_props"
|
||||
#import "text_align"
|
||||
#import "std/text"
|
||||
#import "vec"
|
||||
#import "byte_text_linux"
|
||||
#import "kryon/tree"
|
||||
#import, file "diary_markdown.zi";
|
||||
#import, file "diary_types.zi";
|
||||
#import, file "diary_ui_types.zi";
|
||||
#import "kryon/app_context"
|
||||
#import "json_scan"
|
||||
#import, file "diary_wire.zi";
|
||||
CompressionIcon :: #import "mingcute/mingcute_regular_tool";
|
||||
|
||||
using Image.ImageFit;
|
||||
using TextAlign;
|
||||
using Text.Wrap;
|
||||
using ButtonTone;
|
||||
using ButtonEmphasis;
|
||||
using IconPlacement;
|
||||
using ContentAlignment;
|
||||
library_json: string;
|
||||
|
||||
DiaryPhoto :: (destination: string) -> string {
|
||||
if !AppSupports("media.asset") { return "" }
|
||||
return AppService("media.asset", destination)
|
||||
}
|
||||
|
||||
DiaryMediaQuery :: (day: string, trashed: bool) -> s32 {
|
||||
library_json = "[]"
|
||||
if AppSupports("media.query") {
|
||||
library_json = AppService("media.query", day)
|
||||
}
|
||||
count := ArrayCount(library_json, 0)
|
||||
return ifx count >= 0 then count else 0
|
||||
}
|
||||
|
||||
DiaryMediaItem :: (index: s32) -> DiaryMediaEntry {
|
||||
item := ElementAt(library_json, 0, index)
|
||||
return DiaryMediaEntry.{
|
||||
.hash = DiaryWireString(library_json, FieldAt(library_json, item, "hash")),
|
||||
.name = DiaryWireString(library_json, FieldAt(library_json, item, "name")),
|
||||
.day = DiaryWireString(library_json, FieldAt(library_json, item, "day")),
|
||||
.format = DiaryWireString(library_json, FieldAt(library_json, item, "format"))}
|
||||
}
|
||||
|
||||
state: DiaryMessage;
|
||||
frame: DiaryUiFrame;
|
||||
pending: bool;
|
||||
|
||||
DIARY_PREVIOUS_ICON :: "S1.8rr:M15 5L8 12L15 19"
|
||||
DIARY_NEXT_ICON :: "S1.8rr:M9 5L16 12L9 19"
|
||||
DIARY_CALENDAR_ICON :: "S1.6rr:M4 5H20V20H4ZM4 10H20M8 3V7M16 3V7"
|
||||
DIARY_TIME_ICON :: "S1.6rr:M21 12C21 16.97 16.97 21 12 21C7.03 21 3 16.97 3 12C3 7.03 7.03 3 12 3C16.97 3 21 7.03 21 12ZM12 7V12L15.5 14"
|
||||
DIARY_PHOTO_ICON :: "S1.6rr:M3 5H21V19H3ZM3 16L8 11L13 16L16 13L21 18M17.5 8.5C17.5 9.33 16.83 10 16 10C15.17 10 14.5 9.33 14.5 8.5C14.5 7.67 15.17 7 16 7C16.83 7 17.5 7.67 17.5 8.5Z"
|
||||
DIARY_ATTACHMENT_ICON :: "S1.8rr:M21 11L12 20C9.8 22.2 6.2 22.2 4 20C1.8 17.8 1.8 14.2 4 12L14 2C15.66 0.34 18.34 0.34 20 2C21.66 3.66 21.66 6.34 20 8L10 18C8.9 19.1 7.1 19.1 6 18C4.9 16.9 4.9 15.1 6 14L15 5"
|
||||
DIARY_UNDO_ICON :: "S1.8rr:M9 14L4 9L9 4M4 9H14C17.31 9 20 11.69 20 15C20 18.31 17.31 21 14 21H11"
|
||||
DIARY_REDO_ICON :: "S1.8rr:M15 14L20 9L15 4M20 9H10C6.69 9 4 11.69 4 15C4 18.31 6.69 21 10 21H13"
|
||||
DIARY_SPELLING_ICON :: "S2rr:M3 14L7.5 3L12 14M4.8 10H10.2M12 17L15.5 20.5L21.5 13"
|
||||
|
||||
DiaryObservedFrame :: () -> DiaryUiFrame {
|
||||
return frame
|
||||
}
|
||||
|
||||
// The entry previews its Markdown (diary_markdown.zi): away from the lines
|
||||
// holding the caret or a selection, markers are hidden, emphasis is bold or
|
||||
// slanted, headings are larger, links and list and quote marks take their
|
||||
// colors, and a photo's embed line shows the photo in its place. On the
|
||||
// caret's line the Markdown shows as typed, with the photo under it.
|
||||
editor_blocks: [Markdown.PREVIEW_IMAGES + 1]TextArea.Block;
|
||||
|
||||
// A copy the view owns of text a host call answered. The host answers in its
|
||||
// own buffers, which its next call may overwrite.
|
||||
DiaryKept :: (value: string) -> string {
|
||||
out: Vec(u8)
|
||||
BuilderPrint(*out, "%", value)
|
||||
return BuilderFinish(out)
|
||||
}
|
||||
|
||||
// A photo's height in the entry: three quarters of its width, within limits
|
||||
// that keep a few lines of text in view on a phone.
|
||||
DiaryPhotoHeight :: (width: float32) -> s32 {
|
||||
height := cast(s32)(width * 0.75)
|
||||
if height > Scale(360) {
|
||||
height = Scale(360)
|
||||
}
|
||||
if height < Scale(120) {
|
||||
height = Scale(120)
|
||||
}
|
||||
return height
|
||||
}
|
||||
|
||||
DiaryEditorProps :: (area: TextArea.Props) -> MarkdownEditor.Props {
|
||||
props: MarkdownEditor.Props = .{.area = area, .muted_color = frame.muted_color,
|
||||
.link_color = frame.link_color, .images = DiaryResolvedImages(area.value)}
|
||||
height := DiaryPhotoHeight(area.bounds.width)
|
||||
unavailable := AppLocale("diary_photo_unavailable")
|
||||
for index: cast(s32)0..cast(s32)props.images.count - 1 {
|
||||
embed := DiaryEmbedAt(area.value, props.images[index].start)
|
||||
editor_blocks[index] = TextArea.Block.{.start = embed.line_start, .height = height,
|
||||
.image = DiaryKept(DiaryPhoto(DiaryEmbedDestination(area.value, embed))),
|
||||
.label = unavailable}
|
||||
}
|
||||
props.area.blocks = editor_blocks[:props.images.count]
|
||||
return props
|
||||
}
|
||||
|
||||
// The day's gallery is a separate view, opened by its toolbar icon. It
|
||||
// lists the library's photos of that day, then the entry's other photos.
|
||||
// Choosing one inserts it at the saved caret and returns to the entry.
|
||||
DIARY_DAY_PHOTOS :: 64
|
||||
|
||||
DiaryDayPhoto :: struct {
|
||||
// What an embed of the photo links to.
|
||||
destination: string
|
||||
name: string
|
||||
// Its preview, or "" while the photo is not on this device.
|
||||
asset: string
|
||||
}
|
||||
|
||||
day_photos: [DIARY_DAY_PHOTOS]DiaryDayPhoto;
|
||||
day_photo_count: s32;
|
||||
|
||||
// A photo is listed once: by what it links to, or by the picture it draws,
|
||||
// since a Diary file the library keeps too draws as the library's photo.
|
||||
DiaryDayPhotoKnown :: (destination: string, asset: string) -> bool {
|
||||
for index: cast(s32)0..day_photo_count - 1 {
|
||||
if day_photos[index].destination == destination {
|
||||
return true
|
||||
}
|
||||
if asset.count > 0 && day_photos[index].asset == asset {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
DiaryDayPhotoAdd :: (destination: string, name: string) {
|
||||
if destination.count == 0 || day_photo_count >= DIARY_DAY_PHOTOS {
|
||||
return
|
||||
}
|
||||
asset := DiaryPhoto(destination)
|
||||
if DiaryDayPhotoKnown(destination, asset) {
|
||||
return
|
||||
}
|
||||
day_photos[day_photo_count] = DiaryDayPhoto.{.destination = destination,
|
||||
.name = DiaryKept(name), .asset = DiaryKept(asset)}
|
||||
day_photo_count += 1
|
||||
}
|
||||
|
||||
DiaryDayPhotos :: (text: string) {
|
||||
day_photo_count = 0
|
||||
if state.load_error || state.year <= 0 {
|
||||
return
|
||||
}
|
||||
count := DiaryMediaQuery(ISO(Date.{state.year, state.month, state.day}), false)
|
||||
for index: cast(s32)0..count - 1 {
|
||||
if day_photo_count >= DIARY_DAY_PHOTOS {
|
||||
break
|
||||
}
|
||||
entry := DiaryMediaItem(index)
|
||||
DiaryDayPhotoAdd(DiaryLibraryPath(entry.day, entry.hash, entry.format), entry.name)
|
||||
}
|
||||
embed := DiaryEmbedNext(text, 0)
|
||||
while embed.valid && day_photo_count < DIARY_DAY_PHOTOS {
|
||||
DiaryDayPhotoAdd(DiaryEmbedDestination(text, embed), DiaryEmbedAlt(text, embed))
|
||||
embed = DiaryEmbedNext(text, embed.end)
|
||||
}
|
||||
}
|
||||
|
||||
// The open gallery remembers its day, so another day opens with it closed.
|
||||
DiaryDayKey :: () -> s32 {
|
||||
return state.year * 10000 + state.month * 100 + state.day
|
||||
}
|
||||
|
||||
DiaryGalleryOpen :: () -> bool {
|
||||
return frame.photos_open_day != 0 && frame.photos_open_day == DiaryDayKey()
|
||||
}
|
||||
|
||||
// Puts a photo's embed on its own line at the caret: one edit, saved at once.
|
||||
DiaryInsertPhoto :: (destination: string, name: string) {
|
||||
line := DiaryEmbedLine(destination, name)
|
||||
edit := DiaryEmbedInsertion(state.text, state.cursor, line)
|
||||
state.action = DIARY_EDIT
|
||||
state.edit_start = edit.start
|
||||
state.edit_end = edit.end
|
||||
state.replacement = edit.replacement
|
||||
pending = true
|
||||
frame.save_at = frame.now
|
||||
}
|
||||
|
||||
DiaryDayGallery :: (left: float32, top: float32, width: float32, height: float32, editable: bool) {
|
||||
gap := cast(float32)Scale(8)
|
||||
inner := width - cast(float32)Scale(14)
|
||||
columns := cast(s32)((inner + gap) / cast(float32)Scale(112))
|
||||
if columns < 1 {
|
||||
columns = 1
|
||||
}
|
||||
tile := (inner - cast(float32)(columns - 1) * gap) / cast(float32)columns
|
||||
rows := (day_photo_count + columns - 1) / columns
|
||||
strip := Scroll.Draw(frame.session, Scroll.Props.{.key = cast(u64)290302,
|
||||
.bounds = Rectangle.{left, top, width, height}, .scale = frame.scale,
|
||||
.content_height = cast(s32)(cast(float32)rows * (tile + gap)),
|
||||
.scroll_offset = frame.photos_scroll})
|
||||
frame.photos_scroll = strip.scroll_offset
|
||||
if !strip.opened {
|
||||
return
|
||||
}
|
||||
for index: cast(s32)0..day_photo_count - 1 {
|
||||
photo := day_photos[index]
|
||||
bounds := Rectangle.{strip.content.x + cast(float32)(index % columns) * (tile + gap),
|
||||
strip.content.y + cast(float32)(index / columns) * (tile + gap), tile, tile}
|
||||
Box.Draw(frame.session, Box.Props.{.key = cast(u64)(292000 + index), .bounds = bounds,
|
||||
.fill = Color.{156, 156, 156, 36}, .radius = cast(float32)Scale(6)})
|
||||
if photo.asset.count > 0 {
|
||||
Image.Draw(frame.session, Image.Props.{.key = cast(u64)(292100 + index),
|
||||
.asset_path = photo.asset, .alt_text = photo.name, .bounds = bounds,
|
||||
.fit = cast(Image.ImageFit)ImageFitCover, .smooth = true})
|
||||
}
|
||||
press := Press.Draw(frame.session, Press.Props.{.key = cast(u64)(292200 + index),
|
||||
.id = 292200 + index, .bounds = bounds, .label = photo.name, .now = frame.now,
|
||||
.disabled = !editable})
|
||||
if press.clicked && !pending {
|
||||
DiaryInsertPhoto(photo.destination, photo.name)
|
||||
frame.photos_open_day = 0
|
||||
}
|
||||
}
|
||||
End(frame.session)
|
||||
}
|
||||
|
||||
DateTitle :: (year: s32, month: s32, day: s32) -> string {
|
||||
if month < 1 || month > 12 { return "" }
|
||||
keys: [12]string = .["habit_month_1", "habit_month_2", "habit_month_3",
|
||||
"habit_month_4", "habit_month_5", "habit_month_6", "habit_month_7",
|
||||
"habit_month_8", "habit_month_9", "habit_month_10", "habit_month_11", "habit_month_12"]
|
||||
month_text := AppLocale(keys[month - 1])
|
||||
title: Vec(u8)
|
||||
eastern := month_text.count >= 2 && month_text[:2] == "%d"
|
||||
if day > 0 && !eastern { BuilderPrint(*title, "% ", day) }
|
||||
index: s64 = 0
|
||||
while index < month_text.count {
|
||||
if index + 1 < month_text.count && month_text[index:index + 2] == "%d" {
|
||||
BuilderPrint(*title, "%", year)
|
||||
index += 2
|
||||
} else {
|
||||
BuilderPrint(*title, "%", month_text[index:index + 1])
|
||||
index += 1
|
||||
}
|
||||
}
|
||||
if day > 0 && eastern {
|
||||
BuilderPrint(*title, "%", day)
|
||||
suffix := ifx month_text[month_text.count - 3:] == "월" then "일" else "日"
|
||||
BuilderPrint(*title, "%", suffix)
|
||||
}
|
||||
return BuilderFinish(title)
|
||||
}
|
||||
|
||||
HasWords :: (text: string) -> bool {
|
||||
for byte: text {
|
||||
if byte != cast(u8)32 && byte != cast(u8)10 && byte != cast(u8)13 && byte != cast(u8)9 {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
Scale :: (value: s32) -> s32 {
|
||||
return cast(s32)(cast(float32)value * frame.scale)
|
||||
}
|
||||
|
||||
FinishView :: () -> DiaryMessage {
|
||||
return state
|
||||
}
|
||||
|
||||
// A button with an icon shows only the icon; its label names it for
|
||||
// accessibility.
|
||||
DiaryAction :: ( id: s32, label: string, bounds: Rectangle, enabled: bool = true,
|
||||
icon: string = "", selected: bool = false, loading: bool = false) {
|
||||
if Button.Draw(frame.session, Button.Props.{.id = id, .bounds = bounds,
|
||||
.label = label, .disabled = !enabled, .selected = selected, .loading = loading,
|
||||
.icon_shape = icon, .icon_only = icon != "", .fit_content = true,
|
||||
.tone = cast(ButtonTone)ButtonToneNeutral,
|
||||
.emphasis = cast(ButtonEmphasis)(ifx icon != "" then ButtonEmphasisGhost else ButtonEmphasisSoft)}) != 0 {
|
||||
// Photos, undo, redo and spelling are host effects.
|
||||
frame.focused = false
|
||||
if id == 29005 {
|
||||
frame.photo_requested = true
|
||||
return
|
||||
}
|
||||
if id == 29014 {
|
||||
frame.undo_requested = true
|
||||
return
|
||||
}
|
||||
if id == 29015 {
|
||||
frame.redo_requested = true
|
||||
return
|
||||
}
|
||||
if id == 29016 {
|
||||
frame.spelling_requested = true
|
||||
return
|
||||
}
|
||||
if id == 29017 {
|
||||
frame.photos_open_day = ifx DiaryGalleryOpen() then 0 else DiaryDayKey()
|
||||
frame.photos_scroll = 0
|
||||
return
|
||||
}
|
||||
state.action = DIARY_CONTROL
|
||||
state.control = id
|
||||
pending = true
|
||||
frame.scroll = 0
|
||||
frame.photos_scroll = 0
|
||||
frame.photos_open_day = 0
|
||||
}
|
||||
}
|
||||
|
||||
DiaryView :: (message: DiaryMessage, observed: DiaryUiFrame, today: Date) -> DiaryMessage {
|
||||
state = message
|
||||
frame = observed
|
||||
pending = false
|
||||
column := Layout.CenteredColumnFor(frame.width, Scale(640), Scale(16))
|
||||
left := cast(float32)(column.x + frame.origin_x)
|
||||
width := cast(float32)column.width
|
||||
part := (width - cast(float32)Scale(12)) / 3.0
|
||||
compact := frame.height < Scale(480)
|
||||
top := cast(float32)(frame.origin_y + ifx compact then Scale(4) else Scale(12))
|
||||
control := cast(float32)Scale(44)
|
||||
gap := cast(float32)Scale(8)
|
||||
|
||||
// Title bar: the selected date with the previous and next day right
|
||||
// beside it, centered together.
|
||||
title := DateTitle(state.year, state.month, state.day)
|
||||
title_font := frame.font + Scale(4)
|
||||
title_width := cast(float32)TextWidth(frame.session, Text.Props.{.text = title, .size = title_font})
|
||||
if title_width > width - 2.0 * (control + gap) {
|
||||
title_width = width - 2.0 * (control + gap)
|
||||
}
|
||||
title_left := left + (width - title_width) / 2.0
|
||||
compression := AppSupports("media.compression.open")
|
||||
if compression {
|
||||
title_width = title_width - control - gap
|
||||
if title_width < control {
|
||||
title_width = control
|
||||
}
|
||||
title_left = left + (width - control - gap - title_width) / 2.0
|
||||
if Button.Draw(frame.session, Button.Props.{.id = 29018,
|
||||
.bounds = Rectangle.{left + width - control, top, control, control},
|
||||
.label = AppLocale("media_compression_title"), .icon_only = true,
|
||||
.icon_shape = CompressionIcon.Shape,
|
||||
.tone = cast(ButtonTone)ButtonToneNeutral,
|
||||
.emphasis = cast(ButtonEmphasis)ButtonEmphasisGhost}) != 0 {
|
||||
unused AppService("media.compression.open", "")
|
||||
}
|
||||
}
|
||||
DiaryAction(29001, "‹", Rectangle.{title_left - gap - control, top, control, control},
|
||||
true, DIARY_PREVIOUS_ICON)
|
||||
DiaryAction(29002, "›", Rectangle.{title_left + title_width + gap, top, control, control},
|
||||
OnOrBefore(Next(Date.{state.year, state.month, state.day}, 1), today) &&
|
||||
!OnOrBefore(today, Date.{state.year, state.month, state.day}),
|
||||
DIARY_NEXT_ICON)
|
||||
title_strong: [1]Text.Range = .[Text.Range.{.start = 0, .end = cast(s32)title.count}]
|
||||
Text.Draw(frame.session, Text.Props.{.bounds = Rectangle.{title_left, top, title_width, control},
|
||||
.text = title, .size = title_font, .strong = title_strong[:],
|
||||
.align = cast(TextAlign)TextAlignCenter, .vertical_align = cast(TextAlign)TextAlignCenter,
|
||||
.wrap = cast(Text.Wrap)TextWrapEllipsis})
|
||||
|
||||
// On phones the editing tools get their own row, keeping every target
|
||||
// at 44 units instead of squeezing the icons beside Today.
|
||||
tools := top + control + gap
|
||||
tool_gap := cast(float32)Scale(4)
|
||||
tool := control
|
||||
today_width := cast(float32)Scale(96)
|
||||
stacked := width < today_width + gap + 7.0 * tool + 6.0 * tool_gap
|
||||
edit_tools := tools
|
||||
if stacked && !state.calendar {
|
||||
edit_tools += control + tool_gap
|
||||
}
|
||||
DiaryAction(29004, AppLocale("diary_today"), Rectangle.{left, tools, today_width, control})
|
||||
DiaryAction(29003, AppLocale("tab_diary_calendar"),
|
||||
Rectangle.{left + today_width + gap, tools, tool, control},
|
||||
true, DIARY_CALENDAR_ICON, state.calendar)
|
||||
editable := !state.load_error && state.year > 0
|
||||
if !state.calendar {
|
||||
idle := editable && !frame.spelling_busy
|
||||
DiaryAction(29014, AppLocale("diary_undo"),
|
||||
Rectangle.{left + width - 6.0 * tool - 5.0 * tool_gap, edit_tools, tool, control},
|
||||
idle && frame.can_undo, DIARY_UNDO_ICON)
|
||||
DiaryAction(29015, AppLocale("diary_redo"),
|
||||
Rectangle.{left + width - 5.0 * tool - 4.0 * tool_gap, edit_tools, tool, control},
|
||||
idle && frame.can_redo, DIARY_REDO_ICON)
|
||||
DiaryAction(29016, AppLocale("diary_check_spelling"),
|
||||
Rectangle.{left + width - 4.0 * tool - 3.0 * tool_gap, edit_tools, tool, control},
|
||||
idle && HasWords(state.text) && AppSupports("text.correct.start"), DIARY_SPELLING_ICON, false, frame.spelling_busy)
|
||||
DiaryAction(29013, AppLocale("diary_insert_time"),
|
||||
Rectangle.{left + width - 3.0 * tool - 2.0 * tool_gap, edit_tools, tool, control},
|
||||
!frame.spelling_busy, DIARY_TIME_ICON)
|
||||
DiaryAction(29005, AppLocale("diary_attach_photo"),
|
||||
Rectangle.{left + width - 2.0 * tool - tool_gap, edit_tools, tool, control},
|
||||
AppSupports("media.pick"), DIARY_ATTACHMENT_ICON)
|
||||
DiaryDayPhotos(state.text)
|
||||
gallery_label := AppLocale("diary_show_gallery")
|
||||
if DiaryGalleryOpen() {
|
||||
gallery_label = AppLocale("diary_hide_gallery")
|
||||
}
|
||||
DiaryAction(29017, gallery_label,
|
||||
Rectangle.{left + width - tool, edit_tools, tool, control},
|
||||
editable && day_photo_count > 0, DIARY_PHOTO_ICON, DiaryGalleryOpen())
|
||||
}
|
||||
content := edit_tools + control + cast(float32)Scale(12)
|
||||
content_height := cast(float32)(frame.height - frame.bottom) - content - cast(float32)Scale(16)
|
||||
|
||||
if !state.calendar && DiaryGalleryOpen() {
|
||||
DiaryDayGallery(left, content, width, content_height, editable && !frame.spelling_busy)
|
||||
return FinishView()
|
||||
}
|
||||
|
||||
if state.calendar {
|
||||
scroll := Scroll.Draw(frame.session, Scroll.Props.{.key = cast(u64)290300,
|
||||
.bounds = Rectangle.{left, content, width, content_height},
|
||||
.content_height = Scale(344), .scroll_offset = frame.calendar_scroll})
|
||||
frame.calendar_scroll = scroll.scroll_offset
|
||||
if !scroll.opened {
|
||||
return FinishView()
|
||||
}
|
||||
origin := scroll.content.y
|
||||
DiaryAction(29011, "‹", Rectangle.{left, origin, part, cast(float32)Scale(44)})
|
||||
DiaryAction(29012, "›", Rectangle.{left + 2.0 * (part + cast(float32)Scale(6)),
|
||||
origin, part, cast(float32)Scale(44)},
|
||||
state.month_year < today.year ||
|
||||
(state.month_year == today.year && state.month_number < today.month))
|
||||
Text.Draw(frame.session, Text.Props.{.bounds = Rectangle.{left + part,
|
||||
origin + cast(float32)Scale(8), part, cast(float32)Scale(32)},
|
||||
.text = DateTitle(state.month_year, state.month_number, 0), .size = frame.font})
|
||||
weekdays: [7]string = .["habit_day_mon", "habit_day_tue", "habit_day_wed", "habit_day_thu",
|
||||
"habit_day_fri", "habit_day_sat", "habit_day_sun"]
|
||||
for day: cast(s32)0..cast(s32)6 {
|
||||
Text.Draw(frame.session, Text.Props.{.bounds = Rectangle.{left + cast(float32)day * width / 7.0,
|
||||
origin + cast(float32)Scale(52), width / 7.0, cast(float32)Scale(24)},
|
||||
.text = AppLocale(weekdays[day]), .size = frame.font})
|
||||
}
|
||||
for day: cast(s32)1..state.month_days {
|
||||
position := state.month_weekday + day - 1
|
||||
label: Vec(u8)
|
||||
BuilderPrint(*label, "%", day)
|
||||
if state.marks[day] != cast(u8)0 { BuilderPrint(*label, " •") }
|
||||
day_title := BuilderFinish(label)
|
||||
cell := width / 7.0
|
||||
DiaryAction(29100 + day, day_title,
|
||||
Rectangle.{left + cast(float32)(position % 7) * cell,
|
||||
origin + cast(float32)Scale(80 + (position / 7) * 44), cell - 2.0,
|
||||
cast(float32)Scale(42)},
|
||||
OnOrBefore(Date.{state.month_year, state.month_number, day}, today))
|
||||
}
|
||||
End(frame.session)
|
||||
return FinishView()
|
||||
}
|
||||
// The gallery never changes the entry's viewport or line positions.
|
||||
notice := frame.photo_error || state.load_error || frame.spelling_notice != ""
|
||||
notice_room := ifx notice then Scale(60) else 0
|
||||
editor_height := cast(s32)content_height - notice_room
|
||||
if editor_height < Scale(120) {
|
||||
editor_height = Scale(120)
|
||||
}
|
||||
page := Scroll.Draw(frame.session, Scroll.Props.{.key = cast(u64)290301,
|
||||
.bounds = Rectangle.{left, content, width, content_height},
|
||||
.content_height = editor_height + notice_room,
|
||||
.scroll_offset = frame.page_scroll, .scale = frame.scale})
|
||||
frame.page_scroll = page.scroll_offset
|
||||
if !page.opened {
|
||||
return FinishView()
|
||||
}
|
||||
area: TextArea.Props
|
||||
area.key = cast(u64)290200
|
||||
area.focus_id = 29020
|
||||
area.bounds = Rectangle.{left, page.content.y, width, cast(float32)editor_height}
|
||||
area.value = state.text
|
||||
area.label = AppLocale("tab_diary")
|
||||
area.wrap = true
|
||||
area.scale = frame.scale
|
||||
area.cursor = state.cursor
|
||||
area.anchor = state.anchor
|
||||
area.scroll_y = frame.scroll
|
||||
area.focused = frame.focused
|
||||
area.selecting = frame.selecting
|
||||
// The entry waits while its spelling is checked, so the correction
|
||||
// always applies to the text that was sent.
|
||||
area.read_only = !editable || frame.spelling_busy
|
||||
area.max_bytes = 2147483646
|
||||
area.max_codepoints = 2147483646
|
||||
area.input = frame.input
|
||||
edited := MarkdownEditor.Draw(frame.session, DiaryEditorProps(area))
|
||||
state.cursor = edited.cursor
|
||||
state.anchor = edited.anchor
|
||||
frame.scroll = edited.scroll_y
|
||||
frame.focused = edited.focused
|
||||
frame.selecting = edited.selecting
|
||||
if edited.edit.changed && !pending {
|
||||
state.action = DIARY_EDIT
|
||||
state.edit_start = edited.edit.start
|
||||
state.edit_end = edited.edit.end
|
||||
state.replacement = edited.edit.replacement
|
||||
pending = true
|
||||
frame.save_at = frame.now + 0.75
|
||||
}
|
||||
if edited.clipboard_write {
|
||||
frame.clipboard_write = true
|
||||
frame.clipboard_text = edited.clipboard_text
|
||||
}
|
||||
|
||||
if notice {
|
||||
status := frame.spelling_notice
|
||||
if state.load_error {
|
||||
status = "diary_read_error"
|
||||
}
|
||||
if frame.photo_error {
|
||||
status = "diary_photo_error"
|
||||
}
|
||||
Text.Draw(frame.session, Text.Props.{.bounds = Rectangle.{left,
|
||||
area.bounds.y + area.bounds.height + cast(float32)Scale(12), width, cast(float32)Scale(40)},
|
||||
.text = AppLocale(status), .size = frame.font})
|
||||
}
|
||||
End(frame.session)
|
||||
return FinishView()
|
||||
}
|
||||
@@ -1,151 +0,0 @@
|
||||
// App-owned commands shared with callers. Documents retain their existing schema.
|
||||
#import "json_scan"
|
||||
#import "std/text"
|
||||
#import "vec"
|
||||
#import "byte_text_linux"
|
||||
#import, file "diary_types.zi";
|
||||
|
||||
DiaryWireString :: (text: string, at: s32) -> string {
|
||||
if at < 0 { return "" }
|
||||
bytes: Vec(u8)
|
||||
for index: 0..text.count - 1 { unused VecPush(bytes, cast(u8)0) }
|
||||
count := ReadStringText(text, at, VecSlice(bytes, 0, bytes.count))
|
||||
if count < 0 {
|
||||
VecFree(bytes)
|
||||
return ""
|
||||
}
|
||||
result: Vec(u8)
|
||||
BuilderPrint(*result, "%", TextFromBytes(VecSlice(bytes, 0, count)))
|
||||
VecFree(bytes)
|
||||
return BuilderFinish(result)
|
||||
}
|
||||
|
||||
DiaryWireQuote :: (out: *Vec(u8), value: string) {
|
||||
BuilderPrint(out, "\"")
|
||||
for index: 0..value.count - 1 {
|
||||
byte := value[index]
|
||||
if byte == cast(u8)34 { BuilderPrint(out, "\\\"") }
|
||||
else if byte == cast(u8)92 { BuilderPrint(out, "\\\\") }
|
||||
else if byte == cast(u8)10 { BuilderPrint(out, "\\n") }
|
||||
else if byte == cast(u8)13 { BuilderPrint(out, "\\r") }
|
||||
else if byte == cast(u8)9 { BuilderPrint(out, "\\t") }
|
||||
else if byte < cast(u8)32 {
|
||||
hex := "0123456789abcdef"
|
||||
BuilderPrint(out, "\\u00")
|
||||
unused VecPush(out.*, hex[cast(s64)(byte / cast(u8)16)])
|
||||
unused VecPush(out.*, hex[cast(s64)(byte % cast(u8)16)])
|
||||
}
|
||||
else { BuilderPrint(out, "%", value[index:index + 1]) }
|
||||
}
|
||||
BuilderPrint(out, "\"")
|
||||
}
|
||||
|
||||
DiaryWireNumber :: (text: string, key: string) -> s32 {
|
||||
value := ReadNumber(text, FieldAt(text, 0, key))
|
||||
if !value.valid || value.value < -2147483648.0 || value.value > 2147483647.0 { return 0 }
|
||||
result := cast(s32)value.value
|
||||
return ifx cast(float64)result == value.value then result else 0
|
||||
}
|
||||
|
||||
DiaryWireBool :: (text: string, key: string) -> bool {
|
||||
at := FieldAt(text, 0, key)
|
||||
return at >= 0 && at + 4 <= text.count && text[at:at + 4] == "true"
|
||||
}
|
||||
|
||||
DiaryMessageDecode :: (text: string) -> DiaryMessage {
|
||||
message: DiaryMessage
|
||||
if text.count == 0 || text[0] != cast(u8)123 ||
|
||||
Space(text, ValueEnd(text, 0, 0)) != text.count { return message }
|
||||
message.abi = DiaryWireNumber(text, "abi")
|
||||
message.action = DiaryWireNumber(text, "action")
|
||||
message.control = DiaryWireNumber(text, "control")
|
||||
message.year = DiaryWireNumber(text, "year")
|
||||
message.month = DiaryWireNumber(text, "month")
|
||||
message.day = DiaryWireNumber(text, "day")
|
||||
message.month_year = DiaryWireNumber(text, "month_year")
|
||||
message.month_number = DiaryWireNumber(text, "month_number")
|
||||
message.month_days = DiaryWireNumber(text, "month_days")
|
||||
message.month_weekday = DiaryWireNumber(text, "month_weekday")
|
||||
message.screen = DiaryWireNumber(text, "screen")
|
||||
message.text = DiaryWireString(text, FieldAt(text, 0, "text"))
|
||||
message.document = DiaryWireString(text, FieldAt(text, 0, "document"))
|
||||
message.replacement = DiaryWireString(text, FieldAt(text, 0, "replacement"))
|
||||
message.edit_start = DiaryWireNumber(text, "edit_start")
|
||||
message.edit_end = DiaryWireNumber(text, "edit_end")
|
||||
message.cursor = DiaryWireNumber(text, "cursor")
|
||||
message.anchor = DiaryWireNumber(text, "anchor")
|
||||
message.attachment_file = DiaryWireString(text, FieldAt(text, 0, "attachment_file"))
|
||||
message.attachment_name = DiaryWireString(text, FieldAt(text, 0, "attachment_name"))
|
||||
message.calendar = DiaryWireBool(text, "calendar")
|
||||
message.saved = DiaryWireBool(text, "saved")
|
||||
message.load_error = DiaryWireBool(text, "load_error")
|
||||
message.succeeded = DiaryWireBool(text, "succeeded")
|
||||
marks := FieldAt(text, 0, "marks")
|
||||
if ArrayCount(text, marks) == 32 {
|
||||
for index: cast(s32)0..cast(s32)31 {
|
||||
value := ReadNumber(text, ElementAt(text, marks, index))
|
||||
message.marks[index] = ifx value.valid && value.value == 1.0 then cast(u8)1 else cast(u8)0
|
||||
}
|
||||
}
|
||||
return message
|
||||
}
|
||||
|
||||
DiaryMessageEncode :: (message: DiaryMessage) -> string {
|
||||
out: Vec(u8)
|
||||
BuilderPrint(*out, "{")
|
||||
BuilderPrint(*out, "\"abi\":")
|
||||
BuilderPrint(*out, "%", message.abi)
|
||||
BuilderPrint(*out, ",\"action\":")
|
||||
BuilderPrint(*out, "%", message.action)
|
||||
BuilderPrint(*out, ",\"control\":")
|
||||
BuilderPrint(*out, "%", message.control)
|
||||
BuilderPrint(*out, ",\"year\":")
|
||||
BuilderPrint(*out, "%", message.year)
|
||||
BuilderPrint(*out, ",\"month\":")
|
||||
BuilderPrint(*out, "%", message.month)
|
||||
BuilderPrint(*out, ",\"day\":")
|
||||
BuilderPrint(*out, "%", message.day)
|
||||
BuilderPrint(*out, ",\"month_year\":")
|
||||
BuilderPrint(*out, "%", message.month_year)
|
||||
BuilderPrint(*out, ",\"month_number\":")
|
||||
BuilderPrint(*out, "%", message.month_number)
|
||||
BuilderPrint(*out, ",\"month_days\":")
|
||||
BuilderPrint(*out, "%", message.month_days)
|
||||
BuilderPrint(*out, ",\"month_weekday\":")
|
||||
BuilderPrint(*out, "%", message.month_weekday)
|
||||
BuilderPrint(*out, ",\"screen\":")
|
||||
BuilderPrint(*out, "%", message.screen)
|
||||
BuilderPrint(*out, ",\"text\":")
|
||||
DiaryWireQuote(*out, message.text)
|
||||
BuilderPrint(*out, ",\"document\":")
|
||||
DiaryWireQuote(*out, message.document)
|
||||
BuilderPrint(*out, ",\"replacement\":")
|
||||
DiaryWireQuote(*out, message.replacement)
|
||||
BuilderPrint(*out, ",\"edit_start\":")
|
||||
BuilderPrint(*out, "%", message.edit_start)
|
||||
BuilderPrint(*out, ",\"edit_end\":")
|
||||
BuilderPrint(*out, "%", message.edit_end)
|
||||
BuilderPrint(*out, ",\"cursor\":")
|
||||
BuilderPrint(*out, "%", message.cursor)
|
||||
BuilderPrint(*out, ",\"anchor\":")
|
||||
BuilderPrint(*out, "%", message.anchor)
|
||||
BuilderPrint(*out, ",\"attachment_file\":")
|
||||
DiaryWireQuote(*out, message.attachment_file)
|
||||
BuilderPrint(*out, ",\"attachment_name\":")
|
||||
DiaryWireQuote(*out, message.attachment_name)
|
||||
BuilderPrint(*out, ",\"calendar\":")
|
||||
BuilderPrint(*out, "%", ifx message.calendar then "true" else "false")
|
||||
BuilderPrint(*out, ",\"saved\":")
|
||||
BuilderPrint(*out, "%", ifx message.saved then "true" else "false")
|
||||
BuilderPrint(*out, ",\"load_error\":")
|
||||
BuilderPrint(*out, "%", ifx message.load_error then "true" else "false")
|
||||
BuilderPrint(*out, ",\"succeeded\":")
|
||||
BuilderPrint(*out, "%", ifx message.succeeded then "true" else "false")
|
||||
BuilderPrint(*out, ",\"marks\":[")
|
||||
for index: cast(s32)0..cast(s32)31 {
|
||||
if index > 0 { BuilderPrint(*out, ",") }
|
||||
BuilderPrint(*out, "%", cast(s32)message.marks[index])
|
||||
}
|
||||
BuilderPrint(*out, "]}")
|
||||
return BuilderFinish(out)
|
||||
}
|
||||
@@ -1,184 +0,0 @@
|
||||
# Changelog
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
- Diary links are exclusive. Activity shows completed habit icons, and Habits has daily line graphs and an overview beside Shop.
|
||||
|
||||
- Tap a diary-linked habit's day to open that date in Diary and keep its completion.
|
||||
- Coins follow the selected theme color.
|
||||
- Statistics and Shop have matching icons and separate tap targets.
|
||||
- Claim the daily reward beside the coin balance: one coin a day, three on the seventh day in a row.
|
||||
- Choose soda, coffee, bubble tea, chocolate and candle pictures for custom rewards.
|
||||
|
||||
## [1.3.17] - 2026-11-05
|
||||
|
||||
- Show color purchase totals, recent purchase frequency and the last purchase date for rewards.
|
||||
|
||||
## [1.3.16] - 2026-11-02
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.62.
|
||||
|
||||
## [1.3.15] - 2026-10-29
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.61.
|
||||
|
||||
## [1.3.14] - 2026-10-29
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.60.
|
||||
|
||||
## [1.3.13] - 2026-10-28
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.59.
|
||||
|
||||
## [1.3.12] - 2026-10-28
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.58.
|
||||
|
||||
## [1.3.11] - 2026-10-28
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.56.
|
||||
|
||||
## [1.3.10] - 2026-10-27
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.55.
|
||||
|
||||
## [1.3.9] - 2026-10-27
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.54.
|
||||
|
||||
## [1.3.8] - 2026-10-27
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.53.
|
||||
|
||||
## [1.3.7] - 2026-10-27
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.52.
|
||||
|
||||
## [1.3.6] - 2026-10-27
|
||||
|
||||
- Open Link to reliably with the expanded icon picker.
|
||||
- Choose eight more diary and writing symbols for habits and rewards.
|
||||
- Link habits to Diary entries.
|
||||
- Requires Breeze 2.1.51 or later.
|
||||
|
||||
## [1.3.4] - 2026-10-26
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.50.
|
||||
|
||||
## [1.3.3] - 2026-10-25
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.49.
|
||||
|
||||
## [1.3.2] - 2026-10-25
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.48.
|
||||
|
||||
## [1.3.1] - 2026-10-25
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.47.
|
||||
|
||||
## [1.3.0] - 2026-10-24
|
||||
|
||||
- The habit list, each habit's week and calendar, its day with its entries, its editor and its statistics now come with Habits, so they can change without an app update.
|
||||
|
||||
## [1.2.11] - 2026-10-24
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.46.
|
||||
|
||||
## [1.2.10] - 2026-10-23
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.45.
|
||||
|
||||
## [1.2.9] - 2026-10-23
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.44.
|
||||
|
||||
## [1.2.8] - 2026-10-23
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.43.
|
||||
|
||||
## [1.2.7] - 2026-10-22
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.42.
|
||||
|
||||
## [1.2.6] - 2026-10-22
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.41.
|
||||
|
||||
## [1.2.5] - 2026-10-22
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.40.
|
||||
|
||||
## [1.2.4] - 2026-10-22
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.39.
|
||||
|
||||
## [1.2.3] - 2026-10-21
|
||||
|
||||
- Track zero-occurrence goals and choose custom coins, including 0 and negative coins per occurrence.
|
||||
- Give each achievement its own meaningful icon.
|
||||
- Maintenance release for Inner Breeze 2.1.38.
|
||||
|
||||
## [1.2.2] - 2026-10-21
|
||||
|
||||
- The shop scrolls to the final activity row at phone and desktop sizes.
|
||||
- Rewards can use a soda can symbol.
|
||||
|
||||
## [1.2.1] - 2026-10-20
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.37.
|
||||
|
||||
## [1.2.0] - 2026-10-19
|
||||
|
||||
- The shop now comes with Habits, so it can improve with a Habits update.
|
||||
- Requires Inner Breeze 2.1.36 or later.
|
||||
|
||||
## [1.1.2] - 2026-10-18
|
||||
|
||||
- Save, discard and delete confirmations use consistent controls and can
|
||||
improve with Habits updates while preserving existing habit data.
|
||||
- Requires Inner Breeze 2.1.36 or later.
|
||||
|
||||
## [1.1.1] - 2026-10-18
|
||||
|
||||
- Leaving a habit with unsaved changes asks whether to save, discard, or
|
||||
keep editing. Unchanged habits close without a prompt.
|
||||
|
||||
## [1.1.0] - 2026-10-17
|
||||
|
||||
- A counting habit's count dialog now comes with Habits, so it can improve with a Habits update, without a new Inner Breeze.
|
||||
- Requires Inner Breeze 2.1.35 or later.
|
||||
|
||||
## [1.0.7] - 2026-10-17
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.35.
|
||||
|
||||
## [1.0.6] - 2026-10-17
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.34.
|
||||
- Requires Inner Breeze 2.1.28 or later.
|
||||
|
||||
## [1.0.5] - 2026-10-13
|
||||
|
||||
- Maintenance release for Inner Breeze 2.1.33.
|
||||
- Requires Inner Breeze 2.1.28 or later.
|
||||
|
||||
## [1.0.4] - 2026-10-10
|
||||
|
||||
- Requires Inner Breeze 2.1.28 or later.
|
||||
|
||||
## [1.0.3] - 2026-10-07
|
||||
|
||||
- Keep app labels and content visible after updating Inner Breeze.
|
||||
|
||||
## [1.0.2] - 2026-10-06
|
||||
|
||||
- Use Apps consistently in the app and its independently delivered package.
|
||||
|
||||
## [1.0.1] - 2026-10-06
|
||||
|
||||
- Load independently in the updated app host while retaining saved tracking.
|
||||
|
||||
## [1.0.0] - 2026-10-06
|
||||
|
||||
- First independently versioned Habits module.
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_habits_created_1_title": "Návyky · 1 výsledků",
|
||||
"achievement_habits_created_1_description": "Zaznamenejte 1 různých výsledků: platný uložený návyk.",
|
||||
"achievement_habits_days_1_title": "Návyky · 1 dnů",
|
||||
"achievement_habits_days_1_description": "Vykonejte tuto aktivitu v 1 různých dnech: splněný den návyku.",
|
||||
"achievement_habits_days_3_title": "Návyky · 3 dnů",
|
||||
"achievement_habits_days_3_description": "Vykonejte tuto aktivitu v 3 různých dnech: splněný den návyku.",
|
||||
"achievement_habits_days_7_title": "Návyky · 7 dnů",
|
||||
"achievement_habits_days_7_description": "Vykonejte tuto aktivitu v 7 různých dnech: splněný den návyku.",
|
||||
"achievement_habits_days_14_title": "Návyky · 14 dnů",
|
||||
"achievement_habits_days_14_description": "Vykonejte tuto aktivitu v 14 různých dnech: splněný den návyku.",
|
||||
"achievement_habits_days_30_title": "Návyky · 30 dnů",
|
||||
"achievement_habits_days_30_description": "Vykonejte tuto aktivitu v 30 různých dnech: splněný den návyku.",
|
||||
"achievement_habits_days_60_title": "Návyky · 60 dnů",
|
||||
"achievement_habits_days_60_description": "Vykonejte tuto aktivitu v 60 různých dnech: splněný den návyku.",
|
||||
"achievement_habits_days_100_title": "Návyky · 100 dnů",
|
||||
"achievement_habits_days_100_description": "Vykonejte tuto aktivitu v 100 různých dnech: splněný den návyku.",
|
||||
"achievement_habits_days_180_title": "Návyky · 180 dnů",
|
||||
"achievement_habits_days_180_description": "Vykonejte tuto aktivitu v 180 různých dnech: splněný den návyku.",
|
||||
"achievement_habits_days_365_title": "Návyky · 365 dnů",
|
||||
"achievement_habits_days_365_description": "Vykonejte tuto aktivitu v 365 různých dnech: splněný den návyku.",
|
||||
"achievement_habits_completions_10_title": "Návyky · 10 výsledků",
|
||||
"achievement_habits_completions_10_description": "Zaznamenejte 10 různých výsledků: splněný den návyku.",
|
||||
"achievement_habits_completions_50_title": "Návyky · 50 výsledků",
|
||||
"achievement_habits_completions_50_description": "Zaznamenejte 50 různých výsledků: splněný den návyku.",
|
||||
"achievement_habits_completions_100_title": "Návyky · 100 výsledků",
|
||||
"achievement_habits_completions_100_description": "Zaznamenejte 100 různých výsledků: splněný den návyku.",
|
||||
"achievement_habits_completions_500_title": "Návyky · 500 výsledků",
|
||||
"achievement_habits_completions_500_description": "Zaznamenejte 500 různých výsledků: splněný den návyku.",
|
||||
"achievement_habits_single_scheduled_days_7_title": "Návyky · 7 plánovaných dat",
|
||||
"achievement_habits_single_scheduled_days_7_description": "U jednoho návyku splňte 7 plánovaných dat: splněný plánovaný den návyku.",
|
||||
"achievement_habits_single_scheduled_days_30_title": "Návyky · 30 plánovaných dat",
|
||||
"achievement_habits_single_scheduled_days_30_description": "U jednoho návyku splňte 30 plánovaných dat: splněný plánovaný den návyku.",
|
||||
"achievement_habits_single_scheduled_days_100_title": "Návyky · 100 plánovaných dat",
|
||||
"achievement_habits_single_scheduled_days_100_description": "U jednoho návyku splňte 100 plánovaných dat: splněný plánovaný den návyku.",
|
||||
"achievement_habits_counter_target_1_title": "Návyky · 1 výsledků",
|
||||
"achievement_habits_counter_target_1_description": "Zaznamenejte 1 různých výsledků: dosažený cíl počítaného návyku.",
|
||||
"achievement_habits_question_answer_1_title": "Návyky · 1 výsledků",
|
||||
"achievement_habits_question_answer_1_description": "Zaznamenejte 1 různých výsledků: skutečná uložená odpověď na otázku návyku.",
|
||||
"achievement_habits_ended_span_1_title": "Návyky · 1 výsledků",
|
||||
"achievement_habits_ended_span_1_description": "Zaznamenejte 1 různých výsledků: uložený časový úsek návyku s platným začátkem a koncem."
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_habits_created_1_title": "Gewohnheiten · 1 Ergebnisse",
|
||||
"achievement_habits_created_1_description": "Erfasse 1 unterschiedliche Ergebnisse: eine gültige gespeicherte Gewohnheit.",
|
||||
"achievement_habits_days_1_title": "Gewohnheiten · 1 Tage",
|
||||
"achievement_habits_days_1_description": "Führe dies an 1 unterschiedlichen Tagen aus: ein erfüllter Gewohnheitstag.",
|
||||
"achievement_habits_days_3_title": "Gewohnheiten · 3 Tage",
|
||||
"achievement_habits_days_3_description": "Führe dies an 3 unterschiedlichen Tagen aus: ein erfüllter Gewohnheitstag.",
|
||||
"achievement_habits_days_7_title": "Gewohnheiten · 7 Tage",
|
||||
"achievement_habits_days_7_description": "Führe dies an 7 unterschiedlichen Tagen aus: ein erfüllter Gewohnheitstag.",
|
||||
"achievement_habits_days_14_title": "Gewohnheiten · 14 Tage",
|
||||
"achievement_habits_days_14_description": "Führe dies an 14 unterschiedlichen Tagen aus: ein erfüllter Gewohnheitstag.",
|
||||
"achievement_habits_days_30_title": "Gewohnheiten · 30 Tage",
|
||||
"achievement_habits_days_30_description": "Führe dies an 30 unterschiedlichen Tagen aus: ein erfüllter Gewohnheitstag.",
|
||||
"achievement_habits_days_60_title": "Gewohnheiten · 60 Tage",
|
||||
"achievement_habits_days_60_description": "Führe dies an 60 unterschiedlichen Tagen aus: ein erfüllter Gewohnheitstag.",
|
||||
"achievement_habits_days_100_title": "Gewohnheiten · 100 Tage",
|
||||
"achievement_habits_days_100_description": "Führe dies an 100 unterschiedlichen Tagen aus: ein erfüllter Gewohnheitstag.",
|
||||
"achievement_habits_days_180_title": "Gewohnheiten · 180 Tage",
|
||||
"achievement_habits_days_180_description": "Führe dies an 180 unterschiedlichen Tagen aus: ein erfüllter Gewohnheitstag.",
|
||||
"achievement_habits_days_365_title": "Gewohnheiten · 365 Tage",
|
||||
"achievement_habits_days_365_description": "Führe dies an 365 unterschiedlichen Tagen aus: ein erfüllter Gewohnheitstag.",
|
||||
"achievement_habits_completions_10_title": "Gewohnheiten · 10 Ergebnisse",
|
||||
"achievement_habits_completions_10_description": "Erfasse 10 unterschiedliche Ergebnisse: ein erfüllter Gewohnheitstag.",
|
||||
"achievement_habits_completions_50_title": "Gewohnheiten · 50 Ergebnisse",
|
||||
"achievement_habits_completions_50_description": "Erfasse 50 unterschiedliche Ergebnisse: ein erfüllter Gewohnheitstag.",
|
||||
"achievement_habits_completions_100_title": "Gewohnheiten · 100 Ergebnisse",
|
||||
"achievement_habits_completions_100_description": "Erfasse 100 unterschiedliche Ergebnisse: ein erfüllter Gewohnheitstag.",
|
||||
"achievement_habits_completions_500_title": "Gewohnheiten · 500 Ergebnisse",
|
||||
"achievement_habits_completions_500_description": "Erfasse 500 unterschiedliche Ergebnisse: ein erfüllter Gewohnheitstag.",
|
||||
"achievement_habits_single_scheduled_days_7_title": "Gewohnheiten · 7 geplante Tage",
|
||||
"achievement_habits_single_scheduled_days_7_description": "Erfülle für eine Gewohnheit 7 geplante Tage: ein erfüllter geplanter Gewohnheitstag.",
|
||||
"achievement_habits_single_scheduled_days_30_title": "Gewohnheiten · 30 geplante Tage",
|
||||
"achievement_habits_single_scheduled_days_30_description": "Erfülle für eine Gewohnheit 30 geplante Tage: ein erfüllter geplanter Gewohnheitstag.",
|
||||
"achievement_habits_single_scheduled_days_100_title": "Gewohnheiten · 100 geplante Tage",
|
||||
"achievement_habits_single_scheduled_days_100_description": "Erfülle für eine Gewohnheit 100 geplante Tage: ein erfüllter geplanter Gewohnheitstag.",
|
||||
"achievement_habits_counter_target_1_title": "Gewohnheiten · 1 Ergebnisse",
|
||||
"achievement_habits_counter_target_1_description": "Erfasse 1 unterschiedliche Ergebnisse: ein erreichtes Zählziel einer Gewohnheit.",
|
||||
"achievement_habits_question_answer_1_title": "Gewohnheiten · 1 Ergebnisse",
|
||||
"achievement_habits_question_answer_1_description": "Erfasse 1 unterschiedliche Ergebnisse: eine echte gespeicherte Antwort auf eine Gewohnheitsfrage.",
|
||||
"achievement_habits_ended_span_1_title": "Gewohnheiten · 1 Ergebnisse",
|
||||
"achievement_habits_ended_span_1_description": "Erfasse 1 unterschiedliche Ergebnisse: eine gespeicherte Gewohnheitszeitspanne mit gültigem Beginn und Ende."
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_habits_created_1_title": "An intention takes shape",
|
||||
"achievement_habits_created_1_description": "Record 1 distinct results: a valid saved habit.",
|
||||
"achievement_habits_days_1_title": "First habit day",
|
||||
"achievement_habits_days_1_description": "Do this on 1 distinct dates: a completed habit day.",
|
||||
"achievement_habits_days_3_title": "Three habit days",
|
||||
"achievement_habits_days_3_description": "Do this on 3 distinct dates: a completed habit day.",
|
||||
"achievement_habits_days_7_title": "Seven habit days",
|
||||
"achievement_habits_days_7_description": "Do this on 7 distinct dates: a completed habit day.",
|
||||
"achievement_habits_days_14_title": "Fourteen habit days",
|
||||
"achievement_habits_days_14_description": "Do this on 14 distinct dates: a completed habit day.",
|
||||
"achievement_habits_days_30_title": "Thirty habit days",
|
||||
"achievement_habits_days_30_description": "Do this on 30 distinct dates: a completed habit day.",
|
||||
"achievement_habits_days_60_title": "Sixty habit days",
|
||||
"achievement_habits_days_60_description": "Do this on 60 distinct dates: a completed habit day.",
|
||||
"achievement_habits_days_100_title": "One hundred habit days",
|
||||
"achievement_habits_days_100_description": "Do this on 100 distinct dates: a completed habit day.",
|
||||
"achievement_habits_days_180_title": "A habit history",
|
||||
"achievement_habits_days_180_description": "Do this on 180 distinct dates: a completed habit day.",
|
||||
"achievement_habits_days_365_title": "A year of habit days",
|
||||
"achievement_habits_days_365_description": "Do this on 365 distinct dates: a completed habit day.",
|
||||
"achievement_habits_completions_10_title": "Ten completions",
|
||||
"achievement_habits_completions_10_description": "Record 10 distinct results: a completed habit day.",
|
||||
"achievement_habits_completions_50_title": "Fifty completions",
|
||||
"achievement_habits_completions_50_description": "Record 50 distinct results: a completed habit day.",
|
||||
"achievement_habits_completions_100_title": "One hundred completions",
|
||||
"achievement_habits_completions_100_description": "Record 100 distinct results: a completed habit day.",
|
||||
"achievement_habits_completions_500_title": "Five hundred completions",
|
||||
"achievement_habits_completions_500_description": "Record 500 distinct results: a completed habit day.",
|
||||
"achievement_habits_single_scheduled_days_7_title": "One habit, seven times",
|
||||
"achievement_habits_single_scheduled_days_7_description": "For one habit, do this on 7 scheduled dates: a completed scheduled habit day.",
|
||||
"achievement_habits_single_scheduled_days_30_title": "One habit, thirty times",
|
||||
"achievement_habits_single_scheduled_days_30_description": "For one habit, do this on 30 scheduled dates: a completed scheduled habit day.",
|
||||
"achievement_habits_single_scheduled_days_100_title": "One habit, one hundred times",
|
||||
"achievement_habits_single_scheduled_days_100_description": "For one habit, do this on 100 scheduled dates: a completed scheduled habit day.",
|
||||
"achievement_habits_counter_target_1_title": "A target met",
|
||||
"achievement_habits_counter_target_1_description": "Record 1 distinct results: a counting habit’s target reached.",
|
||||
"achievement_habits_question_answer_1_title": "An answer recorded",
|
||||
"achievement_habits_question_answer_1_description": "Record 1 distinct results: a genuine saved answer to a habit question.",
|
||||
"achievement_habits_ended_span_1_title": "A span recorded",
|
||||
"achievement_habits_ended_span_1_description": "Record 1 distinct results: a saved habit span with a valid start and end."
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_habits_created_1_title": "Hábitos · 1 resultados",
|
||||
"achievement_habits_created_1_description": "Registra 1 resultados distintos: un hábito válido guardado.",
|
||||
"achievement_habits_days_1_title": "Hábitos · 1 días",
|
||||
"achievement_habits_days_1_description": "Realiza esto en 1 fechas distintas: un día de hábito completado.",
|
||||
"achievement_habits_days_3_title": "Hábitos · 3 días",
|
||||
"achievement_habits_days_3_description": "Realiza esto en 3 fechas distintas: un día de hábito completado.",
|
||||
"achievement_habits_days_7_title": "Hábitos · 7 días",
|
||||
"achievement_habits_days_7_description": "Realiza esto en 7 fechas distintas: un día de hábito completado.",
|
||||
"achievement_habits_days_14_title": "Hábitos · 14 días",
|
||||
"achievement_habits_days_14_description": "Realiza esto en 14 fechas distintas: un día de hábito completado.",
|
||||
"achievement_habits_days_30_title": "Hábitos · 30 días",
|
||||
"achievement_habits_days_30_description": "Realiza esto en 30 fechas distintas: un día de hábito completado.",
|
||||
"achievement_habits_days_60_title": "Hábitos · 60 días",
|
||||
"achievement_habits_days_60_description": "Realiza esto en 60 fechas distintas: un día de hábito completado.",
|
||||
"achievement_habits_days_100_title": "Hábitos · 100 días",
|
||||
"achievement_habits_days_100_description": "Realiza esto en 100 fechas distintas: un día de hábito completado.",
|
||||
"achievement_habits_days_180_title": "Hábitos · 180 días",
|
||||
"achievement_habits_days_180_description": "Realiza esto en 180 fechas distintas: un día de hábito completado.",
|
||||
"achievement_habits_days_365_title": "Hábitos · 365 días",
|
||||
"achievement_habits_days_365_description": "Realiza esto en 365 fechas distintas: un día de hábito completado.",
|
||||
"achievement_habits_completions_10_title": "Hábitos · 10 resultados",
|
||||
"achievement_habits_completions_10_description": "Registra 10 resultados distintos: un día de hábito completado.",
|
||||
"achievement_habits_completions_50_title": "Hábitos · 50 resultados",
|
||||
"achievement_habits_completions_50_description": "Registra 50 resultados distintos: un día de hábito completado.",
|
||||
"achievement_habits_completions_100_title": "Hábitos · 100 resultados",
|
||||
"achievement_habits_completions_100_description": "Registra 100 resultados distintos: un día de hábito completado.",
|
||||
"achievement_habits_completions_500_title": "Hábitos · 500 resultados",
|
||||
"achievement_habits_completions_500_description": "Registra 500 resultados distintos: un día de hábito completado.",
|
||||
"achievement_habits_single_scheduled_days_7_title": "Hábitos · 7 fechas programadas",
|
||||
"achievement_habits_single_scheduled_days_7_description": "Para un mismo hábito, completa 7 fechas programadas: un día programado de hábito completado.",
|
||||
"achievement_habits_single_scheduled_days_30_title": "Hábitos · 30 fechas programadas",
|
||||
"achievement_habits_single_scheduled_days_30_description": "Para un mismo hábito, completa 30 fechas programadas: un día programado de hábito completado.",
|
||||
"achievement_habits_single_scheduled_days_100_title": "Hábitos · 100 fechas programadas",
|
||||
"achievement_habits_single_scheduled_days_100_description": "Para un mismo hábito, completa 100 fechas programadas: un día programado de hábito completado.",
|
||||
"achievement_habits_counter_target_1_title": "Hábitos · 1 resultados",
|
||||
"achievement_habits_counter_target_1_description": "Registra 1 resultados distintos: la meta de un hábito de conteo alcanzada.",
|
||||
"achievement_habits_question_answer_1_title": "Hábitos · 1 resultados",
|
||||
"achievement_habits_question_answer_1_description": "Registra 1 resultados distintos: una respuesta real guardada a una pregunta de un hábito.",
|
||||
"achievement_habits_ended_span_1_title": "Hábitos · 1 resultados",
|
||||
"achievement_habits_ended_span_1_description": "Registra 1 resultados distintos: un intervalo de hábito guardado con inicio y fin válidos."
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_habits_created_1_title": "Habitudes · 1 résultats",
|
||||
"achievement_habits_created_1_description": "Enregistrez 1 résultats distincts : une habitude valide enregistrée.",
|
||||
"achievement_habits_days_1_title": "Habitudes · 1 jours",
|
||||
"achievement_habits_days_1_description": "Faites ceci à 1 dates distinctes : une journée d’habitude accomplie.",
|
||||
"achievement_habits_days_3_title": "Habitudes · 3 jours",
|
||||
"achievement_habits_days_3_description": "Faites ceci à 3 dates distinctes : une journée d’habitude accomplie.",
|
||||
"achievement_habits_days_7_title": "Habitudes · 7 jours",
|
||||
"achievement_habits_days_7_description": "Faites ceci à 7 dates distinctes : une journée d’habitude accomplie.",
|
||||
"achievement_habits_days_14_title": "Habitudes · 14 jours",
|
||||
"achievement_habits_days_14_description": "Faites ceci à 14 dates distinctes : une journée d’habitude accomplie.",
|
||||
"achievement_habits_days_30_title": "Habitudes · 30 jours",
|
||||
"achievement_habits_days_30_description": "Faites ceci à 30 dates distinctes : une journée d’habitude accomplie.",
|
||||
"achievement_habits_days_60_title": "Habitudes · 60 jours",
|
||||
"achievement_habits_days_60_description": "Faites ceci à 60 dates distinctes : une journée d’habitude accomplie.",
|
||||
"achievement_habits_days_100_title": "Habitudes · 100 jours",
|
||||
"achievement_habits_days_100_description": "Faites ceci à 100 dates distinctes : une journée d’habitude accomplie.",
|
||||
"achievement_habits_days_180_title": "Habitudes · 180 jours",
|
||||
"achievement_habits_days_180_description": "Faites ceci à 180 dates distinctes : une journée d’habitude accomplie.",
|
||||
"achievement_habits_days_365_title": "Habitudes · 365 jours",
|
||||
"achievement_habits_days_365_description": "Faites ceci à 365 dates distinctes : une journée d’habitude accomplie.",
|
||||
"achievement_habits_completions_10_title": "Habitudes · 10 résultats",
|
||||
"achievement_habits_completions_10_description": "Enregistrez 10 résultats distincts : une journée d’habitude accomplie.",
|
||||
"achievement_habits_completions_50_title": "Habitudes · 50 résultats",
|
||||
"achievement_habits_completions_50_description": "Enregistrez 50 résultats distincts : une journée d’habitude accomplie.",
|
||||
"achievement_habits_completions_100_title": "Habitudes · 100 résultats",
|
||||
"achievement_habits_completions_100_description": "Enregistrez 100 résultats distincts : une journée d’habitude accomplie.",
|
||||
"achievement_habits_completions_500_title": "Habitudes · 500 résultats",
|
||||
"achievement_habits_completions_500_description": "Enregistrez 500 résultats distincts : une journée d’habitude accomplie.",
|
||||
"achievement_habits_single_scheduled_days_7_title": "Habitudes · 7 dates prévues",
|
||||
"achievement_habits_single_scheduled_days_7_description": "Pour une même habitude, accomplissez 7 dates prévues : une journée prévue d’habitude accomplie.",
|
||||
"achievement_habits_single_scheduled_days_30_title": "Habitudes · 30 dates prévues",
|
||||
"achievement_habits_single_scheduled_days_30_description": "Pour une même habitude, accomplissez 30 dates prévues : une journée prévue d’habitude accomplie.",
|
||||
"achievement_habits_single_scheduled_days_100_title": "Habitudes · 100 dates prévues",
|
||||
"achievement_habits_single_scheduled_days_100_description": "Pour une même habitude, accomplissez 100 dates prévues : une journée prévue d’habitude accomplie.",
|
||||
"achievement_habits_counter_target_1_title": "Habitudes · 1 résultats",
|
||||
"achievement_habits_counter_target_1_description": "Enregistrez 1 résultats distincts : l’objectif atteint d’une habitude comptée.",
|
||||
"achievement_habits_question_answer_1_title": "Habitudes · 1 résultats",
|
||||
"achievement_habits_question_answer_1_description": "Enregistrez 1 résultats distincts : une vraie réponse enregistrée à une question d’habitude.",
|
||||
"achievement_habits_ended_span_1_title": "Habitudes · 1 résultats",
|
||||
"achievement_habits_ended_span_1_description": "Enregistrez 1 résultats distincts : une durée d’habitude enregistrée avec début et fin valides."
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_habits_created_1_title": "習慣 · 1 件の結果",
|
||||
"achievement_habits_created_1_description": "異なる結果を1件記録する:有効な保存済みの習慣。",
|
||||
"achievement_habits_days_1_title": "習慣 · 1 日",
|
||||
"achievement_habits_days_1_description": "異なる1日で行う:習慣を達成した日。",
|
||||
"achievement_habits_days_3_title": "習慣 · 3 日",
|
||||
"achievement_habits_days_3_description": "異なる3日で行う:習慣を達成した日。",
|
||||
"achievement_habits_days_7_title": "習慣 · 7 日",
|
||||
"achievement_habits_days_7_description": "異なる7日で行う:習慣を達成した日。",
|
||||
"achievement_habits_days_14_title": "習慣 · 14 日",
|
||||
"achievement_habits_days_14_description": "異なる14日で行う:習慣を達成した日。",
|
||||
"achievement_habits_days_30_title": "習慣 · 30 日",
|
||||
"achievement_habits_days_30_description": "異なる30日で行う:習慣を達成した日。",
|
||||
"achievement_habits_days_60_title": "習慣 · 60 日",
|
||||
"achievement_habits_days_60_description": "異なる60日で行う:習慣を達成した日。",
|
||||
"achievement_habits_days_100_title": "習慣 · 100 日",
|
||||
"achievement_habits_days_100_description": "異なる100日で行う:習慣を達成した日。",
|
||||
"achievement_habits_days_180_title": "習慣 · 180 日",
|
||||
"achievement_habits_days_180_description": "異なる180日で行う:習慣を達成した日。",
|
||||
"achievement_habits_days_365_title": "習慣 · 365 日",
|
||||
"achievement_habits_days_365_description": "異なる365日で行う:習慣を達成した日。",
|
||||
"achievement_habits_completions_10_title": "習慣 · 10 件の結果",
|
||||
"achievement_habits_completions_10_description": "異なる結果を10件記録する:習慣を達成した日。",
|
||||
"achievement_habits_completions_50_title": "習慣 · 50 件の結果",
|
||||
"achievement_habits_completions_50_description": "異なる結果を50件記録する:習慣を達成した日。",
|
||||
"achievement_habits_completions_100_title": "習慣 · 100 件の結果",
|
||||
"achievement_habits_completions_100_description": "異なる結果を100件記録する:習慣を達成した日。",
|
||||
"achievement_habits_completions_500_title": "習慣 · 500 件の結果",
|
||||
"achievement_habits_completions_500_description": "異なる結果を500件記録する:習慣を達成した日。",
|
||||
"achievement_habits_single_scheduled_days_7_title": "習慣 · 7 予定日",
|
||||
"achievement_habits_single_scheduled_days_7_description": "同じ習慣で予定された7日を達成する:予定された日に達成した習慣。",
|
||||
"achievement_habits_single_scheduled_days_30_title": "習慣 · 30 予定日",
|
||||
"achievement_habits_single_scheduled_days_30_description": "同じ習慣で予定された30日を達成する:予定された日に達成した習慣。",
|
||||
"achievement_habits_single_scheduled_days_100_title": "習慣 · 100 予定日",
|
||||
"achievement_habits_single_scheduled_days_100_description": "同じ習慣で予定された100日を達成する:予定された日に達成した習慣。",
|
||||
"achievement_habits_counter_target_1_title": "習慣 · 1 件の結果",
|
||||
"achievement_habits_counter_target_1_description": "異なる結果を1件記録する:回数を数える習慣で達成した自分の目標。",
|
||||
"achievement_habits_question_answer_1_title": "習慣 · 1 件の結果",
|
||||
"achievement_habits_question_answer_1_description": "異なる結果を1件記録する:習慣の質問に保存した実際の回答。",
|
||||
"achievement_habits_ended_span_1_title": "習慣 · 1 件の結果",
|
||||
"achievement_habits_ended_span_1_description": "異なる結果を1件記録する:開始と終了が有効な保存済みの習慣の時間記録。"
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_habits_created_1_title": "습관 · 1 개 결과",
|
||||
"achievement_habits_created_1_description": "서로 다른 결과를 1개 기록하세요: 유효하게 저장한 습관.",
|
||||
"achievement_habits_days_1_title": "습관 · 1 일",
|
||||
"achievement_habits_days_1_description": "서로 다른 1일에 수행하세요: 습관을 완료한 날.",
|
||||
"achievement_habits_days_3_title": "습관 · 3 일",
|
||||
"achievement_habits_days_3_description": "서로 다른 3일에 수행하세요: 습관을 완료한 날.",
|
||||
"achievement_habits_days_7_title": "습관 · 7 일",
|
||||
"achievement_habits_days_7_description": "서로 다른 7일에 수행하세요: 습관을 완료한 날.",
|
||||
"achievement_habits_days_14_title": "습관 · 14 일",
|
||||
"achievement_habits_days_14_description": "서로 다른 14일에 수행하세요: 습관을 완료한 날.",
|
||||
"achievement_habits_days_30_title": "습관 · 30 일",
|
||||
"achievement_habits_days_30_description": "서로 다른 30일에 수행하세요: 습관을 완료한 날.",
|
||||
"achievement_habits_days_60_title": "습관 · 60 일",
|
||||
"achievement_habits_days_60_description": "서로 다른 60일에 수행하세요: 습관을 완료한 날.",
|
||||
"achievement_habits_days_100_title": "습관 · 100 일",
|
||||
"achievement_habits_days_100_description": "서로 다른 100일에 수행하세요: 습관을 완료한 날.",
|
||||
"achievement_habits_days_180_title": "습관 · 180 일",
|
||||
"achievement_habits_days_180_description": "서로 다른 180일에 수행하세요: 습관을 완료한 날.",
|
||||
"achievement_habits_days_365_title": "습관 · 365 일",
|
||||
"achievement_habits_days_365_description": "서로 다른 365일에 수행하세요: 습관을 완료한 날.",
|
||||
"achievement_habits_completions_10_title": "습관 · 10 개 결과",
|
||||
"achievement_habits_completions_10_description": "서로 다른 결과를 10개 기록하세요: 습관을 완료한 날.",
|
||||
"achievement_habits_completions_50_title": "습관 · 50 개 결과",
|
||||
"achievement_habits_completions_50_description": "서로 다른 결과를 50개 기록하세요: 습관을 완료한 날.",
|
||||
"achievement_habits_completions_100_title": "습관 · 100 개 결과",
|
||||
"achievement_habits_completions_100_description": "서로 다른 결과를 100개 기록하세요: 습관을 완료한 날.",
|
||||
"achievement_habits_completions_500_title": "습관 · 500 개 결과",
|
||||
"achievement_habits_completions_500_description": "서로 다른 결과를 500개 기록하세요: 습관을 완료한 날.",
|
||||
"achievement_habits_single_scheduled_days_7_title": "습관 · 7 예정일",
|
||||
"achievement_habits_single_scheduled_days_7_description": "같은 습관에서 예정된 7일을 완료하세요: 예정된 날짜에 완료한 습관.",
|
||||
"achievement_habits_single_scheduled_days_30_title": "습관 · 30 예정일",
|
||||
"achievement_habits_single_scheduled_days_30_description": "같은 습관에서 예정된 30일을 완료하세요: 예정된 날짜에 완료한 습관.",
|
||||
"achievement_habits_single_scheduled_days_100_title": "습관 · 100 예정일",
|
||||
"achievement_habits_single_scheduled_days_100_description": "같은 습관에서 예정된 100일을 완료하세요: 예정된 날짜에 완료한 습관.",
|
||||
"achievement_habits_counter_target_1_title": "습관 · 1 개 결과",
|
||||
"achievement_habits_counter_target_1_description": "서로 다른 결과를 1개 기록하세요: 횟수를 세는 습관에서 달성한 자신의 목표.",
|
||||
"achievement_habits_question_answer_1_title": "습관 · 1 개 결과",
|
||||
"achievement_habits_question_answer_1_description": "서로 다른 결과를 1개 기록하세요: 습관 질문에 저장한 실제 답변.",
|
||||
"achievement_habits_ended_span_1_title": "습관 · 1 개 결과",
|
||||
"achievement_habits_ended_span_1_description": "서로 다른 결과를 1개 기록하세요: 유효한 시작과 종료가 있는 저장된 습관 시간 기록."
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_habits_created_1_title": "Hábitos · 1 resultados",
|
||||
"achievement_habits_created_1_description": "Registe 1 resultados distintos: um hábito válido guardado.",
|
||||
"achievement_habits_days_1_title": "Hábitos · 1 dias",
|
||||
"achievement_habits_days_1_description": "Faça isto em 1 datas distintas: um dia de hábito concluído.",
|
||||
"achievement_habits_days_3_title": "Hábitos · 3 dias",
|
||||
"achievement_habits_days_3_description": "Faça isto em 3 datas distintas: um dia de hábito concluído.",
|
||||
"achievement_habits_days_7_title": "Hábitos · 7 dias",
|
||||
"achievement_habits_days_7_description": "Faça isto em 7 datas distintas: um dia de hábito concluído.",
|
||||
"achievement_habits_days_14_title": "Hábitos · 14 dias",
|
||||
"achievement_habits_days_14_description": "Faça isto em 14 datas distintas: um dia de hábito concluído.",
|
||||
"achievement_habits_days_30_title": "Hábitos · 30 dias",
|
||||
"achievement_habits_days_30_description": "Faça isto em 30 datas distintas: um dia de hábito concluído.",
|
||||
"achievement_habits_days_60_title": "Hábitos · 60 dias",
|
||||
"achievement_habits_days_60_description": "Faça isto em 60 datas distintas: um dia de hábito concluído.",
|
||||
"achievement_habits_days_100_title": "Hábitos · 100 dias",
|
||||
"achievement_habits_days_100_description": "Faça isto em 100 datas distintas: um dia de hábito concluído.",
|
||||
"achievement_habits_days_180_title": "Hábitos · 180 dias",
|
||||
"achievement_habits_days_180_description": "Faça isto em 180 datas distintas: um dia de hábito concluído.",
|
||||
"achievement_habits_days_365_title": "Hábitos · 365 dias",
|
||||
"achievement_habits_days_365_description": "Faça isto em 365 datas distintas: um dia de hábito concluído.",
|
||||
"achievement_habits_completions_10_title": "Hábitos · 10 resultados",
|
||||
"achievement_habits_completions_10_description": "Registe 10 resultados distintos: um dia de hábito concluído.",
|
||||
"achievement_habits_completions_50_title": "Hábitos · 50 resultados",
|
||||
"achievement_habits_completions_50_description": "Registe 50 resultados distintos: um dia de hábito concluído.",
|
||||
"achievement_habits_completions_100_title": "Hábitos · 100 resultados",
|
||||
"achievement_habits_completions_100_description": "Registe 100 resultados distintos: um dia de hábito concluído.",
|
||||
"achievement_habits_completions_500_title": "Hábitos · 500 resultados",
|
||||
"achievement_habits_completions_500_description": "Registe 500 resultados distintos: um dia de hábito concluído.",
|
||||
"achievement_habits_single_scheduled_days_7_title": "Hábitos · 7 datas programadas",
|
||||
"achievement_habits_single_scheduled_days_7_description": "Para um mesmo hábito, conclua 7 datas programadas: um dia programado de hábito concluído.",
|
||||
"achievement_habits_single_scheduled_days_30_title": "Hábitos · 30 datas programadas",
|
||||
"achievement_habits_single_scheduled_days_30_description": "Para um mesmo hábito, conclua 30 datas programadas: um dia programado de hábito concluído.",
|
||||
"achievement_habits_single_scheduled_days_100_title": "Hábitos · 100 datas programadas",
|
||||
"achievement_habits_single_scheduled_days_100_description": "Para um mesmo hábito, conclua 100 datas programadas: um dia programado de hábito concluído.",
|
||||
"achievement_habits_counter_target_1_title": "Hábitos · 1 resultados",
|
||||
"achievement_habits_counter_target_1_description": "Registe 1 resultados distintos: a meta de um hábito de contagem atingida.",
|
||||
"achievement_habits_question_answer_1_title": "Hábitos · 1 resultados",
|
||||
"achievement_habits_question_answer_1_description": "Registe 1 resultados distintos: uma resposta real guardada a uma pergunta de hábito.",
|
||||
"achievement_habits_ended_span_1_title": "Hábitos · 1 resultados",
|
||||
"achievement_habits_ended_span_1_description": "Registe 1 resultados distintos: um intervalo de hábito guardado com início e fim válidos."
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_habits_created_1_title": "Привычки · 1 результатов",
|
||||
"achievement_habits_created_1_description": "Запишите 1 разных результатов: сохранённая корректная привычка.",
|
||||
"achievement_habits_days_1_title": "Привычки · 1 дней",
|
||||
"achievement_habits_days_1_description": "Сделайте это в 1 разных датах: завершённый день привычки.",
|
||||
"achievement_habits_days_3_title": "Привычки · 3 дней",
|
||||
"achievement_habits_days_3_description": "Сделайте это в 3 разных датах: завершённый день привычки.",
|
||||
"achievement_habits_days_7_title": "Привычки · 7 дней",
|
||||
"achievement_habits_days_7_description": "Сделайте это в 7 разных датах: завершённый день привычки.",
|
||||
"achievement_habits_days_14_title": "Привычки · 14 дней",
|
||||
"achievement_habits_days_14_description": "Сделайте это в 14 разных датах: завершённый день привычки.",
|
||||
"achievement_habits_days_30_title": "Привычки · 30 дней",
|
||||
"achievement_habits_days_30_description": "Сделайте это в 30 разных датах: завершённый день привычки.",
|
||||
"achievement_habits_days_60_title": "Привычки · 60 дней",
|
||||
"achievement_habits_days_60_description": "Сделайте это в 60 разных датах: завершённый день привычки.",
|
||||
"achievement_habits_days_100_title": "Привычки · 100 дней",
|
||||
"achievement_habits_days_100_description": "Сделайте это в 100 разных датах: завершённый день привычки.",
|
||||
"achievement_habits_days_180_title": "Привычки · 180 дней",
|
||||
"achievement_habits_days_180_description": "Сделайте это в 180 разных датах: завершённый день привычки.",
|
||||
"achievement_habits_days_365_title": "Привычки · 365 дней",
|
||||
"achievement_habits_days_365_description": "Сделайте это в 365 разных датах: завершённый день привычки.",
|
||||
"achievement_habits_completions_10_title": "Привычки · 10 результатов",
|
||||
"achievement_habits_completions_10_description": "Запишите 10 разных результатов: завершённый день привычки.",
|
||||
"achievement_habits_completions_50_title": "Привычки · 50 результатов",
|
||||
"achievement_habits_completions_50_description": "Запишите 50 разных результатов: завершённый день привычки.",
|
||||
"achievement_habits_completions_100_title": "Привычки · 100 результатов",
|
||||
"achievement_habits_completions_100_description": "Запишите 100 разных результатов: завершённый день привычки.",
|
||||
"achievement_habits_completions_500_title": "Привычки · 500 результатов",
|
||||
"achievement_habits_completions_500_description": "Запишите 500 разных результатов: завершённый день привычки.",
|
||||
"achievement_habits_single_scheduled_days_7_title": "Привычки · 7 запланированных дат",
|
||||
"achievement_habits_single_scheduled_days_7_description": "Для одной привычки выполните 7 запланированных дат: завершённый запланированный день привычки.",
|
||||
"achievement_habits_single_scheduled_days_30_title": "Привычки · 30 запланированных дат",
|
||||
"achievement_habits_single_scheduled_days_30_description": "Для одной привычки выполните 30 запланированных дат: завершённый запланированный день привычки.",
|
||||
"achievement_habits_single_scheduled_days_100_title": "Привычки · 100 запланированных дат",
|
||||
"achievement_habits_single_scheduled_days_100_description": "Для одной привычки выполните 100 запланированных дат: завершённый запланированный день привычки.",
|
||||
"achievement_habits_counter_target_1_title": "Привычки · 1 результатов",
|
||||
"achievement_habits_counter_target_1_description": "Запишите 1 разных результатов: достигнутая собственная цель привычки со счётчиком.",
|
||||
"achievement_habits_question_answer_1_title": "Привычки · 1 результатов",
|
||||
"achievement_habits_question_answer_1_description": "Запишите 1 разных результатов: сохранённый настоящий ответ на вопрос привычки.",
|
||||
"achievement_habits_ended_span_1_title": "Привычки · 1 результатов",
|
||||
"achievement_habits_ended_span_1_description": "Запишите 1 разных результатов: сохранённый отрезок привычки с корректными началом и концом."
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
"achievement_habits_created_1_title": "习惯 · 1 个结果",
|
||||
"achievement_habits_created_1_description": "记录1个不同的结果:有效且已保存的习惯。",
|
||||
"achievement_habits_days_1_title": "习惯 · 1 天",
|
||||
"achievement_habits_days_1_description": "在1个不同日期进行:已完成习惯的日期。",
|
||||
"achievement_habits_days_3_title": "习惯 · 3 天",
|
||||
"achievement_habits_days_3_description": "在3个不同日期进行:已完成习惯的日期。",
|
||||
"achievement_habits_days_7_title": "习惯 · 7 天",
|
||||
"achievement_habits_days_7_description": "在7个不同日期进行:已完成习惯的日期。",
|
||||
"achievement_habits_days_14_title": "习惯 · 14 天",
|
||||
"achievement_habits_days_14_description": "在14个不同日期进行:已完成习惯的日期。",
|
||||
"achievement_habits_days_30_title": "习惯 · 30 天",
|
||||
"achievement_habits_days_30_description": "在30个不同日期进行:已完成习惯的日期。",
|
||||
"achievement_habits_days_60_title": "习惯 · 60 天",
|
||||
"achievement_habits_days_60_description": "在60个不同日期进行:已完成习惯的日期。",
|
||||
"achievement_habits_days_100_title": "习惯 · 100 天",
|
||||
"achievement_habits_days_100_description": "在100个不同日期进行:已完成习惯的日期。",
|
||||
"achievement_habits_days_180_title": "习惯 · 180 天",
|
||||
"achievement_habits_days_180_description": "在180个不同日期进行:已完成习惯的日期。",
|
||||
"achievement_habits_days_365_title": "习惯 · 365 天",
|
||||
"achievement_habits_days_365_description": "在365个不同日期进行:已完成习惯的日期。",
|
||||
"achievement_habits_completions_10_title": "习惯 · 10 个结果",
|
||||
"achievement_habits_completions_10_description": "记录10个不同的结果:已完成习惯的日期。",
|
||||
"achievement_habits_completions_50_title": "习惯 · 50 个结果",
|
||||
"achievement_habits_completions_50_description": "记录50个不同的结果:已完成习惯的日期。",
|
||||
"achievement_habits_completions_100_title": "习惯 · 100 个结果",
|
||||
"achievement_habits_completions_100_description": "记录100个不同的结果:已完成习惯的日期。",
|
||||
"achievement_habits_completions_500_title": "习惯 · 500 个结果",
|
||||
"achievement_habits_completions_500_description": "记录500个不同的结果:已完成习惯的日期。",
|
||||
"achievement_habits_single_scheduled_days_7_title": "习惯 · 7 个计划日期",
|
||||
"achievement_habits_single_scheduled_days_7_description": "同一习惯在7个计划日期完成:在计划日期完成的习惯。",
|
||||
"achievement_habits_single_scheduled_days_30_title": "习惯 · 30 个计划日期",
|
||||
"achievement_habits_single_scheduled_days_30_description": "同一习惯在30个计划日期完成:在计划日期完成的习惯。",
|
||||
"achievement_habits_single_scheduled_days_100_title": "习惯 · 100 个计划日期",
|
||||
"achievement_habits_single_scheduled_days_100_description": "同一习惯在100个计划日期完成:在计划日期完成的习惯。",
|
||||
"achievement_habits_counter_target_1_title": "习惯 · 1 个结果",
|
||||
"achievement_habits_counter_target_1_description": "记录1个不同的结果:计数习惯中已达到的个人目标。",
|
||||
"achievement_habits_question_answer_1_title": "习惯 · 1 个结果",
|
||||
"achievement_habits_question_answer_1_description": "记录1个不同的结果:已保存的习惯问题真实回答。",
|
||||
"achievement_habits_ended_span_1_title": "习惯 · 1 个结果",
|
||||
"achievement_habits_ended_span_1_description": "记录1个不同的结果:开始与结束均有效的已保存习惯时间记录。"
|
||||
}
|
||||
@@ -1,326 +0,0 @@
|
||||
{
|
||||
"schema": 1,
|
||||
"app": "inbe.habits",
|
||||
"achievements": [
|
||||
{
|
||||
"id": "habits.created.1",
|
||||
"group": "habits",
|
||||
"metric": "habit.created",
|
||||
"rule": "count",
|
||||
"target": 1,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_created_1_title",
|
||||
"description_key": "achievement_habits_created_1_description",
|
||||
"title": "An intention takes shape",
|
||||
"description": "Save 1 valid habit.",
|
||||
"icon": "assets/habits/icons/habits.created.1.shape",
|
||||
"icon_source": "mingcute_regular_aiming"
|
||||
},
|
||||
{
|
||||
"id": "habits.days.1",
|
||||
"group": "habits",
|
||||
"metric": "habit.completed",
|
||||
"rule": "days",
|
||||
"target": 1,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_days_1_title",
|
||||
"description_key": "achievement_habits_days_1_description",
|
||||
"title": "First habit day",
|
||||
"description": "Complete a habit on 1 distinct day.",
|
||||
"icon": "assets/habits/icons/habits.days.1.shape",
|
||||
"icon_source": "mingcute_regular_foot"
|
||||
},
|
||||
{
|
||||
"id": "habits.days.3",
|
||||
"group": "habits",
|
||||
"metric": "habit.completed",
|
||||
"rule": "days",
|
||||
"target": 3,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_days_3_title",
|
||||
"description_key": "achievement_habits_days_3_description",
|
||||
"title": "Three habit days",
|
||||
"description": "Complete habits on 3 distinct days.",
|
||||
"icon": "assets/habits/icons/habits.days.3.shape",
|
||||
"icon_source": "mingcute_regular_flag_1"
|
||||
},
|
||||
{
|
||||
"id": "habits.days.7",
|
||||
"group": "habits",
|
||||
"metric": "habit.completed",
|
||||
"rule": "days",
|
||||
"target": 7,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_days_7_title",
|
||||
"description_key": "achievement_habits_days_7_description",
|
||||
"title": "Seven habit days",
|
||||
"description": "Complete habits on 7 distinct days.",
|
||||
"icon": "assets/habits/icons/habits.days.7.shape",
|
||||
"icon_source": "mingcute_regular_flag_2"
|
||||
},
|
||||
{
|
||||
"id": "habits.days.14",
|
||||
"group": "habits",
|
||||
"metric": "habit.completed",
|
||||
"rule": "days",
|
||||
"target": 14,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_days_14_title",
|
||||
"description_key": "achievement_habits_days_14_description",
|
||||
"title": "Fourteen habit days",
|
||||
"description": "Complete habits on 14 distinct days.",
|
||||
"icon": "assets/habits/icons/habits.days.14.shape",
|
||||
"icon_source": "mingcute_regular_flag_3"
|
||||
},
|
||||
{
|
||||
"id": "habits.days.30",
|
||||
"group": "habits",
|
||||
"metric": "habit.completed",
|
||||
"rule": "days",
|
||||
"target": 30,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_days_30_title",
|
||||
"description_key": "achievement_habits_days_30_description",
|
||||
"title": "Thirty habit days",
|
||||
"description": "Complete habits on 30 distinct days.",
|
||||
"icon": "assets/habits/icons/habits.days.30.shape",
|
||||
"icon_source": "mingcute_regular_flag_4"
|
||||
},
|
||||
{
|
||||
"id": "habits.days.60",
|
||||
"group": "habits",
|
||||
"metric": "habit.completed",
|
||||
"rule": "days",
|
||||
"target": 60,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_days_60_title",
|
||||
"description_key": "achievement_habits_days_60_description",
|
||||
"title": "Sixty habit days",
|
||||
"description": "Complete habits on 60 distinct days.",
|
||||
"icon": "assets/habits/icons/habits.days.60.shape",
|
||||
"icon_source": "mingcute_regular_tree_2"
|
||||
},
|
||||
{
|
||||
"id": "habits.days.100",
|
||||
"group": "habits",
|
||||
"metric": "habit.completed",
|
||||
"rule": "days",
|
||||
"target": 100,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_days_100_title",
|
||||
"description_key": "achievement_habits_days_100_description",
|
||||
"title": "One hundred habit days",
|
||||
"description": "Complete habits on 100 distinct days.",
|
||||
"icon": "assets/habits/icons/habits.days.100.shape",
|
||||
"icon_source": "mingcute_regular_tree_3"
|
||||
},
|
||||
{
|
||||
"id": "habits.days.180",
|
||||
"group": "habits",
|
||||
"metric": "habit.completed",
|
||||
"rule": "days",
|
||||
"target": 180,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_days_180_title",
|
||||
"description_key": "achievement_habits_days_180_description",
|
||||
"title": "A habit history",
|
||||
"description": "Complete habits on 180 distinct days.",
|
||||
"icon": "assets/habits/icons/habits.days.180.shape",
|
||||
"icon_source": "mingcute_regular_tree_4"
|
||||
},
|
||||
{
|
||||
"id": "habits.days.365",
|
||||
"group": "habits",
|
||||
"metric": "habit.completed",
|
||||
"rule": "days",
|
||||
"target": 365,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_days_365_title",
|
||||
"description_key": "achievement_habits_days_365_description",
|
||||
"title": "A year of habit days",
|
||||
"description": "Complete habits on 365 distinct days.",
|
||||
"icon": "assets/habits/icons/habits.days.365.shape",
|
||||
"icon_source": "mingcute_regular_mountain_2"
|
||||
},
|
||||
{
|
||||
"id": "habits.completions.10",
|
||||
"group": "habits",
|
||||
"metric": "habit.completed",
|
||||
"rule": "count",
|
||||
"target": 10,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_completions_10_title",
|
||||
"description_key": "achievement_habits_completions_10_description",
|
||||
"title": "Ten completions",
|
||||
"description": "Record 10 distinct habit/date completions.",
|
||||
"icon": "assets/habits/icons/habits.completions.10.shape",
|
||||
"icon_source": "mingcute_regular_check"
|
||||
},
|
||||
{
|
||||
"id": "habits.completions.50",
|
||||
"group": "habits",
|
||||
"metric": "habit.completed",
|
||||
"rule": "count",
|
||||
"target": 50,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_completions_50_title",
|
||||
"description_key": "achievement_habits_completions_50_description",
|
||||
"title": "Fifty completions",
|
||||
"description": "Record 50 distinct habit/date completions.",
|
||||
"icon": "assets/habits/icons/habits.completions.50.shape",
|
||||
"icon_source": "mingcute_regular_check_2"
|
||||
},
|
||||
{
|
||||
"id": "habits.completions.100",
|
||||
"group": "habits",
|
||||
"metric": "habit.completed",
|
||||
"rule": "count",
|
||||
"target": 100,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_completions_100_title",
|
||||
"description_key": "achievement_habits_completions_100_description",
|
||||
"title": "One hundred completions",
|
||||
"description": "Record 100 distinct habit/date completions.",
|
||||
"icon": "assets/habits/icons/habits.completions.100.shape",
|
||||
"icon_source": "mingcute_regular_checks"
|
||||
},
|
||||
{
|
||||
"id": "habits.completions.500",
|
||||
"group": "habits",
|
||||
"metric": "habit.completed",
|
||||
"rule": "count",
|
||||
"target": 500,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_completions_500_title",
|
||||
"description_key": "achievement_habits_completions_500_description",
|
||||
"title": "Five hundred completions",
|
||||
"description": "Record 500 distinct habit/date completions.",
|
||||
"icon": "assets/habits/icons/habits.completions.500.shape",
|
||||
"icon_source": "mingcute_regular_check_circle"
|
||||
},
|
||||
{
|
||||
"id": "habits.single_scheduled_days.7",
|
||||
"group": "habits",
|
||||
"metric": "habit.scheduled",
|
||||
"rule": "max_days",
|
||||
"target": 7,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_single_scheduled_days_7_title",
|
||||
"description_key": "achievement_habits_single_scheduled_days_7_description",
|
||||
"title": "One habit, seven times",
|
||||
"description": "Complete the same habit on 7 of its scheduled dates.",
|
||||
"icon": "assets/habits/icons/habits.single_scheduled_days.7.shape",
|
||||
"icon_source": "mingcute_regular_calendar_day"
|
||||
},
|
||||
{
|
||||
"id": "habits.single_scheduled_days.30",
|
||||
"group": "habits",
|
||||
"metric": "habit.scheduled",
|
||||
"rule": "max_days",
|
||||
"target": 30,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_single_scheduled_days_30_title",
|
||||
"description_key": "achievement_habits_single_scheduled_days_30_description",
|
||||
"title": "One habit, thirty times",
|
||||
"description": "Complete the same habit on 30 of its scheduled dates.",
|
||||
"icon": "assets/habits/icons/habits.single_scheduled_days.30.shape",
|
||||
"icon_source": "mingcute_regular_calendar_add"
|
||||
},
|
||||
{
|
||||
"id": "habits.single_scheduled_days.100",
|
||||
"group": "habits",
|
||||
"metric": "habit.scheduled",
|
||||
"rule": "max_days",
|
||||
"target": 100,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_single_scheduled_days_100_title",
|
||||
"description_key": "achievement_habits_single_scheduled_days_100_description",
|
||||
"title": "One habit, one hundred times",
|
||||
"description": "Complete the same habit on 100 of its scheduled dates.",
|
||||
"icon": "assets/habits/icons/habits.single_scheduled_days.100.shape",
|
||||
"icon_source": "mingcute_regular_history"
|
||||
},
|
||||
{
|
||||
"id": "habits.counter_target.1",
|
||||
"group": "habits",
|
||||
"metric": "habit.counter",
|
||||
"rule": "count",
|
||||
"target": 1,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_counter_target_1_title",
|
||||
"description_key": "achievement_habits_counter_target_1_description",
|
||||
"title": "A target met",
|
||||
"description": "Reach a counting habit's own target on 1 date.",
|
||||
"icon": "assets/habits/icons/habits.counter_target.1.shape",
|
||||
"icon_source": "mingcute_regular_aiming_2"
|
||||
},
|
||||
{
|
||||
"id": "habits.question_answer.1",
|
||||
"group": "habits",
|
||||
"metric": "habit.answer",
|
||||
"rule": "count",
|
||||
"target": 1,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_question_answer_1_title",
|
||||
"description_key": "achievement_habits_question_answer_1_description",
|
||||
"title": "An answer recorded",
|
||||
"description": "Save 1 genuine answer to a habit question.",
|
||||
"icon": "assets/habits/icons/habits.question_answer.1.shape",
|
||||
"icon_source": "mingcute_regular_question"
|
||||
},
|
||||
{
|
||||
"id": "habits.ended_span.1",
|
||||
"group": "habits",
|
||||
"metric": "habit.span",
|
||||
"rule": "count",
|
||||
"target": 1,
|
||||
"variant": "",
|
||||
"pack": "",
|
||||
"needs": "",
|
||||
"title_key": "achievement_habits_ended_span_1_title",
|
||||
"description_key": "achievement_habits_ended_span_1_description",
|
||||
"title": "A span recorded",
|
||||
"description": "Save 1 valid span with both start and end.",
|
||||
"icon": "assets/habits/icons/habits.ended_span.1.shape",
|
||||
"icon_source": "mingcute_regular_time"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
#import "drawing_props"
|
||||
|
||||
// Coins mark the important numbers, such as the balance, prices and
|
||||
// rewards, in the theme's highlight. A host older than the highlight sends
|
||||
// none, and the coin then takes the theme's text color.
|
||||
HabitsCoinColor :: (highlight: Color, text: Color) -> Color {
|
||||
if highlight.a == cast(u8)0 {
|
||||
return text
|
||||
}
|
||||
return highlight
|
||||
}
|
||||
@@ -1,46 +0,0 @@
|
||||
// Habit's editor confirmations belong to its package. The native host uses
|
||||
// the same composition for older installed packages that lack these views.
|
||||
#import "session"
|
||||
Modal :: #import "kryon/modal";
|
||||
#import "control_props"
|
||||
|
||||
using ButtonTone;
|
||||
using ButtonEmphasis;
|
||||
|
||||
HabitEditorDialogProps :: struct {
|
||||
session: Session
|
||||
deleting: bool
|
||||
title: string
|
||||
message: string
|
||||
keep_editing: string
|
||||
save: string
|
||||
discard: string
|
||||
cancel: string
|
||||
delete_label: string
|
||||
}
|
||||
|
||||
HabitEditorDialog :: (props: HabitEditorDialogProps) -> Modal.ActionModalResult {
|
||||
if props.deleting {
|
||||
actions: [2]Modal.ActionModalAction = .[
|
||||
Modal.ActionModalAction.{.label = props.cancel,
|
||||
.tone = cast(ButtonTone)ButtonToneNeutral,
|
||||
.emphasis = cast(ButtonEmphasis)ButtonEmphasisSoft},
|
||||
Modal.ActionModalAction.{.label = props.delete_label,
|
||||
.tone = cast(ButtonTone)ButtonToneDanger,
|
||||
.emphasis = cast(ButtonEmphasis)ButtonEmphasisFilled}]
|
||||
return Modal.ActionModal(props.session, Modal.ActionModalProps.{
|
||||
.title = props.title, .message = props.message}, actions[:])
|
||||
}
|
||||
actions: [3]Modal.ActionModalAction = .[
|
||||
Modal.ActionModalAction.{.label = props.keep_editing,
|
||||
.tone = cast(ButtonTone)ButtonToneNeutral,
|
||||
.emphasis = cast(ButtonEmphasis)ButtonEmphasisSoft},
|
||||
Modal.ActionModalAction.{.label = props.save,
|
||||
.tone = cast(ButtonTone)ButtonToneAccent,
|
||||
.emphasis = cast(ButtonEmphasis)ButtonEmphasisFilled},
|
||||
Modal.ActionModalAction.{.label = props.discard,
|
||||
.tone = cast(ButtonTone)ButtonToneDanger,
|
||||
.emphasis = cast(ButtonEmphasis)ButtonEmphasisSoft}]
|
||||
return Modal.ActionModal(props.session, Modal.ActionModalProps.{
|
||||
.title = props.title, .message = props.message}, actions[:])
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -1,176 +0,0 @@
|
||||
// Habits owns page transitions, linked-day actions, form validation, the
|
||||
// habit list and each habit's page, the count dialog and the shop.
|
||||
#import, file "../../src/apps/habits_types.zi";
|
||||
#import, file "habits_view.zi";
|
||||
#import, file "shop_view.zi";
|
||||
#import, file "shop_stats_view.zi";
|
||||
#import, file "habit_list_view.zi";
|
||||
#import, file "habit_day_view.zi";
|
||||
#import, file "habit_edit_view.zi";
|
||||
#import, file "habit_stats_view.zi";
|
||||
#import, file "../../src/habits/habit_types.zi";
|
||||
#import, file "../../src/habits/habit_links.zi";
|
||||
#import, file "../../src/core/types.zi";
|
||||
#import, file "../../src/apps/module_types.zi";
|
||||
#import "apps/node_types"
|
||||
host_api :: #system_library "host_api";
|
||||
ReadHabitsHost :: () -> HabitsMessage #foreign host_api;
|
||||
WriteHabitsHost :: (message: HabitsMessage) #foreign host_api;
|
||||
HabitNameExistsHost :: (name: string, excluding: s32) -> bool #foreign host_api;
|
||||
SaveHabitHost :: (message: HabitsMessage) -> bool #foreign host_api;
|
||||
|
||||
HabitTrimName :: (name: string) -> string {
|
||||
start: s64 = 0
|
||||
end := name.count
|
||||
while start < end && (name[start] == cast(u8)32 || name[start] == cast(u8)9) {
|
||||
start += 1
|
||||
}
|
||||
while end > start && (name[end - 1] == cast(u8)32 || name[end - 1] == cast(u8)9) {
|
||||
end -= 1
|
||||
}
|
||||
return name[start:end]
|
||||
}
|
||||
|
||||
using HabitSyncMode;
|
||||
|
||||
HabitsApply :: (message: HabitsMessage) -> HabitsMessage {
|
||||
message.succeeded = true
|
||||
if message.action == HABITS_COUNT_DIALOG {
|
||||
return HabitsCountView(message)
|
||||
}
|
||||
if message.action == HABITS_UNSAVED_DIALOG || message.action == HABITS_DELETE_DIALOG {
|
||||
return HabitsEditorView(message)
|
||||
}
|
||||
if message.action == HABITS_SHOP_STATS_VIEW {
|
||||
return HabitsShopStatisticsView(message)
|
||||
}
|
||||
if message.action == HABITS_SHOP_VIEW || message.action == HABITS_SHOP_BUY_DIALOG {
|
||||
return HabitsShopView(message)
|
||||
}
|
||||
if message.action == HABITS_LIST_VIEW {
|
||||
return HabitsListView(message)
|
||||
}
|
||||
if message.action == HABITS_DAY_VIEW {
|
||||
return HabitsDayView(message)
|
||||
}
|
||||
if message.action == HABITS_ENTRY_VIEW {
|
||||
return HabitsEntryView(message)
|
||||
}
|
||||
if message.action == HABITS_EDIT_VIEW {
|
||||
return HabitsEditView(message)
|
||||
}
|
||||
if message.action == HABITS_STATS_VIEW {
|
||||
return HabitsStatsView(message)
|
||||
}
|
||||
if message.action == HABITS_ROUTE {
|
||||
message.succeeded = message.screen == ScreenHabits ||
|
||||
message.screen == ScreenHabitEdit || message.screen == ScreenHabitSessionEdit
|
||||
return message
|
||||
}
|
||||
if message.action == HABITS_DAY_ACTION {
|
||||
// Days off the habit's schedule open and count like planned days.
|
||||
if message.modal_active || message.index < 0 || message.index >= message.count {
|
||||
return message
|
||||
}
|
||||
if (message.sync_activity & HABIT_LINK_DIARY) != 0 {
|
||||
message.day_action = HABITS_DAY_DIARY
|
||||
} else if message.counter_enabled != 0 {
|
||||
message.day_action = ifx message.decrement then HABITS_DAY_DECREMENT else HABITS_DAY_COUNT
|
||||
} else if message.linked_count > 0 {
|
||||
message.day_action = HABITS_DAY_LINKED
|
||||
} else if message.span {
|
||||
// A tap starts the habit's span, the next ends it; a day with
|
||||
// spans opens their data.
|
||||
message.day_action = HABITS_DAY_SPAN
|
||||
} else if message.question_count > 0 {
|
||||
// The day opens its questions, or the data of a done day,
|
||||
// instead of being marked or cleared.
|
||||
message.day_action = HABITS_DAY_QUESTIONS
|
||||
} else {
|
||||
message.day_action = HABITS_DAY_TOGGLE
|
||||
}
|
||||
message.block_click = true
|
||||
return message
|
||||
}
|
||||
if message.action == HABITS_COMMIT {
|
||||
if !message.active {
|
||||
return message
|
||||
}
|
||||
if !message.is_new && (message.index < 0 || message.index >= message.count) {
|
||||
message.cancel_edit = true
|
||||
return message
|
||||
}
|
||||
message.name_error = 0
|
||||
message.name = HabitTrimName(message.name)
|
||||
if message.name.count == 0 {
|
||||
message.name_error = 1
|
||||
} else if HabitNameExistsHost(message.name,
|
||||
ifx message.is_new then -1 else message.index) {
|
||||
message.name_error = 2
|
||||
}
|
||||
if message.name_error != 0 {
|
||||
message.reset_scroll = true
|
||||
return message
|
||||
}
|
||||
message.sync_activity = HabitLinkNormalize(message.sync_activity)
|
||||
message.sync_mode = ifx message.sync_activity != 0 then HABIT_SYNC_ACTIVITIES else HABIT_SYNC_NONE
|
||||
message.weekdays = message.weekdays & 0xff
|
||||
message.color.a = 255
|
||||
message.succeeded = SaveHabitHost(message)
|
||||
if !message.succeeded {
|
||||
return message
|
||||
}
|
||||
message.cancel_edit = true
|
||||
message.action = HABITS_OVERVIEW
|
||||
}
|
||||
if message.action == HABITS_EXPAND {
|
||||
if message.index < 0 || message.index >= message.count {
|
||||
return message
|
||||
}
|
||||
message.selected = message.index
|
||||
message.screen_mode = HABITS_SCREEN_OVERVIEW
|
||||
message.tab = HABIT_TAB_WEEKLY
|
||||
message.view_mode = HABIT_VIEW_WEEKLY
|
||||
} else if message.action == HABITS_HISTORY || message.action == HABITS_STATISTICS {
|
||||
if message.selected < 0 || message.selected >= message.count {
|
||||
return message
|
||||
}
|
||||
message.reset_scroll = true
|
||||
if message.action == HABITS_HISTORY {
|
||||
message.screen_mode = HABITS_SCREEN_HISTORY
|
||||
message.view_mode = HABIT_VIEW_CALENDAR
|
||||
message.tab = HABIT_TAB_MONTHLY
|
||||
} else {
|
||||
message.screen_mode = HABITS_SCREEN_STATISTICS
|
||||
message.tab = HABIT_TAB_STATISTICS
|
||||
}
|
||||
} else if message.action == HABITS_FOCUS {
|
||||
message.screen_mode = HABITS_SCREEN_OVERVIEW
|
||||
message.tab = HABIT_TAB_WEEKLY
|
||||
message.reset_scroll = true
|
||||
} else if message.action == HABITS_OVERVIEW {
|
||||
message.selected = -1
|
||||
message.screen_mode = HABITS_SCREEN_OVERVIEW
|
||||
message.tab = HABIT_TAB_WEEKLY
|
||||
message.view_mode = HABIT_VIEW_WEEKLY
|
||||
message.reset_scroll = true
|
||||
} else if message.action == HABITS_COLLAPSE {
|
||||
message.selected = -1
|
||||
} else {
|
||||
message.succeeded = false
|
||||
}
|
||||
return message
|
||||
}
|
||||
|
||||
#program_export "HabitsMain"
|
||||
Main :: () -> s32 {
|
||||
message := ReadHabitsHost()
|
||||
if message.abi != MODULE_ABI {
|
||||
return -1
|
||||
}
|
||||
if message.action == MODULE_IDENTIFY {
|
||||
return MODULE_HABITS
|
||||
}
|
||||
WriteHabitsHost(HabitsApply(message))
|
||||
return 0
|
||||
}
|
||||
@@ -1,120 +0,0 @@
|
||||
#import "std/c_string"
|
||||
#import "std/text_buffer"
|
||||
#import "std/vec"
|
||||
#import "std/text"
|
||||
#import, file "../../src/storage/achievements.zi";
|
||||
#import, file "../../src/storage/achievement_sources.zi";
|
||||
#import, file "../../src/storage/sqlite.zi";
|
||||
#import, file "../../src/storage/db.zi";
|
||||
#import, file "../../src/storage/state.zi";
|
||||
#import, file "../../src/storage/storage_core.zi";
|
||||
#import, file "../../src/app/text_buffers.zi";
|
||||
#import, file "../../src/habits/habit_types.zi";
|
||||
#import, file "../../src/habits/habit_calendar.zi";
|
||||
#import, file "../../src/habits/habit_schedule.zi";
|
||||
#import, file "../../src/apps/package_files.zi";
|
||||
|
||||
AchievementHabitCreatedBackfill :: (offset: s32) -> s32 {
|
||||
return AchievementSourceRows("habit.created", "SELECT id,0,1,'',id,0,deleted_at!=0 FROM habits WHERE user_id=?1 ORDER BY id LIMIT 128 OFFSET ?2", offset)
|
||||
}
|
||||
|
||||
AchievementHabitDaysBackfill :: (habits: *Habits, offset: s32) -> s32 {
|
||||
statement: *void
|
||||
if SqlitePrepareText(storage_db_handle(),
|
||||
"SELECT h.id,d.local_date,d.completed,d.count,h.counter_enabled,h.counter_target,h.deleted_at,h.span,COALESCE((SELECT c.old_value FROM habit_changes c WHERE c.user_id=h.user_id AND c.habit_id=h.id AND c.kind=8 AND c.deleted_at=0 AND c.changed_at>d.updated_at ORDER BY c.changed_at,c.rowid LIMIT 1),'') FROM habit_days d JOIN habits h ON h.id=d.habit_id WHERE h.user_id=?1 ORDER BY h.id,d.local_date LIMIT 128 OFFSET ?2",
|
||||
-1, *statement, null) != SQLITE_OK { return -1 }
|
||||
defer { SqliteFinalize(statement) }
|
||||
bind_text(statement, 1, AchievementOwner())
|
||||
SqliteBindInt(statement, 2, offset)
|
||||
rows: s32 = 0
|
||||
while SqliteStep(statement) == SQLITE_ROW {
|
||||
id := AppTextFromCString(SqliteColumnText(statement, 0), 96)
|
||||
day := SqliteColumnInt(statement, 1)
|
||||
value := HabitDay.{.day_index = day, .completed = SqliteColumnInt(statement, 2), .count = SqliteColumnInt(statement, 3)}
|
||||
counter := SqliteColumnInt(statement, 4) != 0
|
||||
target := SqliteColumnInt(statement, 5)
|
||||
historical := AppTextFromCString(SqliteColumnText(statement, 8), 256)
|
||||
known := true
|
||||
if historical == "check" || historical == "span" {
|
||||
counter = false
|
||||
target = 1
|
||||
} else if historical.count > 0 {
|
||||
known = historical.count > 6 && historical[:6] == "count:"
|
||||
target = 0
|
||||
if known {
|
||||
for byte: historical[6:] {
|
||||
if byte < #char "0" || byte > #char "9" || target > 1000000 {
|
||||
known = false
|
||||
break
|
||||
}
|
||||
target = target * 10 + cast(s32)(byte - #char "0")
|
||||
}
|
||||
counter = true
|
||||
known = known && target >= 0
|
||||
}
|
||||
}
|
||||
complete := known && HabitDayComplete(value, counter, target)
|
||||
deleted := SqliteColumnInt64(statement, 6) != 0
|
||||
source_bytes: Vec(u8)
|
||||
BuilderPrint(*source_bytes, "%.%", id, day)
|
||||
source := BuilderFinish(source_bytes)
|
||||
defer { PackageFree(source) }
|
||||
unused AchievementRecord("habit.completed", source, day, 1, "", id, true, false, deleted || !complete)
|
||||
unused AchievementRecord("habit.counter", source, day, 1, "", id, false, false, deleted || !complete || !counter)
|
||||
scheduled := false
|
||||
if habits != null {
|
||||
for index: cast(s32)0..habits.count - 1 {
|
||||
habit := *habits.items[index]
|
||||
if TextUntilNul(habit.id[:]) != id { continue }
|
||||
// Pausing a habit today does not erase its historical schedule.
|
||||
if habit.schedule_count > 0 {
|
||||
scheduled = HabitScheduleMatches(HabitScheduleFor(habit, day), day)
|
||||
} else {
|
||||
copy := habit.*
|
||||
copy.deactivated = 0
|
||||
scheduled = habit_scheduled_day(*copy, day) != 0
|
||||
}
|
||||
}
|
||||
}
|
||||
unused AchievementRecord("habit.scheduled", source, day, 1, "", id, false, false, deleted || !complete || !scheduled)
|
||||
rows += 1
|
||||
}
|
||||
return rows
|
||||
}
|
||||
|
||||
AchievementHabitAnswersBackfill :: (offset: s32) -> s32 {
|
||||
return AchievementSourceRows("habit.answer", "SELECT e.id,e.local_date,1,'',e.habit_id,0,(e.deleted_at!=0 OR h.deleted_at!=0 OR NOT EXISTS(SELECT 1 FROM json_each(CASE WHEN json_valid(e.answers) THEN e.answers ELSE '[]' END) a WHERE length(trim(CASE WHEN a.type='object' THEN COALESCE(json_extract(a.value,'$.value'),'') ELSE '' END,char(9)||char(10)||char(13)||' '))>0)) FROM habit_entries e JOIN habits h ON h.id=e.habit_id WHERE e.user_id=?1 ORDER BY e.id LIMIT 128 OFFSET ?2", offset)
|
||||
}
|
||||
|
||||
AchievementHabitSpansBackfill :: (offset: s32) -> s32 {
|
||||
return AchievementSourceRows("habit.span", "SELECT e.id,e.local_date,1,'',e.habit_id,0,(e.deleted_at!=0 OR h.deleted_at!=0 OR e.started_at<=0 OR e.ended_at<=e.started_at) FROM habit_entries e JOIN habits h ON h.id=e.habit_id WHERE e.user_id=?1 ORDER BY e.id LIMIT 128 OFFSET ?2", offset)
|
||||
}
|
||||
|
||||
AchievementHabitRetractRows :: (sql: string, kind: s32) -> bool {
|
||||
statement: *void
|
||||
if SqlitePrepareText(storage_db_handle(), sql, -1, *statement, null) != SQLITE_OK { return false }
|
||||
defer { SqliteFinalize(statement) }
|
||||
bind_text(statement, 1, AchievementOwner())
|
||||
while SqliteStep(statement) == SQLITE_ROW {
|
||||
id := AppTextFromCString(SqliteColumnText(statement, 0), 96)
|
||||
if kind == 0 {
|
||||
if !AchievementRetract("habit.created", id) { return false }
|
||||
} else if kind == 1 {
|
||||
out: Vec(u8)
|
||||
BuilderPrint(*out, "%.%", id, SqliteColumnInt(statement, 1))
|
||||
source := BuilderFinish(out)
|
||||
defer { PackageFree(source) }
|
||||
if !AchievementRetract("habit.completed", source) || !AchievementRetract("habit.counter", source) ||
|
||||
!AchievementRetract("habit.scheduled", source) { return false }
|
||||
} else {
|
||||
if !AchievementRetract("habit.answer", id) || !AchievementRetract("habit.span", id) { return false }
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
AchievementHabitsDeleted :: () -> bool {
|
||||
return AchievementHabitRetractRows("SELECT id FROM habits WHERE user_id=?1 AND deleted_at>0", 0) &&
|
||||
AchievementHabitRetractRows("SELECT h.id,d.local_date FROM habit_days d JOIN habits h ON h.id=d.habit_id WHERE h.user_id=?1 AND (h.deleted_at>0 OR (d.completed=0 AND d.count=0 AND d.session_count=0))", 1) &&
|
||||
AchievementHabitRetractRows("SELECT e.id FROM habit_entries e JOIN habits h ON h.id=e.habit_id WHERE e.user_id=?1 AND (e.deleted_at>0 OR h.deleted_at>0)", 2)
|
||||
}
|
||||
@@ -1,253 +0,0 @@
|
||||
// Habits draws a counting habit's count dialog: the day's count with large
|
||||
// steps down and up. The host supplies the day's count and the theme, and
|
||||
// applies the step or opens the day the dialog asks for.
|
||||
#import "session"
|
||||
#import "geometry"
|
||||
#import "vec"
|
||||
#import "dpi"
|
||||
Box :: #import "kryon/box";
|
||||
Button :: #import "kryon/button";
|
||||
Layout :: #import "kryon/layout";
|
||||
Modal :: #import "kryon/modal";
|
||||
Text :: #import "kryon/text";
|
||||
#import "drawing_props"
|
||||
#import "text_align"
|
||||
#import "control_props"
|
||||
#import "kryon/tree"
|
||||
#import, file "../../src/apps/habits_ui_types.zi";
|
||||
#import, file "../../src/apps/habits_types.zi";
|
||||
#import, file "../../src/app/color.zi";
|
||||
#import, file "editor_dialogs.zi";
|
||||
|
||||
using ButtonTone;
|
||||
using ButtonEmphasis;
|
||||
using TextAlign;
|
||||
using Text.Wrap;
|
||||
host_api :: #system_library "host_api";
|
||||
ReadHabitsUiHost :: () -> HabitsUiFrame #foreign host_api;
|
||||
WriteHabitsUiHost :: (frame: HabitsUiFrame) #foreign host_api;
|
||||
HabitsLocaleHost :: (key: string) -> string #foreign host_api;
|
||||
frame: HabitsUiFrame;
|
||||
|
||||
Scale :: (pixels: s32) -> s32 {
|
||||
return ScalePixels(pixels, frame.scale)
|
||||
}
|
||||
|
||||
Bounds :: (x: s32, y: s32, width: s32, height: s32) -> Rectangle {
|
||||
return Rectangle.{cast(float32)x, cast(float32)y,
|
||||
cast(float32)width, cast(float32)height}
|
||||
}
|
||||
|
||||
// The number with two digits or more, as in a YYYY-MM-DD date.
|
||||
PaddedNumber :: (out: *Vec(u8), value: s32, digits: s32) {
|
||||
width: s32 = 1
|
||||
limit: s32 = 10
|
||||
while value >= limit {
|
||||
width += 1
|
||||
limit *= 10
|
||||
}
|
||||
while width < digits {
|
||||
BuilderPrint(out, "0")
|
||||
width += 1
|
||||
}
|
||||
BuilderPrint(out, "%", value)
|
||||
}
|
||||
|
||||
DayText :: (day: s32) -> string {
|
||||
out: Vec(u8)
|
||||
PaddedNumber(*out, day / 10000, 4)
|
||||
BuilderPrint(*out, "-")
|
||||
PaddedNumber(*out, (day / 100) % 100, 2)
|
||||
BuilderPrint(*out, "-")
|
||||
PaddedNumber(*out, day % 100, 2)
|
||||
return BuilderFinish(out)
|
||||
}
|
||||
|
||||
// The template with its %d replaced by the count.
|
||||
CountText :: (template: string, count: s32) -> string {
|
||||
out: Vec(u8)
|
||||
at: s64 = 0
|
||||
while at < template.count {
|
||||
if at + 1 < template.count && template[at] == cast(u8)37 &&
|
||||
template[at + 1] == cast(u8)100 {
|
||||
BuilderPrint(*out, "%", count)
|
||||
at += 2
|
||||
} else {
|
||||
BuilderPrint(*out, "%", template[at:at + 1])
|
||||
at += 1
|
||||
}
|
||||
}
|
||||
return BuilderFinish(out)
|
||||
}
|
||||
|
||||
CountLabel :: (bounds: Rectangle, text: string) {
|
||||
Text.Draw(frame.session, Text.Props.{
|
||||
.bounds = bounds, .text = text, .size = frame.small_font,
|
||||
.align = cast(TextAlign)TextAlignCenter,
|
||||
.vertical_align = cast(TextAlign)TextAlignCenter,
|
||||
.wrap = cast(Text.Wrap)TextWrapNone})
|
||||
}
|
||||
|
||||
// A step button draws its minus or plus as bars sized to the button, which
|
||||
// read clearly where a "-" or "+" glyph is thin and small.
|
||||
StepButton :: (id: s32, bounds: Rectangle, plus: bool, disabled: bool) -> bool {
|
||||
clicked := Button.Draw(frame.session, Button.Props.{
|
||||
.id = id, .bounds = bounds,
|
||||
.tone = cast(ButtonTone)ButtonToneNeutral,
|
||||
.emphasis = cast(ButtonEmphasis)ButtonEmphasisSoft,
|
||||
.disabled = disabled}) != 0
|
||||
side := bounds.height
|
||||
if bounds.width < side {
|
||||
side = bounds.width
|
||||
}
|
||||
length := side * 0.36
|
||||
thickness := cast(float32)Scale(3)
|
||||
center_x := bounds.x + bounds.width * 0.5
|
||||
center_y := bounds.y + bounds.height * 0.5
|
||||
color := frame.text_color
|
||||
if disabled {
|
||||
color = color_with_alpha(color, 0.35)
|
||||
}
|
||||
unused Box.Draw(frame.session, Box.Props.{
|
||||
.bounds = Rectangle.{center_x - length * 0.5, center_y - thickness * 0.5,
|
||||
length, thickness},
|
||||
.fill = color, .radius = thickness * 0.5})
|
||||
if plus {
|
||||
unused Box.Draw(frame.session, Box.Props.{
|
||||
.bounds = Rectangle.{center_x - thickness * 0.5, center_y - length * 0.5,
|
||||
thickness, length},
|
||||
.fill = color, .radius = thickness * 0.5})
|
||||
}
|
||||
return clicked
|
||||
}
|
||||
|
||||
// Draws the dialog and leaves in frame.action what the host does next.
|
||||
CountDialog :: () {
|
||||
frame.action = HABITS_COUNT_NONE
|
||||
gap := Scale(12)
|
||||
step_h := Scale(56)
|
||||
button_h := Scale(44)
|
||||
content_h := Scale(24) + Scale(64) + Scale(24) + gap + step_h + gap + button_h
|
||||
if frame.linked_count > 0 {
|
||||
content_h += button_h + gap
|
||||
}
|
||||
// A counting habit that asks questions keeps their answers as the
|
||||
// day's entries, opened from here.
|
||||
if frame.asks {
|
||||
content_h += button_h + gap
|
||||
}
|
||||
dialog := Modal.Draw(frame.session, Modal.Props.{
|
||||
.key = Layout.KeyHash("habits/count-dialog"),
|
||||
.title = frame.name,
|
||||
.strong_title = true,
|
||||
.width = Scale(340), .height = content_h + Scale(74),
|
||||
.scale = frame.scale,
|
||||
.has_right_action = true,
|
||||
.right_label = HabitsLocaleHost("close_button")})
|
||||
if dialog.dismissed || dialog.right_clicked {
|
||||
frame.action = HABITS_COUNT_CLOSE
|
||||
return
|
||||
}
|
||||
if !dialog.opened {
|
||||
return
|
||||
}
|
||||
content := dialog.layout.content
|
||||
x := cast(s32)content.x
|
||||
y := cast(s32)content.y
|
||||
width := cast(s32)content.width
|
||||
|
||||
day_text := DayText(frame.day)
|
||||
if frame.today {
|
||||
day_text = HabitsLocaleHost("habits_today")
|
||||
}
|
||||
CountLabel(Bounds(x, y, width, Scale(24)), day_text)
|
||||
y += Scale(24)
|
||||
count_out: Vec(u8)
|
||||
BuilderPrint(*count_out, "%", frame.count)
|
||||
count_text := BuilderFinish(count_out)
|
||||
count_strong: [1]Text.Range
|
||||
count_strong[0] = Text.Range.{.start = 0, .end = cast(s32)count_text.count}
|
||||
Text.Draw(frame.session, Text.Props.{
|
||||
.bounds = Bounds(x, y, width, Scale(64)),
|
||||
.text = count_text, .size = Scale(Text.Text48),
|
||||
.strong = count_strong[:],
|
||||
.align = cast(TextAlign)TextAlignCenter,
|
||||
.vertical_align = cast(TextAlign)TextAlignCenter,
|
||||
.wrap = cast(Text.Wrap)TextWrapNone})
|
||||
y += Scale(64)
|
||||
target_out: Vec(u8)
|
||||
BuilderPrint(*target_out, "% %", HabitsLocaleHost("habit_counter_target"), frame.target)
|
||||
CountLabel(Bounds(x, y, width, Scale(24)), BuilderFinish(target_out))
|
||||
y += Scale(24) + gap
|
||||
|
||||
step_w := (width - gap) / 2
|
||||
if StepButton(5720000, Bounds(x, y, step_w, step_h), false,
|
||||
frame.count <= frame.linked_count) {
|
||||
frame.action = HABITS_COUNT_DECREMENT
|
||||
}
|
||||
if StepButton(5720001, Bounds(x + width - step_w, y, step_w, step_h), true, false) {
|
||||
frame.action = HABITS_COUNT_INCREMENT
|
||||
}
|
||||
y += step_h + gap
|
||||
if frame.asks {
|
||||
if Button.Draw(frame.session, Button.Props.{
|
||||
.id = 5720004, .bounds = Bounds(x, y, width, button_h),
|
||||
.label = HabitsLocaleHost("habit_day_entries"),
|
||||
.tone = cast(ButtonTone)ButtonToneNeutral,
|
||||
.emphasis = cast(ButtonEmphasis)ButtonEmphasisOutline}) != 0 {
|
||||
unused End(frame.session)
|
||||
frame.action = HABITS_COUNT_OPEN_DAY
|
||||
return
|
||||
}
|
||||
y += button_h + gap
|
||||
}
|
||||
|
||||
if frame.linked_count > 0 {
|
||||
template := HabitsLocaleHost(ifx frame.linked_count == 1
|
||||
then "session_count_singular" else "session_count_plural")
|
||||
if Button.Draw(frame.session, Button.Props.{
|
||||
.id = 5720002, .bounds = Bounds(x, y, width, button_h),
|
||||
.label = CountText(template, frame.linked_count),
|
||||
.tone = cast(ButtonTone)ButtonToneNeutral,
|
||||
.emphasis = cast(ButtonEmphasis)ButtonEmphasisOutline}) != 0 {
|
||||
unused End(frame.session)
|
||||
frame.action = HABITS_COUNT_OPEN_DAY
|
||||
return
|
||||
}
|
||||
y += button_h + gap
|
||||
}
|
||||
if Button.Draw(frame.session, Button.Props.{
|
||||
.id = 5720003, .bounds = Bounds(x, y, width, button_h),
|
||||
.label = HabitsLocaleHost("done_button"),
|
||||
.tone = cast(ButtonTone)ButtonToneAccent,
|
||||
.emphasis = cast(ButtonEmphasis)ButtonEmphasisFilled}) != 0 {
|
||||
frame.action = HABITS_COUNT_CLOSE
|
||||
}
|
||||
unused End(frame.session)
|
||||
}
|
||||
|
||||
HabitsCountView :: (message: HabitsMessage) -> HabitsMessage {
|
||||
frame = ReadHabitsUiHost()
|
||||
CountDialog()
|
||||
WriteHabitsUiHost(frame)
|
||||
message.succeeded = true
|
||||
return message
|
||||
}
|
||||
|
||||
HabitsEditorView :: (message: HabitsMessage) -> HabitsMessage {
|
||||
frame = ReadHabitsUiHost()
|
||||
deleting := message.action == HABITS_DELETE_DIALOG
|
||||
result := HabitEditorDialog(HabitEditorDialogProps.{
|
||||
.session = frame.session, .deleting = deleting,
|
||||
.title = HabitsLocaleHost(ifx deleting then "habit_delete_title" else "habit_unsaved_title"),
|
||||
.message = HabitsLocaleHost(ifx deleting then "habit_delete_message" else "habit_unsaved_message"),
|
||||
.keep_editing = HabitsLocaleHost("habit_keep_editing"),
|
||||
.save = HabitsLocaleHost("save_button"),
|
||||
.discard = HabitsLocaleHost("discard_button"),
|
||||
.cancel = HabitsLocaleHost("cancel_button"),
|
||||
.delete_label = HabitsLocaleHost("delete_button")})
|
||||
frame.action = result.action
|
||||
WriteHabitsUiHost(frame)
|
||||
message.succeeded = true
|
||||
return message
|
||||
}
|
||||
@@ -1,239 +0,0 @@
|
||||
// A separate, read-only view of the persisted shop purchase history.
|
||||
#import, file "shop_view.zi";
|
||||
#import, file "../../src/apps/habits_types.zi";
|
||||
#import, file "../../src/apps/habits_ui_types.zi";
|
||||
Box :: #import "kryon/box";
|
||||
Layout :: #import "kryon/layout";
|
||||
Scroll :: #import "kryon/scroll";
|
||||
Text :: #import "kryon/text";
|
||||
#import "kryon/drawing_props"
|
||||
#import "text_measure"
|
||||
#import "text_align"
|
||||
#import "kryon/tree"
|
||||
#import "vec"
|
||||
using Text.Wrap;
|
||||
host_api :: #system_library "host_api";
|
||||
ReadHabitsShopHost :: () -> HabitsShopFrame #foreign host_api;
|
||||
WriteHabitsShopHost :: (frame: HabitsShopFrame) #foreign host_api;
|
||||
ReadHabitRewardHost :: (index: s32) -> HabitsShopReward #foreign host_api;
|
||||
|
||||
|
||||
PurchaseDate :: (date: s32) -> string {
|
||||
month := (date / 100) % 100
|
||||
day := date % 100
|
||||
out: Vec(u8)
|
||||
BuilderPrint(*out, "%-", date / 10000)
|
||||
if month < 10 {
|
||||
BuilderPrint(*out, "0")
|
||||
}
|
||||
BuilderPrint(*out, "%-", month)
|
||||
if day < 10 {
|
||||
BuilderPrint(*out, "0")
|
||||
}
|
||||
BuilderPrint(*out, "%", day)
|
||||
return BuilderFinish(out)
|
||||
}
|
||||
|
||||
RewardStatisticsText :: (reward: HabitsShopReward) -> string {
|
||||
out: Vec(u8)
|
||||
BuilderPrint(*out, "%: % · %: %", Locale("habit_shop_stats_purchases"),
|
||||
reward.statistics.purchase_count, Locale("habit_shop_stats_month"),
|
||||
reward.statistics.month_count)
|
||||
return BuilderFinish(out)
|
||||
}
|
||||
|
||||
RewardStatisticsHeight :: (reward: HabitsShopReward, width: s32) -> s32 {
|
||||
inner := width - Scale(SHOP_CARD_PADDING * 2 + 10)
|
||||
height := ParagraphHeight(RewardStatisticsText(reward), inner, shop.small_font)
|
||||
if reward.statistics.purchase_count > 0 {
|
||||
height += Scale(4) + ParagraphHeight(Filled(Locale("habit_shop_stats_last"),
|
||||
PurchaseDate(reward.statistics.last_date)), inner, shop.small_font)
|
||||
}
|
||||
return height + Scale(14)
|
||||
}
|
||||
|
||||
// Coins spent show in the coins' own color.
|
||||
StatisticsColor :: (index: s32) -> Color {
|
||||
colors: [4]Color = .[Color.{63, 137, 216, 255}, CoinColor(),
|
||||
Color.{48, 159, 128, 255}, Color.{155, 104, 207, 255}]
|
||||
return colors[index]
|
||||
}
|
||||
|
||||
StatisticsLabel :: (index: s32) -> string {
|
||||
keys: [4]string = .["habit_shop_stats_purchases", "habit_shop_stats_spent",
|
||||
"habit_shop_stats_week", "habit_shop_stats_month"]
|
||||
return Locale(keys[index])
|
||||
}
|
||||
|
||||
StatisticsValue :: (index: s32) -> string {
|
||||
values: [4]s64 = .[shop.statistics.purchase_count, shop.statistics.spent_coins,
|
||||
shop.statistics.week_count, shop.statistics.month_count]
|
||||
return Number(values[index])
|
||||
}
|
||||
|
||||
StatisticsColumns :: (width: s32) -> s32 {
|
||||
return ifx width >= Scale(280) then 2 else 1
|
||||
}
|
||||
|
||||
StatisticsInnerWidth :: (width: s32) -> s32 {
|
||||
return (width - Scale(8) * (StatisticsColumns(width) - 1)) /
|
||||
StatisticsColumns(width) - Scale(32)
|
||||
}
|
||||
|
||||
StatisticsNumberHeight :: (width: s32) -> s32 {
|
||||
height := Scale(30)
|
||||
for index: cast(s32)0..3 {
|
||||
value_h := TextHeight(shop.session, Text.Props.{.text = StatisticsValue(index),
|
||||
.size = shop.font + Scale(6),
|
||||
.bounds = Bounds(0, 0, StatisticsInnerWidth(width), 0),
|
||||
.wrap = cast(Text.Wrap)TextWrapAnywhere})
|
||||
if value_h > height {
|
||||
height = value_h
|
||||
}
|
||||
}
|
||||
return height
|
||||
}
|
||||
|
||||
StatisticsCardHeight :: (width: s32) -> s32 {
|
||||
inner := StatisticsInnerWidth(width)
|
||||
height: s32 = 0
|
||||
for index: cast(s32)0..3 {
|
||||
label_h := ParagraphHeight(StatisticsLabel(index), inner, shop.small_font)
|
||||
if label_h > height {
|
||||
height = label_h
|
||||
}
|
||||
}
|
||||
return height + StatisticsNumberHeight(width) + Scale(34)
|
||||
}
|
||||
|
||||
StatisticsHeight :: (width: s32) -> s32 {
|
||||
title_h := SectionTitleHeight(Locale("habit_shop_stats_title"), width) + Scale(10)
|
||||
if shop.statistics.purchase_count == 0 {
|
||||
return title_h + ParagraphHeight(Locale("habit_shop_stats_empty"), width,
|
||||
shop.small_font)
|
||||
}
|
||||
rows := 4 / StatisticsColumns(width)
|
||||
last := Filled(Locale("habit_shop_stats_last"), PurchaseDate(shop.statistics.last_date))
|
||||
return title_h + rows * StatisticsCardHeight(width) + rows * Scale(8) +
|
||||
ParagraphHeight(last, width, shop.small_font)
|
||||
}
|
||||
|
||||
Statistics :: (x: s32, y: s32, width: s32) {
|
||||
y += SectionTitle(Locale("habit_shop_stats_title"), x, y, width) + Scale(10)
|
||||
if shop.statistics.purchase_count == 0 {
|
||||
text := Locale("habit_shop_stats_empty")
|
||||
Text.Draw(shop.session, Text.Props.{.bounds = Bounds(x, y, width,
|
||||
ParagraphHeight(text, width, shop.small_font)), .text = text,
|
||||
.size = shop.small_font, .class_name = shop.muted_class,
|
||||
.wrap = cast(Text.Wrap)TextWrapAuto})
|
||||
return
|
||||
}
|
||||
columns := StatisticsColumns(width)
|
||||
card_w := (width - Scale(8) * (columns - 1)) / columns
|
||||
card_h := StatisticsCardHeight(width)
|
||||
number_h := StatisticsNumberHeight(width)
|
||||
for index: cast(s32)0..3 {
|
||||
card_x := x + (index % columns) * (card_w + Scale(8))
|
||||
card_y := y + (index / columns) * (card_h + Scale(8))
|
||||
Card(Bounds(card_x, card_y, card_w, card_h), "")
|
||||
Box.Draw(shop.session, Box.Props.{.bounds = Bounds(card_x, card_y + Scale(12),
|
||||
Scale(4), card_h - Scale(24)), .fill = StatisticsColor(index)})
|
||||
value := StatisticsValue(index)
|
||||
strong: [1]Text.Range
|
||||
strong[0] = Text.Range.{.start = 0, .end = cast(s32)value.count}
|
||||
Text.Draw(shop.session, Text.Props.{.bounds = Bounds(card_x + Scale(16),
|
||||
card_y + Scale(12), card_w - Scale(32), number_h),
|
||||
.text = value, .size = shop.font + Scale(6), .strong = strong[:],
|
||||
.wrap = cast(Text.Wrap)TextWrapAnywhere})
|
||||
Text.Draw(shop.session, Text.Props.{.bounds = Bounds(card_x + Scale(16),
|
||||
card_y + number_h + Scale(18), card_w - Scale(32), card_h - number_h - Scale(30)),
|
||||
.text = StatisticsLabel(index), .size = shop.small_font,
|
||||
.class_name = shop.muted_class, .wrap = cast(Text.Wrap)TextWrapAuto})
|
||||
}
|
||||
last := Filled(Locale("habit_shop_stats_last"), PurchaseDate(shop.statistics.last_date))
|
||||
last_y := y + (4 / columns) * (card_h + Scale(8))
|
||||
Text.Draw(shop.session, Text.Props.{.bounds = Bounds(x, last_y, width,
|
||||
ParagraphHeight(last, width, shop.small_font)), .text = last,
|
||||
.size = shop.small_font, .class_name = shop.muted_class,
|
||||
.wrap = cast(Text.Wrap)TextWrapAuto})
|
||||
}
|
||||
|
||||
StatisticsRewardHeight :: (index: s32, width: s32) -> s32 {
|
||||
reward := ReadHabitRewardHost(index)
|
||||
return ParagraphHeight(reward.name, width - Scale(32), shop.font) +
|
||||
RewardStatisticsHeight(reward, width) + Scale(32)
|
||||
}
|
||||
|
||||
StatisticsReward :: (index: s32, x: s32, y: s32, width: s32) -> s32 {
|
||||
reward := ReadHabitRewardHost(index)
|
||||
height := StatisticsRewardHeight(index, width)
|
||||
Card(Bounds(x, y, width, height), "")
|
||||
pad := Scale(16)
|
||||
inner := width - pad * 2
|
||||
name_h := ParagraphHeight(reward.name, inner, shop.font)
|
||||
Text.Draw(shop.session, Text.Props.{.bounds = Bounds(x + pad, y + pad, inner, name_h),
|
||||
.text = reward.name, .wrap = cast(Text.Wrap)TextWrapAuto})
|
||||
text := RewardStatisticsText(reward)
|
||||
text_h := ParagraphHeight(text, inner, shop.small_font)
|
||||
line_y := y + pad + name_h + Scale(8)
|
||||
Text.Draw(shop.session, Text.Props.{.bounds = Bounds(x + pad, line_y, inner, text_h),
|
||||
.text = text, .size = shop.small_font, .wrap = cast(Text.Wrap)TextWrapAuto})
|
||||
if reward.statistics.purchase_count > 0 {
|
||||
last := Filled(Locale("habit_shop_stats_last"),
|
||||
PurchaseDate(reward.statistics.last_date))
|
||||
Text.Draw(shop.session, Text.Props.{.bounds = Bounds(x + pad,
|
||||
line_y + text_h + Scale(4), inner,
|
||||
ParagraphHeight(last, inner, shop.small_font)),
|
||||
.text = last, .size = shop.small_font,
|
||||
.class_name = shop.muted_class, .wrap = cast(Text.Wrap)TextWrapAuto})
|
||||
}
|
||||
return height
|
||||
}
|
||||
|
||||
ShopStatisticsPage :: () {
|
||||
bounds := shop.bounds
|
||||
width := cast(s32)bounds.width
|
||||
x := cast(s32)bounds.x
|
||||
if width > Scale(SHOP_COLUMN_MAX) {
|
||||
x += (width - Scale(SHOP_COLUMN_MAX)) / 2
|
||||
width = Scale(SHOP_COLUMN_MAX)
|
||||
}
|
||||
top := PageHeader(x, cast(s32)bounds.y, width,
|
||||
Locale("habit_shop_stats_title"), "")
|
||||
if top < 0 {
|
||||
shop.action = HABITS_SHOP_STATS_BACK
|
||||
return
|
||||
}
|
||||
content_width := width - Scale(SHOP_SCROLLBAR_ROOM)
|
||||
gap := Scale(SHOP_GAP)
|
||||
content_h := StatisticsHeight(content_width) + gap
|
||||
for index: cast(s32)0..shop.reward_count - 1 {
|
||||
content_h += StatisticsRewardHeight(index, content_width) + gap
|
||||
}
|
||||
scrolled := Scroll.Draw(shop.session, Scroll.Props.{
|
||||
.key = Layout.KeyHash("inbe/habits/shop/statistics"),
|
||||
.bounds = Bounds(x, top, width,
|
||||
cast(s32)(bounds.y + bounds.height) - top),
|
||||
.content_height = content_h, .scroll_offset = shop.scroll})
|
||||
shop.scroll = scrolled.scroll_offset
|
||||
if !scrolled.opened {
|
||||
return
|
||||
}
|
||||
y := cast(s32)scrolled.content.y
|
||||
Statistics(x, y, content_width)
|
||||
y += StatisticsHeight(content_width) + gap
|
||||
for index: cast(s32)0..shop.reward_count - 1 {
|
||||
y += StatisticsReward(index, x, y, content_width) + gap
|
||||
}
|
||||
unused End(shop.session)
|
||||
}
|
||||
|
||||
HabitsShopStatisticsView :: (message: HabitsMessage) -> HabitsMessage {
|
||||
shop = ReadHabitsShopHost()
|
||||
shop.action = HABITS_SHOP_NONE
|
||||
shop.clipboard_write = false
|
||||
ShopStatisticsPage()
|
||||
WriteHabitsShopHost(shop)
|
||||
message.succeeded = true
|
||||
return message
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,81 +0,0 @@
|
||||
// The habit table has a name column and then up to seven day columns. The
|
||||
// days share the width the name column leaves, within their limits, and the
|
||||
// name column takes the rest.
|
||||
HabitTableDayWidth :: (width: s32, name_min: s32, day_min: s32,
|
||||
day_max: s32) -> s32 {
|
||||
day := (width - name_min) / 7
|
||||
if day > day_max {
|
||||
day = day_max
|
||||
}
|
||||
if day < day_min {
|
||||
day = day_min
|
||||
}
|
||||
return day
|
||||
}
|
||||
|
||||
// Rows keep their order; only the rows below an open row move down by its
|
||||
// details.
|
||||
HabitRowOffset :: (position: s32, open: s32, row_height: s32,
|
||||
detail_height: s32) -> s32 {
|
||||
offset := position * row_height
|
||||
if open >= 0 && position > open {
|
||||
offset += detail_height
|
||||
}
|
||||
return offset
|
||||
}
|
||||
|
||||
// The table's columns for its inner width.
|
||||
HabitTableLayout :: struct {
|
||||
// The column before the days: an icon and a name, or the icon alone.
|
||||
name_width: s32
|
||||
day_width: s32
|
||||
// Today and the days before it that fit, at most seven.
|
||||
days: s32
|
||||
names: bool
|
||||
}
|
||||
|
||||
// Four days are the smallest useful week: names stay visible while they fit,
|
||||
// then give way to icons. Below that, the four days shrink only when the table
|
||||
// itself is too narrow to hold their readable minimum.
|
||||
HabitTableLayoutFor :: (width: s32, name_preferred: s32, name_min: s32,
|
||||
icon_column: s32, day_min: s32, day_max: s32) -> HabitTableLayout {
|
||||
layout: HabitTableLayout
|
||||
layout.names = true
|
||||
|
||||
days: s32 = 7
|
||||
while days > 4 && width - name_preferred < days * day_min {
|
||||
days -= 1
|
||||
}
|
||||
layout.days = days
|
||||
layout.day_width = (width - name_preferred) / days
|
||||
if layout.day_width > day_max {
|
||||
layout.day_width = day_max
|
||||
}
|
||||
if layout.day_width < day_min && width >= day_min * 4 {
|
||||
layout.day_width = day_min
|
||||
}
|
||||
layout.name_width = width - layout.day_width * days
|
||||
if layout.name_width >= name_min {
|
||||
return layout
|
||||
}
|
||||
|
||||
layout.names = false
|
||||
space := width - icon_column
|
||||
days = space / day_min
|
||||
if days > 7 {
|
||||
days = 7
|
||||
}
|
||||
if days < 4 {
|
||||
days = 4
|
||||
}
|
||||
layout.days = days
|
||||
layout.day_width = space / days
|
||||
if layout.day_width > day_max {
|
||||
layout.day_width = day_max
|
||||
}
|
||||
if layout.day_width < 1 {
|
||||
layout.day_width = 1
|
||||
}
|
||||
layout.name_width = width - layout.day_width * days
|
||||
return layout
|
||||
}
|
||||
@@ -1,278 +0,0 @@
|
||||
# Changelog
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
- Backspace and text corrections work again. Restore backups and add photos reliably.
|
||||
- Read Tao Te Ching art on its own page. Find Photos and Radio in Apps, with clearer feedback and appearance controls.
|
||||
- Desktop controls respond, translations keep clean line breaks, and account sync is called Mesh.
|
||||
- Start the Chromium extension when opened and reuse tabs for repeated opens of the same page.
|
||||
- Free the Chromium extension's WebAssembly memory when an idle Practices or Habits tab loses focus, and load it again on return.
|
||||
|
||||
- Use one modern appearance and a simpler About list with Core and app versions.
|
||||
|
||||
## [2.1.64] - 2026-11-05
|
||||
|
||||
- Bring Lumi 1.5.29, Habits 1.3.17, Practices 1.6.11, Lists 1.1.30, Diary 1.3.27 and Leaderboard 1.0.31 for Inner Breeze 2.1.63.
|
||||
|
||||
## [2.1.63] - 2026-11-02
|
||||
|
||||
- Bring Lumi 1.5.28, Habits 1.3.16, Practices 1.6.10, Lists 1.1.29, Diary 1.3.26 and Leaderboard 1.0.30 for Inner Breeze 2.1.62.
|
||||
|
||||
## [2.1.62] - 2026-10-29
|
||||
|
||||
- Bring Lumi 1.5.27, Habits 1.3.15, Practices 1.6.9, Lists 1.1.28, Diary 1.3.25 and Leaderboard 1.0.29 for Inner Breeze 2.1.61.
|
||||
|
||||
## [2.1.61] - 2026-10-29
|
||||
|
||||
- Bring Lumi 1.5.26, Habits 1.3.14, Practices 1.6.8, Lists 1.1.27, Diary 1.3.24 and Leaderboard 1.0.28 for Inner Breeze 2.1.60.
|
||||
|
||||
## [2.1.60] - 2026-10-28
|
||||
|
||||
- Bring Lumi 1.5.25, Habits 1.3.13, Practices 1.6.7, Lists 1.1.26, Diary 1.3.23 and Leaderboard 1.0.27 for Inner Breeze 2.1.59.
|
||||
|
||||
## [2.1.59] - 2026-10-28
|
||||
|
||||
- Bring Lumi 1.5.24, Habits 1.3.12, Practices 1.6.6, Lists 1.1.25, Diary 1.3.22 and Leaderboard 1.0.26 for Inner Breeze 2.1.58.
|
||||
|
||||
## [2.1.58] - 2026-10-28
|
||||
|
||||
- Bring Diary’s separate day gallery and attachment toolbar.
|
||||
|
||||
## [2.1.57] - 2026-10-28
|
||||
|
||||
- Bring Lumi 1.5.23, Habits 1.3.11, Practices 1.6.5, Lists 1.1.24, Diary 1.3.20 and Leaderboard 1.0.25 for Inner Breeze 2.1.56.
|
||||
|
||||
## [2.1.56] - 2026-10-28
|
||||
|
||||
- Keep Apps guide translations available to older installed wrappers after automatic package updates.
|
||||
|
||||
## [2.1.55] - 2026-10-27
|
||||
|
||||
- Bring Lumi 1.5.22, Habits 1.3.10, Practices 1.6.4, Lists 1.1.23, Diary 1.3.19 and Leaderboard 1.0.24 for Inner Breeze 2.1.55.
|
||||
|
||||
## [2.1.54] - 2026-10-27
|
||||
|
||||
- Bring Lumi 1.5.21, Habits 1.3.9, Practices 1.6.3, Lists 1.1.22, Diary 1.3.18 and Leaderboard 1.0.23 for Inner Breeze 2.1.54.
|
||||
|
||||
## [2.1.53] - 2026-10-27
|
||||
|
||||
- Bring Lumi 1.5.20, Habits 1.3.8, Practices 1.6.2, Lists 1.1.21, Diary 1.3.17 and Leaderboard 1.0.22 for Inner Breeze 2.1.53.
|
||||
|
||||
## [2.1.52] - 2026-10-27
|
||||
|
||||
- Bring Lumi 1.5.19, Habits 1.3.7, Practices 1.6.1, Lists 1.1.20, Diary 1.3.16 and Leaderboard 1.0.21 for Inner Breeze 2.1.52.
|
||||
|
||||
## [2.1.51] - 2026-10-26
|
||||
|
||||
- Bring Lumi 1.5.18, Habits 1.3.6, Practices 1.6.0, Lists 1.1.19, Diary 1.3.15 and Leaderboard 1.0.20 for Inner Breeze 2.1.51.
|
||||
|
||||
## [2.1.50] - 2026-10-26
|
||||
|
||||
- Bring Lumi 1.5.17, Habits 1.3.4, Practices 1.5.4, Lists 1.1.18, Diary 1.3.14 and Leaderboard 1.0.19 for Inner Breeze 2.1.50.
|
||||
|
||||
## [2.1.49] - 2026-10-25
|
||||
|
||||
- Bring Lumi 1.5.16, Habits 1.3.3, Practices 1.5.3, Lists 1.1.17, Diary 1.3.13 and Leaderboard 1.0.18 for Inner Breeze 2.1.49.
|
||||
|
||||
## [2.1.48] - 2026-10-25
|
||||
|
||||
- Bring Lumi 1.5.15, Habits 1.3.2, Practices 1.5.2, Lists 1.1.16, Diary 1.3.12 and Leaderboard 1.0.17 for Inner Breeze 2.1.48.
|
||||
|
||||
## [2.1.47] - 2026-10-25
|
||||
|
||||
- Bring Lumi 1.5.14, Habits 1.3.1, Practices 1.5.1, Lists 1.1.15, Diary 1.3.11 and Leaderboard 1.0.16 for Inner Breeze 2.1.47.
|
||||
|
||||
## [2.1.46] - 2026-10-24
|
||||
|
||||
- Bring Lumi 1.5.13, Habits 1.2.11, Practices 1.3.11, Lists 1.1.14, Diary 1.3.10 and Leaderboard 1.0.15 for Inner Breeze 2.1.46.
|
||||
|
||||
## [2.1.45] - 2026-10-23
|
||||
|
||||
- Bring Lumi 1.5.11, Habits 1.2.10, Practices 1.3.10, Lists 1.1.13, Diary 1.3.9 and Leaderboard 1.0.14 for Inner Breeze 2.1.45.
|
||||
|
||||
## [2.1.44] - 2026-10-23
|
||||
|
||||
- Bring Lumi 1.5.10, Habits 1.2.9, Practices 1.3.9, Lists 1.1.12, Diary 1.3.8 and Leaderboard 1.0.13 for Inner Breeze 2.1.44.
|
||||
|
||||
## [2.1.43] - 2026-10-23
|
||||
|
||||
- Bring Lumi 1.5.9, Habits 1.2.8, Practices 1.3.8, Lists 1.1.10, Diary 1.3.7 and Leaderboard 1.0.12 for Inner Breeze 2.1.43.
|
||||
|
||||
## [2.1.42] - 2026-10-22
|
||||
|
||||
- Bring Lumi 1.5.8, Habits 1.2.7, Practices 1.3.6, Lists 1.1.9, Diary 1.3.6 and Leaderboard 1.0.11 for Inner Breeze 2.1.42.
|
||||
|
||||
## [2.1.41] - 2026-10-22
|
||||
|
||||
- Bring Lumi 1.5.7, Habits 1.2.6, Practices 1.3.5, Lists 1.1.8, Diary 1.3.5 and Leaderboard 1.0.10 for Inner Breeze 2.1.41.
|
||||
|
||||
## [2.1.40] - 2026-10-22
|
||||
|
||||
- Bring Lumi 1.5.6, Habits 1.2.5, Practices 1.3.4, Lists 1.1.7, Diary 1.3.4 and Leaderboard 1.0.9 for Inner Breeze 2.1.40.
|
||||
|
||||
## [2.1.39] - 2026-10-22
|
||||
|
||||
- Bring Lumi 1.5.5, Habits 1.2.4, Practices 1.3.3, Lists 1.1.6, Diary 1.3.3 and Leaderboard 1.0.8 for Inner Breeze 2.1.39.
|
||||
|
||||
## [2.1.38] - 2026-10-21
|
||||
|
||||
- Show activity once, with a single Profile interface and distinct achievement icons.
|
||||
- Bring Lumi 1.5.4, Habits 1.2.3, Practices 1.3.2, Lists 1.1.5, Diary 1.3.2 and Leaderboard 1.0.7 for Inner Breeze 2.1.38.
|
||||
|
||||
## [2.1.37] - 2026-10-20
|
||||
|
||||
- Bring Lumi 1.5.3, Habits 1.2.1, Practices 1.3.1, Lists 1.1.3, Diary 1.3.1 and Leaderboard 1.0.6 for Inner Breeze 2.1.37.
|
||||
|
||||
## [2.1.36] - 2026-10-18
|
||||
|
||||
- Bring Practices 1.3.0, with a separate Astral Projection download, for Inner Breeze 2.1.36.
|
||||
|
||||
## [2.1.35] - 2026-10-18
|
||||
|
||||
- Bring Lumi 1.5.2, Habits 1.1.2, Practices 1.2.2, Lists 1.1.2, Diary 1.3.0 and Leaderboard 1.0.5 for Inner Breeze 2.1.36.
|
||||
|
||||
## [2.1.34] - 2026-10-17
|
||||
|
||||
- Bring Diary 1.2.0, with Markdown entries and photos inside them, and Habits 1.1.0, with its count dialog, for Inner Breeze 2.1.35.
|
||||
- Requires Inner Breeze 2.1.35 or later.
|
||||
|
||||
## [2.1.33] - 2026-10-17
|
||||
|
||||
- Bring Lumi 1.5.1, Habits 1.0.7, Practices 1.2.1, Lists 1.1.1, Diary 1.1.12 and Leaderboard 1.0.4 for Inner Breeze 2.1.35.
|
||||
|
||||
## [2.1.32] - 2026-10-15
|
||||
|
||||
- Bring Practices 1.2.0 with separate practice and language downloads.
|
||||
- Requires Inner Breeze 2.1.34 or later.
|
||||
|
||||
## [2.1.31] - 2026-10-15
|
||||
|
||||
- Bring Lists 1.1.0 with friend invitations and shared task editing.
|
||||
- Requires Inner Breeze 2.1.34 or later.
|
||||
|
||||
|
||||
## [2.1.30] - 2026-10-13
|
||||
|
||||
- Bring Lumi 1.4.0, Habits 1.0.5, Practices 1.1.5, Lists 1.0.6, Diary 1.1.10 and Leaderboard 1.0.2.
|
||||
- Requires Inner Breeze 2.1.33 or later.
|
||||
|
||||
## [2.1.29] - 2026-10-11
|
||||
|
||||
- Bring Lumi 1.3.9, Diary 1.1.9, Lists 1.0.5 and Leaderboard 1.0.1.
|
||||
- Requires Inner Breeze 2.1.29 or later.
|
||||
|
||||
## [2.1.28] - 2026-10-11
|
||||
|
||||
- Bring Lumi's message selection with copy and delete.
|
||||
- Requires Inner Breeze 2.1.29 or later.
|
||||
|
||||
## [2.1.27] - 2026-10-11
|
||||
|
||||
- Bring Lumi's chat that loads older messages as you scroll up.
|
||||
- Requires Inner Breeze 2.1.29 or later.
|
||||
|
||||
## [2.1.26] - 2026-10-10
|
||||
|
||||
- Bring Diary's title bar, undo and redo, and spelling correction, and Lumi's typing dots.
|
||||
- Requires Inner Breeze 2.1.29 or later.
|
||||
|
||||
## [2.1.25] - 2026-10-10
|
||||
|
||||
- Open Leaderboard as its own app.
|
||||
- Requires Inner Breeze 2.1.28 or later.
|
||||
|
||||
## [2.1.24] - 2026-10-10
|
||||
|
||||
- Remove the text of practice window buttons that are no longer shown.
|
||||
|
||||
## [2.1.23] - 2026-10-10
|
||||
|
||||
- Translate the descriptions in Lumi's command list.
|
||||
|
||||
## [2.1.22] - 2026-10-10
|
||||
|
||||
- Say which app, device and system details Lumi feedback includes before you send it.
|
||||
|
||||
## [2.1.21] - 2026-10-10
|
||||
|
||||
- Explain when approved Lumi feedback is still waiting to send and when the developer inbox has received it.
|
||||
|
||||
## [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.1.18] - 2026-10-08
|
||||
|
||||
- Keep Diary in the same account as Habits, including existing entries and photos.
|
||||
- Limit Diary to today and earlier dates and open a blank editor without a writing prompt.
|
||||
|
||||
## [2.1.17] - 2026-10-07
|
||||
|
||||
- Find every app in a searchable library and keep up to two favorites in the compact dock.
|
||||
- Preserve saved app data when changing favorites and keep Profile and Settings close by.
|
||||
|
||||
## [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.1.11] - 2026-10-07
|
||||
|
||||
- Connect Lumi to online conversation and app actions without blocking the interface.
|
||||
- Deliver saved app feedback and show developer replies in chat.
|
||||
|
||||
## [2.1.10] - 2026-10-06
|
||||
|
||||
- Preserve the selected page during upgrades and add hidden apps instantly offline.
|
||||
- Keep the interface responsive when an app cannot reset its view.
|
||||
- Open Lumi smoothly and distinguish Lists from Diary with a checkmark icon.
|
||||
|
||||
|
||||
## [2.1.8] - 2026-10-06
|
||||
|
||||
- Call sidebar choices Apps in setup and settings, with shorter instructions.
|
||||
|
||||
## [2.1.7] - 2026-10-06
|
||||
|
||||
- Show Lumi alongside every other app in one compact, reorderable list.
|
||||
- Include all apps for instant sidebar additions without a download.
|
||||
|
||||
## [2.1.6] - 2026-10-06
|
||||
|
||||
- Show a clearer firefly icon for Lumi and keep the bundled companion available when her shortcut is hidden.
|
||||
- Keep every selected startup app in the sidebar and preserve cached packages for quick reinstallation.
|
||||
- Provide app tools for changing themes, appearance and settings directly.
|
||||
|
||||
## [2.1.5] - 2026-10-06
|
||||
|
||||
- Use a standard app icon for Lumi and include translations for her habit and practice commands.
|
||||
|
||||
## [2.1.4] - 2026-10-06
|
||||
|
||||
- Recommend Lumi first in the app picker and open her chat as the default home.
|
||||
- Keep the firefly helper available offline alongside Habits and Practices.
|
||||
- Include every character used by the current translations in the shared fonts.
|
||||
|
||||
## [2.1.3] - 2026-10-06
|
||||
|
||||
- Use Apps consistently in the app picker and its independently delivered package.
|
||||
|
||||
## [2.1.2] - 2026-10-06
|
||||
|
||||
- Keep all app choices, the automatic update switch and the manual update button visible at normal desktop sizes.
|
||||
|
||||
## [2.1.1] - 2026-10-06
|
||||
|
||||
- The app picker and its update controls now travel with the app package, together with shared fonts, translations, styles and icons.
|
||||
|
||||
## [2.1.0] - 2026-10-06
|
||||
|
||||
- First independently versioned Inner Breeze module.
|
||||
@@ -1,22 +0,0 @@
|
||||
{
|
||||
"achievement_self_active_1_title": "Osobní profil · 1 dnů",
|
||||
"achievement_self_active_1_description": "Vykonejte tuto aktivitu v 1 různých dnech: smysluplná uložená aktivita.",
|
||||
"achievement_self_active_3_title": "Osobní profil · 3 dnů",
|
||||
"achievement_self_active_3_description": "Vykonejte tuto aktivitu v 3 různých dnech: smysluplná uložená aktivita.",
|
||||
"achievement_self_active_7_title": "Osobní profil · 7 dnů",
|
||||
"achievement_self_active_7_description": "Vykonejte tuto aktivitu v 7 různých dnech: smysluplná uložená aktivita.",
|
||||
"achievement_self_active_14_title": "Osobní profil · 14 dnů",
|
||||
"achievement_self_active_14_description": "Vykonejte tuto aktivitu v 14 různých dnech: smysluplná uložená aktivita.",
|
||||
"achievement_self_active_30_title": "Osobní profil · 30 dnů",
|
||||
"achievement_self_active_30_description": "Vykonejte tuto aktivitu v 30 různých dnech: smysluplná uložená aktivita.",
|
||||
"achievement_self_active_60_title": "Osobní profil · 60 dnů",
|
||||
"achievement_self_active_60_description": "Vykonejte tuto aktivitu v 60 různých dnech: smysluplná uložená aktivita.",
|
||||
"achievement_self_active_100_title": "Osobní profil · 100 dnů",
|
||||
"achievement_self_active_100_description": "Vykonejte tuto aktivitu v 100 různých dnech: smysluplná uložená aktivita.",
|
||||
"achievement_self_active_180_title": "Osobní profil · 180 dnů",
|
||||
"achievement_self_active_180_description": "Vykonejte tuto aktivitu v 180 různých dnech: smysluplná uložená aktivita.",
|
||||
"achievement_self_active_365_title": "Osobní profil · 365 dnů",
|
||||
"achievement_self_active_365_description": "Vykonejte tuto aktivitu v 365 různých dnech: smysluplná uložená aktivita.",
|
||||
"achievement_self_return_14_title": "Osobní profil · 14 dnů přestávky",
|
||||
"achievement_self_return_14_description": "Vraťte se po alespoň 14 celých dnech bez této aktivity: smysluplná uložená aktivita."
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
{
|
||||
"achievement_self_active_1_title": "Persönliches Profil · 1 Tage",
|
||||
"achievement_self_active_1_description": "Führe dies an 1 unterschiedlichen Tagen aus: eine sinnvolle gespeicherte Aktivität.",
|
||||
"achievement_self_active_3_title": "Persönliches Profil · 3 Tage",
|
||||
"achievement_self_active_3_description": "Führe dies an 3 unterschiedlichen Tagen aus: eine sinnvolle gespeicherte Aktivität.",
|
||||
"achievement_self_active_7_title": "Persönliches Profil · 7 Tage",
|
||||
"achievement_self_active_7_description": "Führe dies an 7 unterschiedlichen Tagen aus: eine sinnvolle gespeicherte Aktivität.",
|
||||
"achievement_self_active_14_title": "Persönliches Profil · 14 Tage",
|
||||
"achievement_self_active_14_description": "Führe dies an 14 unterschiedlichen Tagen aus: eine sinnvolle gespeicherte Aktivität.",
|
||||
"achievement_self_active_30_title": "Persönliches Profil · 30 Tage",
|
||||
"achievement_self_active_30_description": "Führe dies an 30 unterschiedlichen Tagen aus: eine sinnvolle gespeicherte Aktivität.",
|
||||
"achievement_self_active_60_title": "Persönliches Profil · 60 Tage",
|
||||
"achievement_self_active_60_description": "Führe dies an 60 unterschiedlichen Tagen aus: eine sinnvolle gespeicherte Aktivität.",
|
||||
"achievement_self_active_100_title": "Persönliches Profil · 100 Tage",
|
||||
"achievement_self_active_100_description": "Führe dies an 100 unterschiedlichen Tagen aus: eine sinnvolle gespeicherte Aktivität.",
|
||||
"achievement_self_active_180_title": "Persönliches Profil · 180 Tage",
|
||||
"achievement_self_active_180_description": "Führe dies an 180 unterschiedlichen Tagen aus: eine sinnvolle gespeicherte Aktivität.",
|
||||
"achievement_self_active_365_title": "Persönliches Profil · 365 Tage",
|
||||
"achievement_self_active_365_description": "Führe dies an 365 unterschiedlichen Tagen aus: eine sinnvolle gespeicherte Aktivität.",
|
||||
"achievement_self_return_14_title": "Persönliches Profil · 14 Tage Pause",
|
||||
"achievement_self_return_14_description": "Kehre nach mindestens 14 ganzen Tagen ohne diese Aktivität zurück: eine sinnvolle gespeicherte Aktivität."
|
||||
}
|
||||
Loaded 100 of 2628 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user