Compare commits

..
21 changed files with 124 additions and 172 deletions

View file

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

View file

@ -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<View>(FLUTTER_VIEW_ID) ?: return
view.post { view.requestApplyInsets() }
view.post { view.rootWindowInsets?.let(view::onApplyWindowInsets) }
}
}

2
gomuks

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

View file

@ -123,6 +123,7 @@ Future<void> main(List<String> 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(",");

View file

@ -1,20 +0,0 @@
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,7 +1,6 @@
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";
@ -21,27 +20,19 @@ class MxcImage(final WidgetRef ref, final DownloadMediaRequest request)
MultiFrameImageStreamCompleter(codec: _loadAsync(decode), scale: 1.0);
Future<ui.Codec> _loadAsync(ImageDecoderCallback decode) async {
try {
final file = await ref
.read(ClientController.provider.notifier)
.downloadMedia(request);
final bytes = await File(file.path).readAsBytes();
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 _decodeAvifInIsolate(bytes));
}
return await decode(await .fromUint8List(bytes));
} catch (_) {
scheduleMicrotask(() => PaintingBinding.instance.imageCache.evict(this));
rethrow;
// 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)));
}
}
static Future<AvifImageData> _decodeAvifInIsolate(Uint8List bytes) =>
Isolate.run(() => decodeAvif(bytes));
return decode(await .fromUint8List(bytes));
}
@override
bool operator ==(Object other) =>

View file

@ -45,11 +45,7 @@ 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",
)) {
if (error.toString().contains("'_nextFrame != null': is not true.")) {
return;
}

View file

@ -1,6 +1,5 @@
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";
@ -39,7 +38,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, clock: ref.watch(ClockController.provider))}.",
"Last synced ${format(lastSync)}.",
];
return AnimatedSize(

View file

@ -1,15 +1,13 @@
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 ConsumerWidget {
extends StatelessWidget {
@override
Widget build(BuildContext context, WidgetRef ref) => Tooltip(
Widget build(BuildContext context) => Tooltip(
message: timestamp.toString(),
child: Text(
format(timestamp, clock: ref.watch(ClockController.provider)),
format(timestamp),
maxLines: 1,
overflow: .ellipsis,
style: Theme.of(context).textTheme.labelSmall

View file

@ -834,21 +834,6 @@ 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) {

View file

@ -12,7 +12,6 @@ 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
@ -39,19 +38,19 @@ class const EmojiOverlay(
),
title: Text(emoji.aliases.first),
subtitle: Text(emoji.description),
onTap: () => emoji.value.startsWith("mxc://")
? addTag(
id: ImagePack.emojiMarkdown(
onTap: () => addTag(
id: emoji.value.startsWith("mxc://")
? ImagePack.emojiMarkdown(
emoji.aliases.first,
emoji.value,
description: switch (emoji.data) {
PackImage(:final body) => body,
_ => null,
},
),
name: emoji.aliases.first,
)
: insertText(emoji.value),
)
: emoji.value,
name: emoji.aliases.first,
),
),
)
.toList(),

View file

@ -10,7 +10,6 @@ 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 {
@ -28,12 +27,7 @@ class const TaggerOverlay(
child: switch (triggerCharacter) {
"@" => UserOverlay(query, roomId: roomId, addTag: addTag),
"#" => RoomOverlay(query, addTag: addTag),
":" => EmojiOverlay(
query,
roomId: roomId,
addTag: addTag,
insertText: insertText,
),
":" => EmojiOverlay(query, roomId: roomId, addTag: addTag),
_ => Loading(),
},

View file

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

View file

@ -1,6 +1,7 @@
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";
@ -35,8 +36,8 @@ class const AudioPlayer(
await player.setSource(
audioplayers.DeviceFileSource(audio.path, mimeType: info?.mimeType),
);
} on Exception catch (_) {
// The platform can't play this format, like Ogg on Apple platforms or MIDI on Linux
} on PlatformException catch (_) {
// The platform can't play this format, like Ogg on Apple platforms
if (context.mounted) unsupported.value = true;
return;
}
@ -46,18 +47,18 @@ class const AudioPlayer(
return player.dispose;
}, []);
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 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 playing = state == .playing;
final downloadButton = IconButton(

View file

@ -525,12 +525,10 @@ class const EventRenderer(
child: Row(
spacing: 4,
children: [
Flexible(
child: Text(
event.sendError!,
style: theme.textTheme.labelSmall?.copyWith(
color: theme.colorScheme.error,
),
Text(
event.sendError!,
style: theme.textTheme.labelSmall?.copyWith(
color: theme.colorScheme.error,
),
),
InkWell(

View file

@ -143,18 +143,12 @@ class const MessageRenderer(
UnknownMessageContent(:final body) =>
body == null
? Text("This message is redacted", style: errorStyle)
: Text.rich(
TextSpan(
children: [
TextSpan(
text: "Unknown message type: ",
style: errorStyle,
),
TextSpan(text: body),
],
),
maxLines: maxLines,
overflow: maxLines == null ? null : .ellipsis,
: Wrap(
spacing: 8,
children: [
Text("Unknown message type:", style: errorStyle),
Text(body),
],
),
},
_ => throw Exception("This is impossible"),

View file

@ -20,7 +20,6 @@ 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,
@ -203,14 +202,10 @@ 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)
.onError(showError);
.set(!memberListOpened);
Scaffold.of(thisContext).openEndDrawer();
},
onOpenPinnedMessagesList: Scaffold.of(middleContext)
.openEndDrawer,

View file

@ -58,14 +58,17 @@ 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-RL+l46pBhv75xP7ASJuazyYoi9vI35TSYAV11mkjAwY=";
location = "sha256-zWnffXiK1LD4Ln23coPozBjYfTlhZmBhC5Z8mCdAgwQ=";
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=";
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=";

View file

@ -17,12 +17,12 @@ buildGoModule (
src = "${src}/gomuks";
vendorHash = "sha256-MJu9qN1NhUkjF3MAz+ejVMY9dxg8yxMBqCCHzPh9RHc=";
vendorHash = "sha256-feW1rw74GsRx0fkqGLZk6PeR6bUkIt9JnjvirOAThcI=";
buildPhase = ''
runHook preBuild
go build -buildmode=c-shared -o ${filename} -tags noheic,sqlite_fts5 ./pkg/ffi
go build -buildmode=c-shared -o ${filename} -tags goolm,noheic,sqlite_fts5 ./pkg/ffi
runHook postBuild
'';

View file

@ -77,10 +77,10 @@ packages:
dependency: transitive
description:
name: archive
sha256: "2fda90592c0afd219c5e285618a98da835cd10df38372666093d25dfe457a2d0"
sha256: de5ac590b8155e4e676088d714bd41ea620449a6adc0f7950c5073874b287ddb
url: "https://pub.dev"
source: hosted
version: "4.7.1"
version: "4.6.0"
args:
dependency: transitive
description:
@ -164,27 +164,29 @@ packages:
better_player:
dependency: "direct main"
description:
name: better_player
sha256: f9b928eec81622f33457a5019a02c79d102dffe54b432baa43bb3400d31439e1
url: "https://pub.dev"
source: hosted
version: "1.38.0"
path: "packages/better_player"
ref: "quad/feat/mimetypes"
resolved-ref: c4753aa81b368c0b025a80cbab01424462d64794
url: "https://github.com/Henry-Hiles/betterplayer"
source: git
version: "1.37.0"
better_player_android:
dependency: transitive
description:
name: better_player_android
sha256: "2c7df9bfb1e7fa69c86d3bb91a1825bba30292968307724fa51869bc3a0bb75d"
sha256: "24d3ce6c357186e0ec1eed63519e47a552bdc497ad48556f32593f5d6b406672"
url: "https://pub.dev"
source: hosted
version: "1.13.2"
version: "1.13.1"
better_player_ios:
dependency: transitive
dependency: "direct overridden"
description:
name: better_player_ios
sha256: "4b9c08690374aa84b15ba88ab5d6b695cda618fb895b445a6a4186c220599c84"
url: "https://pub.dev"
source: hosted
version: "1.15.0"
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"
better_player_linux:
dependency: transitive
description:
@ -194,13 +196,14 @@ packages:
source: hosted
version: "1.1.1"
better_player_macos:
dependency: transitive
dependency: "direct overridden"
description:
name: better_player_macos
sha256: "90f6fc0e354b034043850661a7c4e39ac34261ff7cc21c2895ea7bded126d15c"
url: "https://pub.dev"
source: hosted
version: "1.10.0"
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"
better_player_platform_interface:
dependency: transitive
description:
@ -640,10 +643,10 @@ packages:
dependency: "direct main"
description:
name: flutter_local_notifications
sha256: "7d37d69ded3028af4f22531a0097a3baa478a384dff2e23e873707c93df3b704"
sha256: "58f9ea245d7194363c05f7a012bbc73291736c2d8b5f555a8e0ea3f9121868b4"
url: "https://pub.dev"
source: hosted
version: "23.0.3"
version: "23.0.1"
flutter_local_notifications_linux:
dependency: transitive
description:
@ -709,10 +712,10 @@ packages:
dependency: "direct main"
description:
name: flutter_svg
sha256: "4565a66f0a968f2e1ab4197854686990258aadab9572eb80a7655053a01dc302"
sha256: bce4a000275c0d0ac42f3fdcf0a6162fb95ac30983ba7ee6cffcf60f6ad33611
url: "https://pub.dev"
source: hosted
version: "2.5.0"
version: "2.3.4"
flutter_test:
dependency: "direct dev"
description: flutter
@ -837,10 +840,10 @@ packages:
dependency: transitive
description:
name: image
sha256: bc13f61f0f5cb77936e78ae5dae3800f442718dac5d2bc4654f03c239230ed0c
sha256: "89ed75b2f8231fe676808c5564f9590d728024ded7ac782a7ed8474f1c95b72a"
url: "https://pub.dev"
source: hosted
version: "4.13.1"
version: "4.12.0"
image_picker:
dependency: "direct main"
description:
@ -869,10 +872,10 @@ packages:
dependency: transitive
description:
name: image_picker_ios
sha256: a4aeafbe049ad99882059f186862de6fd5296c708c5805277f6f684165268af1
sha256: f4e5650a81b268af3886bc789216ff6d56bdfa79934f93f1a5a8a303b8f60f77
url: "https://pub.dev"
source: hosted
version: "0.8.13+16"
version: "0.8.13+15"
image_picker_linux:
dependency: transitive
description:
@ -930,18 +933,18 @@ packages:
dependency: transitive
description:
name: jni
sha256: "19764f78f6b9e0d40f6395b04649d1046eb57f5ccf05afce50cc63e5a82777b0"
sha256: "2e91e6087291affd10b31b6c872f3e3ac7dc5d93b51b5ba485d930c8f08bde6c"
url: "https://pub.dev"
source: hosted
version: "1.2.1"
version: "1.1.2"
jni_flutter:
dependency: transitive
description:
name: jni_flutter
sha256: "586594ad345b403bda8a794b0b8a9e34298238b86c2a7d7f15160b092fe9ef3d"
sha256: "0dd33d67797560f66e961a6053882d4df54bd345bf063b8fe7ea133f7ad8b191"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
version: "1.0.4+1"
jni_util:
dependency: transitive
description:
@ -1028,10 +1031,10 @@ packages:
description:
path: "packages/location"
ref: "feat/optional-play-services"
resolved-ref: "1a2602a9f7b07906a1191730d5435f4b695547d3"
resolved-ref: "70e2fbe87a4a8769de08f1692412d731063dcfc0"
url: "https://github.com/Henry-Hiles/flutterlocation"
source: git
version: "10.2.0"
version: "10.1.0"
location_platform_interface:
dependency: transitive
description:
@ -1117,10 +1120,10 @@ packages:
dependency: "direct main"
description:
name: material_ui
sha256: a6b19012df437a356cbc01f8ea22a105e07194c47c9a6009da0032a0ce35c4ab
sha256: "474c135fd46b56ff1d35ca982155e8863d28fbc6464d1192acf4ee53a738680e"
url: "https://pub.dev"
source: hosted
version: "1.11.1"
version: "1.11.0"
measure_size:
dependency: "direct main"
description:
@ -1248,7 +1251,7 @@ packages:
description:
path: "packages/pasteboard"
ref: HEAD
resolved-ref: e79a0ecc741b80575f38465c02eba9c553e12479
resolved-ref: b5427767c5da1d9bba4c7227dd66ba2b108e9555
url: "https://github.com/Henry-Hiles/flutter-plugins"
source: git
version: "0.6.1"
@ -1711,10 +1714,10 @@ packages:
dependency: transitive
description:
name: url_launcher_android
sha256: b8073b1e5173d63afe1a18985a75896d72f759d3bc1817eb1ae8d26e8527cceb
sha256: "611e87fb320b70d1dd721dc46af89c98aceccea9b31fde49e084591414e0c610"
url: "https://pub.dev"
source: hosted
version: "6.3.35"
version: "6.3.33"
url_launcher_ios:
dependency: transitive
description:

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