diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 79032d5..4aa566c 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 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: | diff --git a/README.md b/README.md index 4fd61e4..b895cc4 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.3"; +url = "git+https://git.federated.nexus/Nexus/nexus?ref=refs/tags/v1.1.2"; ``` Then import the module and enable it in your NixOS configuration: diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 35d2638..46feed1 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -57,10 +57,6 @@ android { } } - dependenciesInfo { - includeInApk = false - } - buildTypes { release { // Unsigned without a keystore, e.g. for F-Droid, which signs it itself 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 fc480a9..f2b0f68 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.requestApplyInsets() } + view.post { view.rootWindowInsets?.let(view::onApplyWindowInsets) } } } diff --git a/assets/bundled/federated_nexus.svg b/assets/bundled/federated_nexus.svg deleted file mode 100644 index 0effd9a..0000000 --- a/assets/bundled/federated_nexus.svg +++ /dev/null @@ -1,150 +0,0 @@ - - - - diff --git a/assets/bundled/matrix.svg b/assets/bundled/matrix.svg deleted file mode 100644 index bfe705e..0000000 --- a/assets/bundled/matrix.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/gomuks b/gomuks index 2a76e97..94d91fb 160000 --- a/gomuks +++ b/gomuks @@ -1 +1 @@ -Subproject commit 2a76e97eb3e955ec14775ce4027ed446865ed7fa +Subproject commit 94d91fbbb70b1519f545f3ec1ae523a6ee965e23 diff --git a/hook/build.dart b/hook/build.dart index 2181e8a..ca84fda 100644 --- a/hook/build.dart +++ b/hook/build.dart @@ -123,6 +123,7 @@ 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/lib/controllers/clock.dart b/lib/controllers/clock.dart deleted file mode 100644 index f9fe690..0000000 --- a/lib/controllers/clock.dart +++ /dev/null @@ -1,20 +0,0 @@ -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/helpers/launch_helper.dart b/lib/helpers/launch_helper.dart index 82f1806..89c7015 100644 --- a/lib/helpers/launch_helper.dart +++ b/lib/helpers/launch_helper.dart @@ -1,30 +1,17 @@ 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 { - 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())), - ), + try { + return await ul.launchUrl( + url, + mode: useWebview ? .inAppBrowserView : .externalApplication, ); + } on PlatformException catch (_) { + return false; } - return launched; } static final provider = Provider(LaunchHelper.new); diff --git a/lib/helpers/mxc_image.dart b/lib/helpers/mxc_image.dart index d82d485..4013397 100644 --- a/lib/helpers/mxc_image.dart +++ b/lib/helpers/mxc_image.dart @@ -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 _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 _decodeAvifInIsolate(Uint8List bytes) => - Isolate.run(() => decodeAvif(bytes)); + return decode(await .fromUint8List(bytes)); + } @override bool operator ==(Object other) => diff --git a/lib/main.dart b/lib/main.dart index 299e95a..97650d0 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -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; } diff --git a/lib/models/homeserver.dart b/lib/models/homeserver.dart index ca1a271..5504941 100644 --- a/lib/models/homeserver.dart +++ b/lib/models/homeserver.dart @@ -1,5 +1,4 @@ import "package:freezed_annotation/freezed_annotation.dart"; -import "package:material_ui/material_ui.dart"; part "homeserver.freezed.dart"; @@ -8,5 +7,5 @@ class const Homeserver({ required final String name, required final String description, required final Uri url, - required final Widget icon, + required final String iconUrl, }) with _$Homeserver; diff --git a/lib/widgets/common/sync_status_banner.dart b/lib/widgets/common/sync_status_banner.dart index 0eccff3..4199866 100644 --- a/lib/widgets/common/sync_status_banner.dart +++ b/lib/widgets/common/sync_status_banner.dart @@ -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( diff --git a/lib/widgets/common/timestamp.dart b/lib/widgets/common/timestamp.dart index 2f7a2fc..bc9db74 100644 --- a/lib/widgets/common/timestamp.dart +++ b/lib/widgets/common/timestamp.dart @@ -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 diff --git a/lib/widgets/composer/composer.dart b/lib/widgets/composer/composer.dart index 3b722e0..0b0a7db 100644 --- a/lib/widgets/composer/composer.dart +++ b/lib/widgets/composer/composer.dart @@ -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) { diff --git a/lib/widgets/composer/overlays/emoji_overlay.dart b/lib/widgets/composer/overlays/emoji_overlay.dart index 6f9c15f..bb4b88f 100644 --- a/lib/widgets/composer/overlays/emoji_overlay.dart +++ b/lib/widgets/composer/overlays/emoji_overlay.dart @@ -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(), diff --git a/lib/widgets/composer/overlays/tagger_overlay.dart b/lib/widgets/composer/overlays/tagger_overlay.dart index e32a328..f760e01 100644 --- a/lib/widgets/composer/overlays/tagger_overlay.dart +++ b/lib/widgets/composer/overlays/tagger_overlay.dart @@ -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(), }, diff --git a/lib/widgets/composer/overlays/user_overlay.dart b/lib/widgets/composer/overlays/user_overlay.dart index 845fb3a..eec15f5 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 ?? member.stateKey!.localpart}](matrix:u/${member.stateKey!.substring(1)})", + id: "[@$displayName](matrix:u/${member.stateKey!.substring(1)})", name: member.stateKey!.localpart, ), ), diff --git a/lib/widgets/pages/select_server.dart b/lib/widgets/pages/select_server.dart index a3102e6..a44e4b8 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.read( + codeResponse = await ref.watch( AuthUrlController.provider(url).future, ); } on GomuksException catch (error) { @@ -190,34 +190,31 @@ 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"), - icon: SvgPicture.asset( - "assets/bundled/matrix.svg", - colorFilter: .mode(theme.colorScheme.onSurface, .srcIn), - ), + iconUrl: + "https://raw.githubusercontent.com/element-hq/logos/refs/heads/master/matrix/matrix-favicon${Theme.brightnessOf(context) == Brightness.dark ? "-white" : ""}.png", ), .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"), - icon: SvgPicture.asset( - "assets/bundled/federated_nexus.svg", - ), + iconUrl: "https://federated.nexus/images/icon.png", ), // 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"), - // icon: Image.network("https://unredacted.org/favicon.ico"), + // iconUrl: "https://unredacted.org/favicon.ico", // ), ].map( (homeserver) => Card( child: ListTile( enabled: !isLoading.value, title: Text(homeserver.name), - leading: SizedBox.square( - dimension: 32, - child: homeserver.icon, + leading: Image.network( + homeserver.iconUrl, + errorBuilder: (_, _, _) => SizedBox.shrink(), + height: 32, ), subtitle: Text(homeserver.description), onTap: isLoading.value diff --git a/lib/widgets/players/audio.dart b/lib/widgets/players/audio.dart index f29955b..638564b 100644 --- a/lib/widgets/players/audio.dart +++ b/lib/widgets/players/audio.dart @@ -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( diff --git a/lib/widgets/renderers/event.dart b/lib/widgets/renderers/event.dart index 228abf6..4e14fad 100644 --- a/lib/widgets/renderers/event.dart +++ b/lib/widgets/renderers/event.dart @@ -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( diff --git a/lib/widgets/renderers/message.dart b/lib/widgets/renderers/message.dart index 655fc0d..5b25a35 100644 --- a/lib/widgets/renderers/message.dart +++ b/lib/widgets/renderers/message.dart @@ -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"), diff --git a/lib/widgets/room_chat/room_chat.dart b/lib/widgets/room_chat/room_chat.dart index 8a29c38..929be84 100644 --- a/lib/widgets/room_chat/room_chat.dart +++ b/lib/widgets/room_chat/room_chat.dart @@ -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, diff --git a/linux/nexus.federated.nexus.metainfo.xml b/linux/nexus.federated.nexus.metainfo.xml index 53c738c..a064355 100644 --- a/linux/nexus.federated.nexus.metainfo.xml +++ b/linux/nexus.federated.nexus.metainfo.xml @@ -68,7 +68,6 @@ - diff --git a/linux/nix/pkg/default.nix b/linux/nix/pkg/default.nix index 0bd7728..d69710b 100644 --- a/linux/nix/pkg/default.nix +++ b/linux/nix/pkg/default.nix @@ -58,14 +58,16 @@ 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="; unifiedpush_linux = "sha256-KQKyBPL2ORK9O89C4K3RHGve/lvFaU1vIjSDnj6+bj4="; unifiedpush_platform_interface = "sha256-KQKyBPL2ORK9O89C4K3RHGve/lvFaU1vIjSDnj6+bj4="; xdg_desktop_portal = "sha256-8GgiXHGv+wy6hJgj/rZxbymMitNVmdDLAnedZm9STSc="; diff --git a/linux/nix/pkg/gomuks.nix b/linux/nix/pkg/gomuks.nix index dc9f9ac..da3bf3d 100644 --- a/linux/nix/pkg/gomuks.nix +++ b/linux/nix/pkg/gomuks.nix @@ -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 ''; diff --git a/pubspec.lock b/pubspec.lock index d5b2431..40c4b8c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -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: @@ -1246,12 +1249,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: e0535da36124e6f2ca9d17424102ce5de34e72acc39f05a1d942b974b48e5eea + url: "https://pub.dev" + source: hosted + version: "0.6.0" path: dependency: "direct main" description: @@ -1711,10 +1713,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: diff --git a/pubspec.yaml b/pubspec.yaml index dd21cb7..715b3a0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: nexus description: "A simple and user-friendly Matrix client" -version: 1.1.3+101030999 +version: 1.1.2+101020999 publish_to: none flutter: @@ -44,14 +44,25 @@ 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 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: @@ -72,7 +83,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.5.0 + flutter_svg: 2.3.4 json_annotation: 4.12.0 shared_preferences: 2.5.6 fluttertagger: @@ -101,11 +112,11 @@ dependencies: package_info_plus: 10.2.2 app_links: 7.2.2 file_selector: 1.1.0 - material_ui: 1.11.1 + material_ui: 1.11.0 multi_state_switch: 1.1.0 unifiedpush: 6.2.0 unifiedpush_storage_shared_preferences: 1.0.0 - flutter_local_notifications: 23.0.3 + flutter_local_notifications: 23.0.1 timezone: 0.11.2 material_emoji_picker: 2.0.1+1 material_adaptive_sheets: 1.0.0 @@ -124,7 +135,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.38.0 + better_player: 1.37.0 audioplayers: 6.8.1 dev_dependencies: flutter_test: diff --git a/scripts/release.sh b/scripts/release.sh old mode 100755 new mode 100644 diff --git a/windows/installer.iss b/windows/installer.iss index e1a08c0..0a43cb9 100644 --- a/windows/installer.iss +++ b/windows/installer.iss @@ -1,6 +1,6 @@ [Setup] AppName=Nexus -AppVersion=1.1.3 +AppVersion=1.1.2 DefaultDirName={pf}\Nexus DefaultGroupName=Nexus OutputDir=dist