Merge branch 'master' into feat-shuffle-button

lib/components/root/sidebar.dart

@@ -94,7 +94,18 @@ class Sidebar extends HookConsumerWidget {
               final icon = Icon(e.icon);
               return MapEntry(
                 PlatformSidebarItem(
-                  icon: icon,
+                  icon: Badge(
+                    badgeColor: PlatformTheme.of(context).primaryColor!,
+                    showBadge: e.title == "Library" && downloadCount > 0,
+                    badgeContent: Text(
+                      downloadCount.toString(),
+                      style: const TextStyle(
+                        color: Colors.white,
+                        fontSize: 10,
+                      ),
+                    ),
+                    child: icon,
+                  ),
                   title: Text(
                     e.title,
                     style: const TextStyle(

lib/components/shared/playbutton_card.dart

@@ -119,12 +119,7 @@ class PlaybuttonCard extends HookWidget {
                         bottom: 10,
                         end: 5,
                         child: Builder(builder: (context) {
-                          return Container(
+                          return PlatformIconButton(
-                            decoration: BoxDecoration(
-                              color: iconBgColor,
-                              shape: BoxShape.circle,
-                            ),
-                            child: PlatformIconButton(
                             onPressed: onPlaybuttonPressed,
                             backgroundColor:
                                 PlatformTheme.of(context).primaryColor,
@@ -132,11 +127,19 @@ class PlaybuttonCard extends HookWidget {
                                 .primaryColor
                                 ?.withOpacity(0.5),
                             icon: isLoading
-                                  ? const SizedBox(
+                                ? SizedBox(
                                     height: 23,
                                     width: 23,
-                                      child:
+                                    child: PlatformCircularProgressIndicator(
-                                          PlatformCircularProgressIndicator(),
+                                      color:
+                                          ThemeData.estimateBrightnessForColor(
+                                                    PlatformTheme.of(context)
+                                                        .primaryColor!,
+                                                  ) ==
+                                                  Brightness.dark
+                                              ? Colors.white
+                                              : Colors.grey[900],
+                                    ),
                                   )
                                 : Icon(
                                     isPlaying
@@ -144,7 +147,6 @@ class PlaybuttonCard extends HookWidget {
                                         : Icons.play_arrow_rounded,
                                     color: Colors.white,
                                   ),
-                            ),
                           );
                         }),
                       )

lib/components/shared/track_table/track_collection_view.dart

@@ -71,22 +71,17 @@ class TrackCollectionView<T> extends HookConsumerWidget {
         ),
       if (heartBtn != null) heartBtn!,
       if (shuffleButton != null) shuffleButton!,
-
+      const SizedBox(width: 5),
-
       // play playlist
-      Container(
+      PlatformIconButton(
-        margin: const EdgeInsets.symmetric(vertical: 10),
+        backgroundColor: PlatformTheme.of(context).primaryColor,
-        child: PlatformFilledButton(
-          style: ButtonStyle(
-            shape: MaterialStateProperty.all(const CircleBorder()),
-          ),
         onPressed: tracksSnapshot.data != null ? onPlay : null,
-          child: Icon(
+        icon: Icon(
           isPlaying ? Icons.stop_rounded : Icons.play_arrow_rounded,
-            color: Theme.of(context).backgroundColor,
+          color: PlatformTextTheme.of(context).body?.color,
-          ),
         ),
       ),
+      const SizedBox(width: 10),
     ];
 
     final controller = useScrollController();

lib/entities/cache_track.dart

@@ -1,7 +1,7 @@
 import 'package:hive/hive.dart';
 import 'package:youtube_explode_dart/youtube_explode_dart.dart';
 
-part 'CacheTrack.g.dart';
+part 'cache_track.g.dart';
 
 @HiveType(typeId: 2)
 class CacheTrackEngagement {

lib/entities/cache_track.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'CacheTrack.dart';
+part of 'cache_track.dart';
 
 // **************************************************************************
 // TypeAdapterGenerator

lib/extensions/video.dart

@@ -1,4 +1,4 @@
-import 'package:spotube/entities/CacheTrack.dart';
+import 'package:spotube/entities/cache_track.dart';
 import 'package:spotube/utils/duration.dart';
 import 'package:youtube_explode_dart/youtube_explode_dart.dart';
 

lib/main.dart

@@ -12,7 +12,7 @@ import 'package:platform_ui/platform_ui.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:spotube/collections/cache_keys.dart';
 import 'package:spotube/components/shared/dialogs/replace_downloaded_dialog.dart';
-import 'package:spotube/entities/CacheTrack.dart';
+import 'package:spotube/entities/cache_track.dart';
 import 'package:spotube/collections/routes.dart';
 import 'package:spotube/collections/intents.dart';
 import 'package:spotube/models/logger.dart';
@@ -40,7 +40,7 @@ void main() async {
       final savedSize = rawSize != null ? json.decode(rawSize) : null;
       final double? height = savedSize?["height"];
       final double? width = savedSize?["width"];
-      appWindow.minSize = const Size(900, 700);
+      appWindow.minSize = const Size(1020, 700);
       appWindow.alignment = Alignment.center;
       appWindow.title = "Spotube";
       if (height != null && width != null && height >= 700 && width >= 359) {

lib/provider/playback_provider.dart

@@ -7,7 +7,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:hive/hive.dart';
 import 'package:spotify/spotify.dart';
-import 'package:spotube/entities/CacheTrack.dart';
+import 'package:spotube/entities/cache_track.dart';
 import 'package:spotube/extensions/video.dart';
 import 'package:spotube/models/current_playlist.dart';
 import 'package:spotube/models/logger.dart';

pubspec.lock

@@ -1050,9 +1050,11 @@ packages:
   platform_ui:
     dependency: "direct main"
     description:
-      path: "../platform_ui"
+      path: "."
-      relative: true
+      ref: fdff4771fed193aece0862c3216a8457410a856a
-    source: path
+      resolved-ref: fdff4771fed193aece0862c3216a8457410a856a
+      url: "https://github.com/KRTirtho/platform_ui.git"
+    source: git
     version: "0.1.0"
   plugin_platform_interface:
     dependency: transitive

pubspec.yaml

@@ -63,7 +63,9 @@ dependencies:
   tuple: ^2.0.1
   uuid: ^3.0.6
   platform_ui:
-    path: ../platform_ui
+    git:
+      url: https://github.com/KRTirtho/platform_ui.git
+      ref: fdff4771fed193aece0862c3216a8457410a856a
   fluent_ui: ^4.0.3
   macos_ui: ^1.7.5
   libadwaita: ^1.2.5