fix: dialog logo in android, lyrics visible timer adjust button

KRTirtho · Nov 24, 2022 · 3c6803b · 3c6803b
1 parent be56ad4
commit 3c6803b
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 48 deletions.
diff --git a/lib/components/Lyrics/LyricDelayAdjustDialog.dart b/lib/components/Lyrics/LyricDelayAdjustDialog.dart
@@ -18,7 +18,7 @@ class LyricDelayAdjustDialog extends HookConsumerWidget {
         double.tryParse(controller.text.replaceAll("ms", "")) ?? 0;
 
     return PlatformAlertDialog(
-      icon: Sidebar.brandLogo(),
+      macosAppIcon: Sidebar.brandLogo(),
       title: const Center(child: Text("Adjust Lyrics Delay")),
       secondaryActions: [
         PlatformFilledButton(
@@ -41,36 +41,39 @@ class LyricDelayAdjustDialog extends HookConsumerWidget {
           },
         )
       ],
-      content: Row(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          PlatformIconButton(
-            icon: const Icon(Icons.remove_rounded),
-            onPressed: () {
-              controller.text = "${getValue() - 25}ms";
-            },
-          ),
-          Flexible(
-            child: PlatformTextField(
-              keyboardType: TextInputType.number,
-              controller: controller,
-              placeholder: "Delay in milliseconds",
-              onSubmitted: (_) {
-                Navigator.of(context).pop(
-                  Duration(
-                    milliseconds: getValue().toInt(),
-                  ),
-                );
+      content: SizedBox(
+        height: 100,
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            PlatformIconButton(
+              icon: const Icon(Icons.remove_rounded),
+              onPressed: () {
+                controller.text = "${getValue() - 25}ms";
               },
             ),
-          ),
-          PlatformIconButton(
-            icon: const Icon(Icons.add_rounded),
-            onPressed: () {
-              controller.text = "${getValue() + 25}ms";
-            },
-          ),
-        ],
+            Flexible(
+              child: PlatformTextField(
+                keyboardType: TextInputType.number,
+                controller: controller,
+                placeholder: "Delay in milliseconds",
+                onSubmitted: (_) {
+                  Navigator.of(context).pop(
+                    Duration(
+                      milliseconds: getValue().toInt(),
+                    ),
+                  );
+                },
+              ),
+            ),
+            PlatformIconButton(
+              icon: const Icon(Icons.add_rounded),
+              onPressed: () {
+                controller.text = "${getValue() + 25}ms";
+              },
+            ),
+          ],
+        ),
       ),
     );
   }

diff --git a/lib/components/Lyrics/SyncedLyrics.dart b/lib/components/Lyrics/SyncedLyrics.dart
@@ -87,18 +87,24 @@ class SyncedLyrics extends HookConsumerWidget {
                 Positioned.fill(
                   child: Align(
                     alignment: Alignment.centerRight,
-                    child: PlatformIconButton(
-                      tooltip: "Lyrics Delay",
-                      icon: const Icon(Icons.av_timer_rounded),
-                      onPressed: () async {
-                        final delay = await showPlatformAlertDialog(
-                          context,
-                          builder: (context) => const LyricDelayAdjustDialog(),
-                        );
-                        if (delay != null) {
-                          ref.read(lyricDelayState.notifier).state = delay;
-                        }
-                      },
+                    child: Padding(
+                      padding: const EdgeInsets.all(8.0),
+                      child: PlatformFilledButton(
+                        child: const Icon(
+                          Icons.av_timer_rounded,
+                          size: 16,
+                        ),
+                        onPressed: () async {
+                          final delay = await showPlatformAlertDialog(
+                            context,
+                            builder: (context) =>
+                                const LyricDelayAdjustDialog(),
+                          );
+                          if (delay != null) {
+                            ref.read(lyricDelayState.notifier).state = delay;
+                          }
+                        },
+                      ),
                     ),
                   ),
                 ),

diff --git a/lib/components/Playlist/PlaylistCreateDialog.dart b/lib/components/Playlist/PlaylistCreateDialog.dart
@@ -26,7 +26,7 @@ class PlaylistCreateDialog extends HookConsumerWidget {
               final collaborative = useState(false);
 
               return PlatformAlertDialog(
-                icon: Sidebar.brandLogo(),
+                macosAppIcon: Sidebar.brandLogo(),
                 title: const Text("Create a Playlist"),
                 primaryActions: [
                   PlatformFilledButton(

diff --git a/lib/components/Settings/ColorSchemePickerDialog.dart b/lib/components/Settings/ColorSchemePickerDialog.dart
@@ -68,7 +68,7 @@ class ColorSchemePickerDialog extends HookConsumerWidget {
     ).key);
 
     return PlatformAlertDialog(
-      icon: Sidebar.brandLogo(),
+      macosAppIcon: Sidebar.brandLogo(),
       title: Text("Pick ${schemeType.name} color scheme"),
       primaryActions: [
         PlatformFilledButton(

diff --git a/lib/components/Shared/AdaptiveListTile.dart b/lib/components/Shared/AdaptiveListTile.dart
@@ -41,7 +41,7 @@ class AdaptiveListTile extends HookWidget {
                 builder: (context) {
                   return StatefulBuilder(builder: (context, update) {
                     return PlatformAlertDialog(
-                      icon: Sidebar.brandLogo(),
+                      macosAppIcon: Sidebar.brandLogo(),
                       title: title != null
                           ? Row(
                               crossAxisAlignment: CrossAxisAlignment.center,

diff --git a/lib/components/Shared/DownloadConfirmationDialog.dart b/lib/components/Shared/DownloadConfirmationDialog.dart
@@ -9,7 +9,7 @@ class DownloadConfirmationDialog extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return PlatformAlertDialog(
-      icon: Sidebar.brandLogo(),
+      macosAppIcon: Sidebar.brandLogo(),
       title: Padding(
         padding: const EdgeInsets.all(15),
         child: Row(

diff --git a/lib/components/Shared/ReplaceDownloadedFileDialog.dart b/lib/components/Shared/ReplaceDownloadedFileDialog.dart
@@ -16,7 +16,7 @@ class ReplaceDownloadedFileDialog extends ConsumerWidget {
     final groupValue = ref.watch(replaceDownloadedFileState);
 
     return PlatformAlertDialog(
-      icon: Sidebar.brandLogo(),
+      macosAppIcon: Sidebar.brandLogo(),
       title: Text("Track ${track.name} Already Exists"),
       content: Column(
         mainAxisSize: MainAxisSize.min,

diff --git a/lib/components/Shared/TrackTile.dart b/lib/components/Shared/TrackTile.dart
@@ -96,7 +96,7 @@ class TrackTile extends HookConsumerWidget {
               return HookBuilder(builder: (context) {
                 final playlistsCheck = useState(<String, bool>{});
                 return PlatformAlertDialog(
-                  icon: Sidebar.brandLogo(),
+                  macosAppIcon: Sidebar.brandLogo(),
                   title: PlatformText(
                     "Add `${track.value.name}` to following Playlists",
                     style: const TextStyle(

diff --git a/lib/hooks/useUpdateChecker.dart b/lib/hooks/useUpdateChecker.dart
@@ -57,7 +57,7 @@ void useUpdateChecker(WidgetRef ref) {
         const url =
             "https://spotube.netlify.app/other-downloads/stable-downloads";
         return PlatformAlertDialog(
-          icon: Sidebar.brandLogo(),
+          macosAppIcon: Sidebar.brandLogo(),
           title: const PlatformText("Spotube has an update"),
           primaryActions: [
             PlatformFilledButton(