feat: pressing "jump to day" icon will open with the current day at s…

…croll position
namidaco · Oct 10, 2024 · e0cdb64 · e0cdb64
1 parent 30d9cc1
commit e0cdb64
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/lib/core/functions.dart b/lib/core/functions.dart
@@ -611,6 +611,7 @@ Future<void> showCalendarDialog<T extends ItemWithDate, E>({
   HistoryManager<T, E>? historyController,
   void Function(List<DateTime> dates)? onChanged,
   required void Function(List<DateTime> dates) onGenerate,
+  DateTime? initialDate,
 }) async {
   historyController ??= HistoryController.inst as HistoryManager<T, E>;
 
@@ -668,6 +669,7 @@ Future<void> showCalendarDialog<T extends ItemWithDate, E>({
         ),
       ],
       child: CalendarDatePicker2(
+        displayedMonthDate: initialDate,
         onValueChanged: (value) {
           final dts = value.whereType<DateTime>().toList();
           dates.assignAll(dts);
@@ -679,6 +681,7 @@ Future<void> showCalendarDialog<T extends ItemWithDate, E>({
         },
         config: CalendarDatePicker2Config(
           calendarType: calendarType,
+          currentDate: initialDate,
           firstDate: useHistoryDates ? historyController.oldestTrack?.dateTimeAdded : firstDate,
           lastDate: useHistoryDates ? historyController.newestTrack?.dateTimeAdded : lastDate,
         ),

diff --git a/lib/core/namida_converter_ext.dart b/lib/core/namida_converter_ext.dart
@@ -33,6 +33,7 @@ import 'package:namida/controller/search_sort_controller.dart';
 import 'package:namida/controller/selected_tracks_controller.dart';
 import 'package:namida/controller/settings_controller.dart';
 import 'package:namida/core/constants.dart';
+import 'package:namida/core/dimensions.dart';
 import 'package:namida/core/enums.dart';
 import 'package:namida/core/extensions.dart';
 import 'package:namida/core/functions.dart';
@@ -902,9 +903,27 @@ extension RouteUtils on NamidaRoute {
               route == RouteType.SUBPAGE_queueTracks,
         ),
 
-      getAnimatedCrossFade(child: HistoryJumpToDayIcon(controller: HistoryController.inst), shouldShow: route == RouteType.SUBPAGE_historyTracks),
+      getAnimatedCrossFade(
+        child: HistoryJumpToDayIcon(
+          controller: HistoryController.inst,
+          itemExtentAndDayHeaderExtent: () => (
+            itemExtent: Dimensions.inst.trackTileItemExtent,
+            dayHeaderExtent: kHistoryDayHeaderHeightWithPadding,
+          ),
+        ),
+        shouldShow: route == RouteType.SUBPAGE_historyTracks,
+      ),
 
-      getAnimatedCrossFade(child: HistoryJumpToDayIcon(controller: YoutubeHistoryController.inst), shouldShow: route == RouteType.YOUTUBE_HISTORY_SUBPAGE),
+      getAnimatedCrossFade(
+        child: HistoryJumpToDayIcon(
+          controller: YoutubeHistoryController.inst,
+          itemExtentAndDayHeaderExtent: () => (
+            itemExtent: Dimensions.youtubeCardItemExtent,
+            dayHeaderExtent: kYoutubeHistoryDayHeaderHeightWithPadding,
+          ),
+        ),
+        shouldShow: route == RouteType.YOUTUBE_HISTORY_SUBPAGE,
+      ),
 
       // ---- Playlist Tracks ----
       getAnimatedCrossFade(

diff --git a/lib/ui/widgets/custom_widgets.dart b/lib/ui/widgets/custom_widgets.dart
@@ -2985,20 +2985,24 @@ class NamidaInkWellButton extends StatelessWidget {
 
 class HistoryJumpToDayIcon<T extends ItemWithDate, E> extends StatelessWidget {
   final HistoryManager<T, E> controller;
-  const HistoryJumpToDayIcon({super.key, required this.controller});
+  final ({double itemExtent, double dayHeaderExtent}) Function() itemExtentAndDayHeaderExtent;
+  const HistoryJumpToDayIcon({super.key, required this.controller, required this.itemExtentAndDayHeaderExtent});
 
   @override
   Widget build(BuildContext context) {
     return NamidaAppBarIcon(
       icon: Broken.calendar,
       tooltip: () => lang.JUMP_TO_DAY,
       onPressed: () {
+        final info = itemExtentAndDayHeaderExtent();
+        final currentScrolledDay = controller.currentScrollPositionToDay(info.itemExtent, info.dayHeaderExtent);
         showCalendarDialog(
           historyController: controller,
           title: lang.JUMP_TO_DAY,
           buttonText: lang.JUMP,
           calendarType: CalendarDatePicker2Type.single,
           useHistoryDates: true,
+          initialDate: currentScrolledDay == null ? null : DateTime(1970, 0, currentScrolledDay),
           onGenerate: (dates) {
             NamidaNavigator.inst.closeDialog();
             final dayToScrollTo = dates.firstOrNull?.toDaysSince1970() ?? 0;

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: namida
 description: A Beautiful and Feature-rich Music Player, With YouTube & Video Support Built in Flutter
 publish_to: "none"
-version: 4.5.35-beta+241010221
+version: 4.5.37-beta+241010226
 
 environment:
   sdk: ">=3.4.0 <4.0.0"