chore: various tweaks & fixes

ref #142
namidaco · Mar 24, 2024 · 267e1a3 · 267e1a3
1 parent b2c71ee
commit 267e1a3
Show file tree

Hide file tree

Showing 20 changed files with 90 additions and 70 deletions.
diff --git a/android/app/src/main/kotlin/com/example/namida/StorageUtils.kt b/android/app/src/main/kotlin/com/example/namida/StorageUtils.kt
@@ -30,19 +30,24 @@ public class StorageUtils(private val context: Context) {
 
   fun getStorageDirsData(): MutableList<String> {
     val folders = mutableListOf<String>()
-    for (dir in context.getExternalFilesDirs(null)) {
-      if (dir != null) {
-        folders.add(dir.getAbsolutePath())
+    try {
+      for (dir in context.getExternalFilesDirs(null)) {
+        if (dir != null) {
+          folders.add(dir.getAbsolutePath())
+        }
       }
-    }
+    } catch (ignore: Exception) {}
     return folders
   }
 
   fun getStorageDirsCache(): MutableList<String> {
     val folders = mutableListOf<String>()
-    for (f in context.getExternalCacheDirs()) {
-      folders.add(f.path)
-    }
+    try {
+      for (f in context.getExternalCacheDirs()) {
+        folders.add(f.path)
+      }
+    } catch (ignore: Exception) {}
+
     return folders
   }
 }
diff --git a/lib/controller/backup_controller.dart b/lib/controller/backup_controller.dart
@@ -52,6 +52,7 @@ class BackupController {
           AppPaths.FAVOURITES_PLAYLIST,
           AppPaths.SETTINGS,
           AppPaths.SETTINGS_EQUALIZER,
+          AppPaths.SETTINGS_PLAYER,
           AppPaths.LATEST_QUEUE,
           AppPaths.YT_LIKES_PLAYLIST,
           AppDirs.PLAYLISTS,

diff --git a/lib/core/dimensions.dart b/lib/core/dimensions.dart
@@ -66,7 +66,7 @@ class Dimensions {
   // -- YT --
   static const youtubeCardItemHeight = 24.0 * 3;
   static const youtubeCardItemVerticalPadding = 4.0;
-  static double get youtubeCardItemExtent => youtubeCardItemHeight + tileBottomMargin + 2 * youtubeCardItemVerticalPadding;
+  static const youtubeCardItemExtent = youtubeCardItemHeight + tileBottomMargin + 2 * youtubeCardItemVerticalPadding;
 
   // -- 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: context.width * 0.3 * 9 / 16,
+              thumbnailHeight: Dimensions.youtubeCardItemHeight - Dimensions.youtubeCardItemVerticalPadding,
               fromPlayerQueue: true,
               draggingEnabled: true,
               draggableThumbnail: true,

diff --git a/lib/packages/mp.dart b/lib/packages/mp.dart
@@ -92,7 +92,7 @@ class NamidaYTMiniplayerState extends State<NamidaYTMiniplayer> with SingleTicke
   /// used to invoke other animation (eg. entering video fullscreen),
   bool _alternativePercentage = false;
   bool _isDraggingDownwards = false;
-  double get _percentageMultiplier => _alternativePercentage && _isDraggingDownwards ? 0.5 : 1.0;
+  double get _percentageMultiplier => _alternativePercentage && _isDraggingDownwards ? 0.25 : 1.0;
 
   bool _isDragManagedInternally = true;
   void updatePercentageMultiplier(bool alt) {

diff --git a/lib/ui/widgets/inner_drawer.dart b/lib/ui/widgets/inner_drawer.dart
@@ -79,15 +79,6 @@ class NamidaInnerDrawerState extends State<NamidaInnerDrawer> with SingleTickerP
 
   @override
   Widget build(BuildContext context) {
-    const scaffoldShadows = [
-      BoxShadow(
-        color: Color(0x20202020),
-        blurRadius: 4.0,
-        spreadRadius: 2.0,
-        offset: Offset(-2.0, 0),
-      ),
-    ];
-
     return AnimatedBuilderMulti(
       animation: controller,
       children: [
@@ -129,6 +120,23 @@ class NamidaInnerDrawerState extends State<NamidaInnerDrawer> with SingleTickerP
                   color: context.theme.scaffoldBackgroundColor,
                 ),
               ),
+              Positioned.fill(
+                child: Transform.translate(
+                  offset: Offset(context.width * controller.value * 0.6, 0),
+                  child: DecoratedBox(
+                    decoration: BoxDecoration(
+                      boxShadow: [
+                        BoxShadow(
+                          color: context.theme.colorScheme.primary.withAlpha(context.isDarkMode ? 5 : 25),
+                          blurRadius: 58.0,
+                          spreadRadius: 12.0,
+                          offset: const Offset(-2.0, 0),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
               // -- drawer
               Padding(
                 padding: EdgeInsets.only(right: context.width * (1 - controller.upperBound)),
@@ -151,25 +159,15 @@ class NamidaInnerDrawerState extends State<NamidaInnerDrawer> with SingleTickerP
             Transform.translate(
               offset: Offset(context.width * controller.value, 0),
               child: widget.borderRadius > 0
-                  ? DecoratedBox(
-                      decoration: const BoxDecoration(
-                        boxShadow: scaffoldShadows,
-                      ),
-                      child: ClipPath(
-                        clipper: DecorationClipper(
-                          decoration: BoxDecoration(
-                            borderRadius: BorderRadius.circular(widget.borderRadius * controller.value),
-                          ),
+                  ? ClipPath(
+                      clipper: DecorationClipper(
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.circular(widget.borderRadius * controller.value),
                         ),
-                        child: child,
-                      ),
-                    )
-                  : DecoratedBox(
-                      decoration: const BoxDecoration(
-                        boxShadow: scaffoldShadows,
                       ),
                       child: child,
-                    ),
+                    )
+                  : child,
             ),
           ],
         );

diff --git a/lib/ui/widgets/video_widget.dart b/lib/ui/widgets/video_widget.dart
@@ -784,6 +784,7 @@ class NamidaVideoControlsState extends State<NamidaVideoControls> with TickerPro
                                         Navigator.of(context).pop();
                                         if (!isSelected) {
                                           Player.inst.setPlayerSpeed(speed);
+                                          settings.player.save(speed: speed);
                                         }
                                       },
                                       decoration: const BoxDecoration(),

diff --git a/lib/youtube/controller/youtube_controller.dart b/lib/youtube/controller/youtube_controller.dart
@@ -425,7 +425,12 @@ class YoutubeController {
   Future<List<StreamInfoItem>> getChannelStreams(String channelID) async {
     if (channelID == '') return [];
     final url = 'https://www.youtube.com/channel/$channelID';
-    final streams = await NewPipeExtractorDart.channels.getChannelUploads(url);
+    var streams = await NewPipeExtractorDart.channels.getChannelUploads(url);
+    int retries = 3;
+    while (streams.isEmpty && retries > 0) {
+      retries--;
+      streams = await NewPipeExtractorDart.channels.getChannelUploads(url);
+    }
     _fillTempVideoInfoMap(streams);
     return streams;
   }
@@ -1086,7 +1091,8 @@ class YoutubeController {
               config.videoStream = availableVideos.firstWhereEff((e) => e.id == config.prefferedVideoQualityID);
             }
             if (config.videoStream == null || config.videoStream?.url == null || config.videoStream?.url == '') {
-              config.videoStream = getPreferredStreamQuality(availableVideos, qualities: preferredQualities);
+              final webm = config.filename.endsWith('.webm') || config.filename.endsWith('.WEBM');
+              config.videoStream = getPreferredStreamQuality(availableVideos, qualities: preferredQualities, preferIncludeWebm: webm);
             }
             completerV.completeIfWasnt();
           });

diff --git a/lib/youtube/controller/youtube_import_controller.dart b/lib/youtube/controller/youtube_import_controller.dart
@@ -195,8 +195,9 @@ class YoutubeImportController {
     final file = File(filePath);
     try {
       final lines = file.readAsLinesSync();
-      lines.removeAt(0);
+      final header = lines.removeAt(0);
       final list = <({String id, String title})>[];
+      if (header.split(',').length < 3) return list;
       lines.loop((e, _) {
         try {
           final parts = e.split(','); // id, url, name

diff --git a/lib/youtube/pages/youtube_page.dart b/lib/youtube/pages/youtube_page.dart
@@ -28,7 +28,7 @@ class _YoutubePageState extends State<YoutubePage> with AutomaticKeepAliveClient
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    final thumbnailWidth = context.width * 0.36;
+    final thumbnailWidth = context.width * 0.36; // card height is dynamic
     final thumbnailHeight = thumbnailWidth * 9 / 16;
     final thumbnailItemExtent = thumbnailHeight + 8.0 * 2;
     return BackgroundWrapper(

diff --git a/lib/youtube/pages/yt_channel_subpage.dart b/lib/youtube/pages/yt_channel_subpage.dart
@@ -111,9 +111,9 @@ class _YTChannelSubpageState extends YoutubeChannelController<YTChannelSubpage>
 
   @override
   Widget build(BuildContext context) {
-    final thumbnailWidth = context.width * 0.28;
-    final thumbnailHeight = thumbnailWidth * 9 / 16;
-    final thumbnailItemExtent = thumbnailHeight + 8.0 * 2;
+    const thumbnailHeight = 0.8 * (Dimensions.youtubeCardItemHeight - Dimensions.youtubeCardItemVerticalPadding);
+    const thumbnailWidth = thumbnailHeight * 16 / 9;
+    const thumbnailItemExtent = thumbnailHeight + 8.0 * 2;
     final channelID = _channelInfo?.id ?? ch.channelID;
     final avatarUrl = _channelInfo?.avatarUrl ?? _channelInfo?.thumbnailUrl ?? ch.channelID;
     final bannerUrl = _channelInfo?.bannerUrl ?? _channelInfo?.bannerUrl;
@@ -309,7 +309,7 @@ class _YTChannelSubpageState extends YoutubeChannelController<YTChannelSubpage>
                       child: ListView.builder(
                         itemCount: 15,
                         itemBuilder: (context, index) {
-                          return YoutubeVideoCard(
+                          return const YoutubeVideoCard(
                             thumbnailHeight: thumbnailHeight,
                             thumbnailWidth: thumbnailWidth,
                             isImageImportantInCache: false,

diff --git a/lib/youtube/pages/yt_channels_page.dart b/lib/youtube/pages/yt_channels_page.dart
@@ -158,9 +158,9 @@ class _YoutubeChannelsPageState extends YoutubeChannelController<YoutubeChannels
   Widget build(BuildContext context) {
     const horizontalPadding = 6.0;
 
-    final thumbnailWidth = context.width * 0.28;
-    final thumbnailHeight = thumbnailWidth * 9 / 16;
-    final thumbnailItemExtent = thumbnailHeight + 8.0 * 2;
+    const thumbnailHeight = 0.8 * (Dimensions.youtubeCardItemHeight - Dimensions.youtubeCardItemVerticalPadding);
+    const thumbnailWidth = thumbnailHeight * 16 / 9;
+    const thumbnailItemExtent = thumbnailHeight + 8.0 * 2;
 
     final ch = channel;
 
@@ -329,7 +329,7 @@ class _YoutubeChannelsPageState extends YoutubeChannelController<YoutubeChannels
                           child: ListView.builder(
                             itemCount: 15,
                             itemBuilder: (context, index) {
-                              return YoutubeVideoCard(
+                              return const YoutubeVideoCard(
                                 thumbnailHeight: thumbnailHeight,
                                 thumbnailWidth: thumbnailWidth,
                                 isImageImportantInCache: false,

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

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

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

diff --git a/lib/youtube/pages/yt_search_results_page.dart b/lib/youtube/pages/yt_search_results_page.dart
@@ -99,13 +99,13 @@ class YoutubeSearchResultsPageState extends State<YoutubeSearchResultsPage> with
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    final thumbnailWidth = context.width * 0.36;
-    final thumbnailHeight = thumbnailWidth * 9 / 16;
-    final thumbnailItemExtent = thumbnailHeight + 8.0 * 2;
+    const thumbnailHeight = Dimensions.youtubeCardItemHeight - Dimensions.youtubeCardItemVerticalPadding;
+    const thumbnailWidth = thumbnailHeight * 16 / 9;
+    const thumbnailItemExtent = thumbnailHeight + 8.0 * 2;
     const localMultiplier = 0.7;
-    final thumbnailWidthLocal = thumbnailWidth * localMultiplier;
-    final thumbnailHeightLocal = thumbnailHeight * localMultiplier;
-    final thumbnailItemExtentLocal = thumbnailItemExtent * localMultiplier;
+    const thumbnailWidthLocal = thumbnailWidth * localMultiplier;
+    const thumbnailHeightLocal = thumbnailHeight * localMultiplier;
+    const thumbnailItemExtentLocal = thumbnailItemExtent * localMultiplier;
     return BackgroundWrapper(
       child: Navigator(
         key: NamidaNavigator.inst.ytLocalSearchNavigatorKey,

diff --git a/lib/youtube/widgets/yt_card.dart b/lib/youtube/widgets/yt_card.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
+import 'package:namida/core/dimensions.dart';
 import 'package:namida/core/extensions.dart';
 import 'package:namida/ui/widgets/custom_widgets.dart';
 import 'package:namida/youtube/widgets/yt_shimmer.dart';
@@ -69,8 +70,9 @@ class YoutubeCard extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     const verticalPadding = 8.0;
-    final thumbnailWidth = this.thumbnailWidth ?? (thumbnailWidthPercentage * context.width * 0.36);
-    final thumbnailHeight = this.thumbnailHeight ?? (isCircle ? thumbnailWidth : thumbnailWidth * 9 / 16);
+
+    final thumbnailHeight = this.thumbnailHeight ?? (thumbnailWidthPercentage * (Dimensions.youtubeCardItemHeight - Dimensions.youtubeCardItemVerticalPadding));
+    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
@@ -141,7 +141,8 @@ class YTMiniplayerQueueChipState extends State<YTMiniplayerQueueChip> with Ticke
   Widget build(BuildContext context) {
     final maxHeight = context.height;
     const minHeight = kYTQueueSheetMinHeight;
-    final itemThumbnailHeight = context.width * 0.3 * 9 / 16;
+
+    const itemThumbnailHeight = Dimensions.youtubeCardItemHeight - Dimensions.youtubeCardItemVerticalPadding;
 
     return Stack(
       alignment: Alignment.bottomCenter,

diff --git a/lib/youtube/youtube_miniplayer.dart b/lib/youtube/youtube_miniplayer.dart
@@ -84,9 +84,9 @@ class _YoutubeMiniPlayerState extends State<YoutubeMiniPlayer> {
     const space5sb = 8.0;
     const miniplayerHeight = kYoutubeMiniplayerHeight;
 
-    final relatedThumbnailWidth = context.width * 0.36;
-    final relatedThumbnailHeight = relatedThumbnailWidth * 9 / 16;
-    final relatedThumbnailItemExtent = relatedThumbnailHeight + 8.0 * 2;
+    const relatedThumbnailHeight = Dimensions.youtubeCardItemHeight - Dimensions.youtubeCardItemVerticalPadding;
+    const relatedThumbnailWidth = relatedThumbnailHeight * 16 / 9;
+    const relatedThumbnailItemExtent = relatedThumbnailHeight + 8.0 * 2;
 
     final miniplayerBGColor = Color.alphaBlend(context.theme.secondaryHeaderColor.withOpacity(0.25), context.theme.scaffoldBackgroundColor);
 
@@ -1146,7 +1146,7 @@ class _YoutubeMiniPlayerState extends State<YoutubeMiniPlayer> {
                                 alignment: Alignment.centerRight,
                                 child: SizedBox(
                                   height: context.height,
-                                  width: (context.width / 2).withMaximum(324.0),
+                                  width: (context.width * 0.25).withMaximum(324.0),
                                   child: Listener(
                                     behavior: HitTestBehavior.translucent,
                                     onPointerDown: (event) {

diff --git a/lib/youtube/youtube_playlists_view.dart b/lib/youtube/youtube_playlists_view.dart
@@ -83,6 +83,10 @@ class YoutubePlaylistsView extends StatelessWidget {
   Widget build(BuildContext context) {
     final isMinimalView = minimalView ?? idsToAdd.isNotEmpty;
 
+    const playlistsItemExtent = Dimensions.youtubeCardItemExtent * 0.9;
+    const playlistThumbnailHeight = playlistsItemExtent - Dimensions.tileBottomMargin - (Dimensions.youtubeCardItemVerticalPadding * 2);
+    const playlistThumbnailWidth = playlistThumbnailHeight * 16 / 9;
+
     return NamidaScrollbarWithController(
       child: (sc) => CustomScrollView(
         controller: sc,
@@ -254,7 +258,7 @@ class YoutubePlaylistsView extends StatelessWidget {
               final playlistsMap = YoutubePlaylistController.inst.playlistsMap;
               final playlistsNames = playlistsMap.keys.toList();
               return SliverFixedExtentList.builder(
-                itemExtent: Dimensions.youtubeCardItemExtent * 0.9,
+                itemExtent: playlistsItemExtent,
                 itemCount: playlistsNames.length,
                 itemBuilder: (context, index) {
                   final name = playlistsNames[index];
@@ -278,6 +282,8 @@ class YoutubePlaylistsView extends StatelessWidget {
                           thirdLineText: Jiffy.parseFromMillisecondsSinceEpoch(playlist.modifiedDate).fromNow(),
                           displayChannelThumbnail: false,
                           channelThumbnailUrl: '',
+                          thumbnailHeight: playlistThumbnailHeight,
+                          thumbnailWidth: playlistThumbnailWidth,
                           onTap: () {
                             if (idsToAdd.isNotEmpty) {
                               if (idsExist == true) {