diff --git a/lib/pages/chat/events/audio_player.dart b/lib/pages/chat/events/audio_player.dart index 41e1f8606..10d13362d 100644 --- a/lib/pages/chat/events/audio_player.dart +++ b/lib/pages/chat/events/audio_player.dart @@ -395,21 +395,27 @@ class AudioPlayerState extends State { ), if (fileDescription != null) ...[ const SizedBox(height: 8), - Linkify( - text: fileDescription, - textScaleFactor: MediaQuery.textScalerOf(context).scale(1), - style: TextStyle( - color: widget.color, - fontSize: widget.fontSize, + Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 8, ), - options: const LinkifyOptions(humanize: false), - linkStyle: TextStyle( - color: widget.linkColor, - fontSize: widget.fontSize, - decoration: TextDecoration.underline, - decorationColor: widget.linkColor, + child: Linkify( + text: fileDescription, + textScaleFactor: MediaQuery.textScalerOf(context).scale(1), + style: TextStyle( + color: widget.color, + fontSize: widget.fontSize, + ), + options: const LinkifyOptions(humanize: false), + linkStyle: TextStyle( + color: widget.linkColor, + fontSize: widget.fontSize, + decoration: TextDecoration.underline, + decorationColor: widget.linkColor, + ), + onOpen: (url) => UrlLauncher(context, url.url).launchUrl(), ), - onOpen: (url) => UrlLauncher(context, url.url).launchUrl(), ), ], ], diff --git a/lib/pages/chat/events/image_bubble.dart b/lib/pages/chat/events/image_bubble.dart index 4a77af18f..ea0439bec 100644 --- a/lib/pages/chat/events/image_bubble.dart +++ b/lib/pages/chat/events/image_bubble.dart @@ -79,12 +79,19 @@ class ImageBubble extends StatelessWidget { Widget build(BuildContext context) { final theme = Theme.of(context); - final borderRadius = + var borderRadius = this.borderRadius ?? BorderRadius.circular(AppConfig.borderRadius); final fileDescription = event.fileDescription; final textColor = this.textColor; + if (fileDescription != null) { + borderRadius = borderRadius.copyWith( + bottomLeft: Radius.zero, + bottomRight: Radius.zero, + ); + } + return Column( mainAxisSize: MainAxisSize.min, spacing: 8, @@ -122,21 +129,29 @@ class ImageBubble extends StatelessWidget { if (fileDescription != null && textColor != null) SizedBox( width: width, - child: Linkify( - text: fileDescription, - textScaleFactor: MediaQuery.textScalerOf(context).scale(1), - style: TextStyle( - color: textColor, - fontSize: AppConfig.fontSizeFactor * AppConfig.messageFontSize, + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 8, ), - options: const LinkifyOptions(humanize: false), - linkStyle: TextStyle( - color: linkColor, - fontSize: AppConfig.fontSizeFactor * AppConfig.messageFontSize, - decoration: TextDecoration.underline, - decorationColor: linkColor, + child: Linkify( + text: fileDescription, + textScaleFactor: MediaQuery.textScalerOf(context).scale(1), + style: TextStyle( + color: textColor, + fontSize: + AppConfig.fontSizeFactor * AppConfig.messageFontSize, + ), + options: const LinkifyOptions(humanize: false), + linkStyle: TextStyle( + color: linkColor, + fontSize: + AppConfig.fontSizeFactor * AppConfig.messageFontSize, + decoration: TextDecoration.underline, + decorationColor: linkColor, + ), + onOpen: (url) => UrlLauncher(context, url.url).launchUrl(), ), - onOpen: (url) => UrlLauncher(context, url.url).launchUrl(), ), ), ], diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart index 68b84c9e6..c38639b60 100644 --- a/lib/pages/chat/events/message.dart +++ b/lib/pages/chat/events/message.dart @@ -149,10 +149,6 @@ class Message extends StatelessWidget { event.onlyEmotes && event.numberEmotes > 0 && event.numberEmotes <= 3); - final noPadding = { - MessageTypes.File, - MessageTypes.Audio, - }.contains(event.messageType); if (ownMessage) { color = @@ -338,12 +334,6 @@ class Message extends StatelessWidget { AppConfig.borderRadius, ), ), - padding: noBubble || noPadding - ? EdgeInsets.zero - : const EdgeInsets.symmetric( - horizontal: 16, - vertical: 8, - ), constraints: const BoxConstraints( maxWidth: FluffyThemes.columnWidth * 1.5, diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart index 2df156bbc..116aaf4ef 100644 --- a/lib/pages/chat/events/message_content.dart +++ b/lib/pages/chat/events/message_content.dart @@ -185,19 +185,26 @@ class MessageContent extends StatelessWidget { if (event.messageType == MessageTypes.Emote) { html = '* $html'; } - return HtmlMessage( - html: html, - textColor: textColor, - room: event.room, - fontSize: AppConfig.fontSizeFactor * AppConfig.messageFontSize, - linkStyle: TextStyle( - color: linkColor, + return Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 8, + ), + child: HtmlMessage( + html: html, + textColor: textColor, + room: event.room, fontSize: AppConfig.fontSizeFactor * AppConfig.messageFontSize, - decoration: TextDecoration.underline, - decorationColor: linkColor, + linkStyle: TextStyle( + color: linkColor, + fontSize: + AppConfig.fontSizeFactor * AppConfig.messageFontSize, + decoration: TextDecoration.underline, + decorationColor: linkColor, + ), + onOpen: (url) => UrlLauncher(context, url.url).launchUrl(), ), - onOpen: (url) => UrlLauncher(context, url.url).launchUrl(), ); } // else we fall through to the normal message rendering @@ -276,25 +283,32 @@ class MessageContent extends StatelessWidget { final bigEmotes = event.onlyEmotes && event.numberEmotes > 0 && event.numberEmotes <= 3; - return Linkify( - text: event.calcLocalizedBodyFallback( - MatrixLocals(L10n.of(context)), - hideReply: true, - ), - textScaleFactor: MediaQuery.textScalerOf(context).scale(1), - style: TextStyle( - color: textColor, - fontSize: bigEmotes ? fontSize * 5 : fontSize, - decoration: event.redacted ? TextDecoration.lineThrough : null, + return Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 8, ), - options: const LinkifyOptions(humanize: false), - linkStyle: TextStyle( - color: linkColor, - fontSize: fontSize, - decoration: TextDecoration.underline, - decorationColor: linkColor, + child: Linkify( + text: event.calcLocalizedBodyFallback( + MatrixLocals(L10n.of(context)), + hideReply: true, + ), + textScaleFactor: MediaQuery.textScalerOf(context).scale(1), + style: TextStyle( + color: textColor, + fontSize: bigEmotes ? fontSize * 5 : fontSize, + decoration: + event.redacted ? TextDecoration.lineThrough : null, + ), + options: const LinkifyOptions(humanize: false), + linkStyle: TextStyle( + color: linkColor, + fontSize: fontSize, + decoration: TextDecoration.underline, + decorationColor: linkColor, + ), + onOpen: (url) => UrlLauncher(context, url.url).launchUrl(), ), - onOpen: (url) => UrlLauncher(context, url.url).launchUrl(), ); } case EventTypes.CallInvite: @@ -351,13 +365,19 @@ class _ButtonContent extends StatelessWidget { @override Widget build(BuildContext context) { - return InkWell( - onTap: onPressed, - child: Text( - '$icon $label', - style: TextStyle( - color: textColor, - fontSize: fontSize, + return Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 8, + ), + child: InkWell( + onTap: onPressed, + child: Text( + '$icon $label', + style: TextStyle( + color: textColor, + fontSize: fontSize, + ), ), ), ); diff --git a/lib/pages/chat/events/message_download_content.dart b/lib/pages/chat/events/message_download_content.dart index 31a5c0708..80ae1cc08 100644 --- a/lib/pages/chat/events/message_download_content.dart +++ b/lib/pages/chat/events/message_download_content.dart @@ -30,85 +30,51 @@ class MessageDownloadContent extends StatelessWidget { ?.tryGet('mimetype') ?.toUpperCase() ?? 'UNKNOWN'); - final sizeString = event.sizeString; + final sizeString = event.sizeString ?? '?MB'; final fileDescription = event.fileDescription; - return Column( - mainAxisSize: MainAxisSize.min, - spacing: 8, - children: [ - InkWell( - onTap: () => event.saveFile(context), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - Padding( - padding: const EdgeInsets.all(16.0), - child: Row( - children: [ - Icon( - Icons.file_download_outlined, - color: textColor, - ), - const SizedBox(width: 16), - Flexible( - child: Text( - filename, - maxLines: 1, - style: TextStyle( - color: textColor, - fontWeight: FontWeight.bold, - ), - overflow: TextOverflow.ellipsis, - ), - ), - ], - ), - ), - const Divider(height: 1), - Padding( - padding: - const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8), - child: Row( - children: [ - Text( - filetype, - style: TextStyle( - color: linkColor, - ), - ), - const Spacer(), - if (sizeString != null) - Text( - sizeString, - style: TextStyle( - color: linkColor, - ), - ), - ], - ), - ), - ], - ), - ), - if (fileDescription != null) - Linkify( - text: fileDescription, - textScaleFactor: MediaQuery.textScalerOf(context).scale(1), - style: TextStyle( - color: textColor, - fontSize: AppConfig.fontSizeFactor * AppConfig.messageFontSize, + return Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 8, + ), + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.stretch, + spacing: 8, + children: [ + OutlinedButton.icon( + style: OutlinedButton.styleFrom( + foregroundColor: textColor, + side: BorderSide(color: textColor), ), - options: const LinkifyOptions(humanize: false), - linkStyle: TextStyle( - color: linkColor, - fontSize: AppConfig.fontSizeFactor * AppConfig.messageFontSize, - decoration: TextDecoration.underline, - decorationColor: linkColor, + icon: const Icon(Icons.file_download_outlined), + label: Text( + '$sizeString | $filetype - $filename', + maxLines: 1, + overflow: TextOverflow.ellipsis, ), - onOpen: (url) => UrlLauncher(context, url.url).launchUrl(), + onPressed: () => event.saveFile(context), ), - ], + if (fileDescription != null) ...[ + Linkify( + text: fileDescription, + textScaleFactor: MediaQuery.textScalerOf(context).scale(1), + style: TextStyle( + color: textColor, + fontSize: AppConfig.fontSizeFactor * AppConfig.messageFontSize, + ), + options: const LinkifyOptions(humanize: false), + linkStyle: TextStyle( + color: linkColor, + fontSize: AppConfig.fontSizeFactor * AppConfig.messageFontSize, + decoration: TextDecoration.underline, + decorationColor: linkColor, + ), + onOpen: (url) => UrlLauncher(context, url.url).launchUrl(), + ), + ], + ], + ), ); } } diff --git a/lib/pages/chat/events/video_player.dart b/lib/pages/chat/events/video_player.dart index 13f860609..e47979e80 100644 --- a/lib/pages/chat/events/video_player.dart +++ b/lib/pages/chat/events/video_player.dart @@ -189,21 +189,29 @@ class EventVideoPlayerState extends State { if (fileDescription != null && textColor != null && linkColor != null) SizedBox( width: width, - child: Linkify( - text: fileDescription, - textScaleFactor: MediaQuery.textScalerOf(context).scale(1), - style: TextStyle( - color: textColor, - fontSize: AppConfig.fontSizeFactor * AppConfig.messageFontSize, + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 8, ), - options: const LinkifyOptions(humanize: false), - linkStyle: TextStyle( - color: linkColor, - fontSize: AppConfig.fontSizeFactor * AppConfig.messageFontSize, - decoration: TextDecoration.underline, - decorationColor: linkColor, + child: Linkify( + text: fileDescription, + textScaleFactor: MediaQuery.textScalerOf(context).scale(1), + style: TextStyle( + color: textColor, + fontSize: + AppConfig.fontSizeFactor * AppConfig.messageFontSize, + ), + options: const LinkifyOptions(humanize: false), + linkStyle: TextStyle( + color: linkColor, + fontSize: + AppConfig.fontSizeFactor * AppConfig.messageFontSize, + decoration: TextDecoration.underline, + decorationColor: linkColor, + ), + onOpen: (url) => UrlLauncher(context, url.url).launchUrl(), ), - onOpen: (url) => UrlLauncher(context, url.url).launchUrl(), ), ), ], diff --git a/lib/pages/chat_members/chat_members.dart b/lib/pages/chat_members/chat_members.dart index 4ca99ef31..d320f1431 100644 --- a/lib/pages/chat_members/chat_members.dart +++ b/lib/pages/chat_members/chat_members.dart @@ -70,7 +70,8 @@ class ChatMembersController extends State { .client .getRoomById(widget.roomId) ?.requestParticipants( - [...Membership.values]..remove(Membership.leave)); + [...Membership.values]..remove(Membership.leave), + ); if (!mounted) return; diff --git a/lib/utils/adaptive_bottom_sheet.dart b/lib/utils/adaptive_bottom_sheet.dart index cad4d525c..faa7f5ce8 100644 --- a/lib/utils/adaptive_bottom_sheet.dart +++ b/lib/utils/adaptive_bottom_sheet.dart @@ -1,8 +1,9 @@ import 'dart:math'; +import 'package:flutter/material.dart'; + import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; -import 'package:flutter/material.dart'; Future showAdaptiveBottomSheet({ required BuildContext context, diff --git a/pubspec.lock b/pubspec.lock index 17bfb875f..2d95e487d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -90,10 +90,10 @@ packages: dependency: "direct main" description: name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "2.12.0" audio_session: dependency: transitive description: @@ -138,10 +138,10 @@ packages: dependency: transitive description: name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" canonical_json: dependency: transitive description: @@ -154,10 +154,10 @@ packages: dependency: transitive description: name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" charcode: dependency: transitive description: @@ -194,18 +194,18 @@ packages: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.2" collection: dependency: "direct main" description: name: collection - sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" url: "https://pub.dev" source: hosted - version: "1.19.0" + version: "1.19.1" colorize: dependency: transitive description: @@ -354,10 +354,10 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" ffi: dependency: transitive description: @@ -370,10 +370,10 @@ packages: dependency: transitive description: name: file - sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 url: "https://pub.dev" source: hosted - version: "7.0.0" + version: "7.0.1" file_picker: dependency: "direct main" description: @@ -1047,18 +1047,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" + sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec url: "https://pub.dev" source: hosted - version: "10.0.7" + version: "10.0.8" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" + sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.0.9" leak_tracker_testing: dependency: transitive description: @@ -1135,10 +1135,10 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.17" material_color_utilities: dependency: transitive description: @@ -1159,10 +1159,10 @@ packages: dependency: transitive description: name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.16.0" mgrs_dart: dependency: transitive description: @@ -1271,10 +1271,10 @@ packages: dependency: "direct main" description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" path_provider: dependency: "direct main" description: @@ -1383,10 +1383,10 @@ packages: dependency: transitive description: name: platform - sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" url: "https://pub.dev" source: hosted - version: "3.1.5" + version: "3.1.6" platform_detect: dependency: transitive description: @@ -1463,10 +1463,10 @@ packages: dependency: transitive description: name: process - sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32" + sha256: "107d8be718f120bbba9dcd1e95e3bd325b1b4a4f07db64154635ba03f2567a0d" url: "https://pub.dev" source: hosted - version: "5.0.2" + version: "5.0.3" proj4dart: dependency: transitive description: @@ -1780,10 +1780,10 @@ packages: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" sprintf: dependency: transitive description: @@ -1836,26 +1836,26 @@ packages: dependency: transitive description: name: stack_trace - sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.1" string_validator: dependency: transitive description: @@ -1900,34 +1900,34 @@ packages: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.2.2" test: dependency: transitive description: name: test - sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f" + sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e" url: "https://pub.dev" source: hosted - version: "1.25.8" + version: "1.25.15" test_api: dependency: transitive description: name: test_api - sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" + sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd url: "https://pub.dev" source: hosted - version: "0.7.3" + version: "0.7.4" test_core: dependency: transitive description: name: test_core - sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d" + sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa" url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.6.8" timezone: dependency: transitive description: @@ -2164,10 +2164,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b + sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" url: "https://pub.dev" source: hosted - version: "14.3.0" + version: "14.3.1" wakelock_plus: dependency: "direct main" description: @@ -2297,5 +2297,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.6.0 <4.0.0" + dart: ">=3.7.0-0 <4.0.0" flutter: ">=3.27.0" diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 438aafbad..aefa9bf6e 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -3,21 +3,21 @@ # list(APPEND FLUTTER_PLUGIN_LIST - app_links - desktop_drop - dynamic_color - emoji_picker_flutter - file_selector_windows - flutter_secure_storage_windows - flutter_webrtc - geolocator_windows - pasteboard - permission_handler_windows - record_windows - share_plus - sqlcipher_flutter_libs - url_launcher_windows - window_to_front + app_links + desktop_drop + dynamic_color + emoji_picker_flutter + file_selector_windows + flutter_secure_storage_windows + flutter_webrtc + geolocator_windows + pasteboard + permission_handler_windows + record_windows + share_plus + sqlcipher_flutter_libs + url_launcher_windows + window_to_front ) list(APPEND FLUTTER_FFI_PLUGIN_LIST @@ -25,14 +25,14 @@ list(APPEND FLUTTER_FFI_PLUGIN_LIST set(PLUGIN_BUNDLED_LIBRARIES) -foreach (plugin ${FLUTTER_PLUGIN_LIST}) - add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) - target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) - list(APPEND PLUGIN_BUNDLED_LIBRARIES $) - list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) -endforeach (plugin) +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) -foreach (ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) - add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) - list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) -endforeach (ffi_plugin) +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin)