hideo-shell: Change the default wallpaper.

skift-org · Dec 29, 2024 · f904629 · f904629
1 parent babb06e
commit f904629
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 17 deletions.
diff --git a/meta/image/efi/boot/loader.json b/meta/image/efi/boot/loader.json
@@ -16,9 +16,10 @@
                 "bundle://grund-seat/_bin",
                 "bundle://grund-shell/_bin",
                 "bundle://grund-bus/_bin",
-                "bundle://hideo-shell/wallpaper.qoi",
+                "bundle://hideo-shell/wallpapers/winter.qoi",
                 "bundle://fonts-inter/fonts/Inter-Regular.ttf",
-                "bundle://fonts-inter/fonts/Inter-Medium.ttf"
+                "bundle://fonts-inter/fonts/Inter-Medium.ttf",
+                "bundle://fonts-inter/fonts/Inter-Bold.ttf"
             ]
         }
     ]

diff --git a/src/apps/hideo-shell/app.cpp b/src/apps/hideo-shell/app.cpp
@@ -42,13 +42,14 @@ Ui::Child statusbar(State const &state) {
            }) |
            Ui::box({
                .padding = {0, 12},
-               .backgroundFill = Ui::GRAY900,
+               .backgroundFill = state.instances.len() ? Ui::GRAY900 : Ui::GRAY950.withOpacity(0.6),
            });
 }
 
 Ui::Child statusbarButton(State const &state) {
     return Ui::button(
         Model::bind<Activate>(Panel::SYS),
+        Ui::ButtonStyle::none(),
         statusbar(state)
     );
 }
@@ -121,7 +122,7 @@ Ui::Child taskbar(State const &state) {
                ) |
                    Ui::box({
                        .padding = 6,
-                       .backgroundFill = Ui::GRAY950.withOpacity(0.8),
+                       .backgroundFill = Ui::GRAY950.withOpacity(0.6),
                    }),
                Ui::separator()
            ) |
@@ -162,11 +163,7 @@ Ui::Child tablet(State const &state) {
             ? background(state)
             : Ui::empty(),
         Ui::vflow(
-            Ui::vflow(
-                statusbarButton(state),
-                Ui::separator()
-            ) |
-                Ui::slideIn(Ui::SlideFrom::TOP),
+            statusbarButton(state) | Ui::slideIn(Ui::SlideFrom::TOP),
             appHost(state) | Ui::grow(),
             navbar(state)
         )

diff --git a/src/apps/hideo-shell/lock.cpp b/src/apps/hideo-shell/lock.cpp
@@ -1,3 +1,4 @@
+#include <karm-text/loader.h>
 #include <karm-ui/box.h>
 #include <karm-ui/drag.h>
 #include <mdi/chevron-up.h>
@@ -6,21 +7,42 @@
 
 namespace Hideo::Shell {
 
+static Opt<Strong<Text::Fontface>> _blackFontface = NONE;
+
+static Strong<Text::Fontface> blackFontface() {
+    if (not _blackFontface) {
+        _blackFontface = Text::loadFontfaceOrFallback("bundle://fonts-inter/fonts/Inter-Bold.ttf"_url).unwrap();
+    }
+    return *_blackFontface;
+}
+
 Ui::Child lock(State const &state) {
     auto [date, time] = state.dateTime;
     auto dateTime = Io::format(
-        // Mon. 28 Jul
-        "{}. {} {}",
-        Io::toCapitalCase(date.dayOfWeek().abbr()),
+        // Mon, 28 Jul
+        "{}, {} {}",
+        Io::toCapitalCase(date.dayOfWeek().str()),
         date.dayOfMonth() + 1,
         Io::toCapitalCase(date.month.str())
     );
 
     auto clock = Ui::vflow(
-        16,
+        0,
         Math::Align::CENTER,
-        Ui::displayMedium("{02}:{02}", time.hour, time.minute),
-        Ui::titleMedium(dateTime.unwrap())
+        Ui::text({
+                     .font = Text::Font{
+                         blackFontface(),
+                         16,
+                     },
+                 },
+                 dateTime.unwrap()),
+        Ui::text({
+                     .font = Text::Font{
+                         blackFontface(),
+                         72,
+                     },
+                 },
+                 "{02}:{02}", time.hour, time.minute)
     );
 
     auto hintText = Ui::vflow(

diff --git a/src/apps/hideo-shell/main/main.cpp b/src/apps/hideo-shell/main/main.cpp
@@ -24,7 +24,7 @@ Async::Task<> entryPointAsync(Sys::Context &ctx) {
     Hideo::Shell::State state = {
         .isMobile = isMobile,
         .dateTime = Sys::dateTime(),
-        .background = co_try$(Image::loadOrFallback("bundle://hideo-shell/wallpaper.qoi"_url)),
+        .background = co_try$(Image::loadOrFallback("bundle://hideo-shell/wallpapers/winter.qoi"_url)),
         .noti = {},
         .manifests = {
             makeStrong<Hideo::Shell::Manifest>(Mdi::INFORMATION_OUTLINE, "About"s, Gfx::BLUE_RAMP),

diff --git a/src/apps/hideo-shell/res/wallpaper.png → ...s/hideo-shell/res/wallpapers/abstract.png b/src/apps/hideo-shell/res/wallpaper.png → ...s/hideo-shell/res/wallpapers/abstract.png
diff --git a/src/apps/hideo-shell/res/wallpaper.qoi → ...s/hideo-shell/res/wallpapers/abstract.qoi b/src/apps/hideo-shell/res/wallpaper.qoi → ...s/hideo-shell/res/wallpapers/abstract.qoi
diff --git a/src/apps/hideo-shell/res/wallpapers/winter.jpg b/src/apps/hideo-shell/res/wallpapers/winter.jpg
diff --git a/src/apps/hideo-shell/res/wallpapers/winter.qoi b/src/apps/hideo-shell/res/wallpapers/winter.qoi
diff --git a/src/srvs/grund-shell/main.cpp b/src/srvs/grund-shell/main.cpp
@@ -243,7 +243,7 @@ Async::Task<> servAsync(Sys::Context &ctx) {
     Hideo::Shell::State state = {
         .isMobile = false,
         .dateTime = Sys::dateTime(),
-        .background = co_try$(Image::loadOrFallback("bundle://hideo-shell/wallpaper.qoi"_url)),
+        .background = co_try$(Image::loadOrFallback("bundle://hideo-shell/wallpapers/winter.qoi"_url)),
         .noti = {},
         .manifests = {
             makeStrong<Hideo::Shell::Manifest>(Mdi::INFORMATION_OUTLINE, "About"s, Gfx::BLUE_RAMP),