karm-kira: Tweaked text inputs and print-dialog.

Author: sleepy-monax

src/apps/hideo-zoo/page-input.h

@@ -2,7 +2,10 @@
 
 #include <karm-kira/input.h>
 #include <karm-ui/layout.h>
+#include <mdi/account.h>
+#include <mdi/email.h>
 #include <mdi/form-textbox.h>
+#include <mdi/lock.h>
 
 #include "model.h"
 
@@ -16,9 +19,10 @@ static inline Page PAGE_INPUT{
         return Ui::vflow(
                    16,
                    Math::Align::CENTER,
-                   Kr::input(Mdi::FORM_TEXTBOX, "Username"s, ""s) | Ui::pinSize({240, Ui::UNCONSTRAINED}),
-                   Kr::input(Mdi::FORM_TEXTBOX, "Email"s, ""s) | Ui::pinSize({240, Ui::UNCONSTRAINED}),
-                   Kr::input(Mdi::FORM_TEXTBOX, "Password"s, ""s) | Ui::pinSize({240, Ui::UNCONSTRAINED})
+                   Kr::input(Mdi::ACCOUNT, "Username"s, ""s) | Ui::pinSize({240, Ui::UNCONSTRAINED}),
+                   Kr::input(Mdi::EMAIL, "Email"s, ""s) | Ui::pinSize({240, Ui::UNCONSTRAINED}),
+                   Kr::input(Mdi::LOCK, "Password"s, ""s) | Ui::pinSize({240, Ui::UNCONSTRAINED}),
+                   Kr::input("Text"s, ""s) | Ui::pinSize({240, Ui::UNCONSTRAINED})
                ) |
                Ui::center();
     },

src/libs/karm-kira/input.cpp

@@ -0,0 +1,48 @@
+#include <karm-ui/focus.h>
+#include <karm-ui/layout.h>
+#include <karm-ui/view.h>
+
+#include "input.h"
+
+namespace Karm::Kira {
+
+Ui::Child input(Mdi::Icon icon, String placeholder, String text) {
+    return Ui::hflow(
+               8,
+               Math::Align::VCENTER | Math::Align::START,
+               Ui::icon(icon),
+               Ui::stack(
+                   text ? Ui::empty() : Ui::labelMedium(Gfx::ZINC600, placeholder),
+                   Ui::input(Ui::TextStyles::labelMedium(), text, NONE)
+               ) | Ui::grow()
+           ) |
+           Ui::box({
+               .padding = {6, 12, 6, 12},
+               .borderRadii = 4,
+               .borderWidth = 1,
+               .borderFill = Ui::GRAY800,
+           }) |
+           Ui::minSize({Ui::UNCONSTRAINED, 36}) |
+           Ui::focusable();
+}
+
+Ui::Child input(String placeholder, String text) {
+    return Ui::hflow(
+               8,
+               Math::Align::VCENTER | Math::Align::START,
+               Ui::stack(
+                   text ? Ui::empty() : Ui::labelMedium(Gfx::ZINC600, placeholder),
+                   Ui::input(Ui::TextStyles::labelMedium(), text, NONE)
+               ) | Ui::grow()
+           ) |
+           Ui::box({
+               .padding = {6, 12, 6, 12},
+               .borderRadii = 4,
+               .borderWidth = 1,
+               .borderFill = Ui::GRAY800,
+           }) |
+           Ui::minSize({Ui::UNCONSTRAINED, 36}) |
+           Ui::focusable();
+}
+
+} // namespace Karm::Kira

src/libs/karm-kira/input.h

@@ -1,32 +1,13 @@
 #pragma once
 
-#include <karm-ui/focus.h>
 #include <karm-ui/input.h>
-#include <karm-ui/layout.h>
-#include <karm-ui/view.h>
 
 #include "_prelude.h"
 
 namespace Karm::Kira {
 
-static inline Ui::Child input(Mdi::Icon icon, String placeholder, String text) {
-    return Ui::hflow(
-               8,
-               Math::Align::CENTER,
-               Ui::icon(icon),
-               Ui::stack(
-                   text ? Ui::empty() : Ui::labelMedium(Gfx::ZINC600, placeholder),
-                   Ui::input(Ui::TextStyles::labelMedium(), text, NONE)
-               ) | Ui::grow()
-           ) |
-           Ui::box({
-               .padding = {6, 12, 6, 12},
-               .borderRadii = 4,
-               .borderWidth = 1,
-               .borderFill = Ui::GRAY800,
-           }) |
-           Ui::minSize({Ui::UNCONSTRAINED, 36}) |
-           Ui::focusable();
-}
+Ui::Child input(Mdi::Icon icon, String placeholder, String text);
+
+Ui::Child input(String placeholder, String text);
 
 } // namespace Karm::Kira

src/libs/karm-kira/print-dialog.cpp

@@ -134,14 +134,19 @@ Ui::Child _paperSelect() {
     return select(selectValue("A4"s), [] -> Ui::Children {
         Vec<Ui::Child> groups;
 
+        bool first = false;
         for (auto &serie : Print::SERIES) {
             Vec<Ui::Child> items;
             items.pushBack(selectLabel(serie.name));
             for (auto const &stock : serie.stocks) {
                 items.pushBack(selectItem(Ui::NOP, stock.name));
             }
 
+            if (not first)
+                groups.pushBack(Ui::separator());
             groups.pushBack(selectGroup(std::move(items)));
+
+            first = false;
         }
 
         return groups;