From 98e7edd42095d004a33f332f1ae654517e6bb3b8 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Mon, 16 Nov 2026 14:12:20 -0500 Subject: [PATCH 01/25] don't include dependenciesInfo in APK --- android/app/build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 46feed1..35d2638 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -57,6 +57,10 @@ android { } } + dependenciesInfo { + includeInApk = false + } + buildTypes { release { // Unsigned without a keystore, e.g. for F-Droid, which signs it itself From 9a8a54c4a39503e8ff7b9828301b1d9414125ced Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Tue, 17 Nov 2026 10:18:30 -0500 Subject: [PATCH 02/25] add fallback if opening a link fails --- lib/helpers/launch_helper.dart | 25 +++++++++++++++++++------ lib/widgets/pages/select_server.dart | 2 +- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/lib/helpers/launch_helper.dart b/lib/helpers/launch_helper.dart index 89c7015..82f1806 100644 --- a/lib/helpers/launch_helper.dart +++ b/lib/helpers/launch_helper.dart @@ -1,17 +1,30 @@ import "package:flutter/services.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; class LaunchHelper(Ref ref) { Future launchUrl(Uri url, {bool useWebview = false}) async { - try { - return await ul.launchUrl( - url, - mode: useWebview ? .inAppBrowserView : .externalApplication, + final launched = await ul + .launchUrl( + url, + 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.new); diff --git a/lib/widgets/pages/select_server.dart b/lib/widgets/pages/select_server.dart index a44e4b8..2bcbca7 100644 --- a/lib/widgets/pages/select_server.dart +++ b/lib/widgets/pages/select_server.dart @@ -48,7 +48,7 @@ class const SelectServerPage({super.key}) extends HookConsumerWidget { Future tryLogin(Uri url) async { final OAuthAuthCodeResponse codeResponse; try { - codeResponse = await ref.watch( + codeResponse = await ref.read( AuthUrlController.provider(url).future, ); } on GomuksException catch (error) { From 6160ce692feba762d55f02a1df2aee8e2050802a Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Tue, 17 Nov 2026 10:25:43 -0500 Subject: [PATCH 03/25] bundle homeserver icons --- assets/bundled/federated_nexus.svg | 150 +++++++++++++++++++++++++++ assets/bundled/matrix.svg | 11 ++ lib/models/homeserver.dart | 3 +- lib/widgets/pages/select_server.dart | 19 ++-- 4 files changed, 174 insertions(+), 9 deletions(-) create mode 100644 assets/bundled/federated_nexus.svg create mode 100644 assets/bundled/matrix.svg diff --git a/assets/bundled/federated_nexus.svg b/assets/bundled/federated_nexus.svg new file mode 100644 index 0000000..0effd9a --- /dev/null +++ b/assets/bundled/federated_nexus.svg @@ -0,0 +1,150 @@ + + + + diff --git a/assets/bundled/matrix.svg b/assets/bundled/matrix.svg new file mode 100644 index 0000000..bfe705e --- /dev/null +++ b/assets/bundled/matrix.svg @@ -0,0 +1,11 @@ + + + + + diff --git a/lib/models/homeserver.dart b/lib/models/homeserver.dart index 5504941..ca1a271 100644 --- a/lib/models/homeserver.dart +++ b/lib/models/homeserver.dart @@ -1,4 +1,5 @@ import "package:freezed_annotation/freezed_annotation.dart"; +import "package:material_ui/material_ui.dart"; part "homeserver.freezed.dart"; @@ -7,5 +8,5 @@ class const Homeserver({ required final String name, required final String description, required final Uri url, - required final String iconUrl, + required final Widget icon, }) with _$Homeserver; diff --git a/lib/widgets/pages/select_server.dart b/lib/widgets/pages/select_server.dart index 2bcbca7..a3102e6 100644 --- a/lib/widgets/pages/select_server.dart +++ b/lib/widgets/pages/select_server.dart @@ -190,31 +190,34 @@ class const SelectServerPage({super.key}) extends HookConsumerWidget { 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: .https("matrix.org"), - iconUrl: - "https://raw.githubusercontent.com/element-hq/logos/refs/heads/master/matrix/matrix-favicon${Theme.brightnessOf(context) == Brightness.dark ? "-white" : ""}.png", + icon: SvgPicture.asset( + "assets/bundled/matrix.svg", + colorFilter: .mode(theme.colorScheme.onSurface, .srcIn), + ), ), .new( 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: .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 // .new( // 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: .https("unredacted.org", "services/si/matrix"), - // iconUrl: "https://unredacted.org/favicon.ico", + // icon: Image.network("https://unredacted.org/favicon.ico"), // ), ].map( (homeserver) => Card( child: ListTile( enabled: !isLoading.value, title: Text(homeserver.name), - leading: Image.network( - homeserver.iconUrl, - errorBuilder: (_, _, _) => SizedBox.shrink(), - height: 32, + leading: SizedBox.square( + dimension: 32, + child: homeserver.icon, ), subtitle: Text(homeserver.description), onTap: isLoading.value From 4362d2c8bf02bd4405cad7ffff82a71ccda111ad Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Tue, 17 Nov 2026 10:27:23 -0500 Subject: [PATCH 04/25] make release script executable --- scripts/release.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/release.sh diff --git a/scripts/release.sh b/scripts/release.sh old mode 100644 new mode 100755 From 87932465105ecff43ec40e20bf2df06ef4b3bd3b Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Tue, 17 Nov 2026 10:27:28 -0500 Subject: [PATCH 05/25] prepare v1.1.3 --- README.md | 2 +- linux/nexus.federated.nexus.metainfo.xml | 1 + pubspec.yaml | 2 +- windows/installer.iss | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b895cc4..4fd61e4 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ nexus = { This tracks the latest commit on `main`. To stay on a release instead, pin the input to its tag: ```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: diff --git a/linux/nexus.federated.nexus.metainfo.xml b/linux/nexus.federated.nexus.metainfo.xml index a064355..53c738c 100644 --- a/linux/nexus.federated.nexus.metainfo.xml +++ b/linux/nexus.federated.nexus.metainfo.xml @@ -68,6 +68,7 @@ + diff --git a/pubspec.yaml b/pubspec.yaml index 715b3a0..a5bf0c0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: nexus description: "A simple and user-friendly Matrix client" -version: 1.1.2+101020999 +version: 1.1.3+101030999 publish_to: none flutter: diff --git a/windows/installer.iss b/windows/installer.iss index 0a43cb9..e1a08c0 100644 --- a/windows/installer.iss +++ b/windows/installer.iss @@ -1,6 +1,6 @@ [Setup] AppName=Nexus -AppVersion=1.1.2 +AppVersion=1.1.3 DefaultDirName={pf}\Nexus DefaultGroupName=Nexus OutputDir=dist From d7006ebeb0aff18f6802bd30c81d87fae3099235 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Tue, 17 Nov 2026 13:59:53 -0500 Subject: [PATCH 06/25] use pasteboard fork Should work inside flatpak sandbox now --- linux/nix/pkg/default.nix | 1 + pubspec.lock | 11 ++++++----- pubspec.yaml | 4 ++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/linux/nix/pkg/default.nix b/linux/nix/pkg/default.nix index d69710b..75af5ff 100644 --- a/linux/nix/pkg/default.nix +++ b/linux/nix/pkg/default.nix @@ -68,6 +68,7 @@ flutter.buildFlutterApplication { m3e_design = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI="; native_toolchain_cmake = "sha256-/drnHZebmTnsCnHgC1xmlAe+U4PSrjw5Sm9axicuTrY="; navigation_rail_m3e = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI="; + pasteboard = "sha256-7c8fkNBrvJuWar58aS0z657cP7pCZ+az4XPi1/o0ynY="; unifiedpush_linux = "sha256-KQKyBPL2ORK9O89C4K3RHGve/lvFaU1vIjSDnj6+bj4="; unifiedpush_platform_interface = "sha256-KQKyBPL2ORK9O89C4K3RHGve/lvFaU1vIjSDnj6+bj4="; xdg_desktop_portal = "sha256-8GgiXHGv+wy6hJgj/rZxbymMitNVmdDLAnedZm9STSc="; diff --git a/pubspec.lock b/pubspec.lock index 40c4b8c..f3977ab 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1249,11 +1249,12 @@ packages: pasteboard: dependency: "direct main" description: - name: pasteboard - sha256: e0535da36124e6f2ca9d17424102ce5de34e72acc39f05a1d942b974b48e5eea - url: "https://pub.dev" - source: hosted - version: "0.6.0" + path: "packages/pasteboard" + ref: HEAD + resolved-ref: b5427767c5da1d9bba4c7227dd66ba2b108e9555 + url: "https://github.com/Henry-Hiles/flutter-plugins" + source: git + version: "0.6.1" path: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index a5bf0c0..4274f66 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -44,6 +44,10 @@ dependency_overrides: url: https://codeberg.org/Henry-Hiles/flutter-connector ref: quad/nexus path: unifiedpush_platform_interface + pasteboard: + git: + url: https://github.com/Henry-Hiles/flutter-plugins # FileTransfer portal support on Linux, unreleased + path: packages/pasteboard linkify: git: url: https://github.com/appelladev/linkify From 712452f202269260e96d5c85a487cc350d78140f Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Tue, 17 Nov 2026 20:59:19 -0500 Subject: [PATCH 07/25] fall back to localpart in a mention when displayName is null --- lib/widgets/composer/overlays/user_overlay.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/widgets/composer/overlays/user_overlay.dart b/lib/widgets/composer/overlays/user_overlay.dart index eec15f5..845fb3a 100644 --- a/lib/widgets/composer/overlays/user_overlay.dart +++ b/lib/widgets/composer/overlays/user_overlay.dart @@ -41,7 +41,7 @@ class const UserOverlay( title: Text(displayName ?? member.stateKey!.localpart), subtitle: Text(member.stateKey!), 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, ), ), From 01938119931f92be47ca0c5b44ece2989b0d482e Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 18 Nov 2026 09:50:57 -0500 Subject: [PATCH 08/25] add ClockController so timestamps dont get stuck --- lib/controllers/clock.dart | 20 ++++++++++++++++++++ lib/widgets/common/sync_status_banner.dart | 3 ++- lib/widgets/common/timestamp.dart | 8 +++++--- 3 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 lib/controllers/clock.dart diff --git a/lib/controllers/clock.dart b/lib/controllers/clock.dart new file mode 100644 index 0000000..f9fe690 --- /dev/null +++ b/lib/controllers/clock.dart @@ -0,0 +1,20 @@ +import "dart:async"; + +import "package:flutter_riverpod/flutter_riverpod.dart"; + +class ClockController extends Notifier { + @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.new, + ); +} diff --git a/lib/widgets/common/sync_status_banner.dart b/lib/widgets/common/sync_status_banner.dart index 4199866..0eccff3 100644 --- a/lib/widgets/common/sync_status_banner.dart +++ b/lib/widgets/common/sync_status_banner.dart @@ -1,5 +1,6 @@ import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:material_ui/material_ui.dart"; +import "package:nexus/controllers/clock.dart"; import "package:nexus/controllers/sync_status.dart"; import "package:nexus/widgets/common/error_dialog.dart"; import "package:timeago/timeago.dart"; @@ -38,7 +39,7 @@ class const SyncStatusBanner({super.key}) extends ConsumerWidget { ?status.error, if (status.errorCount > 0) "Failed attempts: ${status.errorCount}.", if (status.lastSync case final lastSync?) - "Last synced ${format(lastSync)}.", + "Last synced ${format(lastSync, clock: ref.watch(ClockController.provider))}.", ]; return AnimatedSize( diff --git a/lib/widgets/common/timestamp.dart b/lib/widgets/common/timestamp.dart index bc9db74..2f7a2fc 100644 --- a/lib/widgets/common/timestamp.dart +++ b/lib/widgets/common/timestamp.dart @@ -1,13 +1,15 @@ +import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:material_ui/material_ui.dart"; +import "package:nexus/controllers/clock.dart"; import "package:timeago/timeago.dart"; class const Timestamp(final DateTime timestamp, {super.key}) - extends StatelessWidget { + extends ConsumerWidget { @override - Widget build(BuildContext context) => Tooltip( + Widget build(BuildContext context, WidgetRef ref) => Tooltip( message: timestamp.toString(), child: Text( - format(timestamp), + format(timestamp, clock: ref.watch(ClockController.provider)), maxLines: 1, overflow: .ellipsis, style: Theme.of(context).textTheme.labelSmall From ad402ff456e9258adb01773604f7f36ff9d955d2 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 18 Nov 2026 11:09:36 -0500 Subject: [PATCH 09/25] don't cache fetch failures for media --- lib/helpers/mxc_image.dart | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/lib/helpers/mxc_image.dart b/lib/helpers/mxc_image.dart index 4013397..15c4328 100644 --- a/lib/helpers/mxc_image.dart +++ b/lib/helpers/mxc_image.dart @@ -20,18 +20,23 @@ class MxcImage(final WidgetRef ref, final DownloadMediaRequest request) MultiFrameImageStreamCompleter(codec: _loadAsync(decode), scale: 1.0); Future _loadAsync(ImageDecoderCallback decode) async { - final file = await ref - .read(ClientController.provider.notifier) - .downloadMedia(request); - final bytes = await File(file.path).readAsBytes(); + try { + final file = await ref + .read(ClientController.provider.notifier) + .downloadMedia(request); + final bytes = await File(file.path).readAsBytes(); - // 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)) - case "ftypavif" || "ftypavis") { - return AvifCodec(await Isolate.run(() => decodeAvif(bytes))); + // 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)) + case "ftypavif" || "ftypavis") { + return AvifCodec(await Isolate.run(() => decodeAvif(bytes))); + } + + return await decode(await .fromUint8List(bytes)); + } catch (_) { + scheduleMicrotask(() => PaintingBinding.instance.imageCache.evict(this)); + rethrow; } - - return decode(await .fromUint8List(bytes)); } @override From e1f505a1f8c8540f0a77cfe70f1dfb3d53b6045b Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 18 Nov 2026 12:07:42 -0500 Subject: [PATCH 10/25] bump pasteboard --- linux/nix/pkg/default.nix | 2 +- pubspec.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/nix/pkg/default.nix b/linux/nix/pkg/default.nix index 75af5ff..d42b4e5 100644 --- a/linux/nix/pkg/default.nix +++ b/linux/nix/pkg/default.nix @@ -68,7 +68,7 @@ flutter.buildFlutterApplication { m3e_design = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI="; native_toolchain_cmake = "sha256-/drnHZebmTnsCnHgC1xmlAe+U4PSrjw5Sm9axicuTrY="; navigation_rail_m3e = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI="; - pasteboard = "sha256-7c8fkNBrvJuWar58aS0z657cP7pCZ+az4XPi1/o0ynY="; + pasteboard = "sha256-J3yray5n7XwVXMcOsvQ5+OvADEK2lPMeYniGg+yR704="; unifiedpush_linux = "sha256-KQKyBPL2ORK9O89C4K3RHGve/lvFaU1vIjSDnj6+bj4="; unifiedpush_platform_interface = "sha256-KQKyBPL2ORK9O89C4K3RHGve/lvFaU1vIjSDnj6+bj4="; xdg_desktop_portal = "sha256-8GgiXHGv+wy6hJgj/rZxbymMitNVmdDLAnedZm9STSc="; diff --git a/pubspec.lock b/pubspec.lock index f3977ab..74ba32c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1251,7 +1251,7 @@ packages: description: path: "packages/pasteboard" ref: HEAD - resolved-ref: b5427767c5da1d9bba4c7227dd66ba2b108e9555 + resolved-ref: e79a0ecc741b80575f38465c02eba9c553e12479 url: "https://github.com/Henry-Hiles/flutter-plugins" source: git version: "0.6.1" From 66fadef9279ed8f4e8327957066b34baa488b8a5 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 18 Nov 2026 14:27:03 -0500 Subject: [PATCH 11/25] catch audioplayers error correctly --- lib/widgets/players/audio.dart | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/lib/widgets/players/audio.dart b/lib/widgets/players/audio.dart index 638564b..f29955b 100644 --- a/lib/widgets/players/audio.dart +++ b/lib/widgets/players/audio.dart @@ -1,7 +1,6 @@ import "dart:async"; import "package:audioplayers/audioplayers.dart" as audioplayers; -import "package:flutter/services.dart"; import "package:material_ui/material_ui.dart"; import "package:flutter_hooks/flutter_hooks.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; @@ -36,8 +35,8 @@ class const AudioPlayer( await player.setSource( audioplayers.DeviceFileSource(audio.path, mimeType: info?.mimeType), ); - } on PlatformException catch (_) { - // The platform can't play this format, like Ogg on Apple platforms + } on Exception catch (_) { + // The platform can't play this format, like Ogg on Apple platforms or MIDI on Linux if (context.mounted) unsupported.value = true; return; } @@ -47,18 +46,18 @@ class const AudioPlayer( return player.dispose; }, []); - final state = useStream( - player.onPlayerStateChanged, - initialData: player.state, - ).requireData; - final position = useStream( - player.onPositionChanged, - initialData: Duration.zero, - ).requireData; - final duration = useStream( - player.onDurationChanged, - initialData: Duration.zero, - ).requireData; + final state = + useStream( + player.onPlayerStateChanged, + initialData: player.state, + ).data ?? + player.state; + final position = + useStream(player.onPositionChanged, initialData: Duration.zero).data ?? + Duration.zero; + final duration = + useStream(player.onDurationChanged, initialData: Duration.zero).data ?? + Duration.zero; final playing = state == .playing; final downloadButton = IconButton( From 3fe0ef8454fd709f7f8bdb972ba3ddb9bdd3a51a Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Thu, 19 Nov 2026 10:15:28 -0500 Subject: [PATCH 12/25] fix avif decoding --- lib/helpers/mxc_image.dart | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/helpers/mxc_image.dart b/lib/helpers/mxc_image.dart index 15c4328..d82d485 100644 --- a/lib/helpers/mxc_image.dart +++ b/lib/helpers/mxc_image.dart @@ -1,6 +1,7 @@ import "dart:async"; import "dart:io"; import "dart:isolate"; +import "dart:typed_data"; import "dart:ui" as ui; import "package:avif_native/avif_native.dart"; @@ -29,7 +30,7 @@ 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 if (String.fromCharCodes(bytes.skip(4).take(8)) case "ftypavif" || "ftypavis") { - return AvifCodec(await Isolate.run(() => decodeAvif(bytes))); + return AvifCodec(await _decodeAvifInIsolate(bytes)); } return await decode(await .fromUint8List(bytes)); @@ -39,6 +40,9 @@ class MxcImage(final WidgetRef ref, final DownloadMediaRequest request) } } + static Future _decodeAvifInIsolate(Uint8List bytes) => + Isolate.run(() => decodeAvif(bytes)); + @override bool operator ==(Object other) => other is MxcImage && other.request == request; From 5c510c5f2e0627ce62d481d1b1f043d19f8234e1 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Thu, 19 Nov 2026 11:56:23 -0500 Subject: [PATCH 13/25] fix sendErrors not wrapping --- lib/widgets/renderers/event.dart | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/widgets/renderers/event.dart b/lib/widgets/renderers/event.dart index 4e14fad..228abf6 100644 --- a/lib/widgets/renderers/event.dart +++ b/lib/widgets/renderers/event.dart @@ -525,10 +525,12 @@ class const EventRenderer( child: Row( spacing: 4, children: [ - Text( - event.sendError!, - style: theme.textTheme.labelSmall?.copyWith( - color: theme.colorScheme.error, + Flexible( + child: Text( + event.sendError!, + style: theme.textTheme.labelSmall?.copyWith( + color: theme.colorScheme.error, + ), ), ), InkWell( From a6f2f3072e3f60316b2984ef5169147470ee6388 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Thu, 19 Nov 2026 20:09:56 -0500 Subject: [PATCH 14/25] try to fix doubled inset issue --- .../app/src/main/kotlin/nexus/federated/nexus/MainActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/src/main/kotlin/nexus/federated/nexus/MainActivity.kt b/android/app/src/main/kotlin/nexus/federated/nexus/MainActivity.kt index f2b0f68..fc480a9 100644 --- a/android/app/src/main/kotlin/nexus/federated/nexus/MainActivity.kt +++ b/android/app/src/main/kotlin/nexus/federated/nexus/MainActivity.kt @@ -35,6 +35,6 @@ class MainActivity: FlutterActivity() { // Posted so it runs after Flutter has applied any insets it deferred. private fun reapplyInsets() { val view = findViewById(FLUTTER_VIEW_ID) ?: return - view.post { view.rootWindowInsets?.let(view::onApplyWindowInsets) } + view.post { view.requestApplyInsets() } } } From 54f2c93d929fb6497fa395ca799b5e2501e6c450 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Thu, 19 Nov 2026 20:13:28 -0500 Subject: [PATCH 15/25] fix wrapping of previews of unknown message types --- lib/widgets/renderers/message.dart | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/widgets/renderers/message.dart b/lib/widgets/renderers/message.dart index 5b25a35..655fc0d 100644 --- a/lib/widgets/renderers/message.dart +++ b/lib/widgets/renderers/message.dart @@ -143,12 +143,18 @@ class const MessageRenderer( UnknownMessageContent(:final body) => body == null ? Text("This message is redacted", style: errorStyle) - : Wrap( - spacing: 8, - children: [ - Text("Unknown message type:", style: errorStyle), - Text(body), - ], + : Text.rich( + TextSpan( + children: [ + TextSpan( + text: "Unknown message type: ", + style: errorStyle, + ), + TextSpan(text: body), + ], + ), + maxLines: maxLines, + overflow: maxLines == null ? null : .ellipsis, ), }, _ => throw Exception("This is impossible"), From 8d2bf2145f73526a6b92610466e3188d75c7e19b Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 21 Nov 2026 14:18:44 -0500 Subject: [PATCH 16/25] bump deps --- linux/nix/pkg/default.nix | 3 -- pubspec.lock | 81 +++++++++++++++++++-------------------- pubspec.yaml | 23 ++--------- 3 files changed, 43 insertions(+), 64 deletions(-) diff --git a/linux/nix/pkg/default.nix b/linux/nix/pkg/default.nix index d42b4e5..cb93262 100644 --- a/linux/nix/pkg/default.nix +++ b/linux/nix/pkg/default.nix @@ -58,9 +58,6 @@ flutter.buildFlutterApplication { customSourceBuilders.avif_native = callPackage ./avif_native.nix { }; gitHashes = { - better_player = "sha256-Q9Zclqs3jKIxgWKsFA4gzgUAbAKdi3RTpKgbEi2+Vwk="; - better_player_ios = "sha256-Q9Zclqs3jKIxgWKsFA4gzgUAbAKdi3RTpKgbEi2+Vwk="; - better_player_macos = "sha256-Q9Zclqs3jKIxgWKsFA4gzgUAbAKdi3RTpKgbEi2+Vwk="; linkify = "sha256-TpMD6+0zyY6i9l+6d8ErnVufmepCv362rCtnbOht/z4="; location = "sha256-zWnffXiK1LD4Ln23coPozBjYfTlhZmBhC5Z8mCdAgwQ="; fab_m3e = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI="; diff --git a/pubspec.lock b/pubspec.lock index 74ba32c..d5b2431 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -77,10 +77,10 @@ packages: dependency: transitive description: name: archive - sha256: de5ac590b8155e4e676088d714bd41ea620449a6adc0f7950c5073874b287ddb + sha256: "2fda90592c0afd219c5e285618a98da835cd10df38372666093d25dfe457a2d0" url: "https://pub.dev" source: hosted - version: "4.6.0" + version: "4.7.1" args: dependency: transitive description: @@ -164,29 +164,27 @@ packages: better_player: dependency: "direct main" description: - path: "packages/better_player" - ref: "quad/feat/mimetypes" - resolved-ref: c4753aa81b368c0b025a80cbab01424462d64794 - url: "https://github.com/Henry-Hiles/betterplayer" - source: git - version: "1.37.0" + name: better_player + sha256: f9b928eec81622f33457a5019a02c79d102dffe54b432baa43bb3400d31439e1 + url: "https://pub.dev" + source: hosted + version: "1.38.0" better_player_android: dependency: transitive description: name: better_player_android - sha256: "24d3ce6c357186e0ec1eed63519e47a552bdc497ad48556f32593f5d6b406672" + sha256: "2c7df9bfb1e7fa69c86d3bb91a1825bba30292968307724fa51869bc3a0bb75d" url: "https://pub.dev" source: hosted - version: "1.13.1" + version: "1.13.2" better_player_ios: - dependency: "direct overridden" + dependency: transitive description: - path: "packages/better_player_ios" - ref: "quad/feat/mimetypes" - resolved-ref: c4753aa81b368c0b025a80cbab01424462d64794 - url: "https://github.com/Henry-Hiles/betterplayer" - source: git - version: "1.14.0" + name: better_player_ios + sha256: "4b9c08690374aa84b15ba88ab5d6b695cda618fb895b445a6a4186c220599c84" + url: "https://pub.dev" + source: hosted + version: "1.15.0" better_player_linux: dependency: transitive description: @@ -196,14 +194,13 @@ packages: source: hosted version: "1.1.1" better_player_macos: - dependency: "direct overridden" + dependency: transitive description: - path: "packages/better_player_macos" - ref: "quad/feat/mimetypes" - resolved-ref: c4753aa81b368c0b025a80cbab01424462d64794 - url: "https://github.com/Henry-Hiles/betterplayer" - source: git - version: "1.9.0" + name: better_player_macos + sha256: "90f6fc0e354b034043850661a7c4e39ac34261ff7cc21c2895ea7bded126d15c" + url: "https://pub.dev" + source: hosted + version: "1.10.0" better_player_platform_interface: dependency: transitive description: @@ -643,10 +640,10 @@ packages: dependency: "direct main" description: name: flutter_local_notifications - sha256: "58f9ea245d7194363c05f7a012bbc73291736c2d8b5f555a8e0ea3f9121868b4" + sha256: "7d37d69ded3028af4f22531a0097a3baa478a384dff2e23e873707c93df3b704" url: "https://pub.dev" source: hosted - version: "23.0.1" + version: "23.0.3" flutter_local_notifications_linux: dependency: transitive description: @@ -712,10 +709,10 @@ packages: dependency: "direct main" description: name: flutter_svg - sha256: bce4a000275c0d0ac42f3fdcf0a6162fb95ac30983ba7ee6cffcf60f6ad33611 + sha256: "4565a66f0a968f2e1ab4197854686990258aadab9572eb80a7655053a01dc302" url: "https://pub.dev" source: hosted - version: "2.3.4" + version: "2.5.0" flutter_test: dependency: "direct dev" description: flutter @@ -840,10 +837,10 @@ packages: dependency: transitive description: name: image - sha256: "89ed75b2f8231fe676808c5564f9590d728024ded7ac782a7ed8474f1c95b72a" + sha256: bc13f61f0f5cb77936e78ae5dae3800f442718dac5d2bc4654f03c239230ed0c url: "https://pub.dev" source: hosted - version: "4.12.0" + version: "4.13.1" image_picker: dependency: "direct main" description: @@ -872,10 +869,10 @@ packages: dependency: transitive description: name: image_picker_ios - sha256: f4e5650a81b268af3886bc789216ff6d56bdfa79934f93f1a5a8a303b8f60f77 + sha256: a4aeafbe049ad99882059f186862de6fd5296c708c5805277f6f684165268af1 url: "https://pub.dev" source: hosted - version: "0.8.13+15" + version: "0.8.13+16" image_picker_linux: dependency: transitive description: @@ -933,18 +930,18 @@ packages: dependency: transitive description: name: jni - sha256: "2e91e6087291affd10b31b6c872f3e3ac7dc5d93b51b5ba485d930c8f08bde6c" + sha256: "19764f78f6b9e0d40f6395b04649d1046eb57f5ccf05afce50cc63e5a82777b0" url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.2.1" jni_flutter: dependency: transitive description: name: jni_flutter - sha256: "0dd33d67797560f66e961a6053882d4df54bd345bf063b8fe7ea133f7ad8b191" + sha256: "586594ad345b403bda8a794b0b8a9e34298238b86c2a7d7f15160b092fe9ef3d" url: "https://pub.dev" source: hosted - version: "1.0.4+1" + version: "1.1.0" jni_util: dependency: transitive description: @@ -1031,10 +1028,10 @@ packages: description: path: "packages/location" ref: "feat/optional-play-services" - resolved-ref: "70e2fbe87a4a8769de08f1692412d731063dcfc0" + resolved-ref: "1a2602a9f7b07906a1191730d5435f4b695547d3" url: "https://github.com/Henry-Hiles/flutterlocation" source: git - version: "10.1.0" + version: "10.2.0" location_platform_interface: dependency: transitive description: @@ -1120,10 +1117,10 @@ packages: dependency: "direct main" description: name: material_ui - sha256: "474c135fd46b56ff1d35ca982155e8863d28fbc6464d1192acf4ee53a738680e" + sha256: a6b19012df437a356cbc01f8ea22a105e07194c47c9a6009da0032a0ce35c4ab url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" measure_size: dependency: "direct main" description: @@ -1714,10 +1711,10 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: "611e87fb320b70d1dd721dc46af89c98aceccea9b31fde49e084591414e0c610" + sha256: b8073b1e5173d63afe1a18985a75896d72f759d3bc1817eb1ae8d26e8527cceb url: "https://pub.dev" source: hosted - version: "6.3.33" + version: "6.3.35" url_launcher_ios: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 4274f66..dd21cb7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -52,21 +52,6 @@ dependency_overrides: git: url: https://github.com/appelladev/linkify ref: fix/consecutive-periods-loose-url - better_player: - git: - url: https://github.com/Henry-Hiles/betterplayer - ref: quad/feat/mimetypes - path: packages/better_player - better_player_ios: - git: - url: https://github.com/Henry-Hiles/betterplayer - ref: quad/feat/mimetypes - path: packages/better_player_ios - better_player_macos: - git: - url: https://github.com/Henry-Hiles/betterplayer - ref: quad/feat/mimetypes - path: packages/better_player_macos dependencies: flutter: @@ -87,7 +72,7 @@ dependencies: window_manager: 0.6.0 color_hash: 1.0.1 flutter_widget_from_html_core: 0.18.0-beta.1 - flutter_svg: 2.3.4 + flutter_svg: 2.5.0 json_annotation: 4.12.0 shared_preferences: 2.5.6 fluttertagger: @@ -116,11 +101,11 @@ dependencies: package_info_plus: 10.2.2 app_links: 7.2.2 file_selector: 1.1.0 - material_ui: 1.11.0 + material_ui: 1.11.1 multi_state_switch: 1.1.0 unifiedpush: 6.2.0 unifiedpush_storage_shared_preferences: 1.0.0 - flutter_local_notifications: 23.0.1 + flutter_local_notifications: 23.0.3 timezone: 0.11.2 material_emoji_picker: 2.0.1+1 material_adaptive_sheets: 1.0.0 @@ -139,7 +124,7 @@ dependencies: url: https://github.com/Henry-Hiles/flutterlocation # Adds an option to leave out proprietary Google Play services, unreleased ref: feat/optional-play-services path: packages/location - better_player: 1.37.0 + better_player: 1.38.0 audioplayers: 6.8.1 dev_dependencies: flutter_test: From 3a2d312c37942dae58a050b118296a8146044cd8 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 21 Nov 2026 14:21:26 -0500 Subject: [PATCH 17/25] bump gomuks --- .github/workflows/windows.yml | 2 +- gomuks | 2 +- hook/build.dart | 1 - linux/nix/pkg/gomuks.nix | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4aa566c..79032d5 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -36,7 +36,7 @@ jobs: - name: Go build run: | 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 run: | diff --git a/gomuks b/gomuks index 94d91fb..ce450e6 160000 --- a/gomuks +++ b/gomuks @@ -1 +1 @@ -Subproject commit 94d91fbbb70b1519f545f3ec1ae523a6ee965e23 +Subproject commit ce450e6607e7f9bc2e74898c7134712492b013b0 diff --git a/hook/build.dart b/hook/build.dart index ca84fda..2181e8a 100644 --- a/hook/build.dart +++ b/hook/build.dart @@ -123,7 +123,6 @@ Future main(List args) => build(args, (input, output) async { final tags = [ "sqlite_fts5", - "goolm", // goheif/dav1d is not supported on Android or iOS, would need to be fixed upstream "noheic", ].join(","); diff --git a/linux/nix/pkg/gomuks.nix b/linux/nix/pkg/gomuks.nix index da3bf3d..dedff27 100644 --- a/linux/nix/pkg/gomuks.nix +++ b/linux/nix/pkg/gomuks.nix @@ -22,7 +22,7 @@ buildGoModule ( buildPhase = '' runHook preBuild - go build -buildmode=c-shared -o ${filename} -tags goolm,noheic,sqlite_fts5 ./pkg/ffi + go build -buildmode=c-shared -o ${filename} -tags noheic,sqlite_fts5 ./pkg/ffi runHook postBuild ''; From 600b80b99fac5b5e5ceb8cf00df133c37a0504ad Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 21 Nov 2026 14:21:43 -0500 Subject: [PATCH 18/25] fix location hash --- linux/nix/pkg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/nix/pkg/default.nix b/linux/nix/pkg/default.nix index cb93262..0bd7728 100644 --- a/linux/nix/pkg/default.nix +++ b/linux/nix/pkg/default.nix @@ -59,7 +59,7 @@ flutter.buildFlutterApplication { gitHashes = { linkify = "sha256-TpMD6+0zyY6i9l+6d8ErnVufmepCv362rCtnbOht/z4="; - location = "sha256-zWnffXiK1LD4Ln23coPozBjYfTlhZmBhC5Z8mCdAgwQ="; + location = "sha256-RL+l46pBhv75xP7ASJuazyYoi9vI35TSYAV11mkjAwY="; fab_m3e = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI="; fluttertagger = "sha256-tHUNU2+fBPkq5UK5YRi3SWs1zF2PIPz6RgSbwignU/I="; m3e_design = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI="; From 4e66781fce7d8a3a56a22d72eb2281e1253cc9a5 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 21 Nov 2026 14:24:32 -0500 Subject: [PATCH 19/25] fix gomuks vendorHash --- linux/nix/pkg/gomuks.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/nix/pkg/gomuks.nix b/linux/nix/pkg/gomuks.nix index dedff27..dc9f9ac 100644 --- a/linux/nix/pkg/gomuks.nix +++ b/linux/nix/pkg/gomuks.nix @@ -17,7 +17,7 @@ buildGoModule ( src = "${src}/gomuks"; - vendorHash = "sha256-feW1rw74GsRx0fkqGLZk6PeR6bUkIt9JnjvirOAThcI="; + vendorHash = "sha256-MJu9qN1NhUkjF3MAz+ejVMY9dxg8yxMBqCCHzPh9RHc="; buildPhase = '' runHook preBuild From 82dc81219cae7d35706fde8330a7902b14c20a9a Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 21 Nov 2026 14:32:31 -0500 Subject: [PATCH 20/25] bump gomuks fixes migration issue --- gomuks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gomuks b/gomuks index ce450e6..2a76e97 160000 --- a/gomuks +++ b/gomuks @@ -1 +1 @@ -Subproject commit ce450e6607e7f9bc2e74898c7134712492b013b0 +Subproject commit 2a76e97eb3e955ec14775ce4027ed446865ed7fa From 1d2c6ff02eaabe9dfe551445b0f139175bf1a35d Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 21 Nov 2026 15:08:22 -0500 Subject: [PATCH 21/25] improve member list performance --- lib/widgets/room_chat/room_chat.dart | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/widgets/room_chat/room_chat.dart b/lib/widgets/room_chat/room_chat.dart index 929be84..8a29c38 100644 --- a/lib/widgets/room_chat/room_chat.dart +++ b/lib/widgets/room_chat/room_chat.dart @@ -20,6 +20,7 @@ import "package:nexus/widgets/threads/threads_drawer.dart"; import "package:nexus/widgets/room_chat/chat_body.dart"; import "package:nexus/helpers/extensions/build_event_options.dart"; import "package:nexus/controllers/jump_request.dart"; +import "package:nexus/main.dart"; final class const RoomChat({ required final String? roomId, @@ -202,10 +203,14 @@ final class const RoomChat({ isDesktop: isDesktop, onOpenDrawer: Scaffold.of(context).openDrawer, onOpenMemberList: (thisContext) { + if (!showMembersByDefault) { + return Scaffold.of(thisContext).openEndDrawer(); + } + ref .read(MemberListOpenedController.provider.notifier) - .set(!memberListOpened); - Scaffold.of(thisContext).openEndDrawer(); + .set(!memberListOpened) + .onError(showError); }, onOpenPinnedMessagesList: Scaffold.of(middleContext) .openEndDrawer, From 84aad2efbf367001b0a515ecce27b6f36f466b04 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sun, 22 Nov 2026 10:45:27 -0500 Subject: [PATCH 22/25] ignore errors caused by flutter bug --- lib/main.dart | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/main.dart b/lib/main.dart index 97650d0..299e95a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -45,7 +45,11 @@ New Value: ${newValue is AsyncData ? newValue.value : newValue} } 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; } From f8938b82570a6c3bec30679854a7a662dce199e9 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sun, 22 Nov 2026 12:42:37 -0500 Subject: [PATCH 23/25] bump deps --- android/app/build.gradle.kts | 2 +- android/settings.gradle.kts | 4 +- flake.lock | 17 +++--- flake.nix | 2 +- lib/helpers/extensions/scheme_to_theme.dart | 8 +-- lib/main.dart | 8 --- linux/nix/pkg/default.nix | 2 - pubspec.lock | 64 ++++++++++----------- pubspec.yaml | 16 ++---- 9 files changed, 49 insertions(+), 74 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 35d2638..2dda455 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -75,7 +75,7 @@ android { dependencies { implementation("org.unifiedpush.android:embedded-fcm-distributor:3.1.0") - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5") } kotlin { diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index f07087d..7100c55 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -19,8 +19,8 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "9.3.1" apply false - id("org.jetbrains.kotlin.android") version "2.4.10" apply false + id("com.android.application") version "9.5.1" apply false + id("org.jetbrains.kotlin.android") version "2.4.21" apply false } include(":app") diff --git a/flake.lock b/flake.lock index b6443af..42e7cad 100644 --- a/flake.lock +++ b/flake.lock @@ -29,16 +29,15 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1794436491, - "narHash": "sha256-1Gbe5ys68lljaWtwn8Z4RhkUnWDfw8AaHQJDKVzzmVA=", - "ref": "ea3beb628a3cab6fbc4142b725c9edb043846eb6", - "rev": "ea3beb628a3cab6fbc4142b725c9edb043846eb6", - "revCount": 8146, + "lastModified": 1795368110, + "narHash": "sha256-rIdyHJHv44OJD5B9Wo0CCIyR6Vecnxx5MuAPfanJ7n0=", + "ref": "refs/heads/main", + "rev": "21f3f0c1ebcfad22e5a3ab497d2139a36bd77d6e", + "revCount": 8275, "type": "git", "url": "https://forgejo.ellis.link/Continuwuation/Continuwuity" }, "original": { - "ref": "ea3beb628a3cab6fbc4142b725c9edb043846eb6", "type": "git", "url": "https://forgejo.ellis.link/Continuwuation/Continuwuity" } @@ -174,11 +173,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1793540411, - "narHash": "sha256-fiPJ88izTVucjeo2EQ3jk4aWmLg03I1D4vxnX2QjEgE=", + "lastModified": 1795234589, + "narHash": "sha256-f/VVvxf5RsQgWVhUtefoca5ktVg0DA2bnkMOcmSnozo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0bb2eedc20e4739f29e8045034f2828ad7054f8f", + "rev": "2786a2a72088ecf32aea5b3ec52099e6a7cff78f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2ee3373..af8fd64 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ }; # TEMPORARY: the e2e tests against Continuwuity from the forge, till there's a new full release in nixpkgs continuwuity = { - url = "git+https://forgejo.ellis.link/Continuwuation/Continuwuity?ref=ea3beb628a3cab6fbc4142b725c9edb043846eb6"; + url = "git+https://forgejo.ellis.link/Continuwuation/Continuwuity"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/lib/helpers/extensions/scheme_to_theme.dart b/lib/helpers/extensions/scheme_to_theme.dart index 73ce176..d640b8e 100644 --- a/lib/helpers/extensions/scheme_to_theme.dart +++ b/lib/helpers/extensions/scheme_to_theme.dart @@ -4,13 +4,7 @@ extension SchemeToTheme on ColorScheme { ThemeData get theme { final textTheme = ThemeData( fontFamily: "bundled-sans", - fontFamilyFallback: [ - "emoji", - // TODO: Remove once on Flutter 3.50, whose Linux arm64 engine uses - // fontconfig and so understands the "emoji" alias - "Noto Color Emoji", - "Twemoji", - ], + fontFamilyFallback: ["emoji"], brightness: brightness, ).textTheme; return .from(colorScheme: this).copyWith( diff --git a/lib/main.dart b/lib/main.dart index 299e95a..9f9e328 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -45,14 +45,6 @@ New Value: ${newValue is AsyncData ? newValue.value : newValue} } void showError(Object error, [StackTrace? stackTrace]) { - // 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; - } - debugPrintStack(stackTrace: stackTrace, label: error.toString()); if (navigatorKey.currentContext != null) { Future.delayed( diff --git a/linux/nix/pkg/default.nix b/linux/nix/pkg/default.nix index 0bd7728..c909da4 100644 --- a/linux/nix/pkg/default.nix +++ b/linux/nix/pkg/default.nix @@ -63,9 +63,7 @@ flutter.buildFlutterApplication { fab_m3e = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI="; fluttertagger = "sha256-tHUNU2+fBPkq5UK5YRi3SWs1zF2PIPz6RgSbwignU/I="; m3e_design = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI="; - native_toolchain_cmake = "sha256-/drnHZebmTnsCnHgC1xmlAe+U4PSrjw5Sm9axicuTrY="; navigation_rail_m3e = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI="; - pasteboard = "sha256-J3yray5n7XwVXMcOsvQ5+OvADEK2lPMeYniGg+yR704="; unifiedpush_linux = "sha256-KQKyBPL2ORK9O89C4K3RHGve/lvFaU1vIjSDnj6+bj4="; unifiedpush_platform_interface = "sha256-KQKyBPL2ORK9O89C4K3RHGve/lvFaU1vIjSDnj6+bj4="; xdg_desktop_portal = "sha256-8GgiXHGv+wy6hJgj/rZxbymMitNVmdDLAnedZm9STSc="; diff --git a/pubspec.lock b/pubspec.lock index d5b2431..dae1801 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -173,18 +173,18 @@ packages: dependency: transitive description: name: better_player_android - sha256: "2c7df9bfb1e7fa69c86d3bb91a1825bba30292968307724fa51869bc3a0bb75d" + sha256: "9e074251038a087c31683d371ee573c39f200d3e6f85454ea612320dba65688f" url: "https://pub.dev" source: hosted - version: "1.13.2" + version: "1.14.0" better_player_ios: dependency: transitive description: name: better_player_ios - sha256: "4b9c08690374aa84b15ba88ab5d6b695cda618fb895b445a6a4186c220599c84" + sha256: "03186ef3ecdeb37a120486cf988b005e0b46cdc52308037e7f4aee36bfee6f8d" url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" better_player_linux: dependency: transitive description: @@ -205,18 +205,18 @@ packages: dependency: transitive description: name: better_player_platform_interface - sha256: e5218199dd12ffe6f43c01d5cdeecad0b53125926f8da8c3f4b90136d8b55ec1 + sha256: "9ee3301e17e3a2a937760bfdd8c4b70800cd01bcc636c85c45a4be71bbaa1a45" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.8.1" better_player_web: dependency: transitive description: name: better_player_web - sha256: d7b365221f7724f22d3fef7840e45af2493a784e2429a30e980f807bcb7c9539 + sha256: e365a08e8041d56980fb87e577274e255543fcf377124c40880f189f00b6cf4b url: "https://pub.dev" source: hosted - version: "1.6.1" + version: "1.7.0" better_player_windows: dependency: transitive description: @@ -333,10 +333,10 @@ packages: dependency: transitive description: name: cnativeapi - sha256: c43703998995e132b0656d2b8a95ed2bedc6b22ccee2c827bcdc075e0330e319 + sha256: "49662734cdf3dd1707b1ee35102ac1754e0ab3d450a2d30b066730f219dacc86" url: "https://pub.dev" source: hosted - version: "0.5.10" + version: "0.6.2" code_assets: dependency: "direct main" description: @@ -1178,30 +1178,29 @@ packages: source: hosted version: "0.19.6" native_toolchain_cmake: - dependency: "direct overridden" + dependency: transitive description: - path: "." - ref: HEAD - resolved-ref: d77984a36a16be22e911850de2cd2050610ff4ed - url: "https://github.com/rainyl/native_toolchain_cmake" - source: git - version: "0.3.2" + name: native_toolchain_cmake + sha256: b3501c56fa20328d57586317fdbbcfa2051a498175130ecd21c4a922de6a2c8d + url: "https://pub.dev" + source: hosted + version: "0.3.3" nativeapi: dependency: transitive description: name: nativeapi - sha256: "118045bb549cb6fabad472a3a22a537e7310bbf20097350f5027808b4a5853ce" + sha256: "339b7a91a27ce5c33659cab92cf8e76736142985433652f91a63cc5348135bfb" url: "https://pub.dev" source: hosted - version: "0.5.10" + version: "0.6.2" nativeapi_flutter: dependency: transitive description: name: nativeapi_flutter - sha256: "357a405c69212f5157da1bd3be183a53c2b841d0de0eb51f4a3947913712aec4" + sha256: b0507253748ba9690a295bc162208a91d348809185409e5aee7b09e77ab5d8a3 url: "https://pub.dev" source: hosted - version: "0.5.10" + version: "0.6.2" navigation_rail_m3e: dependency: "direct main" description: @@ -1246,12 +1245,11 @@ packages: pasteboard: dependency: "direct main" description: - path: "packages/pasteboard" - ref: HEAD - resolved-ref: e79a0ecc741b80575f38465c02eba9c553e12479 - url: "https://github.com/Henry-Hiles/flutter-plugins" - source: git - version: "0.6.1" + name: pasteboard + sha256: "7b1c7ed83b4ff27acced26e96b87c16ac37fb6c57d7886eb3130faccb28b2cc2" + url: "https://pub.dev" + source: hosted + version: "0.6.2" path: dependency: "direct main" description: @@ -1613,10 +1611,10 @@ packages: dependency: transitive description: name: test_api - sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11" + sha256: "0a10344e901e5b2e63819567951cb6a06673ed6b84f40462188ff5a0c41f371f" url: "https://pub.dev" source: hosted - version: "0.7.12" + version: "0.7.14" timeago: dependency: "direct main" description: @@ -1903,10 +1901,10 @@ packages: dependency: "direct main" description: name: window_manager - sha256: bdd6b1a2c1ce50f3bba7ffbaa0d5dc5feb6b6a24fd20269da4de90244f77a471 + sha256: "9504ae37e618d31524e337ad3cf9600d252acf11fffa3ddb9b0b5ced634542d9" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.7.1" wkt_parser: dependency: transitive description: @@ -1957,5 +1955,5 @@ packages: source: hosted version: "2.2.4" sdks: - dart: "3.13.3" - flutter: "3.47.4" + dart: "3.14.0" + flutter: "3.50.1" diff --git a/pubspec.yaml b/pubspec.yaml index dd21cb7..4ca55f6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,16 +16,14 @@ flutter: uses-material-design: true environment: - sdk: 3.13.3 - flutter: 3.47.4 + sdk: 3.14.0 + flutter: 3.50.1 dependency_overrides: dynamic_color: 2.1.0 code_assets: 2.2.0 # webcrypto requires ^1.0.0, but works with 2.x webcrypto: 0.6.2 - native_toolchain_cmake: - git: - url: https://github.com/rainyl/native_toolchain_cmake # Fixes native aarch64 linux builds, unreleased + window_manager: 0.7.1 # unifiedpush_linux requires ^0.6.0, 0.7 has the Dart 3.14 nativeapi fix m3e_design: git: url: https://github.com/Henry-Hiles/material_3_expressive @@ -44,10 +42,6 @@ dependency_overrides: url: https://codeberg.org/Henry-Hiles/flutter-connector ref: quad/nexus path: unifiedpush_platform_interface - pasteboard: - git: - url: https://github.com/Henry-Hiles/flutter-plugins # FileTransfer portal support on Linux, unreleased - path: packages/pasteboard linkify: git: url: https://github.com/appelladev/linkify @@ -69,7 +63,7 @@ dependencies: path: 1.9.1 dynamic_color: 2.1.0 collection: 1.19.1 - window_manager: 0.6.0 + window_manager: 0.7.1 color_hash: 1.0.1 flutter_widget_from_html_core: 0.18.0-beta.1 flutter_svg: 2.5.0 @@ -113,7 +107,7 @@ dependencies: git: url: https://github.com/Henry-Hiles/xdg_desktop_portal.dart ref: quad/nexus - pasteboard: 0.6.0 + pasteboard: 0.6.2 flutter_file_dialog: 3.3.6 mime: 2.1.0 avif_native: 0.2.0 From 65890b8e006d5d409614d958d7482e4685bde5e1 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sun, 22 Nov 2026 13:17:44 -0500 Subject: [PATCH 24/25] insert unicode emojis as text not tags --- lib/widgets/composer/composer.dart | 15 +++++++++++++++ lib/widgets/composer/overlays/emoji_overlay.dart | 15 ++++++++------- lib/widgets/composer/overlays/tagger_overlay.dart | 8 +++++++- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/lib/widgets/composer/composer.dart b/lib/widgets/composer/composer.dart index 0b0a7db..3b722e0 100644 --- a/lib/widgets/composer/composer.dart +++ b/lib/widgets/composer/composer.dart @@ -834,6 +834,21 @@ class const Composer( controller.addTag(id: id, name: name); 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, onSearch: (newQuery, newTriggerCharacter) { diff --git a/lib/widgets/composer/overlays/emoji_overlay.dart b/lib/widgets/composer/overlays/emoji_overlay.dart index bb4b88f..6f9c15f 100644 --- a/lib/widgets/composer/overlays/emoji_overlay.dart +++ b/lib/widgets/composer/overlays/emoji_overlay.dart @@ -12,6 +12,7 @@ class const EmojiOverlay( required final String roomId, required final void Function({required String id, required String name}) addTag, + required final void Function(String text) insertText, super.key, }) extends ConsumerWidget { @override @@ -38,19 +39,19 @@ class const EmojiOverlay( ), title: Text(emoji.aliases.first), subtitle: Text(emoji.description), - onTap: () => addTag( - id: emoji.value.startsWith("mxc://") - ? ImagePack.emojiMarkdown( + onTap: () => emoji.value.startsWith("mxc://") + ? addTag( + id: ImagePack.emojiMarkdown( emoji.aliases.first, emoji.value, description: switch (emoji.data) { PackImage(:final body) => body, _ => null, }, - ) - : emoji.value, - name: emoji.aliases.first, - ), + ), + name: emoji.aliases.first, + ) + : insertText(emoji.value), ), ) .toList(), diff --git a/lib/widgets/composer/overlays/tagger_overlay.dart b/lib/widgets/composer/overlays/tagger_overlay.dart index f760e01..e32a328 100644 --- a/lib/widgets/composer/overlays/tagger_overlay.dart +++ b/lib/widgets/composer/overlays/tagger_overlay.dart @@ -10,6 +10,7 @@ class const TaggerOverlay( required final String roomId, required final void Function({required String id, required String name}) addTag, + required final void Function(String text) insertText, required final String? triggerCharacter, super.key, }) extends ConsumerWidget { @@ -27,7 +28,12 @@ class const TaggerOverlay( child: switch (triggerCharacter) { "@" => UserOverlay(query, roomId: roomId, addTag: addTag), "#" => RoomOverlay(query, addTag: addTag), - ":" => EmojiOverlay(query, roomId: roomId, addTag: addTag), + ":" => EmojiOverlay( + query, + roomId: roomId, + addTag: addTag, + insertText: insertText, + ), _ => Loading(), }, From bebbf43a5e5d9ef0a6763dc154e2bd239e9b373d Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sun, 22 Nov 2026 16:01:04 -0500 Subject: [PATCH 25/25] Revert "bump deps" This reverts commit f8938b82570a6c3bec30679854a7a662dce199e9. Needed until https://github.com/flutter/flutter/issues/196529 is fixed. --- android/app/build.gradle.kts | 2 +- android/settings.gradle.kts | 4 +- flake.lock | 17 +++--- flake.nix | 2 +- lib/helpers/extensions/scheme_to_theme.dart | 8 ++- lib/main.dart | 8 +++ linux/nix/pkg/default.nix | 2 + pubspec.lock | 64 +++++++++++---------- pubspec.yaml | 16 ++++-- 9 files changed, 74 insertions(+), 49 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 2dda455..35d2638 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -75,7 +75,7 @@ android { dependencies { implementation("org.unifiedpush.android:embedded-fcm-distributor:3.1.0") - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4") } kotlin { diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index 7100c55..f07087d 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -19,8 +19,8 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "9.5.1" apply false - id("org.jetbrains.kotlin.android") version "2.4.21" apply false + id("com.android.application") version "9.3.1" apply false + id("org.jetbrains.kotlin.android") version "2.4.10" apply false } include(":app") diff --git a/flake.lock b/flake.lock index 42e7cad..b6443af 100644 --- a/flake.lock +++ b/flake.lock @@ -29,15 +29,16 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1795368110, - "narHash": "sha256-rIdyHJHv44OJD5B9Wo0CCIyR6Vecnxx5MuAPfanJ7n0=", - "ref": "refs/heads/main", - "rev": "21f3f0c1ebcfad22e5a3ab497d2139a36bd77d6e", - "revCount": 8275, + "lastModified": 1794436491, + "narHash": "sha256-1Gbe5ys68lljaWtwn8Z4RhkUnWDfw8AaHQJDKVzzmVA=", + "ref": "ea3beb628a3cab6fbc4142b725c9edb043846eb6", + "rev": "ea3beb628a3cab6fbc4142b725c9edb043846eb6", + "revCount": 8146, "type": "git", "url": "https://forgejo.ellis.link/Continuwuation/Continuwuity" }, "original": { + "ref": "ea3beb628a3cab6fbc4142b725c9edb043846eb6", "type": "git", "url": "https://forgejo.ellis.link/Continuwuation/Continuwuity" } @@ -173,11 +174,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1795234589, - "narHash": "sha256-f/VVvxf5RsQgWVhUtefoca5ktVg0DA2bnkMOcmSnozo=", + "lastModified": 1793540411, + "narHash": "sha256-fiPJ88izTVucjeo2EQ3jk4aWmLg03I1D4vxnX2QjEgE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2786a2a72088ecf32aea5b3ec52099e6a7cff78f", + "rev": "0bb2eedc20e4739f29e8045034f2828ad7054f8f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index af8fd64..2ee3373 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ }; # TEMPORARY: the e2e tests against Continuwuity from the forge, till there's a new full release in nixpkgs continuwuity = { - url = "git+https://forgejo.ellis.link/Continuwuation/Continuwuity"; + url = "git+https://forgejo.ellis.link/Continuwuation/Continuwuity?ref=ea3beb628a3cab6fbc4142b725c9edb043846eb6"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/lib/helpers/extensions/scheme_to_theme.dart b/lib/helpers/extensions/scheme_to_theme.dart index d640b8e..73ce176 100644 --- a/lib/helpers/extensions/scheme_to_theme.dart +++ b/lib/helpers/extensions/scheme_to_theme.dart @@ -4,7 +4,13 @@ extension SchemeToTheme on ColorScheme { ThemeData get theme { final textTheme = ThemeData( fontFamily: "bundled-sans", - fontFamilyFallback: ["emoji"], + fontFamilyFallback: [ + "emoji", + // TODO: Remove once on Flutter 3.50, whose Linux arm64 engine uses + // fontconfig and so understands the "emoji" alias + "Noto Color Emoji", + "Twemoji", + ], brightness: brightness, ).textTheme; return .from(colorScheme: this).copyWith( diff --git a/lib/main.dart b/lib/main.dart index 9f9e328..299e95a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -45,6 +45,14 @@ New Value: ${newValue is AsyncData ? newValue.value : newValue} } void showError(Object error, [StackTrace? stackTrace]) { + // 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; + } + debugPrintStack(stackTrace: stackTrace, label: error.toString()); if (navigatorKey.currentContext != null) { Future.delayed( diff --git a/linux/nix/pkg/default.nix b/linux/nix/pkg/default.nix index c909da4..0bd7728 100644 --- a/linux/nix/pkg/default.nix +++ b/linux/nix/pkg/default.nix @@ -63,7 +63,9 @@ flutter.buildFlutterApplication { fab_m3e = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI="; fluttertagger = "sha256-tHUNU2+fBPkq5UK5YRi3SWs1zF2PIPz6RgSbwignU/I="; m3e_design = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI="; + native_toolchain_cmake = "sha256-/drnHZebmTnsCnHgC1xmlAe+U4PSrjw5Sm9axicuTrY="; navigation_rail_m3e = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI="; + pasteboard = "sha256-J3yray5n7XwVXMcOsvQ5+OvADEK2lPMeYniGg+yR704="; unifiedpush_linux = "sha256-KQKyBPL2ORK9O89C4K3RHGve/lvFaU1vIjSDnj6+bj4="; unifiedpush_platform_interface = "sha256-KQKyBPL2ORK9O89C4K3RHGve/lvFaU1vIjSDnj6+bj4="; xdg_desktop_portal = "sha256-8GgiXHGv+wy6hJgj/rZxbymMitNVmdDLAnedZm9STSc="; diff --git a/pubspec.lock b/pubspec.lock index dae1801..d5b2431 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -173,18 +173,18 @@ packages: dependency: transitive description: name: better_player_android - sha256: "9e074251038a087c31683d371ee573c39f200d3e6f85454ea612320dba65688f" + sha256: "2c7df9bfb1e7fa69c86d3bb91a1825bba30292968307724fa51869bc3a0bb75d" url: "https://pub.dev" source: hosted - version: "1.14.0" + version: "1.13.2" better_player_ios: dependency: transitive description: name: better_player_ios - sha256: "03186ef3ecdeb37a120486cf988b005e0b46cdc52308037e7f4aee36bfee6f8d" + sha256: "4b9c08690374aa84b15ba88ab5d6b695cda618fb895b445a6a4186c220599c84" url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.15.0" better_player_linux: dependency: transitive description: @@ -205,18 +205,18 @@ packages: dependency: transitive description: name: better_player_platform_interface - sha256: "9ee3301e17e3a2a937760bfdd8c4b70800cd01bcc636c85c45a4be71bbaa1a45" + sha256: e5218199dd12ffe6f43c01d5cdeecad0b53125926f8da8c3f4b90136d8b55ec1 url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.8.0" better_player_web: dependency: transitive description: name: better_player_web - sha256: e365a08e8041d56980fb87e577274e255543fcf377124c40880f189f00b6cf4b + sha256: d7b365221f7724f22d3fef7840e45af2493a784e2429a30e980f807bcb7c9539 url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.6.1" better_player_windows: dependency: transitive description: @@ -333,10 +333,10 @@ packages: dependency: transitive description: name: cnativeapi - sha256: "49662734cdf3dd1707b1ee35102ac1754e0ab3d450a2d30b066730f219dacc86" + sha256: c43703998995e132b0656d2b8a95ed2bedc6b22ccee2c827bcdc075e0330e319 url: "https://pub.dev" source: hosted - version: "0.6.2" + version: "0.5.10" code_assets: dependency: "direct main" description: @@ -1178,29 +1178,30 @@ packages: source: hosted version: "0.19.6" native_toolchain_cmake: - dependency: transitive + dependency: "direct overridden" description: - name: native_toolchain_cmake - sha256: b3501c56fa20328d57586317fdbbcfa2051a498175130ecd21c4a922de6a2c8d - url: "https://pub.dev" - source: hosted - version: "0.3.3" + path: "." + ref: HEAD + resolved-ref: d77984a36a16be22e911850de2cd2050610ff4ed + url: "https://github.com/rainyl/native_toolchain_cmake" + source: git + version: "0.3.2" nativeapi: dependency: transitive description: name: nativeapi - sha256: "339b7a91a27ce5c33659cab92cf8e76736142985433652f91a63cc5348135bfb" + sha256: "118045bb549cb6fabad472a3a22a537e7310bbf20097350f5027808b4a5853ce" url: "https://pub.dev" source: hosted - version: "0.6.2" + version: "0.5.10" nativeapi_flutter: dependency: transitive description: name: nativeapi_flutter - sha256: b0507253748ba9690a295bc162208a91d348809185409e5aee7b09e77ab5d8a3 + sha256: "357a405c69212f5157da1bd3be183a53c2b841d0de0eb51f4a3947913712aec4" url: "https://pub.dev" source: hosted - version: "0.6.2" + version: "0.5.10" navigation_rail_m3e: dependency: "direct main" description: @@ -1245,11 +1246,12 @@ packages: pasteboard: dependency: "direct main" description: - name: pasteboard - sha256: "7b1c7ed83b4ff27acced26e96b87c16ac37fb6c57d7886eb3130faccb28b2cc2" - url: "https://pub.dev" - source: hosted - version: "0.6.2" + path: "packages/pasteboard" + ref: HEAD + resolved-ref: e79a0ecc741b80575f38465c02eba9c553e12479 + url: "https://github.com/Henry-Hiles/flutter-plugins" + source: git + version: "0.6.1" path: dependency: "direct main" description: @@ -1611,10 +1613,10 @@ packages: dependency: transitive description: name: test_api - sha256: "0a10344e901e5b2e63819567951cb6a06673ed6b84f40462188ff5a0c41f371f" + sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11" url: "https://pub.dev" source: hosted - version: "0.7.14" + version: "0.7.12" timeago: dependency: "direct main" description: @@ -1901,10 +1903,10 @@ packages: dependency: "direct main" description: name: window_manager - sha256: "9504ae37e618d31524e337ad3cf9600d252acf11fffa3ddb9b0b5ced634542d9" + sha256: bdd6b1a2c1ce50f3bba7ffbaa0d5dc5feb6b6a24fd20269da4de90244f77a471 url: "https://pub.dev" source: hosted - version: "0.7.1" + version: "0.6.0" wkt_parser: dependency: transitive description: @@ -1955,5 +1957,5 @@ packages: source: hosted version: "2.2.4" sdks: - dart: "3.14.0" - flutter: "3.50.1" + dart: "3.13.3" + flutter: "3.47.4" diff --git a/pubspec.yaml b/pubspec.yaml index 4ca55f6..dd21cb7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,14 +16,16 @@ flutter: uses-material-design: true environment: - sdk: 3.14.0 - flutter: 3.50.1 + sdk: 3.13.3 + flutter: 3.47.4 dependency_overrides: dynamic_color: 2.1.0 code_assets: 2.2.0 # webcrypto requires ^1.0.0, but works with 2.x webcrypto: 0.6.2 - window_manager: 0.7.1 # unifiedpush_linux requires ^0.6.0, 0.7 has the Dart 3.14 nativeapi fix + native_toolchain_cmake: + git: + url: https://github.com/rainyl/native_toolchain_cmake # Fixes native aarch64 linux builds, unreleased m3e_design: git: url: https://github.com/Henry-Hiles/material_3_expressive @@ -42,6 +44,10 @@ dependency_overrides: url: https://codeberg.org/Henry-Hiles/flutter-connector ref: quad/nexus path: unifiedpush_platform_interface + pasteboard: + git: + url: https://github.com/Henry-Hiles/flutter-plugins # FileTransfer portal support on Linux, unreleased + path: packages/pasteboard linkify: git: url: https://github.com/appelladev/linkify @@ -63,7 +69,7 @@ dependencies: path: 1.9.1 dynamic_color: 2.1.0 collection: 1.19.1 - window_manager: 0.7.1 + window_manager: 0.6.0 color_hash: 1.0.1 flutter_widget_from_html_core: 0.18.0-beta.1 flutter_svg: 2.5.0 @@ -107,7 +113,7 @@ dependencies: git: url: https://github.com/Henry-Hiles/xdg_desktop_portal.dart ref: quad/nexus - pasteboard: 0.6.2 + pasteboard: 0.6.0 flutter_file_dialog: 3.3.6 mime: 2.1.0 avif_native: 0.2.0