feat: log out of or forget a saved server, and pick one on the login screen
The queue button on a server row in Settings opens a prompt with Cancel, Log out and Forget, replacing the double-press Remove. Log out keeps the address and username without credentials; Forget also deletes the server's saved queue and cover cache. The login screen lists the saved servers beside the form, and a saved login the server turns down at startup is logged out and opens the login screen prefilled. Bumps the version to 0.10.0.
This commit is contained in:
+241
-81
@@ -48,6 +48,9 @@ export struct Header {
|
||||
|
||||
export struct Hint { icons: [image], label: string }
|
||||
|
||||
// A saved server on the login screen: its label, and "Logged out" or nothing.
|
||||
export struct KnownServer { label: string, note: string }
|
||||
|
||||
export global Theme {
|
||||
in-out property <float> s: 1.0;
|
||||
// The brand palette: warm darks and cream text, from the logo's maroon
|
||||
@@ -619,6 +622,71 @@ component VolumeLevel inherits HorizontalLayout {
|
||||
}
|
||||
|
||||
// The level after a volume change, faded out again by the app after a moment.
|
||||
// Asks before doing something that cannot be undone from where it is asked.
|
||||
// The choices sit in a row; the app moves the selection and starts with the
|
||||
// first, which is Cancel.
|
||||
component ConfirmDialog inherits Rectangle {
|
||||
in property <string> title;
|
||||
in property <string> message;
|
||||
in property <[string]> choices;
|
||||
in property <int> selected;
|
||||
callback clicked(int);
|
||||
|
||||
background: #00000099;
|
||||
// Keeps clicks from reaching the page behind.
|
||||
TouchArea { }
|
||||
|
||||
Rectangle {
|
||||
width: min(620px * Theme.s, parent.width - 40px * Theme.s);
|
||||
height: col.preferred-height;
|
||||
border-radius: 18px * Theme.s;
|
||||
background: Theme.panel;
|
||||
border-width: 1px * Theme.s;
|
||||
border-color: Theme.line;
|
||||
drop-shadow-blur: 30px * Theme.s;
|
||||
drop-shadow-color: #00000080;
|
||||
|
||||
col := VerticalLayout {
|
||||
padding: 34px * Theme.s;
|
||||
spacing: 18px * Theme.s;
|
||||
Text {
|
||||
text: root.title;
|
||||
font-size: 24px * Theme.s;
|
||||
font-family: Theme.serif;
|
||||
font-weight: 600;
|
||||
color: Theme.text;
|
||||
wrap: word-wrap;
|
||||
}
|
||||
Text {
|
||||
text: root.message;
|
||||
font-size: 16px * Theme.s;
|
||||
color: Theme.muted;
|
||||
wrap: word-wrap;
|
||||
}
|
||||
HorizontalLayout {
|
||||
spacing: 12px * Theme.s;
|
||||
padding-top: 6px * Theme.s;
|
||||
for label[i] in root.choices: Rectangle {
|
||||
height: 50px * Theme.s;
|
||||
border-radius: 12px * Theme.s;
|
||||
background: i == root.selected ? Theme.accent : Theme.raised;
|
||||
border-width: 2px * Theme.s;
|
||||
border-color: i == root.selected ? Theme.focus : transparent;
|
||||
Text {
|
||||
text: label;
|
||||
font-size: 18px * Theme.s;
|
||||
font-weight: i == root.selected ? 700 : 500;
|
||||
color: i == root.selected ? Theme.on-accent : Theme.text;
|
||||
}
|
||||
TouchArea {
|
||||
clicked => { root.clicked(i); }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
component VolumeOverlay inherits Rectangle {
|
||||
in property <bool> shown;
|
||||
in property <int> level;
|
||||
@@ -893,9 +961,13 @@ component LoginView inherits Rectangle {
|
||||
in property <bool> busy;
|
||||
// Adding a server from inside the app: the bottom button goes back.
|
||||
in property <bool> can-cancel;
|
||||
// Saved servers above the form, and which one has focus, -1 for none.
|
||||
in property <[KnownServer]> known;
|
||||
in property <int> known-selected: -1;
|
||||
callback submit;
|
||||
callback exit;
|
||||
callback field-clicked(int);
|
||||
callback known-clicked(int);
|
||||
public function focus-field(i: int) {
|
||||
if (i == 0) {
|
||||
f0.focus-input();
|
||||
@@ -908,90 +980,155 @@ component LoginView inherits Rectangle {
|
||||
|
||||
background: @radial-gradient(circle, Theme.login-glow 0%, Theme.bg 70%);
|
||||
|
||||
Rectangle {
|
||||
width: min(560px * Theme.s, parent.width - 40px * Theme.s);
|
||||
height: col.preferred-height;
|
||||
border-radius: 18px * Theme.s;
|
||||
background: Theme.panel;
|
||||
// Saved servers in a card of their own beside the form, so the form is
|
||||
// as tall as without them and still fits an 800 px high screen.
|
||||
HorizontalLayout {
|
||||
alignment: center;
|
||||
spacing: 24px * Theme.s;
|
||||
padding: 20px * Theme.s;
|
||||
|
||||
col := VerticalLayout {
|
||||
padding: 40px * Theme.s;
|
||||
spacing: 20px * Theme.s;
|
||||
if root.known.length > 0: VerticalLayout {
|
||||
alignment: center;
|
||||
Rectangle {
|
||||
preferred-width: 400px * Theme.s;
|
||||
min-width: 240px * Theme.s;
|
||||
border-radius: 18px * Theme.s;
|
||||
background: Theme.panel;
|
||||
VerticalLayout {
|
||||
padding: 28px * Theme.s;
|
||||
spacing: 10px * Theme.s;
|
||||
Text {
|
||||
text: "Saved servers";
|
||||
font-size: 22px * Theme.s;
|
||||
font-family: Theme.serif;
|
||||
font-weight: 600;
|
||||
color: Theme.text;
|
||||
}
|
||||
Text {
|
||||
text: "Pick one to fill in its address and username.";
|
||||
font-size: 14px * Theme.s;
|
||||
color: Theme.muted;
|
||||
wrap: word-wrap;
|
||||
}
|
||||
for k[i] in root.known: Rectangle {
|
||||
height: 58px * Theme.s;
|
||||
border-radius: 10px * Theme.s;
|
||||
background: i == root.known-selected ? Theme.raised : transparent;
|
||||
border-width: 2px * Theme.s;
|
||||
border-color: i == root.known-selected ? Theme.focus : Theme.line;
|
||||
VerticalLayout {
|
||||
padding-left: 16px * Theme.s;
|
||||
padding-right: 16px * Theme.s;
|
||||
alignment: center;
|
||||
Text {
|
||||
text: k.label;
|
||||
font-size: 17px * Theme.s;
|
||||
color: Theme.text;
|
||||
overflow: elide;
|
||||
}
|
||||
if k.note != "": Text {
|
||||
text: k.note;
|
||||
font-size: 13px * Theme.s;
|
||||
color: Theme.faint;
|
||||
}
|
||||
}
|
||||
TouchArea {
|
||||
clicked => { root.known-clicked(i); }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
HorizontalLayout {
|
||||
alignment: center;
|
||||
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";
|
||||
font-size: 17px * Theme.s;
|
||||
color: Theme.muted;
|
||||
}
|
||||
f0 := Field {
|
||||
label: "Server address";
|
||||
text <=> root.server;
|
||||
highlighted: root.focus-index == 0;
|
||||
accepted => { root.field-clicked(1); }
|
||||
}
|
||||
f1 := Field {
|
||||
label: "Username";
|
||||
text <=> root.username;
|
||||
highlighted: root.focus-index == 1;
|
||||
accepted => { root.field-clicked(2); }
|
||||
}
|
||||
f2 := Field {
|
||||
label: "Password";
|
||||
text <=> root.password;
|
||||
password: true;
|
||||
shown <=> root.password-shown;
|
||||
highlighted: root.focus-index == 2;
|
||||
accepted => { root.submit(); }
|
||||
}
|
||||
VerticalLayout {
|
||||
alignment: center;
|
||||
Rectangle {
|
||||
height: 54px * Theme.s;
|
||||
border-radius: 12px * Theme.s;
|
||||
background: root.focus-index == 3 ? Theme.accent : Theme.raised;
|
||||
Text {
|
||||
text: root.busy ? "Connecting…" : "Connect";
|
||||
font-size: 19px * Theme.s;
|
||||
font-weight: 700;
|
||||
color: root.focus-index == 3 ? Theme.on-accent : Theme.text;
|
||||
preferred-width: 560px * Theme.s;
|
||||
min-width: 320px * Theme.s;
|
||||
height: col.preferred-height;
|
||||
border-radius: 18px * Theme.s;
|
||||
background: Theme.panel;
|
||||
|
||||
col := VerticalLayout {
|
||||
padding: 40px * Theme.s;
|
||||
spacing: 20px * Theme.s;
|
||||
|
||||
HorizontalLayout {
|
||||
alignment: center;
|
||||
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";
|
||||
font-size: 17px * Theme.s;
|
||||
color: Theme.muted;
|
||||
}
|
||||
f0 := Field {
|
||||
label: "Server address";
|
||||
text <=> root.server;
|
||||
highlighted: root.focus-index == 0;
|
||||
accepted => { root.field-clicked(1); }
|
||||
}
|
||||
f1 := Field {
|
||||
label: "Username";
|
||||
text <=> root.username;
|
||||
highlighted: root.focus-index == 1;
|
||||
accepted => { root.field-clicked(2); }
|
||||
}
|
||||
f2 := Field {
|
||||
label: "Password";
|
||||
text <=> root.password;
|
||||
password: true;
|
||||
shown <=> root.password-shown;
|
||||
highlighted: root.focus-index == 2;
|
||||
accepted => { root.submit(); }
|
||||
}
|
||||
Rectangle {
|
||||
height: 54px * Theme.s;
|
||||
border-radius: 12px * Theme.s;
|
||||
background: root.focus-index == 3 ? Theme.accent : Theme.raised;
|
||||
Text {
|
||||
text: root.busy ? "Connecting…" : "Connect";
|
||||
font-size: 19px * Theme.s;
|
||||
font-weight: 700;
|
||||
color: root.focus-index == 3 ? Theme.on-accent : Theme.text;
|
||||
}
|
||||
TouchArea {
|
||||
clicked => { root.submit(); }
|
||||
}
|
||||
}
|
||||
// Secondary to Connect: outlined, no fill, and only lit when focused.
|
||||
Rectangle {
|
||||
height: 46px * Theme.s;
|
||||
border-radius: 12px * Theme.s;
|
||||
border-width: 2px * Theme.s;
|
||||
border-color: root.focus-index == 4 ? Theme.focus : Theme.line;
|
||||
Text {
|
||||
text: root.can-cancel ? "Cancel" : "Exit";
|
||||
font-size: 17px * Theme.s;
|
||||
color: root.focus-index == 4 ? Theme.text : Theme.muted;
|
||||
}
|
||||
TouchArea {
|
||||
clicked => { root.exit(); }
|
||||
}
|
||||
}
|
||||
if root.error != "": Text {
|
||||
text: root.error;
|
||||
font-size: 15px * Theme.s;
|
||||
color: Theme.error;
|
||||
wrap: word-wrap;
|
||||
}
|
||||
Text {
|
||||
text: "On a Steam Deck, press Steam + X to bring up the keyboard.";
|
||||
font-size: 13px * Theme.s;
|
||||
color: Theme.faint;
|
||||
wrap: word-wrap;
|
||||
}
|
||||
}
|
||||
TouchArea {
|
||||
clicked => { root.submit(); }
|
||||
}
|
||||
}
|
||||
// Secondary to Connect: outlined, no fill, and only lit when focused.
|
||||
Rectangle {
|
||||
height: 46px * Theme.s;
|
||||
border-radius: 12px * Theme.s;
|
||||
border-width: 2px * Theme.s;
|
||||
border-color: root.focus-index == 4 ? Theme.focus : Theme.line;
|
||||
Text {
|
||||
text: root.can-cancel ? "Cancel" : "Exit";
|
||||
font-size: 17px * Theme.s;
|
||||
color: root.focus-index == 4 ? Theme.text : Theme.muted;
|
||||
}
|
||||
TouchArea {
|
||||
clicked => { root.exit(); }
|
||||
}
|
||||
}
|
||||
if root.error != "": Text {
|
||||
text: root.error;
|
||||
font-size: 15px * Theme.s;
|
||||
color: Theme.error;
|
||||
wrap: word-wrap;
|
||||
}
|
||||
Text {
|
||||
text: "On a Steam Deck, press Steam + X to bring up the keyboard.";
|
||||
font-size: 13px * Theme.s;
|
||||
color: Theme.faint;
|
||||
wrap: word-wrap;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1200,6 +1337,8 @@ export component AppWindow inherits Window {
|
||||
callback search-accepted(string);
|
||||
callback login-submit();
|
||||
callback login-field-clicked(int);
|
||||
callback login-known-clicked(int);
|
||||
callback confirm-clicked(int);
|
||||
callback layout-changed();
|
||||
|
||||
in property <Screen> screen: Screen.login;
|
||||
@@ -1214,6 +1353,8 @@ export component AppWindow inherits Window {
|
||||
in property <bool> login-busy;
|
||||
in property <bool> login-can-cancel;
|
||||
in-out property <bool> login-password-shown;
|
||||
in property <[KnownServer]> login-known;
|
||||
in property <int> login-known-selected: -1;
|
||||
|
||||
// Browse
|
||||
in property <[string]> sections;
|
||||
@@ -1264,6 +1405,13 @@ export component AppWindow inherits Window {
|
||||
in property <string> version;
|
||||
in property <bool> show-hint-bar: true;
|
||||
|
||||
// The confirmation prompt, over everything else while shown.
|
||||
in property <bool> confirm-shown;
|
||||
in property <string> confirm-title;
|
||||
in property <string> confirm-message;
|
||||
in property <[string]> confirm-choices;
|
||||
in property <int> confirm-selected;
|
||||
|
||||
public function focus-main() {
|
||||
fs.focus();
|
||||
}
|
||||
@@ -1271,7 +1419,8 @@ export component AppWindow inherits Window {
|
||||
search.focus-input();
|
||||
}
|
||||
public function focus-login(i: int) {
|
||||
if (i >= 3) {
|
||||
// Below 0 is a saved server, above 2 a button: keys go to the scope.
|
||||
if (i >= 3 || i < 0) {
|
||||
fs.focus();
|
||||
} else {
|
||||
login.focus-field(i);
|
||||
@@ -1344,6 +1493,9 @@ export component AppWindow inherits Window {
|
||||
can-cancel: root.login-can-cancel;
|
||||
exit => { root.action(root.login-can-cancel ? Action.back : Action.quit); }
|
||||
field-clicked(i) => { root.login-field-clicked(i); }
|
||||
known: root.login-known;
|
||||
known-selected: root.login-known-selected;
|
||||
known-clicked(i) => { root.login-known-clicked(i); }
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
@@ -1456,6 +1608,14 @@ export component AppWindow inherits Window {
|
||||
}
|
||||
}
|
||||
|
||||
if root.confirm-shown: ConfirmDialog {
|
||||
title: root.confirm-title;
|
||||
message: root.confirm-message;
|
||||
choices: root.confirm-choices;
|
||||
selected: root.confirm-selected;
|
||||
clicked(i) => { root.confirm-clicked(i); }
|
||||
}
|
||||
|
||||
VolumeOverlay {
|
||||
x: (parent.width - self.width) / 2;
|
||||
y: parent.height - self.height - 32px * Theme.s;
|
||||
|
||||
Reference in New Issue
Block a user