diff --git a/lib/ui/player/components/albumart_lyrics.dart b/lib/ui/player/components/albumart_lyrics.dart index 280a3a6a..2424a2ee 100644 --- a/lib/ui/player/components/albumart_lyrics.dart +++ b/lib/ui/player/components/albumart_lyrics.dart @@ -15,7 +15,7 @@ class AlbumArtNLyrics extends StatelessWidget { @override Widget build(BuildContext context) { final PlayerController playerController = Get.find(); - final size = MediaQuery.of(context).size; + //final size = MediaQuery.of(context).size; //double playerArtImageSize = size.width - ((size.height < 750) ? 90 : 60); return Obx(() => playerController.currentSong.value != null ? Stack( diff --git a/lib/ui/screens/Artists/artist_screen.dart b/lib/ui/screens/Artists/artist_screen.dart index e74e4945..9ba3a1f6 100644 --- a/lib/ui/screens/Artists/artist_screen.dart +++ b/lib/ui/screens/Artists/artist_screen.dart @@ -60,43 +60,51 @@ class ArtistScreen extends StatelessWidget { artistScreenController: artistScreenController, tag: tag) : Row( children: [ - Obx( - () => NavigationRail( - onDestinationSelected: - artistScreenController.onDestinationSelected, - minWidth: 60, - destinations: [ - "about".tr, - "songs".tr, - "videos".tr, - "albums".tr, - "singles".tr - ].map((e) => railDestination(e)).toList(), - leading: Column( - children: [ - SizedBox( - height: context.isLandscape ? 20.0 : 45.0, - ), - IconButton( - icon: Icon( - Icons.arrow_back_ios_new_rounded, - color: - Theme.of(context).textTheme.titleMedium!.color, + Align( + alignment: Alignment.topCenter, + child: SingleChildScrollView( + padding: const EdgeInsets.only(bottom: 80), + child: IntrinsicHeight( + child: Obx( + () => NavigationRail( + onDestinationSelected: + artistScreenController.onDestinationSelected, + minWidth: 60, + destinations: [ + "about".tr, + "songs".tr, + "videos".tr, + "albums".tr, + "singles".tr + ].map((e) => railDestination(e)).toList(), + leading: Column( + children: [ + SizedBox( + height: context.isLandscape ? 20.0 : 45.0, + ), + IconButton( + icon: Icon( + Icons.arrow_back_ios_new_rounded, + color: + Theme.of(context).textTheme.titleMedium!.color, + ), + onPressed: () { + Get.nestedKey(ScreenNavigationSetup.id)! + .currentState! + .pop(); + }, + ), + const SizedBox( + height: 10, + ), + ], ), - onPressed: () { - Get.nestedKey(ScreenNavigationSetup.id)! - .currentState! - .pop(); - }, - ), - const SizedBox( - height: 10, + labelType: NavigationRailLabelType.all, + selectedIndex: + artistScreenController.navigationRailCurrentIndex.value, ), - ], + ), ), - labelType: NavigationRailLabelType.all, - selectedIndex: - artistScreenController.navigationRailCurrentIndex.value, ), ), Expanded(