Nexus/nexus
Nexus/nexus
4
4
Fork 5
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

Server selection and login are on different pages. #33

Manually merged
Henry-Hiles merged 8 commits from istalri/nexus:better-login into better-login 2026-06-05 16:44:35 -04:00
Conversation 12 Commits 8 Files changed 5 +12 -9
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 28be105552 - Show all commits

Fixed inconsistency with focus change in error case on login page.

Prev Next
istalri 2026-06-02 21:56:43 +02:00
commit 28be105552

8
lib/pages/login_page.dart
View file

@ -81,6 +81,14 @@ class LoginPage extends HookConsumerWidget {
},
decoration: InputDecoration(
label: Text("Username"),
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(
width: hasError.value ? 4 : 2,
color: hasError.value
? theme.colorScheme.error
: theme.colorScheme.primary,
),
),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(
width: hasError.value ? 4 : 2,

9
lib/pages/select_server_page.dart
View file

@ -49,20 +49,15 @@ class SelectServerPage extends HookConsumerWidget {
);
} else {
homeserverUrl.text = newHomeserver!.origin;
Henry-Hiles marked this conversation as resolved
Henry-Hiles commented 2026-06-02 10:01:21 -04:00
Copy link

Instead of setting homeserver in client state controller, can we just Navigator.of(context).push the LoginPage, passing in a homeserver as an argument?

Instead of setting homeserver in client state controller, can we just `Navigator.of(context).push` the `LoginPage`, passing in a `homeserver` as an argument?
Navigator.push(
context,
MaterialPageRoute(
builder: (_) => LoginPage(homeserver: Uri.parse(newUrl)),
),
await Navigator.of(context).push(
Henry-Hiles marked this conversation as resolved Outdated
Henry-Hiles commented 2026-06-02 13:24:42 -04:00
Outdated
Copy link

Might be nice to do that Uri.parse in client.discoverHomeserver, and have that return a Uri.

Might be nice to do that `Uri.parse` in `client.discoverHomeserver`, and have that return a Uri.
istalri commented 2026-06-02 13:31:04 -04:00
Outdated
Copy link

Yeah I don't mind. If you feel that's cleaner I will do so.

Yeah I don't mind. If you feel that's cleaner I will do so.
Henry-Hiles commented 2026-06-02 13:39:39 -04:00
Outdated
Copy link

Also, you should use Navigator.of(context).push, and await it.

Also, you should use `Navigator.of(context).push`, and await it.
istalri commented 2026-06-02 15:46:08 -04:00
Outdated
Copy link

Makes sense, will do

Makes sense, will do
MaterialPageRoute(builder: (_) => LoginPage(homeserver: newUrl)),
);
}
}
if (context.mounted) {
homeserverFocusNode.requestFocus();
isLoading.value = false;
}
}
return Scaffold(
appBar: Appbar(),