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 +181 -177
4 changed files with 181 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 26feae4485 - Show all commits

CleanUp

Prev Next 
Autoformat for better readable code,
using autofocus instead of useState and focus element
istalri 2026-06-02 21:43:14 +02:00
commit 26feae4485

4
lib/controllers/client_controller.dart
View file

@ -263,12 +263,12 @@ class ClientController extends AsyncNotifier<int> {
} }
} }
Future<String?> discoverHomeserver(Uri homeserver) async { Future<Uri?> discoverHomeserver(Uri homeserver) async {
try { try {
final response = await _sendCommand("discover_homeserver", { final response = await _sendCommand("discover_homeserver", {
"user_id": "@fake-user:${homeserver.host}", "user_id": "@fake-user:${homeserver.host}",
}); });
return response["m.homeserver"]?["base_url"]; return Uri.parse(response["m.homeserver"]?["base_url"]);
} catch (error) { } catch (error) {
return null; return null;
} }

2
lib/main.dart
View file

@ -123,7 +123,7 @@ class App extends StatelessWidget {
return Loading(); return Loading();
} }
if (!clientState.isLoggedIn) { if (!clientState.isLoggedIn) {
return SelectServerPage(); return SelectServerPage();
} else if (!clientState.isVerified) { } else if (!clientState.isVerified) {
return VerifyPage(); return VerifyPage();

59
lib/pages/login_page.dart
View file

@ -15,17 +15,8 @@ class LoginPage extends HookConsumerWidget {
final client = ref.watch(ClientController.provider.notifier); final client = ref.watch(ClientController.provider.notifier);
final isLoggingIn = useState(false); final isLoggingIn = useState(false);
final hasError = useState(false); final hasError = useState(false);
final userNameFocusNode = useFocusNode();
final passwordFocusNode = useFocusNode(); final passwordFocusNode = useFocusNode();
//This is the safe way to request things directly after page load.
useEffect(() {
WidgetsBinding.instance.addPostFrameCallback((_) {
userNameFocusNode.requestFocus();
});
return null;
}, []);
final theme = Theme.of(context); final theme = Theme.of(context);
final username = useTextEditingController(); final username = useTextEditingController();
@ -40,8 +31,8 @@ class LoginPage extends HookConsumerWidget {
LoginRequest( LoginRequest(
username: username.text, username: username.text,
password: password.text, password: password.text,
homeserverUrl: homeserver.origin homeserverUrl: homeserver.origin,
) ),
); );
if (!context.mounted) return; if (!context.mounted) return;
@ -52,16 +43,13 @@ class LoginPage extends HookConsumerWidget {
SnackBar( SnackBar(
content: Text( content: Text(
"Login failed. Is your password right?\nError: $error", "Login failed. Is your password right?\nError: $error",
style: TextStyle( style: TextStyle(color: theme.colorScheme.onErrorContainer),
color: theme.colorScheme.onErrorContainer,
),
), ),
backgroundColor: theme.colorScheme.errorContainer, backgroundColor: theme.colorScheme.errorContainer,
), ),
); );
isLoggingIn.value = false; isLoggingIn.value = false;
} } else {
else{
Navigator.pop(context); Navigator.pop(context);
} }
passwordFocusNode.requestFocus(); passwordFocusNode.requestFocus();
@ -72,8 +60,8 @@ class LoginPage extends HookConsumerWidget {
appBar: Appbar( appBar: Appbar(
leading: IconButton( leading: IconButton(
icon: Icon(Icons.arrow_back), icon: Icon(Icons.arrow_back),
onPressed: () => Navigator.pop(context) onPressed: () => Navigator.pop(context),
), ),
), ),
istalri marked this conversation as resolved
Henry-Hiles commented 2026-06-02 16:45:25 -04:00
Copy link

prefer Navigator.of(context).pop()

prefer `Navigator.of(context).pop()`
body: AlertDialog( body: AlertDialog(
title: Text("Login to ${homeserver.host}"), title: Text("Login to ${homeserver.host}"),
@ -81,12 +69,10 @@ class LoginPage extends HookConsumerWidget {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text("Enter your login credentials:"),
"Enter your login credentials:",
),
SizedBox(height: 12), SizedBox(height: 12),
TextField( TextField(
focusNode: userNameFocusNode, autofocus: true,
textInputAction: TextInputAction.next, textInputAction: TextInputAction.next,
onChanged: (newVal) { onChanged: (newVal) {
if (hasError.value) { if (hasError.value) {
@ -98,11 +84,11 @@ class LoginPage extends HookConsumerWidget {
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
width: hasError.value ? 4 : 2, width: hasError.value ? 4 : 2,
color: hasError.value color: hasError.value
? theme.colorScheme.error ? theme.colorScheme.error
: theme.colorScheme.primary : theme.colorScheme.primary,
), ),
) ),
), ),
controller: username, controller: username,
), ),
@ -123,29 +109,26 @@ class LoginPage extends HookConsumerWidget {
borderSide: BorderSide( borderSide: BorderSide(
width: hasError.value ? 4 : 2, width: hasError.value ? 4 : 2,
color: hasError.value color: hasError.value
? theme.colorScheme.error ? theme.colorScheme.error
: theme.colorScheme.primary : theme.colorScheme.primary,
) ),
), ),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
width: hasError.value ? 4 : 2, width: hasError.value ? 4 : 2,
color: hasError.value color: hasError.value
? theme.colorScheme.error ? theme.colorScheme.error
: theme.colorScheme.primary : theme.colorScheme.primary,
), ),
) ),
), ),
controller: password, controller: password,
obscureText: true, obscureText: true,
), ),
], ],
), ),
actions: [ actions: [
TextButton( TextButton(onPressed: () => tryLogin(), child: Text("Sign In")),
onPressed: () => tryLogin(),
child: Text("Sign In"),
),
], ],
), ),
); );

295
lib/pages/select_server_page.dart
View file

@ -20,14 +20,14 @@ class SelectServerPage extends HookConsumerWidget {
final hasError = useState(false); final hasError = useState(false);
final isLoading = useState(false); final isLoading = useState(false);
final homeserverFocusNode = useFocusNode(); final homeserverFocusNode = useFocusNode();
final launch = ref.watch(LaunchHelper.provider).launchUrl; final launch = ref.watch(LaunchHelper.provider).launchUrl;
final homeserverUrl = useTextEditingController(); final homeserverUrl = useTextEditingController();
Future<void> setHomeserver(Uri? newHomeserver) async { Future<void> setHomeserver(Uri? newHomeserver) async {
isLoading.value = true; isLoading.value = true;
if(newHomeserver?.hasScheme == false){ if (newHomeserver?.hasScheme == false) {
newHomeserver = Uri.https(newHomeserver!.path); newHomeserver = Uri.https(newHomeserver!.path);
} }
@ -49,159 +49,180 @@ class SelectServerPage extends HookConsumerWidget {
); );
} else { } else {
homeserverUrl.text = newHomeserver!.origin; 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)))); Navigator.push(
context,
MaterialPageRoute(
builder: (_) => LoginPage(homeserver: Uri.parse(newUrl)),
),
);
} }
} }
homeserverFocusNode.requestFocus(); if (context.mounted) {
isLoading.value = false; homeserverFocusNode.requestFocus();
isLoading.value = false;
}
} }
return Scaffold( return Scaffold(
appBar: Appbar(), appBar: Appbar(),
body: isLoading.value body: isLoading.value
? const Loading() ? const Loading()
: Center( : Center(
child: ConstrainedBox( child: ConstrainedBox(
constraints: BoxConstraints(maxWidth: 600), constraints: BoxConstraints(maxWidth: 600),
child: Column( child: Column(
children: [ children: [
Row( Row(
children: [
SvgPicture.asset("assets/icon.svg", width: 128),
SizedBox(width: 12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text("Nexus", style: theme.textTheme.displayMedium), SvgPicture.asset("assets/icon.svg", width: 128),
Text( SizedBox(width: 12),
"A Simple Matrix Client", Expanded(
style: theme.textTheme.headlineMedium, child: Column(
overflow: TextOverflow.ellipsis, crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"Nexus",
style: theme.textTheme.displayMedium,
),
Text(
"A Simple Matrix Client",
style: theme.textTheme.headlineMedium,
overflow: TextOverflow.ellipsis,
),
],
),
), ),
], ],
), ),
), Padding(
], padding: EdgeInsetsGeometry.symmetric(vertical: 12),
), child: Divider(),
Padding(
padding: EdgeInsetsGeometry.symmetric(vertical: 12),
child: Divider(),
),
DividerText("Enter a homeserver domain:"),
Row(
spacing: 8,
children: [
Expanded(
child: TextField(
focusNode: homeserverFocusNode,
textInputAction: TextInputAction.done,
onSubmitted: (_) => setHomeserver(Uri.tryParse(homeserverUrl.text)),
onChanged: (newVal) {
if (hasError.value) {
hasError.value = false;
}
},
controller: homeserverUrl,
decoration: InputDecoration(
labelText: "Homeserver URL (e.g. matrix.org)",
hintText: "e.g. matrix.org",
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,
color: hasError.value
? theme.colorScheme.error
: theme.colorScheme.primary
)
),
),
), ),
), DividerText("Enter a homeserver domain:"),
IconButton.filled( Row(
tooltip: "Confirm homeserver choice", spacing: 8,
onPressed: isLoading.value children: [
? null Expanded(
: () => setHomeserver(Uri.tryParse(homeserverUrl.text)), child: TextField(
icon: Icon(Icons.check), focusNode: homeserverFocusNode,
), textInputAction: TextInputAction.done,
], onSubmitted: (_) =>
), setHomeserver(Uri.tryParse(homeserverUrl.text)),
Expanded( onChanged: (newVal) {
child: ListView( if (hasError.value) {
padding: EdgeInsets.only(top: 12), hasError.value = false;
children: [ }
DividerText("Or, choose from some popular homeservers:"), },
...(<Homeserver>[ controller: homeserverUrl,
Homeserver( decoration: InputDecoration(
name: "Matrix.org", labelText: "Homeserver URL (e.g. matrix.org)",
description: hintText: "e.g. matrix.org",
"The Matrix.org Foundation offers the matrix.org homeserver as an easy entry point for anyone wanting to try out Matrix.", focusedBorder: OutlineInputBorder(
url: Uri.https("matrix.org"), borderSide: BorderSide(
iconUrl: width: hasError.value ? 4 : 2,
"https://raw.githubusercontent.com/element-hq/logos/refs/heads/master/matrix/matrix-favicon${Theme.brightnessOf(context) == Brightness.dark ? "-white" : ""}.png", color: hasError.value
), ? theme.colorScheme.error
Homeserver( : theme.colorScheme.primary,
name: "Federated Nexus", ),
description: ),
"Federated Nexus is a community resource hosting multiple FOSS (especially federated) services, including Matrix and Forgejo. By the same developers who made Nexus client.", enabledBorder: OutlineInputBorder(
url: Uri.https("federated.nexus"), borderSide: BorderSide(
iconUrl: "https://federated.nexus/images/icon.png", width: hasError.value ? 4 : 2,
), color: hasError.value
Homeserver( ? theme.colorScheme.error
name: "Unredacted", : theme.colorScheme.primary,
description: ),
"Unredacted is a 501(c)(3) non-profit organization that builds Internet infrastructure and services to help people evade censorship and protect their right to privacy.", ),
url: Uri.https("unredacted.org", "services/si/matrix"),
iconUrl: "https://unredacted.org/favicon.ico",
),
Homeserver(
name: "Lorem ipsum",
description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
url: Uri.https("loremipsum.io"),
iconUrl: "https://loremipsum.io/favicon.ico"
),
].map(
(homeserver) => Card(
child: ListTile(
title: Text(homeserver.name),
leading: Image.network(
homeserver.iconUrl,
errorBuilder: (_, _, _) => SizedBox.shrink(),
height: 32,
),
subtitle: Text(homeserver.description),
onTap: isLoading.value
? null
: () => setHomeserver(homeserver.url),
trailing: IconButton(
tooltip: "Launch homeserver info page",
onPressed: () => launch(homeserver.url),
icon: Icon(Icons.info_outline),
), ),
), ),
), ),
)), IconButton.filled(
tooltip: "Confirm homeserver choice",
onPressed: isLoading.value
? null
: () => setHomeserver(
Uri.tryParse(homeserverUrl.text),
),
icon: Icon(Icons.check),
),
],
),
Expanded(
child: ListView(
padding: EdgeInsets.only(top: 12),
children: [
DividerText(
"Or, choose from some popular homeservers:",
),
...(<Homeserver>[
Homeserver(
name: "Matrix.org",
description:
"The Matrix.org Foundation offers the matrix.org homeserver as an easy entry point for anyone wanting to try out Matrix.",
url: Uri.https("matrix.org"),
iconUrl:
"https://raw.githubusercontent.com/element-hq/logos/refs/heads/master/matrix/matrix-favicon${Theme.brightnessOf(context) == Brightness.dark ? "-white" : ""}.png",
),
Homeserver(
name: "Federated Nexus",
description:
"Federated Nexus is a community resource hosting multiple FOSS (especially federated) services, including Matrix and Forgejo. By the same developers who made Nexus client.",
url: Uri.https("federated.nexus"),
iconUrl:
"https://federated.nexus/images/icon.png",
),
Homeserver(
name: "Unredacted",
description:
"Unredacted is a 501(c)(3) non-profit organization that builds Internet infrastructure and services to help people evade censorship and protect their right to privacy.",
url: Uri.https(
"unredacted.org",
"services/si/matrix",
),
iconUrl: "https://unredacted.org/favicon.ico",
),
Homeserver(
name: "Lorem ipsum",
description:
"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
url: Uri.https("loremipsum.io"),
iconUrl: "https://loremipsum.io/favicon.ico",
),
].map(
(homeserver) => Card(
child: ListTile(
title: Text(homeserver.name),
leading: Image.network(
homeserver.iconUrl,
errorBuilder: (_, _, _) => SizedBox.shrink(),
height: 32,
),
subtitle: Text(homeserver.description),
onTap: isLoading.value
? null
: () => setHomeserver(homeserver.url),
trailing: IconButton(
tooltip: "Launch homeserver info page",
onPressed: () => launch(homeserver.url),
icon: Icon(Icons.info_outline),
),
),
),
)),
],
),
),
SizedBox(height: 5),
TextButton(
onPressed: () =>
launch(Uri.https("servers.joinmatrix.org")),
child: Text("See more homeservers..."),
),
], ],
), ),
), ),
SizedBox(height: 5), ),
TextButton(
onPressed: () => launch(Uri.https("servers.joinmatrix.org")),
child: Text("See more homeservers..."),
),
],
),
),
),
); );
} }
} }