fix: band-aid fix to disallow linux video fullscreen (#1023)

Ref #1022
ubuntu-flutter-community · Nov 16, 2024 · 8dbaa98 · 8dbaa98
1 parent 6d78c2b
commit 8dbaa98
Show file tree

Hide file tree

Showing 37 changed files with 778 additions and 698 deletions.
diff --git a/lib/app_config.dart b/lib/app_config.dart
@@ -8,3 +8,10 @@ bool allowDiscordRPC = kDebugMode ||
     Platform.isMacOS ||
     Platform.isWindows ||
     bool.tryParse(const String.fromEnvironment('ALLOW_DISCORD_RPC')) == true;
+
+bool get yaruStyled => Platform.isLinux;
+
+bool get appleStyled => Platform.isMacOS || Platform.isIOS;
+
+// TODO(#1022): fix linux video fullscreen
+bool get allowVideoFullScreen => !Platform.isLinux;
diff --git a/lib/common/view/animated_like_icon.dart b/lib/common/view/animated_like_icon.dart
@@ -1,3 +1,4 @@
+import '../../app_config.dart';
 import 'icons.dart';
 import 'package:flutter/material.dart';
 import 'package:yaru/yaru.dart';

diff --git a/lib/common/view/audio_autocomplete.dart b/lib/common/view/audio_autocomplete.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:yaru/constants.dart';
 
+import '../../app_config.dart';
 import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../extensions/theme_data_x.dart';

diff --git a/lib/common/view/audio_tile_option_button.dart b/lib/common/view/audio_tile_option_button.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
+import '../../app_config.dart';
 import '../../extensions/build_context_x.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
@@ -10,7 +11,6 @@ import '../data/audio.dart';
 import 'icons.dart';
 import 'snackbars.dart';
 import 'stream_provider_share_button.dart';
-import 'theme.dart';
 
 class AudioTileOptionButton extends StatelessWidget {
   const AudioTileOptionButton({

diff --git a/lib/common/view/common_widgets.dart b/lib/common/view/common_widgets.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:yaru/yaru.dart';
 
-import 'theme.dart';
+import '../../app_config.dart';
 
 class CommonSwitch extends StatelessWidget {
   const CommonSwitch({super.key, required this.value, this.onChanged});

diff --git a/lib/common/view/country_auto_complete.dart b/lib/common/view/country_auto_complete.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:podcast_search/podcast_search.dart';
 
+import '../../app_config.dart';
 import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../extensions/country_x.dart';

diff --git a/lib/common/view/drop_down_arrow.dart b/lib/common/view/drop_down_arrow.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:yaru/yaru.dart';
-import 'theme.dart';
+
+import '../../app_config.dart';
 
 class DropDownArrow extends StatelessWidget {
   const DropDownArrow({super.key});

diff --git a/lib/common/view/header_bar.dart b/lib/common/view/header_bar.dart
@@ -5,6 +5,7 @@ import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
 import '../../app/app_model.dart';
+import '../../app_config.dart';
 import '../../extensions/build_context_x.dart';
 import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';

diff --git a/lib/common/view/icons.dart b/lib/common/view/icons.dart
@@ -2,7 +2,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:yaru/yaru.dart';
 
-import 'theme.dart';
+import '../../app_config.dart';
 
 class Iconz {
   static IconData get image => yaruStyled

diff --git a/lib/common/view/language_autocomplete.dart b/lib/common/view/language_autocomplete.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 
+import '../../app_config.dart';
 import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../extensions/string_x.dart';

diff --git a/lib/common/view/nav_back_button.dart b/lib/common/view/nav_back_button.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
+import '../../app_config.dart';
 import '../../library/library_model.dart';
-import 'theme.dart';
 
 class NavBackButton extends StatelessWidget {
   const NavBackButton({super.key});

diff --git a/lib/common/view/progress.dart b/lib/common/view/progress.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:yaru/yaru.dart';
 
+import '../../app_config.dart';
 import '../../extensions/build_context_x.dart';
 import 'theme.dart';
 

diff --git a/lib/common/view/search_button.dart b/lib/common/view/search_button.dart
@@ -1,7 +1,9 @@
-import '../../extensions/build_context_x.dart';
-import 'icons.dart';
 import 'package:flutter/material.dart';
 import 'package:yaru/yaru.dart';
+
+import '../../app_config.dart';
+import '../../extensions/build_context_x.dart';
+import 'icons.dart';
 import 'theme.dart';
 
 class SearchButton extends StatelessWidget {

diff --git a/lib/common/view/search_input.dart b/lib/common/view/search_input.dart
@@ -1,6 +1,9 @@
-import '../../extensions/build_context_x.dart';
 import 'dart:async';
+
 import 'package:flutter/material.dart';
+
+import '../../app_config.dart';
+import '../../extensions/build_context_x.dart';
 import 'theme.dart';
 
 class SearchInput extends StatefulWidget {

diff --git a/lib/common/view/theme.dart b/lib/common/view/theme.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:yaru/yaru.dart';
 
+import '../../app_config.dart';
 import '../../constants.dart';
 import 'icons.dart';
 
@@ -70,10 +71,6 @@ Color getPlayerBg(Color? surfaceTintColor, Color fallbackColor) {
   }
 }
 
-bool get yaruStyled => Platform.isLinux;
-
-bool get appleStyled => Platform.isMacOS || Platform.isIOS;
-
 const alphabetColors = {
   'A': Colors.red,
   'B': Colors.orange,

diff --git a/lib/extensions/theme_data_x.dart b/lib/extensions/theme_data_x.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:yaru/yaru.dart';
 
-import '../common/view/theme.dart';
+import '../../app_config.dart';
 
 extension ThemeDataX on ThemeData {
   bool get isLight => brightness == Brightness.light;

diff --git a/lib/player/player_service.dart b/lib/player/player_service.dart
@@ -211,7 +211,14 @@ class PlayerService {
       Media? media = audio!.path != null
           ? Media('file://${audio!.path!}')
           : (audio!.url != null)
-              ? Media(audio!.url!)
+              ? Media(
+                  audio!.url!,
+                  httpHeaders: {
+                    'Accept': '*',
+                    'User-Agent': '$kAppTitle ($kRepoUrl)',
+                    'Content-Language': 'de-DE',
+                  },
+                )
               : null;
       if (media == null) return;
       _player.open(media).then((_) {

diff --git a/lib/player/view/full_height_video_player.dart b/lib/player/view/full_height_video_player.dart
@@ -4,6 +4,7 @@ import 'package:watch_it/watch_it.dart';
 import 'package:yaru/constants.dart';
 
 import '../../app/connectivity_model.dart';
+import '../../app_config.dart';
 import '../../common/data/audio.dart';
 import '../../common/view/icons.dart';
 import '../../l10n/l10n.dart';
@@ -58,15 +59,16 @@ class FullHeightVideoPlayer extends StatelessWidget with WatchItMixin {
       topButtonBar: [
         const Spacer(),
         controls,
-        Tooltip(
-          message: context.l10n.leaveFullScreen,
-          child: MaterialFullscreenButton(
-            icon: Icon(
-              Iconz.fullScreenExit,
-              color: baseColor,
+        if (allowVideoFullScreen)
+          Tooltip(
+            message: context.l10n.leaveFullScreen,
+            child: MaterialFullscreenButton(
+              icon: Icon(
+                Iconz.fullScreenExit,
+                color: baseColor,
+              ),
             ),
           ),
-        ),
       ],
       bottomButtonBarMargin: const EdgeInsets.all(20),
       bottomButtonBar: [
@@ -92,15 +94,16 @@ class FullHeightVideoPlayer extends StatelessWidget with WatchItMixin {
         topButtonBar: [
           const Spacer(),
           controls,
-          Tooltip(
-            message: context.l10n.fullScreen,
-            child: MaterialFullscreenButton(
-              icon: Icon(
-                Iconz.fullScreen,
-                color: baseColor,
+          if (allowVideoFullScreen)
+            Tooltip(
+              message: context.l10n.fullScreen,
+              child: MaterialFullscreenButton(
+                icon: Icon(
+                  Iconz.fullScreen,
+                  color: baseColor,
+                ),
               ),
             ),
-          ),
         ],
       ),
       child: RepaintBoundary(

diff --git a/lib/player/view/player_track.dart b/lib/player/view/player_track.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
+import '../../app_config.dart';
 import '../../common/data/audio.dart';
 import '../../common/view/custom_track_shape.dart';
 import '../../common/view/progress.dart';
-import '../../common/view/theme.dart';
 import '../../extensions/build_context_x.dart';
 import '../../extensions/duration_x.dart';
 import '../player_model.dart';

diff --git a/lib/player/view/seek_button.dart b/lib/player/view/seek_button.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
+import '../../app_config.dart';
 import '../../common/view/icons.dart';
-import '../../common/view/theme.dart';
 import '../../extensions/build_context_x.dart';
 import '../player_model.dart';
 

diff --git a/lib/playlists/view/add_to_playlist_dialog.dart b/lib/playlists/view/add_to_playlist_dialog.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
+import '../../app_config.dart';
 import '../../common/data/audio.dart';
 import '../../common/view/common_widgets.dart';
 import '../../common/view/global_keys.dart';

diff --git a/lib/playlists/view/manual_add_dialog.dart b/lib/playlists/view/manual_add_dialog.dart
@@ -2,11 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
+import '../../app_config.dart';
 import '../../common/data/audio.dart';
 import '../../common/view/common_widgets.dart';
 import '../../common/view/global_keys.dart';
 import '../../common/view/icons.dart';
-import '../../common/view/theme.dart';
 import '../../constants.dart';
 import '../../external_path/external_path_service.dart';
 import '../../l10n/l10n.dart';

diff --git a/lib/podcasts/view/podcast_audio_tile.dart b/lib/podcasts/view/podcast_audio_tile.dart
@@ -4,6 +4,7 @@ import 'package:url_launcher/url_launcher.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
+import '../../app_config.dart';
 import '../../common/data/audio.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/share_button.dart';
@@ -14,8 +15,8 @@ import '../../extensions/duration_x.dart';
 import '../../extensions/int_x.dart';
 import '../../l10n/l10n.dart';
 import '../../player/player_model.dart';
-import 'podcast_tile_play_button.dart';
 import 'download_button.dart';
+import 'podcast_tile_play_button.dart';
 
 class PodcastAudioTile extends StatelessWidget {
   const PodcastAudioTile({

diff --git a/lib/podcasts/view/podcast_genre_autocomplete.dart b/lib/podcasts/view/podcast_genre_autocomplete.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 
+import '../../app_config.dart';
 import '../../common/data/podcast_genre.dart';
 import '../../common/view/theme.dart';
 import '../../constants.dart';

diff --git a/lib/podcasts/view/podcast_tile_play_button.dart b/lib/podcasts/view/podcast_tile_play_button.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
+import '../../app_config.dart';
 import '../../common/data/audio.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/theme.dart';

diff --git a/lib/radio/view/radio_history_tile.dart b/lib/radio/view/radio_history_tile.dart
@@ -3,13 +3,13 @@ import 'package:watch_it/watch_it.dart';
 import 'package:yaru/constants.dart';
 import 'package:yaru/yaru.dart';
 
+import '../../app_config.dart';
 import '../../common/data/audio.dart';
 import '../../common/view/copy_clipboard_content.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/mpv_metadata_dialog.dart';
 import '../../common/view/snackbars.dart';
 import '../../common/view/tapable_text.dart';
-import '../../common/view/theme.dart';
 import '../../extensions/build_context_x.dart';
 import '../../extensions/theme_data_x.dart';
 import '../../l10n/l10n.dart';

diff --git a/lib/radio/view/radio_lib_page.dart b/lib/radio/view/radio_lib_page.dart
@@ -6,6 +6,7 @@ import 'package:radio_browser_api/radio_browser_api.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
+import '../../app_config.dart';
 import '../../common/data/audio.dart';
 import '../../common/view/adaptive_container.dart';
 import '../../common/view/audio_card.dart';

diff --git a/lib/radio/view/tag_auto_complete.dart b/lib/radio/view/tag_auto_complete.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:radio_browser_api/radio_browser_api.dart' hide State;
 
+import '../../app_config.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/theme.dart';
 import '../../constants.dart';

diff --git a/lib/search/view/search_page.dart b/lib/search/view/search_page.dart
@@ -3,6 +3,7 @@ import 'package:flutter/rendering.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/theme.dart';
 
+import '../../app_config.dart';
 import '../../common/data/audio.dart';
 import '../../common/view/adaptive_container.dart';
 import '../../common/view/header_bar.dart';