Merge pull request #2595 from BlueBubblesApp/joel/snapcraft-1.12.5

Some more fixes for snap config
BlueBubblesApp · Dec 2, 2023 · 10be464 · 10be464
2 parents d142bcf + a53c6ee
commit 10be464
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 14 deletions.
diff --git a/lib/app/layouts/conversation_view/widgets/message/attachment/attachment_holder.dart b/lib/app/layouts/conversation_view/widgets/message/attachment/attachment_holder.dart
@@ -283,7 +283,7 @@ class _AttachmentHolderState extends CustomState<AttachmentHolder, void, Message
                                   );
                                 }
                               );
-                            } else if ((attachment.mimeStart == "video" || attachment.mimeType == "audio/mp4") && !ss.settings.highPerfMode.value) {
+                            } else if ((attachment.mimeStart == "video" || attachment.mimeType == "audio/mp4") && !ss.settings.highPerfMode.value && !isSnap) {
                               return VideoPlayer(
                                 attachment: attachment,
                                 file: _content,

diff --git a/lib/app/layouts/conversation_view/widgets/message/attachment/video_player.dart b/lib/app/layouts/conversation_view/widgets/message/attachment/video_player.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:math';
 
-import 'package:bluebubbles/app/layouts/conversation_view/widgets/message/attachment/other_file.dart';
 import 'package:bluebubbles/app/layouts/conversation_view/widgets/message/reply/reply_bubble.dart';
 import 'package:bluebubbles/app/layouts/fullscreen_media/fullscreen_holder.dart';
 import 'package:bluebubbles/app/wrappers/theme_switcher.dart';
@@ -412,17 +411,6 @@ class _DesktopVideoPlayerState extends OptimizedState<VideoPlayer> with Automati
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    if (isSnap) {
-      return Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          OtherFile(
-            attachment: attachment,
-            file: file,
-          ),
-        ],
-      );
-    }
     if (videoController != null) {
       return MouseRegion(
         onEnter: (event) => showPlayPauseOverlay.value = true,

diff --git a/lib/app/layouts/conversation_view/widgets/text_field/text_field_suffix.dart b/lib/app/layouts/conversation_view/widgets/text_field/text_field_suffix.dart
@@ -16,6 +16,7 @@ import 'package:get/get.dart';
 import 'package:multi_value_listenable_builder/multi_value_listenable_builder.dart';
 import 'package:path/path.dart';
 import 'package:record/record.dart';
+import 'package:system_info2/system_info2.dart';
 import 'package:universal_io/io.dart';
 
 class TextFieldSuffix extends StatefulWidget {
@@ -58,6 +59,7 @@ class _TextFieldSuffixState extends OptimizedState<TextFieldSuffix> {
               widget.subjectTextController.text.isNotEmpty ||
               (widget.controller?.pickedAttachments.isNotEmpty ?? false.obs.value);
           bool showRecording = (widget.controller?.showRecording.value ?? false.obs.value) && widget.recorderController != null;
+          bool isLinuxArm64 = kIsDesktop && Platform.isLinux && SysInfo.kernelArchitecture == ProcessorArchitecture.arm64;
           return Padding(
             padding: const EdgeInsets.all(3.0),
             child: AnimatedCrossFade(
@@ -78,7 +80,8 @@ class _TextFieldSuffixState extends OptimizedState<TextFieldSuffix> {
                   minimumSize: const Size(32, 32),
                   tapTargetSize: MaterialTapTargetSize.shrinkWrap,
                 ),
-                child: !isChatCreator && !showRecording
+                child: isLinuxArm64 ? const SizedBox(height: 40) :
+                  !isChatCreator && !showRecording
                   ? CupertinoIconWrapper(icon: Icon(
                     iOS ? CupertinoIcons.mic : Icons.mic_none,
                     color: iOS ? context.theme.colorScheme.outline : context.theme.colorScheme.properOnSurface,

diff --git a/pubspec.lock b/pubspec.lock
@@ -1114,6 +1114,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.2"
+  globbing:
+    dependency: transitive
+    description:
+      name: globbing
+      sha256: "4f89cfaf6fa74c9c1740a96259da06bd45411ede56744e28017cc534a12b6e2d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   google_fonts:
     dependency: "direct main"
     description:
@@ -2650,6 +2658,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.0"
+  system_info2:
+    dependency: "direct main"
+    description:
+      name: system_info2
+      sha256: "65206bbef475217008b5827374767550a5420ce70a04d2d7e94d1d2253f3efc9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.0"
   system_tray:
     dependency: "direct main"
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -159,6 +159,7 @@ dependencies:
   store_checker: ^1.4.0
   synchronized: ^3.0.1
   supercharged: ^2.1.1
+  system_info2: ^4.0.0
   system_tray: ^2.0.3
   tuple: ^2.0.2
   universal_html: ^2.2.3 # cross-platform dart:html implementation

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -98,10 +98,21 @@ parts:
       - usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libvorbis*
       - usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio
 
+  fmedia:
+    source:
+      - on amd64: https://github.com/stsaz/fmedia/releases/download/v1.31/fmedia-1.31-linux-amd64.tar.xz
+    plugin: dump
+    override-build: |
+      set -eux
+      mkdir -p $SNAPCRAFT_PART_INSTALL/bin/fmedia-1
+      cp -r . $SNAPCRAFT_PART_INSTALL/bin/fmedia-1/
+      ln -s $SNAPCRAFT_PART_INSTALL/bin/fmedia-1/fmedia $SNAPCRAFT_PART_INSTALL/bin/fmedia
+
   bluebubbles:
     after:
       - desktop-glib-only
       - alsa-mixin
+      - fmedia
     source:
       - on amd64: https://github.com/BlueBubblesApp/bluebubbles-app/releases/download/v1.12.5%2B59/bluebubbles-linux-x86_64.tar
       - on arm64: https://github.com/BlueBubblesApp/bluebubbles-app/releases/download/v1.12.5%2B59/bluebubbles-linux-aarch64.tar