Compare commits

...
Author SHA1 Message Date
bebbf43a5e
Revert "bump deps"
This reverts commit f8938b8257. Needed until https://github.com/flutter/flutter/issues/196529 is fixed.
2026-11-22 16:01:04 -05:00
65890b8e00
insert unicode emojis as text not tags 2026-11-22 13:17:44 -05:00
f8938b8257
bump deps 2026-11-22 12:42:37 -05:00
84aad2efbf
ignore errors caused by flutter bug 2026-11-22 10:45:27 -05:00
1d2c6ff02e
improve member list performance 2026-11-21 15:08:22 -05:00
82dc81219c
bump gomuks
fixes migration issue
2026-11-21 14:32:31 -05:00
4e66781fce
fix gomuks vendorHash 2026-11-21 14:24:32 -05:00
600b80b99f
fix location hash 2026-11-21 14:21:43 -05:00
3a2d312c37
bump gomuks 2026-11-21 14:21:26 -05:00
8d2bf2145f
bump deps 2026-11-21 14:18:44 -05:00
54f2c93d92
fix wrapping of previews of unknown message types 2026-11-19 20:13:28 -05:00
a6f2f3072e
try to fix doubled inset issue 2026-11-19 20:09:56 -05:00
5c510c5f2e
fix sendErrors not wrapping 2026-11-19 11:56:23 -05:00
3fe0ef8454
fix avif decoding 2026-11-19 10:33:10 -05:00
66fadef927
catch audioplayers error correctly 2026-11-18 14:27:03 -05:00
e1f505a1f8
bump pasteboard 2026-11-18 12:07:42 -05:00
ad402ff456
don't cache fetch failures for media 2026-11-18 11:09:36 -05:00
0193811993
add ClockController so timestamps dont get stuck 2026-11-18 09:51:00 -05:00
712452f202
fall back to localpart in a mention when displayName is null 2026-11-17 20:59:19 -05:00
d7006ebeb0
use pasteboard fork
Should work inside flatpak sandbox now
2026-11-17 13:59:53 -05:00
8793246510
prepare v1.1.3 2026-11-17 10:27:28 -05:00
4362d2c8bf
make release script executable 2026-11-17 10:27:23 -05:00
6160ce692f
bundle homeserver icons 2026-11-17 10:25:43 -05:00
9a8a54c4a3
add fallback if opening a link fails 2026-11-17 10:18:30 -05:00
98e7edd420
don't include dependenciesInfo in APK 2026-11-16 14:12:20 -05:00
31 changed files with 383 additions and 146 deletions

View file

@ -36,7 +36,7 @@ jobs:
- name: Go build - name: Go build
run: | run: |
cd gomuks/pkg/ffi cd gomuks/pkg/ffi
go build -tags goolm,sqlite_fts5 -o ../../../libgomuks.dll -buildmode=c-shared go build -tags sqlite_fts5 -o ../../../libgomuks.dll -buildmode=c-shared
- name: Build with Flutter - name: Build with Flutter
run: | run: |

View file

@ -49,7 +49,7 @@ nexus = {
This tracks the latest commit on `main`. To stay on a release instead, pin the input to its tag: This tracks the latest commit on `main`. To stay on a release instead, pin the input to its tag:
```nix ```nix
url = "git+https://git.federated.nexus/Nexus/nexus?ref=refs/tags/v1.1.2"; url = "git+https://git.federated.nexus/Nexus/nexus?ref=refs/tags/v1.1.3";
``` ```
Then import the module and enable it in your NixOS configuration: Then import the module and enable it in your NixOS configuration:

View file

@ -57,6 +57,10 @@ android {
} }
} }
dependenciesInfo {
includeInApk = false
}
buildTypes { buildTypes {
release { release {
// Unsigned without a keystore, e.g. for F-Droid, which signs it itself // Unsigned without a keystore, e.g. for F-Droid, which signs it itself

View file

@ -35,6 +35,6 @@ class MainActivity: FlutterActivity() {
// Posted so it runs after Flutter has applied any insets it deferred. // Posted so it runs after Flutter has applied any insets it deferred.
private fun reapplyInsets() { private fun reapplyInsets() {
val view = findViewById<View>(FLUTTER_VIEW_ID) ?: return val view = findViewById<View>(FLUTTER_VIEW_ID) ?: return
view.post { view.rootWindowInsets?.let(view::onApplyWindowInsets) } view.post { view.requestApplyInsets() }
} }
} }

View file

@ -0,0 +1,150 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="100mm"
height="100mm"
viewBox="0 0 100 100"
version="1.1"
id="svg1"
xml:space="preserve"
inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
sodipodi:docname="icon.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
id="namedview1"
pagecolor="#505050"
bordercolor="#eeeeee"
borderopacity="1"
inkscape:showpageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#505050"
inkscape:document-units="mm"
inkscape:zoom="1.0847363"
inkscape:cx="57.61769"
inkscape:cy="214.33781"
inkscape:window-width="1896"
inkscape:window-height="963"
inkscape:window-x="35"
inkscape:window-y="32"
inkscape:window-maximized="0"
inkscape:current-layer="layer1" /><defs
id="defs1"><linearGradient
id="linearGradient10"
inkscape:collect="always"><stop
style="stop-color:#c7a312;stop-opacity:1;"
offset="0"
id="stop10" /><stop
style="stop-color:#26a0b3;stop-opacity:1;"
offset="1"
id="stop11" /></linearGradient><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient10"
id="linearGradient11"
x1="20.031296"
y1="32.697563"
x2="90.709213"
y2="66.3423"
gradientUnits="userSpaceOnUse" /></defs><g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"><rect
style="fill:url(#linearGradient11);fill-opacity:1;stroke:none;stroke-width:7.99999;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
id="rect10"
width="100"
height="100"
x="0"
y="0"
ry="28.294127" /><path
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
d="M 19.377906,68.106953 80.937684,32.43771"
id="path10" /><path
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
d="m 19.044488,32.469148 61.61782,35.569625"
id="path9" /><path
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
d="M 50,85.574911 V 14.425087"
id="path8" /><circle
style="fill:none;stroke:#ffffff;stroke-width:7.11498;stroke-linecap:round;stroke-linejoin:round"
id="path1"
cx="50"
cy="50"
r="35.574913" /><circle
style="fill:#09bd05;stroke:#ffffff;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;fill-opacity:1;stroke-dasharray:none"
id="path2"
cx="50"
cy="84.604881"
r="8.2508707" /><circle
style="fill:#fe1e24;stroke:#ffffff;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;fill-opacity:1;stroke-dasharray:none"
id="circle2"
cx="50"
cy="15.395123"
r="8.2508707" /><circle
style="fill:#fe941d;stroke:#ffffff;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;fill-opacity:1;stroke-dasharray:none"
id="circle3"
cx="-68.30127"
cy="52.906147"
r="8.2508707"
transform="rotate(-120)" /><circle
style="fill:#001996;stroke:#ffffff;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;fill-opacity:1;stroke-dasharray:none"
id="circle4"
cx="-68.30127"
cy="-16.30361"
r="8.2508707"
transform="rotate(-120)" /><circle
style="fill:#ffff04;stroke:#ffffff;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;fill-opacity:1;stroke-dasharray:none"
id="circle5"
cx="-18.301271"
cy="102.90615"
r="8.2508707"
transform="rotate(-60)" /><circle
style="fill:#770287;stroke:#ffffff;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;fill-opacity:1;stroke-dasharray:none"
id="circle6"
cx="-18.301271"
cy="33.696392"
r="8.2508707"
transform="rotate(-60)" /><circle
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:6.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
id="path7"
cx="50"
cy="50"
r="9.7918472" /><g
inkscape:label="Layer 1"
id="layer1-3"
transform="matrix(0.08246781,0,0,0.08246781,38.828362,38.828362)"
style="stroke:#ffffff"><text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:96.3615px;line-height:0;font-family:'Noto Serif';-inkscape-font-specification:'Noto Serif, Heavy';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-dasharray:none;stroke-opacity:1"
x="-305.64749"
y="194.14493"
id="text2819"><tspan
sodipodi:role="line"
id="tspan2817"
style="stroke:#ffffff;stroke-width:0"
x="-305.64749"
y="194.14493" /></text><circle
style="fill:#354b5f;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-dasharray:none;stroke-opacity:1"
id="path342"
cx="135.46666"
cy="135.46666"
r="135.46666" /><text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:96.3615px;line-height:0;font-family:'Noto Serif';-inkscape-font-specification:'Noto Serif, Heavy';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-dasharray:none;stroke-opacity:1"
x="-305.64749"
y="194.14493"
id="text2819-3"><tspan
sodipodi:role="line"
id="tspan2817-5"
style="stroke:#ffffff;stroke-width:0"
x="-305.64749"
y="194.14493" /></text><g
aria-label="❯"
id="text2827-6"
style="font-size:132.452px;line-height:0;font-family:PowerlineSymbols;-inkscape-font-specification:'PowerlineSymbols, Normal';text-align:end;text-anchor:end;fill:#4e94e4;fill-opacity:1;stroke:#ffffff;stroke-width:0"><path
d="M 95.096912,209.8167 143.88912,135.46666 95.096912,61.116629 h 32.818568 l 47.92093,74.350031 -47.92093,74.35004 z"
id="path2883-2"
style="fill:#4e94e4;fill-opacity:1;stroke:#ffffff;stroke-width:0" /></g></g></g></svg>

After

Width:  |  Height:  |  Size: 6.8 KiB

11
assets/bundled/matrix.svg Normal file
View file

@ -0,0 +1,11 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 520 520">
<path d="M13.7,11.9v496.2h35.7V520H0V0h49.4v11.9H13.7z"/>
<path d="M166.3,169.2v25.1h0.7c6.7-9.6,14.8-17,24.2-22.2c9.4-5.3,20.3-7.9,32.5-7.9c11.7,0,22.4,2.3,32.1,6.8
c9.7,4.5,17,12.6,22.1,24c5.5-8.1,13-15.3,22.4-21.5c9.4-6.2,20.6-9.3,33.5-9.3c9.8,0,18.9,1.2,27.3,3.6c8.4,2.4,15.5,6.2,21.5,11.5
c6,5.3,10.6,12.1,14,20.6c3.3,8.5,5,18.7,5,30.7v124.1h-50.9V249.6c0-6.2-0.2-12.1-0.7-17.6c-0.5-5.5-1.8-10.3-3.9-14.3
c-2.2-4.1-5.3-7.3-9.5-9.7c-4.2-2.4-9.9-3.6-17-3.6c-7.2,0-13,1.4-17.4,4.1c-4.4,2.8-7.9,6.3-10.4,10.8c-2.5,4.4-4.2,9.4-5,15.1
c-0.8,5.6-1.3,11.3-1.3,17v103.3h-50.9v-104c0-5.5-0.1-10.9-0.4-16.3c-0.2-5.4-1.3-10.3-3.1-14.9c-1.8-4.5-4.8-8.2-9-10.9
c-4.2-2.7-10.3-4.1-18.5-4.1c-2.4,0-5.6,0.5-9.5,1.6c-3.9,1.1-7.8,3.1-11.5,6.1c-3.7,3-6.9,7.3-9.5,12.9c-2.6,5.6-3.9,13-3.9,22.1
v107.6h-50.9V169.2H166.3z"/>
<path d="M506.3,508.1V11.9h-35.7V0H520v520h-49.4v-11.9H506.3z"/>
</svg>

After

Width:  |  Height:  |  Size: 958 B

2
gomuks

@ -1 +1 @@
Subproject commit 94d91fbbb70b1519f545f3ec1ae523a6ee965e23 Subproject commit 2a76e97eb3e955ec14775ce4027ed446865ed7fa

View file

@ -123,7 +123,6 @@ Future<void> main(List<String> args) => build(args, (input, output) async {
final tags = [ final tags = [
"sqlite_fts5", "sqlite_fts5",
"goolm",
// goheif/dav1d is not supported on Android or iOS, would need to be fixed upstream // goheif/dav1d is not supported on Android or iOS, would need to be fixed upstream
"noheic", "noheic",
].join(","); ].join(",");

View file

@ -0,0 +1,20 @@
import "dart:async";
import "package:flutter_riverpod/flutter_riverpod.dart";
class ClockController extends Notifier<DateTime> {
@override
DateTime build() {
final timer = Timer.periodic(
const .new(seconds: 30),
(_) => state = .now(),
);
ref.onDispose(timer.cancel);
return .now();
}
static final provider =
NotifierProvider.autoDispose<ClockController, DateTime>(
ClockController.new,
);
}

View file

@ -1,17 +1,30 @@
import "package:flutter/services.dart"; import "package:flutter/services.dart";
import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:flutter_riverpod/flutter_riverpod.dart";
import "package:material_ui/material_ui.dart";
import "package:nexus/helpers/extensions/show_error_snack_bar.dart";
import "package:nexus/main.dart";
import "package:url_launcher/url_launcher.dart" as ul; import "package:url_launcher/url_launcher.dart" as ul;
class LaunchHelper(Ref ref) { class LaunchHelper(Ref ref) {
Future<bool> launchUrl(Uri url, {bool useWebview = false}) async { Future<bool> launchUrl(Uri url, {bool useWebview = false}) async {
try { final launched = await ul
return await ul.launchUrl( .launchUrl(
url, url,
mode: useWebview ? .inAppBrowserView : .externalApplication, mode: useWebview ? .inAppBrowserView : .externalApplication,
)
.catchError((_) => false, test: (error) => error is PlatformException);
if (navigatorKey.currentContext case final context?
when !launched && context.mounted) {
ScaffoldMessenger.of(context).showErrorSnackBar(
"Couldn't open $url. Is there a browser installed?",
action: (
label: "Copy link",
onPressed: () => Clipboard.setData(.new(text: url.toString())),
),
); );
} on PlatformException catch (_) {
return false;
} }
return launched;
} }
static final provider = Provider<LaunchHelper>(LaunchHelper.new); static final provider = Provider<LaunchHelper>(LaunchHelper.new);

View file

@ -1,6 +1,7 @@
import "dart:async"; import "dart:async";
import "dart:io"; import "dart:io";
import "dart:isolate"; import "dart:isolate";
import "dart:typed_data";
import "dart:ui" as ui; import "dart:ui" as ui;
import "package:avif_native/avif_native.dart"; import "package:avif_native/avif_native.dart";
@ -20,6 +21,7 @@ class MxcImage(final WidgetRef ref, final DownloadMediaRequest request)
MultiFrameImageStreamCompleter(codec: _loadAsync(decode), scale: 1.0); MultiFrameImageStreamCompleter(codec: _loadAsync(decode), scale: 1.0);
Future<ui.Codec> _loadAsync(ImageDecoderCallback decode) async { Future<ui.Codec> _loadAsync(ImageDecoderCallback decode) async {
try {
final file = await ref final file = await ref
.read(ClientController.provider.notifier) .read(ClientController.provider.notifier)
.downloadMedia(request); .downloadMedia(request);
@ -28,11 +30,18 @@ class MxcImage(final WidgetRef ref, final DownloadMediaRequest request)
// Flutter can't decode AVIF on Linux/Windows (or older Android/iOS), so we do it ourselves // Flutter can't decode AVIF on Linux/Windows (or older Android/iOS), so we do it ourselves
if (String.fromCharCodes(bytes.skip(4).take(8)) if (String.fromCharCodes(bytes.skip(4).take(8))
case "ftypavif" || "ftypavis") { case "ftypavif" || "ftypavis") {
return AvifCodec(await Isolate.run(() => decodeAvif(bytes))); return AvifCodec(await _decodeAvifInIsolate(bytes));
} }
return decode(await .fromUint8List(bytes)); return await decode(await .fromUint8List(bytes));
} catch (_) {
scheduleMicrotask(() => PaintingBinding.instance.imageCache.evict(this));
rethrow;
} }
}
static Future<AvifImageData> _decodeAvifInIsolate(Uint8List bytes) =>
Isolate.run(() => decodeAvif(bytes));
@override @override
bool operator ==(Object other) => bool operator ==(Object other) =>

View file

@ -45,7 +45,11 @@ New Value: ${newValue is AsyncData ? newValue.value : newValue}
} }
void showError(Object error, [StackTrace? stackTrace]) { void showError(Object error, [StackTrace? stackTrace]) {
if (error.toString().contains("'_nextFrame != null': is not true.")) { // Harmless Flutter race in animated images (the assert in debug, a null check in release)
if (error.toString().contains("'_nextFrame != null': is not true.") ||
stackTrace.toString().contains(
"MultiFrameImageStreamCompleter._handleAppFrame",
)) {
return; return;
} }

View file

@ -1,4 +1,5 @@
import "package:freezed_annotation/freezed_annotation.dart"; import "package:freezed_annotation/freezed_annotation.dart";
import "package:material_ui/material_ui.dart";
part "homeserver.freezed.dart"; part "homeserver.freezed.dart";
@ -7,5 +8,5 @@ class const Homeserver({
required final String name, required final String name,
required final String description, required final String description,
required final Uri url, required final Uri url,
required final String iconUrl, required final Widget icon,
}) with _$Homeserver; }) with _$Homeserver;

View file

@ -1,5 +1,6 @@
import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:material_ui/material_ui.dart"; import "package:material_ui/material_ui.dart";
import "package:nexus/controllers/clock.dart";
import "package:nexus/controllers/sync_status.dart"; import "package:nexus/controllers/sync_status.dart";
import "package:nexus/widgets/common/error_dialog.dart"; import "package:nexus/widgets/common/error_dialog.dart";
import "package:timeago/timeago.dart"; import "package:timeago/timeago.dart";
@ -38,7 +39,7 @@ class const SyncStatusBanner({super.key}) extends ConsumerWidget {
?status.error, ?status.error,
if (status.errorCount > 0) "Failed attempts: ${status.errorCount}.", if (status.errorCount > 0) "Failed attempts: ${status.errorCount}.",
if (status.lastSync case final lastSync?) if (status.lastSync case final lastSync?)
"Last synced ${format(lastSync)}.", "Last synced ${format(lastSync, clock: ref.watch(ClockController.provider))}.",
]; ];
return AnimatedSize( return AnimatedSize(

View file

@ -1,13 +1,15 @@
import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:material_ui/material_ui.dart"; import "package:material_ui/material_ui.dart";
import "package:nexus/controllers/clock.dart";
import "package:timeago/timeago.dart"; import "package:timeago/timeago.dart";
class const Timestamp(final DateTime timestamp, {super.key}) class const Timestamp(final DateTime timestamp, {super.key})
extends StatelessWidget { extends ConsumerWidget {
@override @override
Widget build(BuildContext context) => Tooltip( Widget build(BuildContext context, WidgetRef ref) => Tooltip(
message: timestamp.toString(), message: timestamp.toString(),
child: Text( child: Text(
format(timestamp), format(timestamp, clock: ref.watch(ClockController.provider)),
maxLines: 1, maxLines: 1,
overflow: .ellipsis, overflow: .ellipsis,
style: Theme.of(context).textTheme.labelSmall style: Theme.of(context).textTheme.labelSmall

View file

@ -834,6 +834,21 @@ class const Composer(
controller.addTag(id: id, name: name); controller.addTag(id: id, name: name);
node?.requestFocus(); node?.requestFocus();
}, },
insertText: (text) {
final end =
controller.selection.baseOffset;
controller
..dismissOverlay()
..value = controller.value.replaced(
.new(
start:
end - query.value.length - 1,
end: end,
),
"$text ",
);
node?.requestFocus();
},
), ),
controller: controller, controller: controller,
onSearch: (newQuery, newTriggerCharacter) { onSearch: (newQuery, newTriggerCharacter) {

View file

@ -12,6 +12,7 @@ class const EmojiOverlay(
required final String roomId, required final String roomId,
required final void Function({required String id, required String name}) required final void Function({required String id, required String name})
addTag, addTag,
required final void Function(String text) insertText,
super.key, super.key,
}) extends ConsumerWidget { }) extends ConsumerWidget {
@override @override
@ -38,19 +39,19 @@ class const EmojiOverlay(
), ),
title: Text(emoji.aliases.first), title: Text(emoji.aliases.first),
subtitle: Text(emoji.description), subtitle: Text(emoji.description),
onTap: () => addTag( onTap: () => emoji.value.startsWith("mxc://")
id: emoji.value.startsWith("mxc://") ? addTag(
? ImagePack.emojiMarkdown( id: ImagePack.emojiMarkdown(
emoji.aliases.first, emoji.aliases.first,
emoji.value, emoji.value,
description: switch (emoji.data) { description: switch (emoji.data) {
PackImage(:final body) => body, PackImage(:final body) => body,
_ => null, _ => null,
}, },
)
: emoji.value,
name: emoji.aliases.first,
), ),
name: emoji.aliases.first,
)
: insertText(emoji.value),
), ),
) )
.toList(), .toList(),

View file

@ -10,6 +10,7 @@ class const TaggerOverlay(
required final String roomId, required final String roomId,
required final void Function({required String id, required String name}) required final void Function({required String id, required String name})
addTag, addTag,
required final void Function(String text) insertText,
required final String? triggerCharacter, required final String? triggerCharacter,
super.key, super.key,
}) extends ConsumerWidget { }) extends ConsumerWidget {
@ -27,7 +28,12 @@ class const TaggerOverlay(
child: switch (triggerCharacter) { child: switch (triggerCharacter) {
"@" => UserOverlay(query, roomId: roomId, addTag: addTag), "@" => UserOverlay(query, roomId: roomId, addTag: addTag),
"#" => RoomOverlay(query, addTag: addTag), "#" => RoomOverlay(query, addTag: addTag),
":" => EmojiOverlay(query, roomId: roomId, addTag: addTag), ":" => EmojiOverlay(
query,
roomId: roomId,
addTag: addTag,
insertText: insertText,
),
_ => Loading(), _ => Loading(),
}, },

View file

@ -41,7 +41,7 @@ class const UserOverlay(
title: Text(displayName ?? member.stateKey!.localpart), title: Text(displayName ?? member.stateKey!.localpart),
subtitle: Text(member.stateKey!), subtitle: Text(member.stateKey!),
onTap: () => addTag( onTap: () => addTag(
id: "[@$displayName](matrix:u/${member.stateKey!.substring(1)})", id: "[@${displayName ?? member.stateKey!.localpart}](matrix:u/${member.stateKey!.substring(1)})",
name: member.stateKey!.localpart, name: member.stateKey!.localpart,
), ),
), ),

View file

@ -48,7 +48,7 @@ class const SelectServerPage({super.key}) extends HookConsumerWidget {
Future<void> tryLogin(Uri url) async { Future<void> tryLogin(Uri url) async {
final OAuthAuthCodeResponse codeResponse; final OAuthAuthCodeResponse codeResponse;
try { try {
codeResponse = await ref.watch( codeResponse = await ref.read(
AuthUrlController.provider(url).future, AuthUrlController.provider(url).future,
); );
} on GomuksException catch (error) { } on GomuksException catch (error) {
@ -190,31 +190,34 @@ class const SelectServerPage({super.key}) extends HookConsumerWidget {
name: "Matrix.org", 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.", description: "The Matrix.org Foundation offers the matrix.org homeserver as an easy entry point for anyone wanting to try out Matrix.",
url: .https("matrix.org"), url: .https("matrix.org"),
iconUrl: icon: SvgPicture.asset(
"https://raw.githubusercontent.com/element-hq/logos/refs/heads/master/matrix/matrix-favicon${Theme.brightnessOf(context) == Brightness.dark ? "-white" : ""}.png", "assets/bundled/matrix.svg",
colorFilter: .mode(theme.colorScheme.onSurface, .srcIn),
),
), ),
.new( .new(
name: "Federated Nexus", 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.", 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: .https("federated.nexus"), url: .https("federated.nexus"),
iconUrl: "https://federated.nexus/images/icon.png", icon: SvgPicture.asset(
"assets/bundled/federated_nexus.svg",
),
), ),
// TODO: Add back unredacted when they have MAS, find where new favicon is // TODO: Add back unredacted when they have MAS, find where new favicon is
// .new( // .new(
// name: "Unredacted", // 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.", // 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: .https("unredacted.org", "services/si/matrix"), // url: .https("unredacted.org", "services/si/matrix"),
// iconUrl: "https://unredacted.org/favicon.ico", // icon: Image.network("https://unredacted.org/favicon.ico"),
// ), // ),
].map( ].map(
(homeserver) => Card( (homeserver) => Card(
child: ListTile( child: ListTile(
enabled: !isLoading.value, enabled: !isLoading.value,
title: Text(homeserver.name), title: Text(homeserver.name),
leading: Image.network( leading: SizedBox.square(
homeserver.iconUrl, dimension: 32,
errorBuilder: (_, _, _) => SizedBox.shrink(), child: homeserver.icon,
height: 32,
), ),
subtitle: Text(homeserver.description), subtitle: Text(homeserver.description),
onTap: isLoading.value onTap: isLoading.value

Some files were not shown because too many files have changed in this diff Show more