diff --git a/CHANGELOG.md b/CHANGELOG.md index bf0b97a7f..d6dae1bb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ - Lightfield buttons and glow settings now update with the selected style, and glow is scoped to styles that support it. - Material sliders keep labels and values readable instead of floating too high or drawing white text on pale slider fills. - Android masked app icons use a gentle blue background instead of black. +- Web loading screens and browser icons now show the current meditation logo. - Emptying a list no longer restores the initial sample data. - Improved text selection, keyboard focus, and composition handling when editing text. - Connecting to sync runs in the background so network requests do not block the interface. diff --git a/Makefile b/Makefile index ca8c79fa6..90a5ddb38 100644 --- a/Makefile +++ b/Makefile @@ -513,6 +513,7 @@ endif KRYON_WINDOWS_SRCS += $(KRYON_RAYLIB_WRAPPERS_C) KRYON_CLICK_SRCS += $(KRYON_RAYLIB_WRAPPERS_C) 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 := WEB_JS_TARGET := $(WEB_DIST_DIR)/index.js @@ -1563,7 +1564,7 @@ $(WEB_TARGET): src/web_shell.html $(WEB_BOOT_JS) $(WEB_JS_TARGET) vendor/kryon/w rm -rf $(WEB_DIST_DIR)/web-assets/dl rm -f $(WEB_DIST_DIR)/web-assets/canvas_index.html cp -R site-icons $(WEB_DIST_DIR)/ - cp manifest.json $(WEB_DIST_DIR)/webmanifest.json + perl -0pe 's/WEB_CACHE_BUSTER/$(WEB_CACHE_BUSTER)/g' manifest.json > $(WEB_DIST_DIR)/webmanifest.json web-canvas: web @@ -1598,7 +1599,7 @@ $(WEB_CANVAS_TARGET): Makefile $(WEB_SRC) $(KRYON_CANVAS_SRCS) $(SQLITE_SRC) $(S rm -rf $(WEB_CANVAS_DIR)/web-assets/dl rm -f $(WEB_CANVAS_DIR)/web-assets/canvas_index.html cp -R site-icons $(WEB_CANVAS_DIR)/ - cp manifest.json $(WEB_CANVAS_DIR)/webmanifest.json + perl -0pe 's/WEB_CACHE_BUSTER/$(WEB_CACHE_BUSTER)/g' manifest.json > $(WEB_CANVAS_DIR)/webmanifest.json android-copy-assets: $(MAKE) $(FONT_FILES) diff --git a/fastlane/metadata/android/en-US/changelogs/124.txt b/fastlane/metadata/android/en-US/changelogs/124.txt index 6753d6bff..2d8fcaefa 100644 --- a/fastlane/metadata/android/en-US/changelogs/124.txt +++ b/fastlane/metadata/android/en-US/changelogs/124.txt @@ -30,6 +30,7 @@ Fixed - Lightfield buttons and glow settings now update with the selected style, and glow is scoped to styles that support it. - Material sliders keep labels and values readable instead of floating too high or drawing white text on pale slider fills. - Android masked app icons use a gentle blue background instead of black. +- Web loading screens and browser icons now show the current meditation logo. - Emptying a list no longer restores the initial sample data. - Improved text selection, keyboard focus, and composition handling when editing text. - Connecting to sync runs in the background so network requests do not block the interface. diff --git a/manifest.json b/manifest.json index 6e98cab80..1bb505615 100644 --- a/manifest.json +++ b/manifest.json @@ -3,27 +3,27 @@ "short_name": "Inbe", "start_url": "/", "display": "fullscreen", - "background_color": "#1a1a2e", - "theme_color": "#779999", + "background_color": "#e6f1fa", + "theme_color": "#e6f1fa", "icons": [ { - "src": "/site-icons/icon-192x192.png", + "src": "/site-icons/icon-192x192.png?v=WEB_CACHE_BUSTER", "sizes": "192x192", "type": "image/png" }, { - "src": "/site-icons/icon-512x512.png", + "src": "/site-icons/icon-512x512.png?v=WEB_CACHE_BUSTER", "sizes": "512x512", "type": "image/png" }, { - "src": "/site-icons/maskable-192x192.png", + "src": "/site-icons/maskable-192x192.png?v=WEB_CACHE_BUSTER", "sizes": "192x192", "type": "image/png", "purpose": "maskable" }, { - "src": "/site-icons/maskable-512x512.png", + "src": "/site-icons/maskable-512x512.png?v=WEB_CACHE_BUSTER", "sizes": "512x512", "type": "image/png", "purpose": "maskable" diff --git a/site/index.html b/site/index.html index 2c841166d..15b266db1 100644 --- a/site/index.html +++ b/site/index.html @@ -7,9 +7,10 @@ - - - + + + + diff --git a/site/static/legacy-converter.html b/site/static/legacy-converter.html index 931372559..7541561f5 100644 --- a/site/static/legacy-converter.html +++ b/site/static/legacy-converter.html @@ -11,8 +11,9 @@ - - + + + diff --git a/site/static/manifest.json b/site/static/manifest.json index bae7f7994..87f11312d 100644 --- a/site/static/manifest.json +++ b/site/static/manifest.json @@ -5,16 +5,16 @@ "start_url": "/build/web/index.html", "scope": "/", "display": "standalone", - "background_color": "#1a1a2e", - "theme_color": "#5566aa", + "background_color": "#e6f1fa", + "theme_color": "#e6f1fa", "icons": [ { - "src": "/site-icons/icon-192x192.png", + "src": "/site-icons/icon-192x192.png?v=${asset_version}", "sizes": "192x192", "type": "image/png" }, { - "src": "/site-icons/icon-512x512.png", + "src": "/site-icons/icon-512x512.png?v=${asset_version}", "sizes": "512x512", "type": "image/png" } diff --git a/site/static/privacy.html b/site/static/privacy.html index 704feeea9..c3b2dbacb 100644 --- a/site/static/privacy.html +++ b/site/static/privacy.html @@ -7,8 +7,9 @@ - - + + + diff --git a/src/web_shell.html b/src/web_shell.html index 94811e253..d19e0b801 100644 --- a/src/web_shell.html +++ b/src/web_shell.html @@ -6,24 +6,42 @@ Inner Breeze - + - + - + - + - - - - + + + + + +
- +

Inner Breeze

Downloading...