feat: use bottom sheets for search input prefix and suffix, move Audi…

…oType to its own file (#1042)

lib/app/connectivity_model.dart

@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:safe_change_notifier/safe_change_notifier.dart';
 
-import '../common/data/audio.dart';
+import '../common/data/audio_type.dart';
 import '../player/player_service.dart';
 
 class ConnectivityModel extends SafeChangeNotifier {

lib/app/view/main_page_icon.dart

@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
-import '../../common/data/audio.dart';
+import '../../app_config.dart';
+import '../../common/data/audio_type.dart';
 import '../../common/view/audio_signal_indicator.dart';
 import '../../common/view/icons.dart';
-import '../../constants.dart';
+import '../../common/view/theme.dart';
 import '../../extensions/build_context_x.dart';
 import '../../player/player_model.dart';
 import '../../settings/settings_model.dart';
@@ -29,10 +30,12 @@ class MainPageIcon extends StatelessWidget with WatchItMixin {
 
     if (currentAudioType == audioType && isPlaying) {
       if (useMoreAnimations) {
-        return const ActiveAudioSignalIndicator(thickness: 1);
+        return ActiveAudioSignalIndicator(
+          thickness: yaruStyled || appleStyled ? 1 : 2,
+        );
       } else {
         return Padding(
-          padding: kMainPageIconPadding,
+          padding: mainPageIconPadding,
           child: Icon(
             Iconz.playFilled,
             color: context.colorScheme.primary,
@@ -42,15 +45,8 @@ class MainPageIcon extends StatelessWidget with WatchItMixin {
     }
 
     return Padding(
-      padding: kMainPageIconPadding,
-      child: switch (audioType) {
-        AudioType.local =>
-          selected ? Icon(Iconz.localAudioFilled) : Icon(Iconz.localAudio),
-        AudioType.radio =>
-          selected ? Icon(Iconz.radioFilled) : Icon(Iconz.radio),
-        AudioType.podcast =>
-          selected ? Icon(Iconz.podcastFilled) : Icon(Iconz.podcast),
-      },
+      padding: mainPageIconPadding,
+      child: Icon(selected ? audioType.selectedIconData : audioType.iconData),
     );
   }
 }

lib/app/view/master_items.dart

@@ -1,7 +1,7 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 
-import '../../common/data/audio.dart';
+import '../../common/data/audio_type.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/side_bar_fall_back_image.dart';
 import '../../common/view/theme.dart';

lib/app/view/master_tile.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
-import '../../common/data/audio.dart';
+import '../../common/data/audio_type.dart';
 import '../../constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../library/library_model.dart';

lib/app/view/mobile_navigation_bar.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
-import '../../common/data/audio.dart';
+import '../../common/data/audio_type.dart';
 import '../../common/view/icons.dart';
 import '../../constants.dart';
 import '../../extensions/build_context_x.dart';

lib/common/data/audio.dart

@@ -8,7 +8,7 @@ import 'package:podcast_search/podcast_search.dart';
 import 'package:radio_browser_api/radio_browser_api.dart';
 
 import '../../extensions/string_x.dart';
-import '../../l10n/l10n.dart';
+import 'audio_type.dart';
 import 'genres.dart';
 
 class Audio {
@@ -378,15 +378,3 @@ class Audio {
       path != null &&
       audioType == AudioType.local;
 }
-
-enum AudioType {
-  local,
-  radio,
-  podcast;
-
-  String localize(AppLocalizations l10n) => switch (this) {
-        local => l10n.localAudio,
-        radio => l10n.radio,
-        podcast => l10n.podcast,
-      };
-}

lib/common/data/audio_type.dart

@@ -0,0 +1,28 @@
+import 'package:flutter/material.dart';
+
+import '../../l10n/l10n.dart';
+import '../view/icons.dart';
+
+enum AudioType {
+  local,
+  radio,
+  podcast;
+
+  String localize(AppLocalizations l10n) => switch (this) {
+        local => l10n.localAudio,
+        radio => l10n.radio,
+        podcast => l10n.podcast,
+      };
+
+  IconData get iconData => switch (this) {
+        local => Iconz.localAudio,
+        radio => Iconz.radio,
+        podcast => Iconz.podcast,
+      };
+
+  IconData get selectedIconData => switch (this) {
+        local => Iconz.localAudioFilled,
+        radio => Iconz.radioFilled,
+        podcast => Iconz.podcastFilled,
+      };
+}

lib/common/view/audio_signal_indicator.dart

@@ -3,6 +3,7 @@ import 'dart:math' as math;
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
+import '../../app_config.dart';
 import 'theme.dart';
 
 class ActiveAudioSignalIndicator extends StatefulWidget {
@@ -59,7 +60,9 @@ class _ActiveAudioSignalIndicatorState extends State<ActiveAudioSignalIndicator>
   Widget build(BuildContext context) {
     return RepaintBoundary(
       child: Padding(
-        padding: const EdgeInsets.only(left: 3, right: 1),
+        padding: yaruStyled || appleStyled
+            ? const EdgeInsets.only(left: 3, right: 1)
+            : const EdgeInsets.only(left: 5),
         child: SizedBox(
           width: iconSize - 2,
           height: iconSize,

lib/common/view/audio_tile.dart

@@ -10,6 +10,7 @@ import '../../l10n/l10n.dart';
 import '../../library/library_model.dart';
 import '../../player/player_model.dart';
 import '../data/audio.dart';
+import '../data/audio_type.dart';
 import 'audio_page_type.dart';
 import 'audio_tile_image.dart';
 import 'audio_tile_option_button.dart';

lib/common/view/audio_tile_bottom_sheet.dart

@@ -7,6 +7,7 @@ import '../../library/library_model.dart';
 import '../../player/player_model.dart';
 import '../../playlists/view/add_to_playlist_dialog.dart';
 import '../data/audio.dart';
+import '../data/audio_type.dart';
 import 'audio_tile_image.dart';
 import 'icons.dart';
 import 'like_all_icon.dart';

lib/common/view/audio_tile_image.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import '../../constants.dart';
 import '../../local_audio/view/local_cover.dart';
 import '../data/audio.dart';
+import '../data/audio_type.dart';
 import 'icons.dart';
 import 'safe_network_image.dart';
 

lib/common/view/audio_tile_option_button.dart

@@ -10,6 +10,7 @@ import '../../library/library_model.dart';
 import '../../player/player_model.dart';
 import '../../playlists/view/add_to_playlist_dialog.dart';
 import '../data/audio.dart';
+import '../data/audio_type.dart';
 import 'audio_tile_bottom_sheet.dart';
 import 'icons.dart';
 import 'meta_data_dialog.dart';
@@ -167,6 +168,7 @@ class AudioTileBottomSheetButton extends StatelessWidget {
   Widget build(BuildContext context) => IconButton(
         tooltip: context.l10n.moreOptions,
         onPressed: () => showModal(
+          mode: ModalMode.platformModalMode,
           context: context,
           content: AudioTileBottomSheet(
             searchTerm: searchTerm,

lib/common/view/avatar_play_button.dart

@@ -6,6 +6,7 @@ import '../../l10n/l10n.dart';
 import '../../player/player_model.dart';
 import '../../radio/radio_model.dart';
 import '../data/audio.dart';
+import '../data/audio_type.dart';
 import 'icons.dart';
 import 'theme.dart';
 

lib/common/view/meta_data_dialog.dart

@@ -4,7 +4,8 @@ import 'package:yaru/yaru.dart';
 import '../../app_config.dart';
 import '../../l10n/l10n.dart';
 import '../data/audio.dart';
-import 'modal_mode.dart';
+import '../data/audio_type.dart';
+import 'modals.dart';
 
 class MetaDataContent extends StatelessWidget {
   const MetaDataContent.dialog({

lib/common/view/modals.dart

@@ -1,18 +1,42 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
-import 'package:yaru/theme.dart';
 
 Future<void> showModal({
   required BuildContext context,
   required Widget content,
+  required ModalMode mode,
 }) async {
   Widget builder(context) => content;
 
-  if (isMobile) {
-    showModalBottomSheet(context: context, builder: builder);
-  } else {
-    showDialog(
-      context: context,
-      builder: builder,
-    );
+  switch (mode) {
+    case ModalMode.bottomSheet:
+      showModalBottomSheet(context: context, builder: builder);
+
+    case ModalMode.dialog:
+      showDialog(
+        context: context,
+        builder: builder,
+      );
   }
 }
+
+enum ModalMode {
+  dialog,
+  bottomSheet;
+
+  static ModalMode get platformModalMode =>
+      Platform.isAndroid || Platform.isIOS || Platform.isFuchsia
+          ? ModalMode.bottomSheet
+          : ModalMode.dialog;
+}
+
+enum OverlayMode {
+  popup,
+  bottomSheet;
+
+  static OverlayMode get platformModalMode =>
+      Platform.isAndroid || Platform.isIOS || Platform.isFuchsia
+          ? OverlayMode.bottomSheet
+          : OverlayMode.popup;
+}

lib/common/view/mpv_metadata_dialog.dart

@@ -5,11 +5,18 @@ import 'package:yaru/yaru.dart';
 import '../../constants.dart';
 import '../data/mpv_meta_data.dart';
 import 'icons.dart';
-import 'modal_mode.dart';
+import 'modals.dart';
 import 'safe_network_image.dart';
 import 'stream_provider_share_button.dart';
 
 class MpvMetadataDialog extends StatelessWidget {
+  const MpvMetadataDialog({
+    super.key,
+    this.image,
+    required this.mpvMetaData,
+    required ModalMode mode,
+  }) : _mode = mode;
+
   const MpvMetadataDialog.dialog({
     super.key,
     this.image,

lib/common/view/search_input.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+import 'package:yaru/yaru.dart';
 
 import '../../app_config.dart';
 import '../../extensions/build_context_x.dart';
@@ -59,7 +60,7 @@ class _SearchInputState extends State<SearchInput> {
   Widget build(BuildContext context) {
     final theme = context.theme;
     return SizedBox(
-      height: yaruStyled ? null : 38,
+      height: yaruStyled || isMobile ? null : 38,
       child: TextField(
         onTap: () {
           _controller.selection = TextSelection(

lib/common/view/sliver_audio_page.dart

@@ -8,6 +8,7 @@ import '../../library/library_model.dart';
 import '../../search/search_model.dart';
 import '../../search/search_type.dart';
 import '../data/audio.dart';
+import '../data/audio_type.dart';
 import 'adaptive_container.dart';
 import 'audio_page_header.dart';
 import 'audio_page_type.dart';

lib/common/view/theme.dart

@@ -253,6 +253,9 @@ EdgeInsets get appBarSingleActionSpacing => Platform.isMacOS
 EdgeInsetsGeometry get radioHistoryListPadding =>
     EdgeInsets.only(left: yaruStyled ? 0 : 5);
 
+EdgeInsets get mainPageIconPadding =>
+    yaruStyled || appleStyled ? kMainPageIconPadding : EdgeInsets.zero;
+
 EdgeInsets get countryPillPadding => yaruStyled
     ? const EdgeInsets.only(
         bottom: 9,

lib/external_path/external_path_service.dart

@@ -11,6 +11,7 @@ import 'package:pls/pls.dart';
 import 'package:yaru/yaru.dart';
 
 import '../common/data/audio.dart';
+import '../common/data/audio_type.dart';
 import '../common/logging.dart';
 import '../player/player_service.dart';
 

lib/local_audio/view/artist_page.dart

@@ -4,6 +4,7 @@ import 'package:watch_it/watch_it.dart';
 
 import '../../app/view/music_pod_scaffold.dart';
 import '../../common/data/audio.dart';
+import '../../common/data/audio_type.dart';
 import '../../common/view/adaptive_container.dart';
 import '../../common/view/audio_page_header.dart';
 import '../../common/view/audio_page_type.dart';

lib/local_audio/view/genre_page.dart

@@ -3,7 +3,7 @@ import 'package:radio_browser_api/radio_browser_api.dart' hide State;
 import 'package:watch_it/watch_it.dart';
 
 import '../../app/view/music_pod_scaffold.dart';
-import '../../common/data/audio.dart';
+import '../../common/data/audio_type.dart';
 import '../../common/view/adaptive_container.dart';
 import '../../common/view/header_bar.dart';
 import '../../common/view/icons.dart';

lib/local_audio/view/local_audio_page.dart

@@ -4,7 +4,7 @@ import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
 import '../../app/view/music_pod_scaffold.dart';
-import '../../common/data/audio.dart';
+import '../../common/data/audio_type.dart';
 import '../../common/view/adaptive_container.dart';
 import '../../common/view/header_bar.dart';
 import '../../common/view/search_button.dart';

lib/player/player_service.dart

@@ -11,6 +11,7 @@ import 'package:path/path.dart' as p;
 import 'package:smtc_windows/smtc_windows.dart';
 
 import '../common/data/audio.dart';
+import '../common/data/audio_type.dart';
 import '../common/data/mpv_meta_data.dart';
 import '../common/data/player_state.dart';
 import '../common/logging.dart';

lib/player/view/bottom_player.dart

@@ -4,7 +4,7 @@ import 'package:yaru/yaru.dart';
 
 import '../../app/app_model.dart';
 import '../../app/connectivity_model.dart';
-import '../../common/data/audio.dart';
+import '../../common/data/audio_type.dart';
 import '../../common/view/icons.dart';
 import '../../common/view/like_icon.dart';
 import '../../common/view/theme.dart';

lib/player/view/bottom_player_image.dart

@@ -4,6 +4,7 @@ import 'package:watch_it/watch_it.dart';
 
 import '../../app/app_model.dart';
 import '../../common/data/audio.dart';
+import '../../common/data/audio_type.dart';
 import '../../common/view/icons.dart';
 import '../../l10n/l10n.dart';
 import '../../local_audio/view/local_cover.dart';

lib/player/view/full_height_player.dart

@@ -4,7 +4,7 @@ import 'package:yaru/yaru.dart';
 
 import '../../app/app_model.dart';
 import '../../app/connectivity_model.dart';
-import '../../common/data/audio.dart';
+import '../../common/data/audio_type.dart';
 import '../../common/view/header_bar.dart';
 import '../../extensions/build_context_x.dart';
 import '../../player/player_model.dart';