code: refactor yt card dimensions

namidaco · Mar 26, 2024 · 9e8b1da · 9e8b1da
1 parent 9964839
commit 9e8b1da
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/lib/core/dimensions.dart b/lib/core/dimensions.dart
@@ -67,6 +67,8 @@ class Dimensions {
   static const youtubeCardItemHeight = 24.0 * 3;
   static const youtubeCardItemVerticalPadding = 4.0;
   static const youtubeCardItemExtent = youtubeCardItemHeight + tileBottomMargin + 2 * youtubeCardItemVerticalPadding;
+  static const youtubeThumbnailHeight = youtubeCardItemHeight - youtubeCardItemVerticalPadding;
+  static const youtubeThumbnailWidth = youtubeThumbnailHeight * 16 / 9;
 
   // -- Track Tile --
   double trackTileItemExtent = 0.0;

diff --git a/lib/packages/miniplayer.dart b/lib/packages/miniplayer.dart
@@ -395,7 +395,7 @@ class NamidaMiniPlayerYoutubeID extends StatelessWidget {
               playlistName: '',
               openMenuOnLongPress: false,
               displayTimeAgo: false,
-              thumbnailHeight: Dimensions.youtubeCardItemHeight - Dimensions.youtubeCardItemVerticalPadding,
+              thumbnailHeight: Dimensions.youtubeThumbnailHeight,
               fromPlayerQueue: true,
               draggingEnabled: true,
               draggableThumbnail: true,

diff --git a/lib/youtube/pages/yt_channel_subpage.dart b/lib/youtube/pages/yt_channel_subpage.dart
@@ -111,8 +111,8 @@ class _YTChannelSubpageState extends YoutubeChannelController<YTChannelSubpage>
 
   @override
   Widget build(BuildContext context) {
-    const thumbnailHeight = 0.8 * (Dimensions.youtubeCardItemHeight - Dimensions.youtubeCardItemVerticalPadding);
-    const thumbnailWidth = thumbnailHeight * 16 / 9;
+    const thumbnailHeight = Dimensions.youtubeThumbnailHeight;
+    const thumbnailWidth = Dimensions.youtubeThumbnailWidth;
     const thumbnailItemExtent = thumbnailHeight + 8.0 * 2;
     final channelID = _channelInfo?.id ?? ch.channelID;
     final avatarUrl = _channelInfo?.avatarUrl ?? _channelInfo?.thumbnailUrl ?? ch.channelID;

diff --git a/lib/youtube/pages/yt_channels_page.dart b/lib/youtube/pages/yt_channels_page.dart
@@ -158,8 +158,8 @@ class _YoutubeChannelsPageState extends YoutubeChannelController<YoutubeChannels
   Widget build(BuildContext context) {
     const horizontalPadding = 6.0;
 
-    const thumbnailHeight = 0.8 * (Dimensions.youtubeCardItemHeight - Dimensions.youtubeCardItemVerticalPadding);
-    const thumbnailWidth = thumbnailHeight * 16 / 9;
+    const thumbnailHeight = Dimensions.youtubeThumbnailHeight;
+    const thumbnailWidth = Dimensions.youtubeThumbnailWidth;
     const thumbnailItemExtent = thumbnailHeight + 8.0 * 2;
 
     final ch = channel;

diff --git a/lib/youtube/pages/yt_local_search_results.dart b/lib/youtube/pages/yt_local_search_results.dart
@@ -72,8 +72,8 @@ class YTLocalSearchResultsState extends State<YTLocalSearchResults> {
 
   @override
   Widget build(BuildContext context) {
-    const thumbnailHeight = Dimensions.youtubeCardItemHeight - Dimensions.youtubeCardItemVerticalPadding;
-    const thumbnailWidth = thumbnailHeight * 16 / 9;
+    const thumbnailHeight = Dimensions.youtubeThumbnailHeight;
+    const thumbnailWidth = Dimensions.youtubeThumbnailWidth;
     const thumbnailItemExtent = thumbnailHeight + 8.0 * 2;
     return BackgroundWrapper(
       child: NamidaScrollbar(

diff --git a/lib/youtube/pages/yt_playlist_download_subpage.dart b/lib/youtube/pages/yt_playlist_download_subpage.dart
@@ -261,7 +261,7 @@ class _YTPlaylistDownloadPageState extends State<YTPlaylistDownloadPage> {
 
   @override
   Widget build(BuildContext context) {
-    final thumHeight = _hmultiplier * (Dimensions.youtubeCardItemHeight - Dimensions.youtubeCardItemVerticalPadding);
+    final thumHeight = _hmultiplier * Dimensions.youtubeThumbnailHeight;
     final thumWidth = thumHeight * 16 / 9;
     return BackgroundWrapper(
       child: Stack(

diff --git a/lib/youtube/pages/yt_playlist_subpage.dart b/lib/youtube/pages/yt_playlist_subpage.dart
@@ -410,8 +410,8 @@ class _YTHostedPlaylistSubpageState extends State<YTHostedPlaylistSubpage> with
     final bigThumbWidth = context.width - horizontalBigThumbPadding * 2;
     final playlist = widget.playlist;
 
-    const itemsThumbnailHeight = (Dimensions.youtubeCardItemHeight - Dimensions.youtubeCardItemVerticalPadding);
-    const itemsThumbnailWidth = itemsThumbnailHeight * 16 / 9;
+    const itemsThumbnailHeight = Dimensions.youtubeThumbnailHeight;
+    const itemsThumbnailWidth = Dimensions.youtubeThumbnailWidth;
     const itemsThumbnailItemExtent = itemsThumbnailHeight + 8.0 * 2;
 
     final firstID = playlist.streams.firstOrNull?.id;

diff --git a/lib/youtube/pages/yt_search_results_page.dart b/lib/youtube/pages/yt_search_results_page.dart
@@ -99,8 +99,8 @@ class YoutubeSearchResultsPageState extends State<YoutubeSearchResultsPage> with
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    const thumbnailHeight = Dimensions.youtubeCardItemHeight - Dimensions.youtubeCardItemVerticalPadding;
-    const thumbnailWidth = thumbnailHeight * 16 / 9;
+    const thumbnailHeight = Dimensions.youtubeThumbnailHeight;
+    const thumbnailWidth = Dimensions.youtubeThumbnailWidth;
     const thumbnailItemExtent = thumbnailHeight + 8.0 * 2;
     const localMultiplier = 0.7;
     const thumbnailWidthLocal = thumbnailWidth * localMultiplier;

diff --git a/lib/youtube/widgets/yt_card.dart b/lib/youtube/widgets/yt_card.dart
@@ -71,7 +71,7 @@ class YoutubeCard extends StatelessWidget {
   Widget build(BuildContext context) {
     const verticalPadding = 8.0;
 
-    final thumbnailHeight = this.thumbnailHeight ?? (thumbnailWidthPercentage * (Dimensions.youtubeCardItemHeight - Dimensions.youtubeCardItemVerticalPadding));
+    final thumbnailHeight = this.thumbnailHeight ?? (thumbnailWidthPercentage * Dimensions.youtubeThumbnailHeight);
     final thumbnailWidth = this.thumbnailWidth ?? (isCircle ? thumbnailHeight : thumbnailHeight * 16 / 9);
 
     final channelThumbSize = 20.0 * thumbnailWidthPercentage;

diff --git a/lib/youtube/widgets/yt_queue_chip.dart b/lib/youtube/widgets/yt_queue_chip.dart
@@ -142,8 +142,6 @@ class YTMiniplayerQueueChipState extends State<YTMiniplayerQueueChip> with Ticke
     final maxHeight = context.height;
     const minHeight = kYTQueueSheetMinHeight;
 
-    const itemThumbnailHeight = Dimensions.youtubeCardItemHeight - Dimensions.youtubeCardItemVerticalPadding;
-
     return Stack(
       alignment: Alignment.bottomCenter,
       fit: StackFit.expand,
@@ -387,7 +385,7 @@ class YTMiniplayerQueueChipState extends State<YTMiniplayerQueueChip> with Ticke
                                       playlistName: '',
                                       openMenuOnLongPress: false,
                                       displayTimeAgo: false,
-                                      thumbnailHeight: itemThumbnailHeight,
+                                      thumbnailHeight: Dimensions.youtubeThumbnailHeight,
                                       fromPlayerQueue: true,
                                       draggingEnabled: true,
                                       draggableThumbnail: true,

diff --git a/lib/youtube/youtube_miniplayer.dart b/lib/youtube/youtube_miniplayer.dart
@@ -84,8 +84,8 @@ class _YoutubeMiniPlayerState extends State<YoutubeMiniPlayer> {
     const space5sb = 8.0;
     const miniplayerHeight = kYoutubeMiniplayerHeight;
 
-    const relatedThumbnailHeight = Dimensions.youtubeCardItemHeight - Dimensions.youtubeCardItemVerticalPadding;
-    const relatedThumbnailWidth = relatedThumbnailHeight * 16 / 9;
+    const relatedThumbnailHeight = Dimensions.youtubeThumbnailHeight;
+    const relatedThumbnailWidth = Dimensions.youtubeThumbnailWidth;
     const relatedThumbnailItemExtent = relatedThumbnailHeight + 8.0 * 2;
 
     final miniplayerBGColor = Color.alphaBlend(context.theme.secondaryHeaderColor.withOpacity(0.25), context.theme.scaffoldBackgroundColor);