feat(): fix stuff for timestamps

aayush2622 · aayush2622 · commit 469dc193b9c8 · 2024-12-28T23:16:33.000+05:30
diff --git a/lib/Adaptor/Episode/EpisodeCompactViewHolder.dart b/lib/Adaptor/Episode/EpisodeCompactViewHolder.dart
@@ -48,7 +48,7 @@ class EpisodeCompactView extends StatelessWidget {
               context: context,
               mediaId: mediaData.id,
               ep: episode.number,
-              width: 162,
+              width: double.infinity,
             ),
           ),
 
diff --git a/lib/Adaptor/Episode/EpisodeGridViewHolder.dart b/lib/Adaptor/Episode/EpisodeGridViewHolder.dart
@@ -52,7 +52,7 @@ class EpisodeCardView extends StatelessWidget {
             context: context,
             mediaId: mediaData.id,
             ep: episode.number,
-            width: 162,
+            width: double.infinity,
           )
         ],
       ),
diff --git a/lib/Screens/Info/Tabs/Watch/Anime/Player/Platform/WindowsPlayer.dart b/lib/Screens/Info/Tabs/Watch/Anime/Player/Platform/WindowsPlayer.dart
@@ -89,6 +89,7 @@ class WindowsPlayer extends BasePlayer {
         visible: settings.showSubtitle,
         style: TextStyle(
           fontSize: settings.subtitleSize.toDouble(),
+          fontWeight: FontWeight.values[settings.subtitleWeight.toInt()],
           fontFamily: settings.subtitleFont,
           backgroundColor: Color(settings.subtitleBackgroundColor),
           color: Color(settings.subtitleColor),
diff --git a/lib/Screens/Info/Tabs/Watch/Anime/Player/PlayerController.dart b/lib/Screens/Info/Tabs/Watch/Anime/Player/PlayerController.dart
@@ -88,19 +88,24 @@ class _PlayerControllerState extends State<PlayerController> {
     setDiscordRpc();
 
     timeStamps.value = await AniSkip.getResult(
-      malId: media.idMAL,
-      episodeNumber: currentEpisode.number.toInt(),
-      episodeLength: _timeStringToSeconds(_controller.maxTime.value).toInt(),
-      useProxyForTimeStamps: false,
-    ) ?? [];
+          malId: media.idMAL,
+          episodeNumber: currentEpisode.number.toInt(),
+          episodeLength:
+              _timeStringToSeconds(_controller.maxTime.value).toInt(),
+          useProxyForTimeStamps: false,
+        ) ??
+        [];
 
     _controller.seek(Duration(seconds: currentProgress ?? 0));
     _controller.currentPosition.listen((v) {
       if (v.inSeconds > 0) {
         _saveProgress(v.inSeconds);
         timeStampsText.value = timeStamps
-            .firstWhereOrNull((e) => e.interval.startTime <= v.inSeconds && e.interval.endTime >= v.inSeconds)
-            ?.getType() ?? '';
+                .firstWhereOrNull((e) =>
+                    e.interval.startTime <= v.inSeconds &&
+                    e.interval.endTime >= v.inSeconds)
+                ?.getType() ??
+            '';
       }
     });
 
@@ -213,12 +218,14 @@ class _PlayerControllerState extends State<PlayerController> {
                 ),
               ),
               Obx(
-                () => Text(
-                  " $timeStampsText",
+                () => timeStampsText.value != '' ? Text(
+                  "  • $timeStampsText",
                   style: TextStyle(
                     color: Colors.white,
+                    fontWeight: FontWeight.w300,
+                    fontFamily: 'Poppins-SemiBold',
                   ),
-                ),
+                ) : const SizedBox(),
               ),
             ],
           ),
@@ -264,20 +271,18 @@ class _PlayerControllerState extends State<PlayerController> {
                         secondaryTrackValue:
                             bufferingValue.clamp(0.0, maxValue),
                         secondaryActiveColor: Colors.white,
-                        onChangeStart: (_) => _controller.pause(),
                         onChangeEnd: (val) async {
                           _controller.seek(Duration(seconds: val.toInt()));
-                          _controller.play();
                         },
                         onChanged: (double value) => _controller
                             .currentTime.value = _formatTime(value.toInt()),
                       ),
                       Positioned.fill(
                         child: Padding(
                           padding: const EdgeInsets.only(
-                            left: 7.0,
-                            right: 8.0,
-                            top: 4.5,
+                            left: 3.0,
+                            right: 5.0,
+                            top: 4.4,
                           ),
                           child: LayoutBuilder(
                             builder: (context, constraints) {
@@ -286,10 +291,13 @@ class _PlayerControllerState extends State<PlayerController> {
                                 children: timeStamps.map(
                                   (timestamp) {
                                     var startPosition =
-                                        (timestamp.interval.startTime / maxValue) *
+                                        (timestamp.interval.startTime /
+                                                maxValue) *
                                             trackWidth;
                                     var endPosition =
-                                        (timestamp.interval.endTime / maxValue) * trackWidth;
+                                        (timestamp.interval.endTime /
+                                                maxValue) *
+                                            trackWidth;
 
                                     return Positioned(
                                       left:
@@ -298,7 +306,7 @@ class _PlayerControllerState extends State<PlayerController> {
                                         children: [
                                           SizedBox(
                                             width: endPosition - startPosition,
-                                            child: _buildDot(),
+                                            child: _buildLine(),
                                           ),
                                         ],
                                       ),
@@ -321,9 +329,9 @@ class _PlayerControllerState extends State<PlayerController> {
     );
   }
 
-  Widget _buildDot() {
+  Widget _buildLine() {
     return Container(
-      height: 3,
+      height: 3.4,
       decoration: BoxDecoration(
         color: Color.fromARGB(255, 56, 192, 41),
         shape: BoxShape.rectangle,
@@ -588,52 +596,33 @@ class _PlayerControllerState extends State<PlayerController> {
       title: "Subtitles",
       viewList: [_buildSubtitleList(sub)],
       negativeText: "Add Subtitle",
-      negativeCallback: () {
-        FilePicker.platform.pickFiles(
+      negativeCallback: () async {
+        var file = await FilePicker.platform.pickFiles(
           type: FileType.custom,
-          allowedExtensions: [
-            'srt',
-            'ass',
-            'ssa',
-            'vtt',
-            'sub',
-            'txt',
-            'dfxp',
-            'smi',
-            'stl',
-            'idx',
-            'ttml',
-            'sbv',
-            'lrc',
-            'xml'
-          ],
-        ).then(
-          (value) {
-            if (value != null) {
-              if (sub) {
-                currentQuality.subtitles = [
-                  v.Track(
-                    file: value.files.single.path ?? "",
-                    label: value.files.single.name,
-                  ),
-                ];
-              } else {
-                currentQuality.subtitles?.add(
-                  v.Track(
-                    file: value.files.single.path ?? "",
-                    label: value.files.single.name,
-                  ),
-                );
-              }
-              _controller.setSubtitle(
-                value.files.single.path ?? "",
-                value.files.single.name,
-              );
-              Get.back();
-              _controller.play();
-            }
-          },
+          allowedExtensions: subMap,
         );
+        if (file == null) return;
+        if (sub) {
+          currentQuality.subtitles = [
+            v.Track(
+              file: file.files.single.path ?? "",
+              label: file.files.single.name,
+            ),
+          ];
+        } else {
+          currentQuality.subtitles?.add(
+            v.Track(
+              file: file.files.single.path ?? "",
+              label: file.files.single.name,
+            ),
+          );
+        }
+        _controller.setSubtitle(
+          file.files.single.path ?? "",
+          file.files.single.name,
+        );
+        Get.back();
+        _controller.play();
       },
     );
     showCustomBottomDialog(context, subtitlesDialog);
@@ -693,7 +682,8 @@ class _PlayerControllerState extends State<PlayerController> {
                     return Text(
                       timeStampsText.value != ''
                           ? timeStamps
-                              .firstWhere((e) => e.getType() == timeStampsText.value)
+                              .firstWhere(
+                                  (e) => e.getType() == timeStampsText.value)
                               .getType()
                           : "+${settings.skipDuration}s",
                       style: const TextStyle(
@@ -719,9 +709,8 @@ class _PlayerControllerState extends State<PlayerController> {
 
   void _fastForward(int seconds) {
     if (timeStampsText.value != '') {
-      var current = timeStamps.firstWhere(
-        (element) => element.getType() == timeStampsText.value
-      );
+      var current = timeStamps
+          .firstWhere((element) => element.getType() == timeStampsText.value);
       _controller.seek(Duration(seconds: current.interval.endTime.toInt()));
       return;
     }
diff --git a/lib/Screens/Info/Tabs/Watch/Widgets/WrongTitle.dart b/lib/Screens/Info/Tabs/Watch/Widgets/WrongTitle.dart
@@ -30,7 +30,7 @@ class WrongTitleDialog extends StatefulWidget {
 class WrongTitleDialogState extends State<WrongTitleDialog> {
   final TextEditingController textEditingController = TextEditingController();
   late Future<MPages?> searchFuture;
-
+  late FocusNode focusNode;
   @override
   void initState() {
     super.initState();
@@ -40,6 +40,18 @@ class WrongTitleDialogState extends State<WrongTitleDialog> {
     '';
     textEditingController.text = initialSearchText;
     searchFuture = _performSearch(initialSearchText);
+
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      focusNode.requestFocus();
+    });
+  }
+
+  @override
+  void dispose() {
+    super.dispose;
+    textEditingController.dispose();
+    focusNode.dispose();
   }
 
   Future<MPages?> _performSearch(String query) {
@@ -66,7 +78,7 @@ class WrongTitleDialogState extends State<WrongTitleDialog> {
       viewList: [
         _buildSearchInput(theme),
         const SizedBox(height: 16.0),
-        FutureBuilder<MPages?>(
+        FutureBuilder(
           future: searchFuture,
           builder: (context, snapshot) {
             return _buildResultList(snapshot, theme);
@@ -78,6 +90,7 @@ class WrongTitleDialogState extends State<WrongTitleDialog> {
 
   Widget _buildSearchInput(ColorScheme theme) {
     return TextField(
+      focusNode: focusNode,
       controller: textEditingController,
       onSubmitted: _onSubmitted,
       style: TextStyle(
diff --git a/lib/Screens/Settings/SettingsPlayerScreen.dart b/lib/Screens/Settings/SettingsPlayerScreen.dart
@@ -297,26 +297,10 @@ List<Widget> playerSettings(
 }
 
 Future<void> openPlayer(BuildContext context) async {
-  const allowedExtensions = [
-    'mp4',
-    'mkv',
-    'webm',
-    'avi',
-    'mov',
-    'wmv',
-    'flv',
-    'm4v',
-    '3gp',
-    'mpg',
-    'mpeg',
-    'ogv',
-    'ts',
-    'm3u8',
-  ];
-
+  if (!await StorageProvider().videoPermission()) return;
   final result = await FilePicker.platform.pickFiles(
     type: FileType.custom,
-    allowedExtensions: allowedExtensions,
+    allowedExtensions: vidMap,
   );
 
   if (result == null) return;
@@ -350,6 +334,40 @@ Future<void> openPlayer(BuildContext context) async {
   );
 }
 
+List<String> vidMap = [
+  'mp4',
+  'mkv',
+  'webm',
+  'avi',
+  'mov',
+  'wmv',
+  'flv',
+  'm4v',
+  '3gp',
+  'mpg',
+  'mpeg',
+  'ogv',
+  'ts',
+  'm3u8',
+];
+
+List<String> subMap = [
+  'srt',
+  'ass',
+  'ssa',
+  'vtt',
+  'sub',
+  'txt',
+  'dfxp',
+  'smi',
+  'stl',
+  'idx',
+  'ttml',
+  'sbv',
+  'lrc',
+  'xml'
+];
+
 List<String> speedMap(bool cursed) => cursed
     ? [
         "0.25x",
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -134,6 +134,9 @@ flutter:
           weight: 600
         - asset: assets/fonts/poppins_thin.ttf
           weight: 100
+    - family: Poppins-SemiBold
+      fonts:
+        - asset: assets/fonts/poppins_semi_bold.ttf
 
   # Assets
   assets:

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class EpisodeCardView extends StatelessWidget {`
`52`	`52`	`context: context,`
`53`	`53`	`mediaId: mediaData.id,`
`54`	`54`	`ep: episode.number,`
`55`		`- width: 162,`
	`55`	`+ width: double.infinity,`
`56`	`56`	`)`
`57`	`57`	`],`
`58`	`58`	`),`