Henry-Hiles/nexus
2
2
Fork 1
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

minor changes

Browse source
This commit is contained in:
Henry Hiles 2025-12-14 16:30:19 -05:00
commit aa6b0f692c
No known key found for this signature in database
3 changed files with 12 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/helpers/extensions/room_to_children.dart
View file

@ -1,10 +1,11 @@
import "package:collection/collection.dart"; import "package:collection/collection.dart";
import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:matrix/matrix.dart"; import "package:matrix/matrix.dart";
import "package:nexus/helpers/extensions/get_full_room.dart"; import "package:nexus/helpers/extensions/get_full_room.dart";
import "package:nexus/models/full_room.dart"; import "package:nexus/models/full_room.dart";
extension RoomToChildren on Room { extension RoomToChildren on Room {
Future<List<FullRoom>> getAllChildren(Client client) async { Future<IList<FullRoom>> getAllChildren(Client client) async {
final direct = await Future.wait( final direct = await Future.wait(
spaceChildren spaceChildren
.map( .map(
@ -21,6 +22,6 @@ extension RoomToChildren on Room {
? await child.roomData.getAllChildren(client) ? await child.roomData.getAllChildren(client)
: [child], : [child],
), ),
)).expand((list) => list).toList(); )).expand((list) => list).toIList();
} }
} }

10
lib/pages/login_page.dart
View file

@ -19,6 +19,8 @@ class LoginPage extends HookConsumerWidget {
final isLoading = useState(false); final isLoading = useState(false);
final allowLogin = useState(false); final allowLogin = useState(false);
final launch = ref.watch(LaunchHelper.provider).launchUrl;
Future<void> setHomeserver(Uri? homeserver) async { Future<void> setHomeserver(Uri? homeserver) async {
isLoading.value = true; isLoading.value = true;
final succeeded = homeserver == null final succeeded = homeserver == null
@ -142,9 +144,7 @@ class LoginPage extends HookConsumerWidget {
? null ? null
: () => setHomeserver(homeserver.url), : () => setHomeserver(homeserver.url),
trailing: IconButton( trailing: IconButton(
onPressed: () => ref onPressed: () => launch(homeserver.url),
.watch(LaunchHelper.provider)
.launchUrl(homeserver.url),
icon: Icon(Icons.info_outline), icon: Icon(Icons.info_outline),
), ),
), ),
@ -152,9 +152,7 @@ class LoginPage extends HookConsumerWidget {
)), )),
SizedBox(height: 8), SizedBox(height: 8),
TextButton( TextButton(
onPressed: () => ref onPressed: () => launch(Uri.https("servers.joinmatrix.org")),
.watch(LaunchHelper.provider)
.launchUrl(Uri.https("servers.joinmatrix.org")),
child: Text("See more homeservers..."), child: Text("See more homeservers..."),
), ),
if (isLoading.value) if (isLoading.value)

19
lib/widgets/chat_page/top_widget.dart
View file

@ -3,10 +3,8 @@ import "package:flutter/material.dart";
import "package:flutter_chat_core/flutter_chat_core.dart"; import "package:flutter_chat_core/flutter_chat_core.dart";
import "package:flutter_chat_ui/flutter_chat_ui.dart"; import "package:flutter_chat_ui/flutter_chat_ui.dart";
import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:flutter_riverpod/flutter_riverpod.dart";
import "package:nexus/controllers/avatar_controller.dart";
import "package:nexus/controllers/message_controller.dart"; import "package:nexus/controllers/message_controller.dart";
import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/helpers/extensions/better_when.dart";
import "package:nexus/widgets/avatar_or_hash.dart";
import "package:nexus/widgets/chat_page/quoted.dart"; import "package:nexus/widgets/chat_page/quoted.dart";
class TopWidget extends ConsumerWidget { class TopWidget extends ConsumerWidget {
@ -64,18 +62,11 @@ class TopWidget extends ConsumerWidget {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
spacing: 8, spacing: 8,
children: [ children: [
ref Avatar(
.watch( userId: replyMessage.authorId,
AvatarController.provider(replyMessage.authorId), headers: headers,
) size: 16,
.betterWhen( ),
data: (avatar) => AvatarOrHash(
avatar,
replyMessage.metadata?["displayName"] ??
replyMessage.authorId,
headers: headers,
),
),
Flexible( Flexible(
child: Text( child: Text(
replyMessage.metadata?["displayName"] ?? replyMessage.metadata?["displayName"] ??