diff --git a/lib/screens/creators/stickers/pack_detail.dart b/lib/screens/creators/stickers/pack_detail.dart index 89117f8..decdaa3 100644 --- a/lib/screens/creators/stickers/pack_detail.dart +++ b/lib/screens/creators/stickers/pack_detail.dart @@ -26,7 +26,7 @@ part 'pack_detail.freezed.dart'; @riverpod Future> stickerPackContent(Ref ref, String packId) async { final apiClient = ref.watch(apiClientProvider); - final resp = await apiClient.get('/stickers/$packId/content'); + final resp = await apiClient.get('/sphere/stickers/$packId/content'); return resp.data .map((e) => SnSticker.fromJson(e)) .cast() @@ -74,13 +74,16 @@ class StickerPackDetailScreen extends HookConsumerWidget { IconButton( icon: const Icon(Symbols.add_circle), onPressed: () { - context.pushNamed('creatorStickerNew', pathParameters: {'packId': id}).then(( - value, - ) { - if (value != null) { - ref.invalidate(stickerPackContentProvider(id)); - } - }); + context + .pushNamed( + 'creatorStickerNew', + pathParameters: {'name': pubName, 'packId': id}, + ) + .then((value) { + if (value != null) { + ref.invalidate(stickerPackContentProvider(id)); + } + }); }, ), _StickerPackActionMenu( @@ -173,9 +176,13 @@ class StickerPackDetailScreen extends HookConsumerWidget { title: 'edit'.tr(), image: MenuImage.icon(Symbols.edit), callback: () { - context.pushNamed( + context + .pushNamed( 'creatorStickerEdit', - pathParameters: {'packId': id, 'id': sticker.id}, + pathParameters: { + 'packId': id, + 'id': sticker.id, + }, ) .then((value) { if (value != null) { @@ -259,9 +266,7 @@ class _StickerPackActionMenu extends HookConsumerWidget { (context) => [ PopupMenuItem( onTap: () { - context.push( - '/creators/$pubName/stickers/$packId/edit', - ); + context.push('/creators/$pubName/stickers/$packId/edit'); }, child: Row( children: [ diff --git a/lib/screens/creators/stickers/stickers.dart b/lib/screens/creators/stickers/stickers.dart index c96a244..9beeecc 100644 --- a/lib/screens/creators/stickers/stickers.dart +++ b/lib/screens/creators/stickers/stickers.dart @@ -31,7 +31,7 @@ class StickersScreen extends HookConsumerWidget { context .pushNamed( 'creatorStickerPackNew', - queryParameters: {'pubName': pubName}, + queryParameters: {'name': pubName}, ) .then((value) { if (value != null) { @@ -76,7 +76,7 @@ class SliverStickerPacksList extends HookConsumerWidget { onTap: () { context.pushNamed( 'creatorStickerPackDetail', - pathParameters: {'pubName': pubName, 'packId': sticker.id}, + pathParameters: {'name': pubName, 'packId': sticker.id}, ); }, ); diff --git a/lib/screens/explore.dart b/lib/screens/explore.dart index c4a135a..b4083ee 100644 --- a/lib/screens/explore.dart +++ b/lib/screens/explore.dart @@ -395,7 +395,11 @@ class _ActivityListView extends HookConsumerWidget { slivers: [ SliverGap(12), if (user.value != null && !contentOnly) - SliverToBoxAdapter(child: CheckInWidget()), + SliverToBoxAdapter( + child: CheckInWidget( + margin: EdgeInsets.only(left: 8, right: 8, bottom: 4), + ), + ), SliverList.builder( itemCount: widgetCount, itemBuilder: (context, index) { diff --git a/lib/screens/posts/compose_article.dart b/lib/screens/posts/compose_article.dart index 9fdbce8..3645263 100644 --- a/lib/screens/posts/compose_article.dart +++ b/lib/screens/posts/compose_article.dart @@ -21,7 +21,6 @@ import 'package:island/widgets/post/compose_settings_sheet.dart'; import 'package:island/services/compose_storage_db.dart'; import 'package:island/widgets/post/compose_toolbar.dart'; import 'package:island/widgets/post/publishers_modal.dart'; -import 'package:island/widgets/post/draft_manager.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 2305b32..388e835 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -48,6 +49,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) irondash_engine_context_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "IrondashEngineContextPlugin"); irondash_engine_context_plugin_register_with_registrar(irondash_engine_context_registrar); + g_autoptr(FlPluginRegistrar) livekit_client_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "LiveKitPlugin"); + live_kit_plugin_register_with_registrar(livekit_client_registrar); g_autoptr(FlPluginRegistrar) media_kit_libs_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "MediaKitLibsLinuxPlugin"); media_kit_libs_linux_plugin_register_with_registrar(media_kit_libs_linux_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 0d4527c..4a1b249 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -11,6 +11,7 @@ list(APPEND FLUTTER_PLUGIN_LIST flutter_udid flutter_webrtc irondash_engine_context + livekit_client media_kit_libs_linux media_kit_video pasteboard diff --git a/pubspec.lock b/pubspec.lock index 6d7cd4f..1aeeb10 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: ff0a84a2734d9e1089f8aedd5c0af0061b82fb94e95260d943404e0ef2134b11 + sha256: bb84ee51e527053dd8e25ecc9f97a6abfdc19130fb4d883e4e8585e23e7e6dd8 url: "https://pub.dev" source: hosted - version: "1.3.59" + version: "1.3.60" analyzer: dependency: transitive description: @@ -421,10 +421,10 @@ packages: dependency: transitive description: name: dart_webrtc - sha256: "5b76fd85ac95d6f5dee3e7d7de8d4b51bfbec1dc73804647c6aebb52d6297116" + sha256: a2ae542cdadc21359022adedc26138fa3487cc3b3547c24ff4f556681869e28c url: "https://pub.dev" source: hosted - version: "1.5.3+hotfix.2" + version: "1.5.3+hotfix.4" dbus: dependency: transitive description: @@ -477,10 +477,10 @@ packages: dependency: "direct main" description: name: drift - sha256: dce2723fb0dd03563af21f305f8f96514c27f870efba934b4fe84d4fedb4eff7 + sha256: "6aaea757f53bb035e8a3baedf3d1d53a79d6549a6c13d84f7546509da9372c7c" url: "https://pub.dev" source: hosted - version: "2.28.0" + version: "2.28.1" drift_dev: dependency: "direct dev" description: @@ -509,10 +509,10 @@ packages: dependency: "direct main" description: name: easy_localization - sha256: "0f5239c7b8ab06c66440cfb0e9aa4b4640429c6668d5a42fe389c5de42220b12" + sha256: "2ccdf9db8fe4d9c5a75c122e6275674508fd0f0d49c827354967b8afcc56bbed" url: "https://pub.dev" source: hosted - version: "3.0.7+1" + version: "3.0.8" easy_logger: dependency: transitive description: @@ -613,10 +613,10 @@ packages: dependency: "direct main" description: name: firebase_core - sha256: "7be63a3f841fc9663342f7f3a011a42aef6a61066943c90b1c434d79d5c995c5" + sha256: "6b343e6f7b72a4f32d7ce8df8c9a28d8f54b4ac20d7c6500f3e8b3969afca457" url: "https://pub.dev" source: hosted - version: "3.15.2" + version: "4.0.0" firebase_core_platform_interface: dependency: transitive description: @@ -629,34 +629,34 @@ packages: dependency: transitive description: name: firebase_core_web - sha256: "0ed0dc292e8f9ac50992e2394e9d336a0275b6ae400d64163fdf0a8a8b556c37" + sha256: "5d28b14dd32282fb7ce2b22b897362453755b6b8541d491127dc72b755bb7b16" url: "https://pub.dev" source: hosted - version: "2.24.1" + version: "3.0.0" firebase_messaging: dependency: "direct main" description: name: firebase_messaging - sha256: "60be38574f8b5658e2f22b7e311ff2064bea835c248424a383783464e8e02fcc" + sha256: "10272b553a49c13a6cedfd00121047157521f82a5d3f2a1706b9dd28342cc482" url: "https://pub.dev" source: hosted - version: "15.2.10" + version: "16.0.0" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - sha256: "685e1771b3d1f9c8502771ccc9f91485b376ffe16d553533f335b9183ea99754" + sha256: b846a305feb3f74ee3f0aace447f65a4696bc6550bc828ecf5a84a1b77473d16 url: "https://pub.dev" source: hosted - version: "4.6.10" + version: "4.7.0" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - sha256: "0d1be17bc89ed3ff5001789c92df678b2e963a51b6fa2bdb467532cc9dbed390" + sha256: "28714749880f7242c5fb3b1ee6c66b41f61453f02ae348b43c82957df80b87ae" url: "https://pub.dev" source: hosted - version: "3.10.10" + version: "4.0.0" fixnum: dependency: transitive description: @@ -830,6 +830,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" + flutter_langdetect: + dependency: "direct main" + description: + name: flutter_langdetect + sha256: "93bd865c7d5723eac614744abb32234ee4f593505a293bc17ef097bd55fbdf38" + url: "https://pub.dev" + source: hosted + version: "0.0.2" flutter_launcher_icons: dependency: "direct dev" description: @@ -1017,10 +1025,10 @@ packages: dependency: "direct main" description: name: flutter_webrtc - sha256: "792aa1e5838a719f29ae52c0773dbb5dd781fc33b1bf87c321b274e55ab51ad1" + sha256: "69095ba39b83da3de48286dfc0769aa8e9f10491f70058dc8d8ecc960ef7a260" url: "https://pub.dev" source: hosted - version: "0.14.2" + version: "1.0.0" font_awesome_flutter: dependency: transitive description: @@ -1337,10 +1345,10 @@ packages: dependency: "direct main" description: name: livekit_client - sha256: "5d182f40cc9aafce60a9acf936bad8bc69010b5cbf0a949f6f27dc4390f2fcce" + sha256: b3db2d8afa8d1dbe4fd8dfc965fc9d661cb51a8d864ad199919575ce919a40fb url: "https://pub.dev" source: hosted - version: "2.4.9" + version: "2.5.0+hotfix.1" local_auth: dependency: "direct main" description: @@ -1381,6 +1389,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.11" + logger: + dependency: transitive + description: + name: logger + sha256: "7ad7215c15420a102ec687bb320a7312afd449bac63bfb1c60d9787c27b9767f" + url: "https://pub.dev" + source: hosted + version: "1.4.0" logging: dependency: transitive description: @@ -1433,10 +1449,10 @@ packages: dependency: "direct main" description: name: material_symbols_icons - sha256: "7c50901b39d1ad645ee25d920aed008061e1fd541a897b4ebf2c01d966dbf16b" + sha256: ef20d86fb34c2b59eb7553c4d795bb8a7ec8c890c53ffd3148c64f7adc46ae50 url: "https://pub.dev" source: hosted - version: "4.2815.1" + version: "4.2858.1" media_kit: dependency: "direct main" description: @@ -2166,10 +2182,10 @@ packages: dependency: transitive description: name: sqflite_common - sha256: "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b" + sha256: "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6" url: "https://pub.dev" source: hosted - version: "2.5.5" + version: "2.5.6" sqflite_darwin: dependency: transitive description: @@ -2190,18 +2206,18 @@ packages: dependency: transitive description: name: sqlite3 - sha256: "608b56d594e4c8498c972c8f1507209f9fd74939971b948ddbbfbfd1c9cb3c15" + sha256: dd806fff004a0aeb01e208b858dbc649bc72104670d425a81a6dd17698535f6e url: "https://pub.dev" source: hosted - version: "2.7.7" + version: "2.8.0" sqlite3_flutter_libs: dependency: transitive description: name: sqlite3_flutter_libs - sha256: "60464aa06f3f6f6fba9abd7564e315526c1fee6d6a77d6ee52a1f7f48a9107f6" + sha256: fd996da5515a73aacd0a04ae7063db5fe8df42670d974df4c3ee538c652eef2e url: "https://pub.dev" source: hosted - version: "0.5.37" + version: "0.5.38" sqlparser: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 1e18b16..fd29392 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -79,9 +79,9 @@ dependencies: image_picker_android: ^0.8.12+23 super_context_menu: ^0.9.0-dev.6 modal_bottom_sheet: ^3.0.0 - firebase_messaging: ^15.2.5 + firebase_messaging: ^16.0.0 flutter_udid: ^4.0.0 - firebase_core: ^3.13.0 + firebase_core: ^4.0.0 web_socket_channel: ^3.0.3 material_symbols_icons: ^4.2815.0 drift: ^2.26.0 @@ -103,7 +103,7 @@ dependencies: gal: ^2.3.1 dismissible_page: ^1.0.2 super_sliver_list: ^0.4.1 - flutter_webrtc: ^0.14.1 + flutter_webrtc: ^1.0.0 livekit_client: ^2.4.7 pasteboard: ^0.4.0 flutter_colorpicker: ^1.1.0 @@ -131,6 +131,7 @@ dependencies: mime: ^2.0.0 html2md: ^1.3.2 flutter_typeahead: ^5.2.0 + flutter_langdetect: ^0.0.2 dev_dependencies: flutter_test: