diff --git a/ui/app.slint b/ui/app.slint index d9d1f56..fb818e5 100644 --- a/ui/app.slint +++ b/ui/app.slint @@ -2,6 +2,9 @@ // (800px = 1.0, the Steam Deck). The UI keeps the same proportions on a Deck // and on a 4K TV, whatever scale factor the compositor reports. +// Bundled so headings look the same on every machine. Licence in fonts/OFL.txt. +import "fonts/NotoSerif-SemiBold.ttf"; + export enum Action { none, up, down, left, right, page-up, page-down, activate, back, play-pause, next, prev, queue, section-next, section-prev, @@ -43,21 +46,29 @@ export struct Hint { key: string, label: string } export global Theme { in-out property s: 1.0; - out property bg: #0d0f13; - out property panel: #14171d; - out property raised: #1e222a; - out property line: #2a2f39; - out property text: #f3f4f6; - out property muted: #a0a7b4; - out property faint: #626a78; - out property accent: #8ab4ff; - out property on-accent: #0d0f13; + // Warm darks and cream text, from the logo's maroon (#5a0712) and cream. + out property bg: #140b0c; + out property panel: #1d1012; + out property raised: #2b181b; + out property line: #42272b; + out property text: #faebda; + out property muted: #bea999; + out property faint: #80685f; + // Filled surfaces: the current section, buttons, the playing badge. + out property accent: #a51d2d; + out property on-accent: #faebda; + // Accent for text and thin lines, where the fill colour is too dark to read. + out property highlight: #e8757b; + // Ring around whatever has focus. + out property focus: #faebda; + out property error: #f0605d; + out property serif: "Noto Serif"; } component Art inherits Rectangle { in property source; in property has-image; - in property tint: #39404d; + in property tint: Theme.raised; in property letter; in property round; in property letter-size: 64px * Theme.s; @@ -71,8 +82,9 @@ component Art inherits Rectangle { text: root.letter; // Not derived from the art's own height: that feeds back into layout. font-size: root.letter-size; - font-weight: 800; - color: #ffffff60; + font-family: Theme.serif; + font-weight: 600; + color: Theme.text.with-alpha(0.4); horizontal-alignment: center; vertical-alignment: center; visible: !root.has-image; @@ -104,7 +116,7 @@ component Card inherits Rectangle { height: root.art + 2 * root.ring; border-radius: root.item.round ? self.width / 2 : 13px * Theme.s; border-width: 3px * Theme.s; - border-color: root.selected ? (root.active ? Theme.accent : Theme.faint) : transparent; + border-color: root.selected ? (root.active ? Theme.focus : Theme.faint) : transparent; animate border-color { duration: 120ms; } } @@ -171,7 +183,7 @@ component Row inherits Rectangle { border-radius: 10px * Theme.s; background: root.selected ? (root.active ? Theme.raised : Theme.panel) : transparent; border-width: root.selected && root.active ? 2px * Theme.s : 0; - border-color: Theme.accent; + border-color: Theme.focus; HorizontalLayout { padding-left: 16px * Theme.s; @@ -195,7 +207,7 @@ component Row inherits Rectangle { width: 34px * Theme.s; text: root.item.playing ? "▶" : root.item.number; font-size: 15px * Theme.s; - color: root.item.playing ? Theme.accent : Theme.faint; + color: root.item.playing ? Theme.highlight : Theme.faint; horizontal-alignment: right; vertical-alignment: center; } @@ -208,7 +220,7 @@ component Row inherits Rectangle { text: root.item.title; font-size: 17px * Theme.s; font-weight: 600; - color: root.item.playing ? Theme.accent : Theme.text; + color: root.item.playing ? Theme.highlight : Theme.text; overflow: elide; } if root.item.subtitle != "": Text { @@ -334,15 +346,17 @@ component PageHeader inherits Rectangle { horizontal-stretch: 1; Text { text: root.h.kind; - font-size: 13px * Theme.s; - font-weight: 700; - letter-spacing: 2px * Theme.s; - color: Theme.accent; + font-size: 14px * Theme.s; + font-family: Theme.serif; + font-weight: 600; + letter-spacing: 3px * Theme.s; + color: Theme.highlight; } Text { text: root.h.title; font-size: 40px * Theme.s; - font-weight: 800; + font-family: Theme.serif; + font-weight: 600; color: Theme.text; overflow: elide; } @@ -368,7 +382,8 @@ component Sidebar inherits Rectangle { in property footer; callback clicked(int); - background: Theme.panel; + // A hint of the logo's maroon at the top, fading into the panel. + background: @linear-gradient(180deg, #2a0b11 0%, Theme.panel 55%); VerticalLayout { padding: 26px * Theme.s; @@ -376,11 +391,15 @@ component Sidebar inherits Rectangle { spacing: 6px * Theme.s; alignment: start; - Text { - text: "remus"; - font-size: 30px * Theme.s; - font-weight: 800; - color: Theme.text; + HorizontalLayout { + alignment: start; + padding-left: 6px * Theme.s; + Image { + source: @image-url("../branding/svg/remus-logo.svg"); + height: 44px * Theme.s; + // The lockup's aspect ratio, so the image box hugs the logo. + width: self.height * 2.93; + } } Rectangle { height: 26px * Theme.s; } @@ -426,7 +445,7 @@ component SearchBox inherits Rectangle { border-radius: 12px * Theme.s; background: Theme.raised; border-width: 2px * Theme.s; - border-color: input.has-focus || root.highlighted ? Theme.accent : Theme.line; + border-color: input.has-focus || root.highlighted ? Theme.focus : Theme.line; input := TextInput { x: 18px * Theme.s; @@ -472,7 +491,7 @@ component NowBar inherits Rectangle { Rectangle { x: 0; width: parent.width * root.progress; - background: Theme.accent; + background: Theme.highlight; } } @@ -522,7 +541,7 @@ component NowBar inherits Rectangle { if root.has-track: Text { text: root.paused ? "❚❚" : "▶"; font-size: 18px * Theme.s; - color: Theme.accent; + color: Theme.highlight; vertical-alignment: center; } } @@ -599,7 +618,7 @@ component Field inherits VerticalLayout { border-radius: 10px * Theme.s; background: Theme.raised; border-width: 2px * Theme.s; - border-color: input.has-focus || root.highlighted ? Theme.accent : Theme.line; + border-color: input.has-focus || root.highlighted ? Theme.focus : Theme.line; input := TextInput { x: 16px * Theme.s; width: parent.width - 32px * Theme.s; @@ -634,6 +653,8 @@ component LoginView inherits Rectangle { } } + background: @radial-gradient(circle, #3a0b13 0%, Theme.bg 70%); + Rectangle { width: min(560px * Theme.s, parent.width - 40px * Theme.s); height: col.preferred-height; @@ -644,11 +665,14 @@ component LoginView inherits Rectangle { padding: 40px * Theme.s; spacing: 20px * Theme.s; - Text { - text: "remus"; - font-size: 38px * Theme.s; - font-weight: 800; - color: Theme.text; + HorizontalLayout { + alignment: start; + Image { + source: @image-url("../branding/svg/remus-logo.svg"); + height: 68px * Theme.s; + // The lockup's aspect ratio, so the image box hugs the logo. + width: self.height * 2.93; + } } Text { text: "Connect to your Subsonic server"; @@ -691,7 +715,7 @@ component LoginView inherits Rectangle { if root.error != "": Text { text: root.error; font-size: 15px * Theme.s; - color: #f0605d; + color: Theme.error; wrap: word-wrap; } Text { @@ -734,7 +758,7 @@ component NowPlayingView inherits Rectangle { opacity: 0.16; } Rectangle { - background: @linear-gradient(90deg, #0d0f13aa, #0d0f13f2); + background: @linear-gradient(90deg, Theme.bg.with-alpha(0.67), Theme.bg.with-alpha(0.95)); } HorizontalLayout { @@ -761,8 +785,9 @@ component NowPlayingView inherits Rectangle { Rectangle { height: 14px * Theme.s; } Text { text: root.has-track ? root.title : "Nothing playing"; - font-size: 30px * Theme.s; - font-weight: 800; + font-size: 32px * Theme.s; + font-family: Theme.serif; + font-weight: 600; color: Theme.text; overflow: elide; } @@ -787,7 +812,7 @@ component NowPlayingView inherits Rectangle { x: 0; width: parent.width * root.progress; border-radius: 3px * Theme.s; - background: Theme.accent; + background: Theme.highlight; } } HorizontalLayout { @@ -800,7 +825,7 @@ component NowPlayingView inherits Rectangle { horizontal-stretch: 1; text: root.has-track ? (root.paused ? "Paused" : "Playing") : ""; font-size: 14px * Theme.s; - color: Theme.accent; + color: Theme.highlight; horizontal-alignment: center; } Text { @@ -816,8 +841,9 @@ component NowPlayingView inherits Rectangle { horizontal-stretch: 1; Text { text: "Queue"; - font-size: 26px * Theme.s; - font-weight: 800; + font-size: 28px * Theme.s; + font-family: Theme.serif; + font-weight: 600; color: Theme.text; } ItemView { @@ -999,8 +1025,9 @@ export component AppWindow inherits Window { visible: !root.header.visible; Text { text: root.page-title; - font-size: 30px * Theme.s; - font-weight: 800; + font-size: 32px * Theme.s; + font-family: Theme.serif; + font-weight: 600; color: Theme.text; vertical-alignment: center; } diff --git a/ui/fonts/NotoSerif-SemiBold.ttf b/ui/fonts/NotoSerif-SemiBold.ttf new file mode 100644 index 0000000..6bcc433 Binary files /dev/null and b/ui/fonts/NotoSerif-SemiBold.ttf differ diff --git a/ui/fonts/OFL.txt b/ui/fonts/OFL.txt new file mode 100644 index 0000000..24863e0 --- /dev/null +++ b/ui/fonts/OFL.txt @@ -0,0 +1,94 @@ +Noto Serif SemiBold (NotoSerif-SemiBold.ttf), version 2.004 +Copyright 2015 Google LLC. All Rights Reserved. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE.