fix: control panel heights mismatch (#1449)

Author: Feichtmeier

lib/app/view/main_page_icon.dart

@@ -34,17 +34,17 @@ class MainPageIcon extends StatelessWidget with WatchItMixin {
       (LocalAudioModel m) => m.initAudiosCommand.isRunning,
     );
 
-    if (currentAudioType == audioType) {
-      if (isLocalAudioImporting) {
-        return Padding(
-          padding: mainPageIconPadding,
-          child: const SizedBox(
-            width: 16,
-            height: 16,
-            child: Progress(strokeWidth: 2),
-          ),
-        );
-      } else if (isPlaying) {
+    if (isLocalAudioImporting && audioType == AudioType.local) {
+      return Padding(
+        padding: mainPageIconPadding,
+        child: const SizedBox(
+          width: 16,
+          height: 16,
+          child: Progress(strokeWidth: 2),
+        ),
+      );
+    } else if (currentAudioType == audioType) {
+      if (isPlaying) {
         if (useMoreAnimations) {
           return const ActiveAudioSignalIndicator(thickness: 2);
         } else {

lib/common/view/country_auto_complete.dart

@@ -55,7 +55,7 @@ class CountryAutoComplete extends StatelessWidget with WatchItMixin {
     final useYaruTheme = watchPropertyValue(
       (SettingsModel m) => m.useYaruTheme,
     );
-    final inputHeight = getInputHeight(useYaruTheme);
+    final inputHeight = getInputHeight();
 
     return SizedBox(
       height: height ?? inputHeight,

lib/common/view/language_autocomplete.dart

@@ -55,7 +55,7 @@ class LanguageAutoComplete extends StatelessWidget with WatchItMixin {
     );
 
     return SizedBox(
-      height: height ?? getInputHeight(useYaruTheme),
+      height: height ?? getInputHeight(),
       width: width,
       child: LayoutBuilder(
         builder: (_, constraints) {

lib/common/view/sliver_audio_page_control_panel.dart

@@ -18,24 +18,21 @@ class SliverAudioPageControlPanel extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return SliverPadding(
-      padding: const EdgeInsets.only(bottom: 10),
-      sliver: SliverAppBar(
-        shape: const RoundedRectangleBorder(side: BorderSide.none),
-        elevation: 0,
-        backgroundColor:
-            backgroundColor ?? context.theme.scaffoldBackgroundColor,
-        automaticallyImplyLeading: false,
-        pinned: true,
-        centerTitle: true,
-        titleSpacing: 0,
-        title: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: kLargestSpace),
-          child: controlPanel,
-        ),
-        bottom: const SliverAppBarBottomSpace(),
-        onStretchTrigger: onStretchTrigger,
+    return SliverAppBar(
+      shape: const RoundedRectangleBorder(side: BorderSide.none),
+      elevation: 0,
+      backgroundColor: backgroundColor ?? context.theme.scaffoldBackgroundColor,
+      automaticallyImplyLeading: false,
+      pinned: true,
+      centerTitle: true,
+      titleSpacing: 0,
+      toolbarHeight: 70,
+      title: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: kLargestSpace),
+        child: controlPanel,
       ),
+      bottom: const SliverAppBarBottomSpace(),
+      onStretchTrigger: onStretchTrigger,
     );
   }
 }

lib/common/view/theme.dart

@@ -290,11 +290,7 @@ EdgeInsets getCountryPillPadding(bool useYaruTheme) => useYaruTheme
     ? const EdgeInsets.only(bottom: 9, top: 9, right: 15, left: 15)
     : const EdgeInsets.only(top: 11, bottom: 11, left: 15, right: 15);
 
-double getInputHeight(bool useYaruTheme) => isMobile
-    ? 40
-    : useYaruTheme
-    ? kYaruTitleBarItemHeight
-    : 36;
+double getInputHeight() => isMobile ? 40 : 36;
 
 double get audioCardDimension => kAudioCardDimension - (isMobile ? 15 : 0);
 

lib/local_audio/local_audio_model.dart

@@ -77,11 +77,14 @@ class LocalAudioModel extends SafeChangeNotifier {
     notifyListeners();
   }
 
-  bool _showPlaylistAddAudios = true;
+  bool _showPlaylistAddAudios = false;
   bool get showPlaylistAddAudios => _showPlaylistAddAudios;
   void setShowPlaylistAddAudios(bool value) {
     if (value == _showPlaylistAddAudios) return;
     _showPlaylistAddAudios = value;
+    if (_showPlaylistAddAudios && audios == null) {
+      initAudiosCommand.run((directory: null, forceInit: false));
+    }
     notifyListeners();
   }