diff --git a/Makefile b/Makefile index a3fe58e8e..01eb3a34e 100644 --- a/Makefile +++ b/Makefile @@ -370,7 +370,7 @@ LOCALE_FILES := $(wildcard locales/*.txt) # The practice media is the practices package, packaged under # assets/practices/ (scripts/practice_media.py). PRACTICE_MEDIA := build/packages/practices -IMAGE_FILES := assets/app/icon.png assets/easteregg/art.png assets/easteregg/waozi.png $(PRACTICE_MEDIA)/whm/1.png $(PRACTICE_MEDIA)/whm/2.png $(PRACTICE_MEDIA)/meditation/1.png assets/pet/egg1.png $(wildcard $(PRACTICE_MEDIA)/*/banner*.png) $(wildcard $(PRACTICE_MEDIA)/sunsalutation/characters/*/*.png) $(wildcard $(PRACTICE_MEDIA)/taichi/*.png $(PRACTICE_MEDIA)/taichi/*/*.png) $(PRACTICE_MEDIA)/taichi/course.tch +IMAGE_FILES := assets/app/icon.webp assets/easteregg/art.webp assets/easteregg/waozi.png $(PRACTICE_MEDIA)/whm/1.png $(PRACTICE_MEDIA)/whm/2.png $(PRACTICE_MEDIA)/meditation/1.png assets/pet/egg1.png $(wildcard $(PRACTICE_MEDIA)/*/banner*.png) $(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 @@ -384,8 +384,8 @@ EMBEDDED_ASSETS_C := $(BUILD_OBJ_DIR)/$(APP_NAME)_embedded_assets.c STYLE_FILES := $(wildcard $(KSS_DIR)/styles/*.kss) \ $(wildcard assets/styles/*.kss) \ $(wildcard themes/catalog_*.kss) -IMAGE_FILES += assets/app/icon-sky-cradle.png assets/app/icon-ink-and-air.png -IMAGE_FILES += $(wildcard assets/social/*.png) +IMAGE_FILES += assets/app/icon-sky-cradle.webp assets/app/icon-ink-and-air.webp +IMAGE_FILES += $(wildcard assets/social/*.png assets/social/*.webp) IMAGE_FILES += $(KRYON_DIR)/icons/ui.png $(KRYON_DIR)/icons/pfp.png APP_BUNDLES := $(addprefix $(BUILD_DIR)/apps/,lists.zx habits.zx practices.zx diary.zx lumi.zx leaderboard.zx) INBE_BUNDLE := $(BUILD_DIR)/inbe.zx @@ -397,7 +397,7 @@ APP_RESOURCES += $(wildcard apps/*/achievements.json) $(wildcard apps/*/achievem APP_RESOURCES += $(wildcard assets/*/sidebar.shape) APPS_BUNDLE ?= build/apps-ui/apps.zx -EMBEDDED_ASSET_FILES := apps/publishers.json $(INBE_BUNDLE) $(APPS_BUNDLE) assets/app/icon.png +EMBEDDED_ASSET_FILES := apps/publishers.json $(INBE_BUNDLE) $(APPS_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) diff --git a/apps/lumi/lumi_view.zi b/apps/lumi/lumi_view.zi index 661e8fb60..47e526b95 100644 --- a/apps/lumi/lumi_view.zi +++ b/apps/lumi/lumi_view.zi @@ -541,7 +541,7 @@ FeedbackQuote :: (row: LumiChatRow, index: s32, x: s32, y: s32, width: s32) { TypingDots :: (x: s32, top: s32) { left := x + Scale(48) Image(frame.session, ImageProps.{.key = cast(u64)300380, - .asset_path = "assets/lumi/mascot.png", .alt_text = "Lumi", + .asset_path = "assets/lumi/mascot.webp", .alt_text = "Lumi", .bounds = Bounds(x, top + Scale(16), Scale(40), Scale(40)), .source = Rectangle.{0.0, 0.0, -1254.0, 1254.0}, .fit = cast(ImageFit)ImageFitContain}) @@ -578,7 +578,7 @@ LumiAvatar :: (index: s32, x: s32, y: s32) { } } Image(frame.session, ImageProps.{.key = cast(u64)(300400 + index * 4), - .asset_path = "assets/lumi/mascot.png", .alt_text = "Lumi", + .asset_path = "assets/lumi/mascot.webp", .alt_text = "Lumi", .bounds = bounds, .source = Rectangle.{0.0, 0.0, -1254.0, 1254.0}, .fit = cast(ImageFit)ImageFitContain}) press := Press(frame.session, PressProps.{.key = cast(u64)(430000 + RowSlot(index) + 1), diff --git a/assets/app/icon-ink-and-air.png b/assets/app/icon-ink-and-air.png deleted file mode 100644 index 7132eba22..000000000 Binary files a/assets/app/icon-ink-and-air.png and /dev/null differ diff --git a/assets/app/icon-ink-and-air.webp b/assets/app/icon-ink-and-air.webp new file mode 100644 index 000000000..f14067c8b Binary files /dev/null and b/assets/app/icon-ink-and-air.webp differ diff --git a/assets/app/icon-sky-cradle.png b/assets/app/icon-sky-cradle.png deleted file mode 100644 index 90725611e..000000000 Binary files a/assets/app/icon-sky-cradle.png and /dev/null differ diff --git a/assets/app/icon-sky-cradle.webp b/assets/app/icon-sky-cradle.webp new file mode 100644 index 000000000..1af39659e Binary files /dev/null and b/assets/app/icon-sky-cradle.webp differ diff --git a/assets/app/icon.png b/assets/app/icon.png deleted file mode 100644 index 0f4c6d29a..000000000 Binary files a/assets/app/icon.png and /dev/null differ diff --git a/assets/app/icon.webp b/assets/app/icon.webp new file mode 100644 index 000000000..a5d0c80ac Binary files /dev/null and b/assets/app/icon.webp differ diff --git a/assets/easteregg/art.png b/assets/easteregg/art.png deleted file mode 100644 index 5acb4e37b..000000000 Binary files a/assets/easteregg/art.png and /dev/null differ diff --git a/assets/easteregg/art.webp b/assets/easteregg/art.webp new file mode 100644 index 000000000..e1e21e13c Binary files /dev/null and b/assets/easteregg/art.webp differ diff --git a/assets/habits/rewards/bubble-tea.png b/assets/habits/rewards/bubble-tea.png deleted file mode 100644 index 9b38f685e..000000000 Binary files a/assets/habits/rewards/bubble-tea.png and /dev/null differ diff --git a/assets/habits/rewards/bubble-tea.webp b/assets/habits/rewards/bubble-tea.webp new file mode 100644 index 000000000..7a536127b Binary files /dev/null and b/assets/habits/rewards/bubble-tea.webp differ diff --git a/assets/habits/rewards/candle.png b/assets/habits/rewards/candle.png deleted file mode 100644 index e0a62342e..000000000 Binary files a/assets/habits/rewards/candle.png and /dev/null differ diff --git a/assets/habits/rewards/candle.webp b/assets/habits/rewards/candle.webp new file mode 100644 index 000000000..459ee840b Binary files /dev/null and b/assets/habits/rewards/candle.webp differ diff --git a/assets/habits/rewards/chocolate.png b/assets/habits/rewards/chocolate.png deleted file mode 100644 index 74e705496..000000000 Binary files a/assets/habits/rewards/chocolate.png and /dev/null differ diff --git a/assets/habits/rewards/chocolate.webp b/assets/habits/rewards/chocolate.webp new file mode 100644 index 000000000..524757ab8 Binary files /dev/null and b/assets/habits/rewards/chocolate.webp differ diff --git a/assets/habits/rewards/coffee.png b/assets/habits/rewards/coffee.png deleted file mode 100644 index b3be6c999..000000000 Binary files a/assets/habits/rewards/coffee.png and /dev/null differ diff --git a/assets/habits/rewards/coffee.webp b/assets/habits/rewards/coffee.webp new file mode 100644 index 000000000..171e4d364 Binary files /dev/null and b/assets/habits/rewards/coffee.webp differ diff --git a/assets/habits/rewards/soda.png b/assets/habits/rewards/soda.png deleted file mode 100644 index 5e63fed0e..000000000 Binary files a/assets/habits/rewards/soda.png and /dev/null differ diff --git a/assets/habits/rewards/soda.webp b/assets/habits/rewards/soda.webp new file mode 100644 index 000000000..8ac01fbee Binary files /dev/null and b/assets/habits/rewards/soda.webp differ diff --git a/assets/lumi/guide-flight.png b/assets/lumi/guide-flight.png deleted file mode 100644 index f596465e8..000000000 Binary files a/assets/lumi/guide-flight.png and /dev/null differ diff --git a/assets/lumi/guide-flight.webp b/assets/lumi/guide-flight.webp new file mode 100644 index 000000000..f994abb0c Binary files /dev/null and b/assets/lumi/guide-flight.webp differ diff --git a/assets/lumi/mascot.png b/assets/lumi/mascot.png deleted file mode 100644 index 7bf012be3..000000000 Binary files a/assets/lumi/mascot.png and /dev/null differ diff --git a/assets/lumi/mascot.webp b/assets/lumi/mascot.webp new file mode 100644 index 000000000..a0d9ed10a Binary files /dev/null and b/assets/lumi/mascot.webp differ diff --git a/assets/social/discord.png b/assets/social/discord.png deleted file mode 100644 index bb6397891..000000000 Binary files a/assets/social/discord.png and /dev/null differ diff --git a/assets/social/discord.webp b/assets/social/discord.webp new file mode 100644 index 000000000..a25177060 Binary files /dev/null and b/assets/social/discord.webp differ diff --git a/assets/social/github-dark-on-light.png b/assets/social/github-dark-on-light.png deleted file mode 100644 index b5659d09f..000000000 Binary files a/assets/social/github-dark-on-light.png and /dev/null differ diff --git a/assets/social/github-dark-on-light.webp b/assets/social/github-dark-on-light.webp new file mode 100644 index 000000000..89cd85178 Binary files /dev/null and b/assets/social/github-dark-on-light.webp differ diff --git a/assets/social/github-light-on-dark.png b/assets/social/github-light-on-dark.png deleted file mode 100644 index ca43351d4..000000000 Binary files a/assets/social/github-light-on-dark.png and /dev/null differ diff --git a/assets/social/github-light-on-dark.webp b/assets/social/github-light-on-dark.webp new file mode 100644 index 000000000..dc4426272 Binary files /dev/null and b/assets/social/github-light-on-dark.webp differ diff --git a/assets/social/telegram.png b/assets/social/telegram.png deleted file mode 100644 index 044593fb6..000000000 Binary files a/assets/social/telegram.png and /dev/null differ diff --git a/assets/social/telegram.webp b/assets/social/telegram.webp new file mode 100644 index 000000000..0920300d1 Binary files /dev/null and b/assets/social/telegram.webp differ diff --git a/scripts/embed-app-assets.py b/scripts/embed-app-assets.py index ea56da718..afae08670 100644 --- a/scripts/embed-app-assets.py +++ b/scripts/embed-app-assets.py @@ -9,6 +9,7 @@ import json MIME_TYPES = { ".png": "image/png", + ".webp": "image/webp", ".jpg": "image/jpeg", ".jpeg": "image/jpeg", ".ogg": "audio/ogg", diff --git a/scripts/prepare-package-assets.py b/scripts/prepare-package-assets.py index f53f2e26a..6f7e61e03 100644 --- a/scripts/prepare-package-assets.py +++ b/scripts/prepare-package-assets.py @@ -34,10 +34,10 @@ for name in ('inbe', 'lists', 'habits', 'practices', 'diary', 'lumi', 'leaderboa 'practice-workout') + NODE_APPS: (OUTPUT / name / 'assets').mkdir(parents=True) patterns = ( - 'assets/mcp/*.json', 'assets/app/icon.png', 'assets/app/icon-sky-cradle.png', - 'assets/app/icon-ink-and-air.png', 'assets/easteregg/*.png', 'assets/pet/*.png', + 'assets/mcp/*.json', 'assets/app/icon.webp', 'assets/app/icon-sky-cradle.webp', + 'assets/app/icon-ink-and-air.webp', 'assets/easteregg/*.png', 'assets/easteregg/*.webp', 'assets/pet/*.png', 'assets/apps/icons/*.png', - 'assets/social/*.png', + 'assets/social/*.png', 'assets/social/*.webp', 'assets/sounds/*.ogg', 'assets/habits/**/*', 'assets/lists/**/*', 'assets/diary/**/*', 'assets/lumi/**/*', 'assets/fonts/subset/*-App-Regular.*', 'assets/styles/*.kss', diff --git a/src/app/application_update.zi b/src/app/application_update.zi index 2c827970b..076df9ed2 100644 --- a/src/app/application_update.zi +++ b/src/app/application_update.zi @@ -99,7 +99,7 @@ app_draw_blank_home_easteregg :: (app: *InnerBreeze) { available_h = view_height } Image(CurrentApp().ui.session, ImageProps.{ - .asset_path = "assets/easteregg/art.png", + .asset_path = "assets/easteregg/art.webp", .bounds = Rectangle.{0, 0, cast(float32)view_width, cast(float32)available_h}, .fit = cast(ImageFit)ImageFitCover }) diff --git a/src/app/lumi_guide.zi b/src/app/lumi_guide.zi index fd0409c00..7428f7efd 100644 --- a/src/app/lumi_guide.zi +++ b/src/app/lumi_guide.zi @@ -27,7 +27,7 @@ GetTime :: () -> float64 #foreign raylib; // Lumi's flight cycle: eight frames facing right, then the same eight facing // left, each 192 by 157 pixels on a 200 by 165 grid four frames wide. -LUMI_GUIDE_SHEET :: "assets/lumi/guide-flight.png" +LUMI_GUIDE_SHEET :: "assets/lumi/guide-flight.webp" LUMI_GUIDE_WIDTH :: 72 LUMI_SHEET_FRAME_WIDTH :: 192 LUMI_SHEET_FRAME_HEIGHT :: 157 diff --git a/src/habits/reward_icons.zi b/src/habits/reward_icons.zi index 44b1e873d..fd6bcb174 100644 --- a/src/habits/reward_icons.zi +++ b/src/habits/reward_icons.zi @@ -9,19 +9,19 @@ REWARD_ICON_COUNT :: 88 RewardIconAsset :: (icon: s32) -> string { if icon == HABIT_ICON_SODA { - return "assets/habits/rewards/soda.png" + return "assets/habits/rewards/soda.webp" } if icon == REWARD_ICON_COFFEE { - return "assets/habits/rewards/coffee.png" + return "assets/habits/rewards/coffee.webp" } if icon == REWARD_ICON_BUBBLE_TEA { - return "assets/habits/rewards/bubble-tea.png" + return "assets/habits/rewards/bubble-tea.webp" } if icon == REWARD_ICON_CHOCOLATE { - return "assets/habits/rewards/chocolate.png" + return "assets/habits/rewards/chocolate.webp" } if icon == REWARD_ICON_CANDLE { - return "assets/habits/rewards/candle.png" + return "assets/habits/rewards/candle.webp" } return "" } diff --git a/src/platform/app_host.zi b/src/platform/app_host.zi index 9b803d280..6088aa935 100644 --- a/src/platform/app_host.zi +++ b/src/platform/app_host.zi @@ -268,7 +268,7 @@ ConfigureWindow :: () { FinishWindowSetup :: () -> s32 { icon_path: [64]u8 - if !CopyCString("assets/app/icon.png", icon_path[:]) || + if !CopyCString("assets/app/icon.webp", icon_path[:]) || native_after_window(*icon_path[0]) == 0 { return 0 } diff --git a/src/platform/desktop_tray.zi b/src/platform/desktop_tray.zi index 6160a08ba..670ee4826 100644 --- a/src/platform/desktop_tray.zi +++ b/src/platform/desktop_tray.zi @@ -303,7 +303,7 @@ SaveTrayIcon :: (path: *u8, data: *u8, size: s32) -> bool #foreign raylib "SaveF TrayIconFromAssets :: () -> string { asset_path: [32]u8 - if !CopyCString("assets/app/icon.png", asset_path[:]) { + if !CopyCString("assets/app/icon.webp", asset_path[:]) { return "" } asset := asset_lookup(*asset_path[0]) diff --git a/src/screens/settings/settings_about.zi b/src/screens/settings/settings_about.zi index 8bf08256e..5cf1ad0e6 100644 --- a/src/screens/settings/settings_about.zi +++ b/src/screens/settings/settings_about.zi @@ -180,12 +180,12 @@ ABOUT_SOCIAL_GITHUB :: 2 about_social_icon_asset :: (app: *InnerBreeze, kind: s32) -> string { if kind == ABOUT_SOCIAL_TELEGRAM { - return "assets/social/telegram.png" + return "assets/social/telegram.webp" } if kind == ABOUT_SOCIAL_GITHUB { - return ifx (app != null && app.dark_mode == 0) then ("assets/social/github-dark-on-light.png") else ("assets/social/github-light-on-dark.png") + return ifx (app != null && app.dark_mode == 0) then ("assets/social/github-dark-on-light.webp") else ("assets/social/github-light-on-dark.webp") } - return "assets/social/discord.png" + return "assets/social/discord.webp" } about_social_icon_alt :: (kind: s32) -> string { @@ -250,7 +250,7 @@ settings_about_draw :: (app: *InnerBreeze, x: s32, w: s32, y: *s32) { y.* += AppScale(16) Image(CurrentApp().ui.session, ImageProps.{ - .asset_path = "assets/app/icon.png", + .asset_path = "assets/app/icon.webp", .alt_text = "Inner Breeze", .bounds = Rectangle.{cast(float32)(x + (w - logo_size) / 2), cast(float32)y.*, cast(float32)logo_size, cast(float32)logo_size} }) diff --git a/src/screens/settings/settings_theme.zi b/src/screens/settings/settings_theme.zi index 974758843..f5793c769 100644 --- a/src/screens/settings/settings_theme.zi +++ b/src/screens/settings/settings_theme.zi @@ -143,7 +143,7 @@ settings_theme_draw_app_icon :: (app: *InnerBreeze, section: SettingsSection, app_open_modal(app, cast(ModalType)ModalAppIconPicker) } Image(app.ui.session, ImageProps.{ - .asset_path = ifx (state.app_icon == 1) then ("assets/app/icon-ink-and-air.png") else ("assets/app/icon-sky-cradle.png"), + .asset_path = ifx (state.app_icon == 1) then ("assets/app/icon-ink-and-air.webp") else ("assets/app/icon-sky-cradle.webp"), .bounds = Rectangle.{cast(float32)(section.inner_x + AppScale(8)), cast(float32)(y.* + (row_h - icon_size) / 2), cast(float32)icon_size, cast(float32)icon_size}, @@ -257,8 +257,8 @@ settings_screen_draw_app_icon_modal :: (app: *InnerBreeze) { LocaleText("app_icon_sky_cradle"), LocaleText("app_icon_ink_and_air")] previews: [2]string = .[ - "assets/app/icon-sky-cradle.png", - "assets/app/icon-ink-and-air.png"] + "assets/app/icon-sky-cradle.webp", + "assets/app/icon-ink-and-air.webp"] gap := AppScale(12) choice_w := (content_w - gap) / 2 {