💄 Optimize large screen ux

⚡ Cache link expansion image

ios/Podfile.lock

@@ -51,6 +51,9 @@ PODS:
   - Firebase/Messaging (10.29.0):
     - Firebase/CoreOnly
     - FirebaseMessaging (~> 10.29.0)
+  - Firebase/Performance (10.29.0):
+    - Firebase/CoreOnly
+    - FirebasePerformance (~> 10.29.0)
   - firebase_analytics (11.2.1):
     - Firebase/Analytics (= 10.29.0)
     - firebase_core
@@ -66,6 +69,12 @@ PODS:
     - Firebase/Messaging (= 10.29.0)
     - firebase_core
     - Flutter
+  - firebase_performance (0.10.0-4):
+    - Firebase/Performance (= 10.29.0)
+    - firebase_core
+    - Flutter
+  - FirebaseABTesting (10.29.0):
+    - FirebaseCore (~> 10.0)
   - FirebaseAnalytics (10.29.0):
     - FirebaseAnalytics/AdIdSupport (= 10.29.0)
     - FirebaseCore (~> 10.0)
@@ -115,6 +124,25 @@ PODS:
     - GoogleUtilities/Reachability (~> 7.8)
     - GoogleUtilities/UserDefaults (~> 7.8)
     - nanopb (< 2.30911.0, >= 2.30908.0)
+  - FirebasePerformance (10.29.0):
+    - FirebaseCore (~> 10.5)
+    - FirebaseInstallations (~> 10.0)
+    - FirebaseRemoteConfig (~> 10.0)
+    - FirebaseSessions (~> 10.5)
+    - GoogleDataTransport (~> 9.2)
+    - GoogleUtilities/Environment (~> 7.13)
+    - GoogleUtilities/ISASwizzler (~> 7.13)
+    - GoogleUtilities/MethodSwizzler (~> 7.13)
+    - GoogleUtilities/UserDefaults (~> 7.13)
+    - nanopb (< 2.30911.0, >= 2.30908.0)
+  - FirebaseRemoteConfig (10.29.0):
+    - FirebaseABTesting (~> 10.0)
+    - FirebaseCore (~> 10.0)
+    - FirebaseInstallations (~> 10.0)
+    - FirebaseRemoteConfigInterop (~> 10.23)
+    - FirebaseSharedSwift (~> 10.0)
+    - GoogleUtilities/Environment (~> 7.8)
+    - "GoogleUtilities/NSData+zlib (~> 7.8)"
   - FirebaseRemoteConfigInterop (10.29.0)
   - FirebaseSessions (10.29.0):
     - FirebaseCore (~> 10.5)
@@ -125,6 +153,7 @@ PODS:
     - GoogleUtilities/UserDefaults (~> 7.13)
     - nanopb (< 2.30911.0, >= 2.30908.0)
     - PromisesSwift (~> 2.1)
+  - FirebaseSharedSwift (10.29.0)
   - Flutter (1.0.0)
   - flutter_keyboard_visibility (0.0.1):
     - Flutter
@@ -168,6 +197,8 @@ PODS:
   - GoogleUtilities/Environment (7.13.3):
     - GoogleUtilities/Privacy
     - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleUtilities/ISASwizzler (7.13.3):
+    - GoogleUtilities/Privacy
   - GoogleUtilities/Logger (7.13.3):
     - GoogleUtilities/Environment
     - GoogleUtilities/Privacy
@@ -196,6 +227,12 @@ PODS:
   - livekit_client (2.2.4):
     - Flutter
     - WebRTC-SDK (= 125.6422.04)
+  - media_kit_libs_ios_video (1.0.4):
+    - Flutter
+  - media_kit_native_event_loop (1.0.0):
+    - Flutter
+  - media_kit_video (0.0.1):
+    - Flutter
   - nanopb (2.30910.0):
     - nanopb/decode (= 2.30910.0)
     - nanopb/encode (= 2.30910.0)
@@ -217,6 +254,8 @@ PODS:
     - PromisesObjC (= 2.4.0)
   - protocol_handler_ios (0.0.1):
     - Flutter
+  - screen_brightness_ios (0.1.0):
+    - Flutter
   - SDWebImage (5.19.6):
     - SDWebImage/Core (= 5.19.6)
   - SDWebImage/Core (5.19.6)
@@ -232,9 +271,8 @@ PODS:
   - TOCropViewController (2.7.4)
   - url_launcher_ios (0.0.1):
     - Flutter
-  - video_player_avfoundation (0.0.1):
+  - volume_controller (0.0.1):
     - Flutter
-    - FlutterMacOS
   - wakelock_plus (0.0.1):
     - Flutter
   - WebRTC-SDK (125.6422.04)
@@ -247,6 +285,7 @@ DEPENDENCIES:
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
   - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
   - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
+  - firebase_performance (from `.symlinks/plugins/firebase_performance/ios`)
   - Flutter (from `Flutter`)
   - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
@@ -255,17 +294,21 @@ DEPENDENCIES:
   - image_cropper (from `.symlinks/plugins/image_cropper/ios`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
   - livekit_client (from `.symlinks/plugins/livekit_client/ios`)
+  - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
+  - media_kit_native_event_loop (from `.symlinks/plugins/media_kit_native_event_loop/ios`)
+  - media_kit_video (from `.symlinks/plugins/media_kit_video/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - pasteboard (from `.symlinks/plugins/pasteboard/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - pointer_interceptor_ios (from `.symlinks/plugins/pointer_interceptor_ios/ios`)
   - protocol_handler_ios (from `.symlinks/plugins/protocol_handler_ios/ios`)
+  - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite (from `.symlinks/plugins/sqflite/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
-  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
+  - volume_controller (from `.symlinks/plugins/volume_controller/ios`)
   - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
 
 SPEC REPOS:
@@ -273,6 +316,7 @@ SPEC REPOS:
     - DKImagePickerController
     - DKPhotoGallery
     - Firebase
+    - FirebaseABTesting
     - FirebaseAnalytics
     - FirebaseCore
     - FirebaseCoreExtension
@@ -280,8 +324,11 @@ SPEC REPOS:
     - FirebaseCrashlytics
     - FirebaseInstallations
     - FirebaseMessaging
+    - FirebasePerformance
+    - FirebaseRemoteConfig
     - FirebaseRemoteConfigInterop
     - FirebaseSessions
+    - FirebaseSharedSwift
     - GoogleAppMeasurement
     - GoogleDataTransport
     - GoogleUtilities
@@ -308,6 +355,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/firebase_crashlytics/ios"
   firebase_messaging:
     :path: ".symlinks/plugins/firebase_messaging/ios"
+  firebase_performance:
+    :path: ".symlinks/plugins/firebase_performance/ios"
   Flutter:
     :path: Flutter
   flutter_keyboard_visibility:
@@ -324,6 +373,12 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/image_picker_ios/ios"
   livekit_client:
     :path: ".symlinks/plugins/livekit_client/ios"
+  media_kit_libs_ios_video:
+    :path: ".symlinks/plugins/media_kit_libs_ios_video/ios"
+  media_kit_native_event_loop:
+    :path: ".symlinks/plugins/media_kit_native_event_loop/ios"
+  media_kit_video:
+    :path: ".symlinks/plugins/media_kit_video/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   pasteboard:
@@ -336,6 +391,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/pointer_interceptor_ios/ios"
   protocol_handler_ios:
     :path: ".symlinks/plugins/protocol_handler_ios/ios"
+  screen_brightness_ios:
+    :path: ".symlinks/plugins/screen_brightness_ios/ios"
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
@@ -344,8 +401,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/sqflite/darwin"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
-  video_player_avfoundation:
+  volume_controller:
-    :path: ".symlinks/plugins/video_player_avfoundation/darwin"
+    :path: ".symlinks/plugins/volume_controller/ios"
   wakelock_plus:
     :path: ".symlinks/plugins/wakelock_plus/ios"
 
@@ -360,6 +417,8 @@ SPEC CHECKSUMS:
   firebase_core: 57aeb91680e5d5e6df6b888064be7c785f146efb
   firebase_crashlytics: e3d3e0c99bad5aaab5908385133dea8ec344693f
   firebase_messaging: c862b3d2b973ecc769194dc8de09bd22c77ae757
+  firebase_performance: 8643e815a354ee94da1192cd69335a48a7b625a4
+  FirebaseABTesting: d87f56707159bae64e269757a6e963d490f2eebe
   FirebaseAnalytics: 23717de130b779aa506e757edb9713d24b6ffeda
   FirebaseCore: 30e9c1cbe3d38f5f5e75f48bfcea87d7c358ec16
   FirebaseCoreExtension: 705ca5b14bf71d2564a0ddc677df1fc86ffa600f
@@ -367,8 +426,11 @@ SPEC CHECKSUMS:
   FirebaseCrashlytics: 34647b41e18de773717fdd348a22206f2f9bc774
   FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd
   FirebaseMessaging: 7b5d8033e183ab59eb5b852a53201559e976d366
+  FirebasePerformance: d0ac4aa90f8c1aedeb8d0329a56e2d77d8d9e004
+  FirebaseRemoteConfig: 48ef3f243742a8d72422ccfc9f986e19d7de53fd
   FirebaseRemoteConfigInterop: 6efda51fb5e2f15b16585197e26eaa09574e8a4d
   FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc
+  FirebaseSharedSwift: 20530f495084b8d840f78a100d8c5ee613375f6e
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
   flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
@@ -380,6 +442,9 @@ SPEC CHECKSUMS:
   image_cropper: 37d40f62177c101ff4c164906d259ea2c3aa70cf
   image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
   livekit_client: d079c5f040d4bf2b80440ff0ae997725a183e4bc
+  media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
+  media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
+  media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
   nanopb: 438bc412db1928dac798aa6fd75726007be04262
   package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
   pasteboard: 982969ebaa7c78af3e6cc7761e8f5e77565d9ce0
@@ -389,6 +454,7 @@ SPEC CHECKSUMS:
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
   protocol_handler_ios: a5db8abc38526ee326988b808be621e5fd568990
+  screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
   SDWebImage: a79252b60f4678812d94316c91da69ec83089c9f
   share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
@@ -396,7 +462,7 @@ SPEC CHECKSUMS:
   SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
   TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
-  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
+  volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
   wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
   WebRTC-SDK: c3d69a87e7185fad3568f6f3cff7c9ac5890acf3
 

ios/Runner.xcodeproj/project.pbxproj

@@ -254,6 +254,7 @@
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
 				B1CDA9DD5B638A2BB88053CB /* [CP] Check Pods Manifest.lock */,
+				7356FAC42C72724B0051A465 /* [Crashlytics] Clear dSYM */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
@@ -263,7 +264,7 @@
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				287A33C298CA352A7E7F32A4 /* [CP] Embed Pods Frameworks */,
 				0818E8E4321C0D7433E07576 /* [CP] Copy Pods Resources */,
-				1A9FD6BE5DEE99CDA7399504 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */,
+				1A9FD6BE5DEE99CDA7399504 /* [Crashlytics] Upload dSYM */,
 			);
 			buildRules = (
 			);
@@ -366,7 +367,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		1A9FD6BE5DEE99CDA7399504 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */ = {
+		1A9FD6BE5DEE99CDA7399504 /* [Crashlytics] Upload dSYM */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -375,14 +376,14 @@
 			);
 			inputPaths = (
 			);
-			name = "FlutterFire: \"flutterfire upload-crashlytics-symbols\"";
+			name = "[Crashlytics] Upload dSYM";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\n#!/bin/bash\nPATH=${PATH}:$FLUTTER_ROOT/bin:$HOME/.pub-cache/bin\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=$PODS_ROOT/FirebaseCrashlytics/upload-symbols --platform=ios --apple-project-path=${SRCROOT} --env-platform-name=${PLATFORM_NAME} --env-configuration=${CONFIGURATION} --env-project-dir=${PROJECT_DIR} --env-built-products-dir=${BUILT_PRODUCTS_DIR} --env-dwarf-dsym-folder-path=${DWARF_DSYM_FOLDER_PATH} --env-dwarf-dsym-file-name=${DWARF_DSYM_FILE_NAME} --env-infoplist-path=${INFOPLIST_PATH} --default-config=default\n";
+			shellScript = "\n#!/bin/bash\nsleep 1 # Without this, there seems a chance that the script runs before dSYM generation is finished \n$PODS_ROOT/FirebaseCrashlytics/upload-symbols -gsp $PROJECT_DIR/Runner/GoogleService-Info.plist -p ios $DWARF_DSYM_FOLDER_PATH/$DWARF_DSYM_FILE_NAME\n";
 		};
 		259653AE41D478F4C6BAE9B2 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -439,6 +440,24 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		7356FAC42C72724B0051A465 /* [Crashlytics] Clear dSYM */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "[Crashlytics] Clear dSYM";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\n#!/bin/bash\nrm -rf $DWARF_DSYM_FOLDER_PATH/$DWARF_DSYM_FILE_NAME\n";
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -452,7 +471,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
 		B1CDA9DD5B638A2BB88053CB /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;

lib/main.dart

@@ -6,12 +6,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter_acrylic/flutter_acrylic.dart';
 import 'package:get/get.dart';
 import 'package:go_router/go_router.dart';
+import 'package:media_kit/media_kit.dart';
 import 'package:protocol_handler/protocol_handler.dart';
 import 'package:provider/provider.dart';
 import 'package:solian/bootstrapper.dart';
 import 'package:solian/firebase_options.dart';
 import 'package:solian/platform.dart';
 import 'package:solian/providers/attachment_uploader.dart';
+import 'package:solian/providers/link_expander.dart';
 import 'package:solian/providers/stickers.dart';
 import 'package:solian/providers/theme_switcher.dart';
 import 'package:solian/providers/websocket.dart';
@@ -31,6 +33,7 @@ import 'package:flutter_web_plugins/url_strategy.dart' show usePathUrlStrategy;
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  MediaKit.ensureInitialized();
 
   await Future.wait([
     _initializeFirebase(),
@@ -126,5 +129,6 @@ class SolianApp extends StatelessWidget {
     Get.lazyPut(() => RealmProvider());
     Get.lazyPut(() => ChatCallProvider());
     Get.lazyPut(() => AttachmentUploaderController());
+    Get.lazyPut(() => LinkExpandController());
   }
 }

lib/models/event.dart

@@ -63,7 +63,7 @@ class Event {
 class EventMessageBody {
   String text;
   String algorithm;
-  List<int>? attachments;
+  List<String>? attachments;
   int? quoteEvent;
   int? relatedEvent;
   List<int>? relatedUsers;
@@ -82,7 +82,7 @@ class EventMessageBody {
         text: json['text'] ?? '',
         algorithm: json['algorithm'] ?? 'plain',
         attachments: json['attachments'] != null
-            ? List<int>.from(json['attachments'].map((x) => x))
+            ? List<String>.from(json['attachments']?.whereType<String>())
             : null,
         quoteEvent: json['quote_event'],
         relatedEvent: json['related_event'],

lib/models/link.dart

@@ -0,0 +1,65 @@
+class LinkMeta {
+  int id;
+  DateTime createdAt;
+  DateTime updatedAt;
+  DateTime? deletedAt;
+  String entryId;
+  String? icon;
+  String url;
+  String? title;
+  String? image;
+  String? video;
+  String? audio;
+  String? description;
+  String? siteName;
+
+  LinkMeta({
+    required this.id,
+    required this.createdAt,
+    required this.updatedAt,
+    required this.deletedAt,
+    required this.entryId,
+    required this.icon,
+    required this.url,
+    required this.title,
+    required this.image,
+    required this.video,
+    required this.audio,
+    required this.description,
+    required this.siteName,
+  });
+
+  factory LinkMeta.fromJson(Map<String, dynamic> json) => LinkMeta(
+        id: json['id'],
+        createdAt: DateTime.parse(json['created_at']),
+        updatedAt: DateTime.parse(json['updated_at']),
+        deletedAt: json['deleted_at'] != null
+            ? DateTime.parse(json['deleted_at'])
+            : null,
+        entryId: json['entry_id'],
+        icon: json['icon'],
+        url: json['url'],
+        title: json['title'],
+        image: json['image'],
+        video: json['video'],
+        audio: json['audio'],
+        description: json['description'],
+        siteName: json['site_name'],
+      );
+
+  Map<String, dynamic> toJson() => {
+        'id': id,
+        'created_at': createdAt.toIso8601String(),
+        'updated_at': updatedAt.toIso8601String(),
+        'deleted_at': deletedAt?.toIso8601String(),
+        'entry_id': entryId,
+        'icon': icon,
+        'url': url,
+        'title': title,
+        'image': image,
+        'video': video,
+        'audio': audio,
+        'description': description,
+        'site_name': siteName,
+      };
+}

lib/models/stickers.dart

@@ -36,7 +36,7 @@ class Sticker {
 
   String get imageUrl => ServiceFinder.buildUrl(
         'files',
-        '/attachments/$attachmentId',
+        '/attachments/${attachment.rid}',
       );
 
   factory Sticker.fromJson(Map<String, dynamic> json) => Sticker(

lib/providers/link_expander.dart

@@ -0,0 +1,25 @@
+import 'dart:convert';
+import 'dart:developer';
+
+import 'package:get/get.dart';
+import 'package:solian/models/link.dart';
+import 'package:solian/services.dart';
+
+class LinkExpandController extends GetxController {
+  final Map<String, LinkMeta?> _cachedResponse = {};
+
+  Future<LinkMeta?> expandLink(String url) async {
+    final target = utf8.fuse(base64).encode(url);
+    if (_cachedResponse.containsKey(target)) return _cachedResponse[target];
+    final client = ServiceFinder.configureClient('dealer');
+    final resp = await client.get('/api/links/$target');
+    if (resp.statusCode != 200) {
+      log('Unable to expand link ($url), status: ${resp.statusCode}, response: ${resp.body}');
+      _cachedResponse[target] = null;
+      return null;
+    }
+    final result = LinkMeta.fromJson(resp.body);
+    _cachedResponse[target] = result;
+    return result;
+  }
+}

lib/screens/account/stickers.dart

@@ -66,7 +66,7 @@ class _StickerScreenState extends State<StickerScreen> {
   Widget _buildEmoteEntry(Sticker item, String prefix) {
     final imageUrl = ServiceFinder.buildUrl(
       'files',
-      '/attachments/${item.attachmentId}',
+      '/attachments/${item.attachment.rid}',
     );
     return ListTile(
       title: Text(item.name),

lib/shells/root_shell.dart

@@ -1,3 +1,4 @@
+import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:solian/theme.dart';
@@ -29,6 +30,15 @@ class RootShell extends StatelessWidget {
   Widget build(BuildContext context) {
     final routeName = state.topRoute?.name;
 
+    if (routeName != null) {
+      FirebaseAnalytics.instance.logEvent(
+        name: 'screen_view',
+        parameters: {
+          'firebase_screen': routeName,
+        },
+      );
+    }
+
     return Scaffold(
       key: rootScaffoldKey,
       drawer: SolianTheme.isLargeScreen(context)

lib/widgets/attachments/attachment_editor.dart

@@ -252,7 +252,7 @@ class _AttachmentEditorPopupState extends State<AttachmentEditorPopup> {
         .listMetadata(widget.initialAttachments ?? List.empty())
         .then((result) {
       setState(() {
-        _attachments = result;
+        _attachments = List.from(result, growable: true);
         _isBusy = false;
         _isFirstTimeBusy = false;
       });

lib/widgets/attachments/attachment_item.dart

@@ -1,14 +1,14 @@
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:chewie/chewie.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:get/get.dart';
+import 'package:media_kit/media_kit.dart';
+import 'package:media_kit_video/media_kit_video.dart';
 import 'package:solian/models/attachment.dart';
 import 'package:solian/platform.dart';
 import 'package:solian/services.dart';
 import 'package:solian/widgets/sized_container.dart';
 import 'package:url_launcher/url_launcher_string.dart';
-import 'package:video_player/video_player.dart';
 
 class AttachmentItem extends StatefulWidget {
   final String parentId;
@@ -231,22 +231,20 @@ class _AttachmentItemVideo extends StatefulWidget {
 }
 
 class _AttachmentItemVideoState extends State<_AttachmentItemVideo> {
-  VideoPlayerController? _playerController;
+  late final _player = Player(
-  ChewieController? _chewieController;
+    configuration: const PlayerConfiguration(
+      logLevel: MPVLogLevel.error,
+    ),
+  );
+
+  late final _controller = VideoController(_player);
 
   bool _showContent = false;
 
   Future<void> _startLoad() async {
-    final ratio = widget.item.metadata?['ratio'] ?? 16 / 9;
+    await _player.open(
-    _playerController = VideoPlayerController.networkUrl(
+      Media(ServiceFinder.buildUrl('files', '/attachments/${widget.item.rid}')),
-      Uri.parse(
+      play: false,
-        ServiceFinder.buildUrl('files', '/attachments/${widget.item.rid}'),
-      ),
-    );
-    _playerController!.initialize();
-    _chewieController = ChewieController(
-      aspectRatio: ratio,
-      videoPlayerController: _playerController!,
     );
     setState(() => _showContent = true);
   }
@@ -259,17 +257,10 @@ class _AttachmentItemVideoState extends State<_AttachmentItemVideo> {
     }
   }
 
-  @override
-  void dispose() {
-    _playerController?.dispose();
-    _chewieController?.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     final ratio = widget.item.metadata?['ratio'] ?? 16 / 9;
-    if (!_showContent || _chewieController == null) {
+    if (!_showContent) {
       return GestureDetector(
         child: AspectRatio(
           aspectRatio: ratio,
@@ -307,8 +298,15 @@ class _AttachmentItemVideoState extends State<_AttachmentItemVideo> {
       );
     }
 
-    return Chewie(
+    return Video(
-      controller: _chewieController!,
+      aspectRatio: ratio,
+      controller: _controller,
     );
   }
+
+  @override
+  void dispose() {
+    _player.dispose();
+    super.dispose();
+  }
 }

lib/widgets/attachments/attachment_list.dart

@@ -1,4 +1,4 @@
-import 'dart:math' show min;
+import 'dart:math' as math;
 import 'dart:ui';
 
 import 'package:carousel_slider/carousel_slider.dart';
@@ -16,9 +16,11 @@ class AttachmentList extends StatefulWidget {
   final String parentId;
   final List<String> attachmentsId;
   final bool isGrid;
+  final bool isColumn;
   final bool isForceGrid;
   final bool autoload;
   final double flatMaxHeight;
+  final double columnMaxWidth;
 
   final double? width;
   final double? viewport;
@@ -28,9 +30,11 @@ class AttachmentList extends StatefulWidget {
     required this.parentId,
     required this.attachmentsId,
     this.isGrid = false,
+    this.isColumn = false,
     this.isForceGrid = false,
     this.autoload = false,
     this.flatMaxHeight = 720,
+    this.columnMaxWidth = 480,
     this.width,
     this.viewport,
   });
@@ -72,7 +76,8 @@ class _AttachmentListState extends State<AttachmentList> {
     double? consistentValue;
     int portrait = 0, square = 0, landscape = 0;
     for (var entry in _attachmentsMeta) {
-      if (entry!.metadata?['ratio'] != null) {
+      if (entry == null) continue;
+      if (entry.metadata?['ratio'] != null) {
         if (entry.metadata?['ratio'] is int) {
           consistentValue ??= entry.metadata?['ratio'].toDouble();
         } else {
@@ -104,13 +109,14 @@ class _AttachmentListState extends State<AttachmentList> {
     }
   }
 
-  Widget _buildEntry(Attachment? element, int idx) {
+  Widget _buildEntry(Attachment? element, int idx, {double? width}) {
     return AttachmentListEntry(
       item: element,
       parentId: widget.parentId,
-      width: widget.width,
+      width: width ?? widget.width,
       badgeContent: '${idx + 1}/${_attachmentsMeta.length}',
-      showBadge: _attachmentsMeta.length > 1 && !widget.isGrid,
+      showBadge:
+          _attachmentsMeta.length > 1 && !widget.isGrid && !widget.isColumn,
       showBorder: widget.attachmentsId.length > 1,
       showMature: _showMature,
       autoload: widget.autoload,
@@ -141,6 +147,43 @@ class _AttachmentListState extends State<AttachmentList> {
       );
     }
 
+    if (widget.isColumn) {
+      var idx = 0;
+      const radius = BorderRadius.all(Radius.circular(8));
+      return Wrap(
+        spacing: 8,
+        runSpacing: 8,
+        children: widget.attachmentsId.map((x) {
+          final element = _attachmentsMeta[idx];
+          idx++;
+          if (element == null) return const SizedBox();
+          double ratio = element.metadata!['ratio']?.toDouble() ?? 16 / 9;
+          return Container(
+            constraints: BoxConstraints(
+              maxWidth: widget.columnMaxWidth,
+              maxHeight: 640,
+            ),
+            child: AspectRatio(
+              aspectRatio: ratio,
+              child: Container(
+                decoration: BoxDecoration(
+                  border: Border.all(
+                    color: Theme.of(context).dividerColor,
+                    width: 1,
+                  ),
+                  borderRadius: radius,
+                ),
+                child: ClipRRect(
+                  borderRadius: radius,
+                  child: _buildEntry(element, idx),
+                ),
+              ),
+            ),
+          );
+        }).toList(),
+      );
+    }
+
     final isNotPureImage = _attachmentsMeta.any(
       (x) => x?.mimetype.split('/').firstOrNull != 'image',
     );
@@ -152,7 +195,7 @@ class _AttachmentListState extends State<AttachmentList> {
         physics: const NeverScrollableScrollPhysics(),
         shrinkWrap: true,
         gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-          crossAxisCount: min(3, widget.attachmentsId.length),
+          crossAxisCount: math.min(3, widget.attachmentsId.length),
           mainAxisSpacing: 8.0,
           crossAxisSpacing: 8.0,
         ),
@@ -212,6 +255,7 @@ class AttachmentListEntry extends StatelessWidget {
   final Attachment? item;
   final String? badgeContent;
   final double? width;
+  final double? height;
   final bool showBorder;
   final bool showBadge;
   final bool showMature;
@@ -226,6 +270,7 @@ class AttachmentListEntry extends StatelessWidget {
     this.item,
     this.badgeContent,
     this.width,
+    this.height,
     this.showBorder = false,
     this.showBadge = false,
     this.showMature = false,
@@ -250,6 +295,7 @@ class AttachmentListEntry extends StatelessWidget {
     return GestureDetector(
       child: Container(
         width: width ?? MediaQuery.of(context).size.width,
+        height: height,
         decoration: BoxDecoration(
           border: showBorder
               ? Border.symmetric(
@@ -372,7 +418,6 @@ class _AttachmentSelfContainedEntryState
           isDense: widget.isDense,
           parentId: widget.parentId,
           showMature: _showMature,
-          showBorder: true,
           onReveal: (value) {
             setState(() => _showMature = value);
           },

lib/widgets/chat/chat_event.dart

@@ -8,6 +8,7 @@ import 'package:solian/widgets/account/account_profile_popup.dart';
 import 'package:solian/widgets/attachments/attachment_list.dart';
 import 'package:solian/widgets/chat/chat_event_action_log.dart';
 import 'package:solian/widgets/chat/chat_event_message.dart';
+import 'package:solian/widgets/link_expansion.dart';
 import 'package:timeago/timeago.dart' show format;
 
 class ChatEvent extends StatelessWidget {
@@ -37,9 +38,14 @@ class ChatEvent extends StatelessWidget {
     return '$negativeSign${twoDigits(duration.inHours)}:$twoDigitMinutes:$twoDigitSeconds';
   }
 
+  Widget _buildLinkExpansion() {
+    if (item.body['text'] == null) return const SizedBox();
+    return LinkExpansion(content: item.body['text']);
+  }
+
   Widget _buildAttachment(BuildContext context, {bool isMinimal = false}) {
     final attachments = item.body['attachments'] != null
-        ? List<String>.from(item.body['attachments'].map((x) => x))
+        ? List<String>.from(item.body['attachments']?.whereType<String>())
         : List<String>.empty();
 
     if (attachments.isEmpty) return const SizedBox();
@@ -75,7 +81,7 @@ class ChatEvent extends StatelessWidget {
         key: Key('m${item.uuid}attachments'),
         parentId: item.uuid,
         attachmentsId: attachments,
-        viewport: 1,
+        isColumn: true,
       ),
     );
   }
@@ -90,10 +96,13 @@ class ChatEvent extends StatelessWidget {
           return const SizedBox();
         }
 
-        return ChatEvent(
+        return Container(
-          item: snapshot.data!.data,
+          constraints: const BoxConstraints(maxWidth: 480),
-          isMerged: false,
+          child: ChatEvent(
-          isQuote: true,
+            item: snapshot.data!.data,
+            isMerged: false,
+            isQuote: true,
+          ),
         ).paddingOnly(left: isMerged ? 52 : 0);
       },
     );
@@ -188,8 +197,9 @@ class ChatEvent extends StatelessWidget {
                 ),
             ],
           ).paddingOnly(right: 12),
-          _buildAttachment(context, isMinimal: isContentPreviewing)
+          _buildAttachment(context, isMinimal: isContentPreviewing).paddingOnly(
-              .paddingOnly(left: isContentPreviewing ? 12 : 0),
+            left: isContentPreviewing ? 12 : 56,
+          ),
         ],
       );
     } else if (isQuote) {
@@ -210,7 +220,9 @@ class ChatEvent extends StatelessWidget {
                   Row(
                     children: [
                       AccountAvatar(
-                          content: item.sender.account.avatar, radius: 9),
+                        content: item.sender.account.avatar,
+                        radius: 9,
+                      ),
                       const SizedBox(width: 5),
                       Text(
                         item.sender.account.nick,
@@ -221,8 +233,7 @@ class ChatEvent extends StatelessWidget {
                     ],
                   ),
                   _buildContent().paddingOnly(left: 0.5),
-                  _buildAttachment(context, isMinimal: true)
+                  _buildAttachment(context, isMinimal: true),
-                      .paddingOnly(left: 0),
                 ],
               ),
             ),
@@ -231,6 +242,7 @@ class ChatEvent extends StatelessWidget {
       ).paddingOnly(left: isMerged ? 52 : 0, right: 4);
     } else {
       return Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
         key: Key('m${item.uuid}'),
         children: [
           Row(
@@ -284,7 +296,8 @@ class ChatEvent extends StatelessWidget {
               ),
             ],
           ).paddingSymmetric(horizontal: 12),
-          _buildAttachment(context),
+          _buildLinkExpansion().paddingOnly(left: 52),
+          _buildAttachment(context).paddingOnly(left: 56),
         ],
       );
     }

lib/widgets/chat/chat_event_list.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_animate/flutter_animate.dart';
 import 'package:get/get.dart';
 import 'package:solian/controllers/chat_events_controller.dart';
 import 'package:solian/models/channel.dart';
@@ -83,12 +82,7 @@ class ChatEventList extends StatelessWidget {
                     ),
                   );
                 },
-              ).animate(key: Key('m-animation${item.uuid}')).slideY(
+              );
-                    duration: 250.ms,
-                    curve: Curves.fastEaseInToSlowEaseOut,
-                    end: 0,
-                    begin: 0.5,
-                  );
             },
           );
         }),

lib/widgets/link_expansion.dart

@@ -0,0 +1,123 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_markdown/flutter_markdown.dart';
+import 'package:get/get.dart';
+import 'package:solian/platform.dart';
+import 'package:solian/providers/link_expander.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+
+class LinkExpansion extends StatelessWidget {
+  final String content;
+
+  const LinkExpansion({super.key, required this.content});
+
+  Widget _buildImage(String url, {double? width, double? height}) {
+    return PlatformInfo.canCacheImage
+        ? CachedNetworkImage(imageUrl: url, width: width, height: height)
+        : Image.network(url, width: width, height: height);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final linkRegex = RegExp(
+      r'(?:(?:https?|ftp):\/\/|www\.)'
+      r'(?:[-_a-z0-9]+\.)*(?:[-a-z0-9]+\.[-a-z0-9]+)'
+      r'[^\s<]*'
+      r'[^\s<?!.,:*_~]',
+    );
+    final matches = linkRegex.allMatches(content);
+    if (matches.isEmpty) {
+      return const SizedBox();
+    }
+
+    final LinkExpandController expandController = Get.find();
+
+    return Wrap(
+      children: matches.map((x) {
+        return Container(
+          constraints: BoxConstraints(
+            maxWidth: matches.length == 1 ? 480 : 340,
+          ),
+          child: FutureBuilder(
+            future: expandController.expandLink(x.group(0)!),
+            builder: (context, snapshot) {
+              if (!snapshot.hasData) {
+                return const SizedBox();
+              }
+
+              final isRichDescription = [
+                "solsynth.dev",
+              ].contains(Uri.parse(snapshot.data!.url).host);
+
+              return GestureDetector(
+                child: Card(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      if ([
+                        (snapshot.data!.icon?.isNotEmpty ?? false),
+                        snapshot.data!.siteName != null
+                      ].any((x) => x))
+                        Row(
+                          children: [
+                            if (snapshot.data!.icon?.isNotEmpty ?? false)
+                              ClipRRect(
+                                borderRadius: const BorderRadius.all(
+                                  Radius.circular(8),
+                                ),
+                                child: _buildImage(
+                                  snapshot.data!.icon!,
+                                  width: 32,
+                                  height: 32,
+                                ),
+                              ).paddingOnly(right: 8),
+                            if (snapshot.data!.siteName != null)
+                              Text(
+                                snapshot.data!.siteName!,
+                                style: Theme.of(context).textTheme.labelLarge,
+                              ),
+                          ],
+                        ).paddingOnly(
+                          bottom: (snapshot.data!.icon?.isNotEmpty ?? false)
+                              ? 8
+                              : 4,
+                        ),
+                      if (snapshot.data!.image != null &&
+                          (snapshot.data!.image?.startsWith('http') ?? false))
+                        ClipRRect(
+                          borderRadius: const BorderRadius.all(
+                            Radius.circular(8),
+                          ),
+                          child: _buildImage(
+                            snapshot.data!.image!,
+                          ),
+                        ).paddingOnly(bottom: 8),
+                      Text(
+                        snapshot.data!.title ?? 'No Title',
+                        maxLines: 1,
+                        overflow: TextOverflow.fade,
+                        style: Theme.of(context).textTheme.bodyLarge,
+                      ),
+                      if (snapshot.data!.description != null &&
+                          isRichDescription)
+                        MarkdownBody(data: snapshot.data!.description!)
+                      else if (snapshot.data!.description != null)
+                        Text(
+                          snapshot.data!.description!,
+                          maxLines: 3,
+                          overflow: TextOverflow.ellipsis,
+                        ),
+                    ],
+                  ).paddingAll(12),
+                ),
+                onTap: () {
+                  launchUrlString(x.group(0)!);
+                },
+              );
+            },
+          ),
+        );
+      }).toList(),
+    );
+  }
+}

lib/widgets/navigation/app_navigation_drawer.dart

@@ -33,9 +33,11 @@ class _AppNavigationDrawerState extends State<AppNavigationDrawer> {
     final resp = await provider.getCurrentStatus();
     final status = AccountStatus.fromJson(resp.body);
 
-    setState(() {
+    if (mounted) {
-      _accountStatus = status;
+      setState(() {
-    });
+        _accountStatus = status;
+      });
+    }
   }
 
   void _closeDrawer() {

lib/widgets/posts/post_item.dart

@@ -10,6 +10,7 @@ import 'package:solian/shells/title_shell.dart';
 import 'package:solian/widgets/account/account_avatar.dart';
 import 'package:solian/widgets/account/account_profile_popup.dart';
 import 'package:solian/widgets/attachments/attachment_list.dart';
+import 'package:solian/widgets/link_expansion.dart';
 import 'package:solian/widgets/markdown_text_content.dart';
 import 'package:solian/widgets/posts/post_tags.dart';
 import 'package:solian/widgets/posts/post_quick_action.dart';
@@ -288,12 +289,41 @@ class _PostItemState extends State<PostItem> {
     );
   }
 
+  Widget _buildAttachments() {
+    final List<String> attachments = item.body['attachments'] is List
+        ? List.from(item.body['attachments']?.whereType<String>())
+        : List.empty();
+
+    if (attachments.length > 3) {
+      return AttachmentList(
+        parentId: widget.item.id.toString(),
+        attachmentsId: attachments,
+        autoload: true,
+        isGrid: true,
+      ).paddingOnly(left: 36, top: 4, bottom: 4);
+    } else if (attachments.length > 1) {
+      return AttachmentList(
+        parentId: widget.item.id.toString(),
+        attachmentsId: attachments,
+        autoload: true,
+        isColumn: true,
+      ).paddingOnly(left: 60, right: 24);
+    } else {
+      return AttachmentList(
+        flatMaxHeight: MediaQuery.of(context).size.width,
+        parentId: widget.item.id.toString(),
+        attachmentsId: attachments,
+        autoload: true,
+      );
+    }
+  }
+
   double _contentHeight = 0;
 
   @override
   Widget build(BuildContext context) {
     final List<String> attachments = item.body['attachments'] is List
-        ? item.body['attachments']?.cast<String>()
+        ? List.from(item.body['attachments']?.whereType<String>())
         : List.empty();
     final hasAttachment = attachments.isNotEmpty;
 
@@ -301,7 +331,7 @@ class _PostItemState extends State<PostItem> {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          _buildThumbnail(),
+          _buildThumbnail().paddingOnly(bottom: 8),
           _buildHeader().paddingSymmetric(horizontal: 12),
           _buildHeaderDivider().paddingSymmetric(horizontal: 12),
           Stack(
@@ -349,6 +379,11 @@ class _PostItemState extends State<PostItem> {
                 ),
             ],
           ),
+          LinkExpansion(content: item.body['content']).paddingOnly(
+            left: 8,
+            right: 8,
+            top: 4,
+          ),
           _buildFooter().paddingOnly(left: 16),
           if (attachments.isNotEmpty)
             Row(
@@ -441,27 +476,31 @@ class _PostItemState extends State<PostItem> {
                       ],
                     ),
                     if (widget.item.replyTo != null && widget.isShowEmbed)
-                      _buildReply(context).paddingOnly(top: 4),
+                      Container(
+                        constraints: const BoxConstraints(maxWidth: 480),
+                        padding: const EdgeInsets.only(top: 4),
+                        child: _buildReply(context),
+                      ),
                     if (widget.item.repostTo != null && widget.isShowEmbed)
-                      _buildRepost(context).paddingOnly(top: 4),
+                      Container(
+                        constraints: const BoxConstraints(maxWidth: 480),
+                        padding: const EdgeInsets.only(top: 4),
+                        child: _buildRepost(context),
+                      ),
                     _buildFooter().paddingOnly(left: 12),
+                    LinkExpansion(content: item.body['content'])
+                        .paddingOnly(top: 4),
                   ],
                 ),
               ),
             ],
           ).paddingOnly(
             top: 10,
-            bottom: hasAttachment ? 10 : 0,
+            bottom: attachments.length == 1 ? 10 : 0,
             right: 16,
             left: 16,
           ),
-          AttachmentList(
+          _buildAttachments(),
-            flatMaxHeight: MediaQuery.of(context).size.width,
-            parentId: widget.item.id.toString(),
-            attachmentsId: attachments,
-            autoload: true,
-            isGrid: attachments.length > 1,
-          ),
           if (widget.isShowReply || widget.isReactable)
             PostQuickAction(
               isShowReply: widget.isShowReply,
@@ -474,8 +513,8 @@ class _PostItemState extends State<PostItem> {
                 });
               },
             ).paddingOnly(
-              top: hasAttachment ? 10 : 6,
+              top: attachments.length == 1 ? 10 : 6,
-              left: hasAttachment ? 24 : 60,
+              left: attachments.length == 1 ? 24 : 60,
               right: 16,
               bottom: 10,
             )

linux/flutter/generated_plugin_registrant.cc

@@ -11,6 +11,8 @@
 #include <flutter_acrylic/flutter_acrylic_plugin.h>
 #include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
 #include <flutter_webrtc/flutter_web_r_t_c_plugin.h>
+#include <media_kit_libs_linux/media_kit_libs_linux_plugin.h>
+#include <media_kit_video/media_kit_video_plugin.h>
 #include <pasteboard/pasteboard_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 
@@ -30,6 +32,12 @@ void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) flutter_webrtc_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterWebRTCPlugin");
   flutter_web_r_t_c_plugin_register_with_registrar(flutter_webrtc_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);
+  g_autoptr(FlPluginRegistrar) media_kit_video_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "MediaKitVideoPlugin");
+  media_kit_video_plugin_register_with_registrar(media_kit_video_registrar);
   g_autoptr(FlPluginRegistrar) pasteboard_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "PasteboardPlugin");
   pasteboard_plugin_register_with_registrar(pasteboard_registrar);

linux/flutter/generated_plugins.cmake

@@ -8,11 +8,14 @@ list(APPEND FLUTTER_PLUGIN_LIST
   flutter_acrylic
   flutter_secure_storage_linux
   flutter_webrtc
+  media_kit_libs_linux
+  media_kit_video
   pasteboard
   url_launcher_linux
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
+  media_kit_native_event_loop
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -18,15 +18,17 @@ import flutter_webrtc
 import gal
 import livekit_client
 import macos_window_utils
+import media_kit_libs_macos_video
+import media_kit_video
 import package_info_plus
 import pasteboard
 import path_provider_foundation
 import protocol_handler_macos
+import screen_brightness_macos
 import share_plus
 import shared_preferences_foundation
 import sqflite
 import url_launcher_macos
-import video_player_avfoundation
 import wakelock_plus
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
@@ -43,14 +45,16 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   GalPlugin.register(with: registry.registrar(forPlugin: "GalPlugin"))
   LiveKitPlugin.register(with: registry.registrar(forPlugin: "LiveKitPlugin"))
   MacOSWindowUtilsPlugin.register(with: registry.registrar(forPlugin: "MacOSWindowUtilsPlugin"))
+  MediaKitLibsMacosVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitLibsMacosVideoPlugin"))
+  MediaKitVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitVideoPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PasteboardPlugin.register(with: registry.registrar(forPlugin: "PasteboardPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   ProtocolHandlerMacosPlugin.register(with: registry.registrar(forPlugin: "ProtocolHandlerMacosPlugin"))
+  ScreenBrightnessMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenBrightnessMacosPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
-  FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))
   WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
 }

pubspec.lock

@@ -206,14 +206,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.3"
-  chewie:
-    dependency: "direct main"
-    description:
-      name: chewie
-      sha256: "2243e41e79e865d426d9dd9c1a9624aa33c4ad11de2d0cd680f826e2cd30e879"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.8.3"
   cli_util:
     dependency: transitive
     description:
@@ -286,14 +278,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.5"
-  csslib:
-    dependency: transitive
-    description:
-      name: csslib
-      sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -550,6 +534,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.8.12"
+  firebase_performance:
+    dependency: "direct main"
+    description:
+      name: firebase_performance
+      sha256: "6d17133458b9627f15f278d6f71bebbbce885d393f3462b690e55deeb5c36b90"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.0+4"
+  firebase_performance_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_performance_platform_interface
+      sha256: "28dc0a70a3459fe51d1c1be5754803a9a0db0e210322ec7526f6ce42bf6ad83e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4+40"
+  firebase_performance_web:
+    dependency: transitive
+    description:
+      name: firebase_performance_web
+      sha256: db91d86b34280f5253d2913945fdd51d7114486584a298a7bedf1c4b2ab08f79
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6+12"
   fixnum:
     dependency: transitive
     description:
@@ -869,14 +877,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.5"
-  html:
-    dependency: transitive
-    description:
-      name: html
-      sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.15.4"
   http:
     dependency: transitive
     description:
@@ -1141,6 +1141,78 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.11.1"
+  media_kit:
+    dependency: "direct main"
+    description:
+      name: media_kit
+      sha256: "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.10+1"
+  media_kit_libs_android_video:
+    dependency: transitive
+    description:
+      name: media_kit_libs_android_video
+      sha256: "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.6"
+  media_kit_libs_ios_video:
+    dependency: transitive
+    description:
+      name: media_kit_libs_ios_video
+      sha256: b5382994eb37a4564c368386c154ad70ba0cc78dacdd3fb0cd9f30db6d837991
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.4"
+  media_kit_libs_linux:
+    dependency: transitive
+    description:
+      name: media_kit_libs_linux
+      sha256: e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.3"
+  media_kit_libs_macos_video:
+    dependency: transitive
+    description:
+      name: media_kit_libs_macos_video
+      sha256: f26aa1452b665df288e360393758f84b911f70ffb3878032e1aabba23aa1032d
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.4"
+  media_kit_libs_video:
+    dependency: "direct main"
+    description:
+      name: media_kit_libs_video
+      sha256: "3688e0c31482074578652bf038ce6301a5d21e1eda6b54fc3117ffeb4bdba067"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
+  media_kit_libs_windows_video:
+    dependency: transitive
+    description:
+      name: media_kit_libs_windows_video
+      sha256: "7bace5f35d9afcc7f9b5cdadb7541d2191a66bb3fc71bfa11c1395b3360f6122"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.9"
+  media_kit_native_event_loop:
+    dependency: transitive
+    description:
+      name: media_kit_native_event_loop
+      sha256: a605cf185499d14d58935b8784955a92a4bf0ff4e19a23de3d17a9106303930e
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.8"
+  media_kit_video:
+    dependency: "direct main"
+    description:
+      name: media_kit_video
+      sha256: c048d11a19e379aebbe810647636e3fc6d18374637e2ae12def4ff8a4b99a882
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.4"
   meta:
     dependency: transitive
     description:
@@ -1485,6 +1557,62 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.28.0"
+  safe_local_storage:
+    dependency: transitive
+    description:
+      name: safe_local_storage
+      sha256: ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
+  screen_brightness:
+    dependency: transitive
+    description:
+      name: screen_brightness
+      sha256: ed8da4a4511e79422fc1aa88138e920e4008cd312b72cdaa15ccb426c0faaedd
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.2+1"
+  screen_brightness_android:
+    dependency: transitive
+    description:
+      name: screen_brightness_android
+      sha256: "3df10961e3a9e968a5e076fe27e7f4741fa8a1d3950bdeb48cf121ed529d0caf"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0+2"
+  screen_brightness_ios:
+    dependency: transitive
+    description:
+      name: screen_brightness_ios
+      sha256: "99adc3ca5490b8294284aad5fcc87f061ad685050e03cf45d3d018fe398fd9a2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
+  screen_brightness_macos:
+    dependency: transitive
+    description:
+      name: screen_brightness_macos
+      sha256: "64b34e7e3f4900d7687c8e8fb514246845a73ecec05ab53483ed025bd4a899fd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0+1"
+  screen_brightness_platform_interface:
+    dependency: transitive
+    description:
+      name: screen_brightness_platform_interface
+      sha256: b211d07f0c96637a15fb06f6168617e18030d5d74ad03795dd8547a52717c171
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
+  screen_brightness_windows:
+    dependency: transitive
+    description:
+      name: screen_brightness_windows
+      sha256: "9261bf33d0fc2707d8cf16339ce25768100a65e70af0fcabaf032fc12408ba86"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.3"
   sdp_transform:
     dependency: transitive
     description:
@@ -1630,10 +1758,10 @@ packages:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: c5e5b2a142a893a752cb36ae5888680248686725a54afceff31f9a3a76bc53c2
+      sha256: "7b41b6c3507854a159e24ae90a8e3e9cc01eb26a477c118d6dca065b5f55453e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.4+1"
+    version: "2.5.4+2"
   sqflite_common_ffi:
     dependency: "direct dev"
     description:
@@ -1762,6 +1890,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.1"
+  universal_platform:
+    dependency: transitive
+    description:
+      name: universal_platform
+      sha256: "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  uri_parser:
+    dependency: transitive
+    description:
+      name: uri_parser
+      sha256: "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   url_launcher:
     dependency: "direct main"
     description:
@@ -1842,46 +1986,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
-  video_player:
-    dependency: "direct main"
-    description:
-      name: video_player
-      sha256: e30df0d226c4ef82e2c150ebf6834b3522cf3f654d8e2f9419d376cdc071425d
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.9.1"
-  video_player_android:
-    dependency: transitive
-    description:
-      name: video_player_android
-      sha256: "4de50df9ee786f5891d3281e1e633d7b142ef1acf47392592eb91cba5d355849"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.6.0"
-  video_player_avfoundation:
-    dependency: transitive
-    description:
-      name: video_player_avfoundation
-      sha256: d1e9a824f2b324000dc8fb2dcb2a3285b6c1c7c487521c63306cc5b394f68a7c
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.6.1"
-  video_player_platform_interface:
-    dependency: transitive
-    description:
-      name: video_player_platform_interface
-      sha256: "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.2.2"
-  video_player_web:
-    dependency: transitive
-    description:
-      name: video_player_web
-      sha256: "6dcdd298136523eaf7dfc31abaf0dfba9aa8a8dbc96670e87e9d42b6f2caf774"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.2"
   vm_service:
     dependency: transitive
     description:
@@ -1890,6 +1994,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "14.2.4"
+  volume_controller:
+    dependency: transitive
+    description:
+      name: volume_controller
+      sha256: c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.8"
   wakelock_plus:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -2,7 +2,7 @@ name: solian
 description: "The Solar Network App"
 publish_to: "none"
 
-version: 1.2.1+16
+version: 1.2.1+19
 
 environment:
   sdk: ">=3.3.4 <4.0.0"
@@ -67,8 +67,10 @@ dependencies:
   collection: ^1.18.0
   firebase_crashlytics: ^4.0.4
   firebase_analytics: ^11.2.1
-  video_player: ^2.9.1
+  firebase_performance: ^0.10.0+4
-  chewie: ^1.8.3
+  media_kit: ^1.1.10+1
+  media_kit_video: ^1.2.4
+  media_kit_libs_video: ^1.0.4
 
 dev_dependencies:
   flutter_test:

windows/flutter/generated_plugin_registrant.cc

@@ -15,9 +15,12 @@
 #include <flutter_webrtc/flutter_web_r_t_c_plugin.h>
 #include <gal/gal_plugin_c_api.h>
 #include <livekit_client/live_kit_plugin.h>
+#include <media_kit_libs_windows_video/media_kit_libs_windows_video_plugin_c_api.h>
+#include <media_kit_video/media_kit_video_plugin_c_api.h>
 #include <pasteboard/pasteboard_plugin.h>
 #include <permission_handler_windows/permission_handler_windows_plugin.h>
 #include <protocol_handler_windows/protocol_handler_windows_plugin_c_api.h>
+#include <screen_brightness_windows/screen_brightness_windows_plugin.h>
 #include <share_plus/share_plus_windows_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 
@@ -40,12 +43,18 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("GalPluginCApi"));
   LiveKitPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("LiveKitPlugin"));
+  MediaKitLibsWindowsVideoPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("MediaKitLibsWindowsVideoPluginCApi"));
+  MediaKitVideoPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("MediaKitVideoPluginCApi"));
   PasteboardPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("PasteboardPlugin"));
   PermissionHandlerWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
   ProtocolHandlerWindowsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("ProtocolHandlerWindowsPluginCApi"));
+  ScreenBrightnessWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ScreenBrightnessWindowsPlugin"));
   SharePlusWindowsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
   UrlLauncherWindowsRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake

@@ -12,14 +12,18 @@ list(APPEND FLUTTER_PLUGIN_LIST
   flutter_webrtc
   gal
   livekit_client
+  media_kit_libs_windows_video
+  media_kit_video
   pasteboard
   permission_handler_windows
   protocol_handler_windows
+  screen_brightness_windows
   share_plus
   url_launcher_windows
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
+  media_kit_native_event_loop
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)