From 6818a61b6e8441cbef13e3e36222270c3d3f3540 Mon Sep 17 00:00:00 2001 From: MSOB7YY Date: Tue, 19 Dec 2023 04:54:16 +0200 Subject: [PATCH] chore: ui tweaks --- lib/packages/miniplayer.dart | 9 +++++---- lib/ui/pages/home_page.dart | 15 ++++++++------- lib/ui/widgets/artwork.dart | 2 +- lib/ui/widgets/custom_widgets.dart | 3 ++- lib/youtube/pages/yt_channels_page.dart | 1 + lib/youtube/widgets/yt_comment_card.dart | 12 ++++++------ lib/youtube/widgets/yt_video_card.dart | 2 +- lib/youtube/youtube_miniplayer.dart | 1 + 8 files changed, 25 insertions(+), 20 deletions(-) diff --git a/lib/packages/miniplayer.dart b/lib/packages/miniplayer.dart index d56ab90d..9c947031 100644 --- a/lib/packages/miniplayer.dart +++ b/lib/packages/miniplayer.dart @@ -76,11 +76,12 @@ class _MiniPlayerParentState extends State with SingleTickerPr Positioned.fill( child: AnimatedBuilder( animation: widget.animation, + child: const Wallpaper(gradient: false, particleOpacity: .3), builder: (context, child) { if (widget.animation.value > 0.01) { return NamidaOpacity( opacity: widget.animation.value.clamp(0.0, 1.0), - child: const Wallpaper(gradient: false, particleOpacity: .3), + child: child!, ); } else { return const SizedBox(); @@ -2349,16 +2350,15 @@ class LyricsWrapper extends StatelessWidget { @override Widget build(BuildContext context) { - // if (cp == 0.0) return child; - final childFinal = enableChildBorderRadius ? ClipRRect( - key: Key("${(6.0 + 10.0 * cp).multipliedRadius}"), borderRadius: BorderRadius.circular((6.0 + 10.0 * cp).multipliedRadius), child: child, ) : child; + if (cp == 0.0) return childFinal; + return Obx( () => AnimatedSwitcher( key: Key(track.path), @@ -2375,6 +2375,7 @@ class LyricsWrapper extends StatelessWidget { ) : Lyrics.inst.currentLyricsText.value != '' ? Stack( + key: const Key('child_2'), alignment: Alignment.center, children: [ childFinal, diff --git a/lib/ui/pages/home_page.dart b/lib/ui/pages/home_page.dart index c65478d5..637fe336 100644 --- a/lib/ui/pages/home_page.dart +++ b/lib/ui/pages/home_page.dart @@ -874,18 +874,19 @@ class _MixesCardState extends State<_MixesCard> { Positioned( top: 12.0, left: 0.0, - child: ClipRect( + child: Container( + clipBehavior: Clip.hardEdge, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: context.theme.colorScheme.background.withAlpha(50), + ), child: NamidaBgBlur( blur: 2.0, - child: Container( - decoration: BoxDecoration( - shape: BoxShape.circle, - color: context.theme.cardColor.withAlpha(50), - ), + child: Padding( padding: const EdgeInsets.all(2.0), child: NamidaIconButton( icon: Broken.arrow_left_2, - iconColor: context.theme.cardColor.withAlpha(160), + iconColor: context.theme.colorScheme.onBackground.withAlpha(160), onPressed: NamidaNavigator.inst.closeDialog, ), ), diff --git a/lib/ui/widgets/artwork.dart b/lib/ui/widgets/artwork.dart index f1e788d5..0e29007e 100644 --- a/lib/ui/widgets/artwork.dart +++ b/lib/ui/widgets/artwork.dart @@ -201,7 +201,7 @@ class _ArtworkWidgetState extends State { width: realWidthAndHeight, height: realWidthAndHeight, frameBuilder: ((context, child, frame, wasSynchronouslyLoaded) { - if (wasSynchronouslyLoaded) return child; + if (wasSynchronouslyLoaded || bytes?.isNotEmpty == true) return child; return AnimatedSwitcher( duration: Duration(milliseconds: widget.fadeMilliSeconds), child: frame != null ? child : const SizedBox(), diff --git a/lib/ui/widgets/custom_widgets.dart b/lib/ui/widgets/custom_widgets.dart index 414e65e9..d852b01a 100644 --- a/lib/ui/widgets/custom_widgets.dart +++ b/lib/ui/widgets/custom_widgets.dart @@ -2021,9 +2021,10 @@ class _FadeDismissibleState extends State { direction: widget.direction, child: ValueListenableBuilder( valueListenable: fadeOpacity, + child: widget.child, builder: (context, value, child) => NamidaOpacity( opacity: 1 - fadeOpacity.value, - child: widget.child, + child: child!, ), ), ); diff --git a/lib/youtube/pages/yt_channels_page.dart b/lib/youtube/pages/yt_channels_page.dart index 73fc50f4..88a9b7ce 100644 --- a/lib/youtube/pages/yt_channels_page.dart +++ b/lib/youtube/pages/yt_channels_page.dart @@ -300,6 +300,7 @@ class _YoutubeChannelsPageState extends State { ), ), ), + const SizedBox(width: 4.0), NamidaButton( text: lang.IMPORT, onPressed: _onSubscriptionFileImportTap, diff --git a/lib/youtube/widgets/yt_comment_card.dart b/lib/youtube/widgets/yt_comment_card.dart index 9a0b4181..1bb687b5 100644 --- a/lib/youtube/widgets/yt_comment_card.dart +++ b/lib/youtube/widgets/yt_comment_card.dart @@ -260,8 +260,8 @@ class YTCommentCardCompact extends StatelessWidget { const SizedBox(height: 2.0), NamidaDummyContainer( width: context.width * 0.5, - height: 12.0, - borderRadius: 6.0, + height: 8.0, + borderRadius: 4.0, shimmerEnabled: author == null, child: Row( children: [ @@ -303,13 +303,13 @@ class YTCommentCardCompact extends StatelessWidget { ? Column( children: [ ...List.filled( - 3, + 2, const Padding( padding: EdgeInsets.only(top: 2.0), child: NamidaDummyContainer( width: null, - height: 12.0, - borderRadius: 4.0, + height: 8.0, + borderRadius: 3.0, shimmerEnabled: true, child: null, ), @@ -336,7 +336,7 @@ class YTCommentCardCompact extends StatelessWidget { const SizedBox(width: 4.0), NamidaDummyContainer( width: 18.0, - height: 8.0, + height: 6.0, borderRadius: 4.0, shimmerEnabled: likeCount == null, child: Text( diff --git a/lib/youtube/widgets/yt_video_card.dart b/lib/youtube/widgets/yt_video_card.dart index 37b2098e..06178227 100644 --- a/lib/youtube/widgets/yt_video_card.dart +++ b/lib/youtube/widgets/yt_video_card.dart @@ -64,7 +64,7 @@ class YoutubeVideoCard extends StatelessWidget { shimmerEnabled: video == null, title: video?.name ?? '', subtitle: [ - if (videoViewCount != null) "${videoViewCount.formatDecimalShort()} ${videoViewCount == 0 ? lang.VIEW : lang.VIEWS}", + if (videoViewCount != null && videoViewCount >= 0) "${videoViewCount.formatDecimalShort()} ${videoViewCount == 0 ? lang.VIEW : lang.VIEWS}", if (video?.textualUploadDate != null) video?.textualUploadDate, ].join(' - '), thirdLineText: video?.uploaderName ?? '', diff --git a/lib/youtube/youtube_miniplayer.dart b/lib/youtube/youtube_miniplayer.dart index 456ed875..9f173984 100644 --- a/lib/youtube/youtube_miniplayer.dart +++ b/lib/youtube/youtube_miniplayer.dart @@ -567,6 +567,7 @@ class YoutubeMiniPlayer extends StatelessWidget { baseIcon: Broken.refresh, secondaryIcon: Broken.global, iconSize: 20.0, + secondaryIconSize: 12.0, ) : Icon( Broken.refresh,