fix: dunno

aayush2622 · aayush2622 · commit b7ad185d70d9 · 2024-12-23T22:35:43.000+05:30
diff --git a/lib/Screens/Info/Tabs/Watch/Anime/Player/Platform/AndroidPlayer.dart b/lib/Screens/Info/Tabs/Watch/Anime/Player/Platform/AndroidPlayer.dart
@@ -1,17 +1,22 @@
-
 import 'package:dantotsu/Screens/Info/Tabs/Watch/Anime/Player/Platform/BasePlayer.dart';
 import 'package:flutter/cupertino.dart';
+import 'package:get/get_rx/src/rx_types/rx_types.dart';
 import 'package:video_player/video_player.dart';
 import 'package:fvp/fvp.dart' as fvp;
 
-class AndroidPlayer extends BasePlayer{
-
-  late VideoPlayer player;
+class AndroidPlayer extends BasePlayer {
+  final String url;
+  Rx<BoxFit> resizeMode;
   late VideoPlayerController videoController;
+
+  AndroidPlayer(this.url, this.resizeMode) {
+    videoController = VideoPlayerController.network(url);
+  }
+
   @override
   Future<void> open(String url, Duration duration) async {
+    videoController.dispose();
     videoController = VideoPlayerController.network(url);
-    player = VideoPlayer(videoController);
     await videoController.initialize();
     await videoController.seekTo(duration);
     videoController.play();
@@ -20,7 +25,6 @@ class AndroidPlayer extends BasePlayer{
   @override
   Future<void> pause() => videoController.pause();
 
-
   @override
   Future<void> play() => videoController.play();
 
@@ -38,7 +42,8 @@ class AndroidPlayer extends BasePlayer{
     videoController.addListener(() {
       isBuffering.value = videoController.value.isBuffering;
       isPlaying.value = videoController.value.isPlaying;
-      bufferingTime.value = _formatTime(videoController.value.buffered.first.end.inSeconds);
+      bufferingTime.value =
+          _formatTime(videoController.value.buffered.first.end.inSeconds);
       currentPosition.value = videoController.value.position;
       currentTime.value = _formatTime(videoController.value.position.inSeconds);
       maxTime.value = _formatTime(videoController.value.duration.inSeconds);
@@ -58,28 +63,38 @@ class AndroidPlayer extends BasePlayer{
 
   @override
   Widget playerWidget() {
-    return player;
+    return AspectRatio(
+      aspectRatio: videoController.value.aspectRatio,
+      child: FittedBox(
+        fit: resizeMode.value,
+        child: SizedBox(
+          width: videoController.value.size.width,
+          height: videoController.value.size.height,
+          child: VideoPlayer(videoController),
+        ),
+      ),
+    );
   }
 
   @override
   Future<void> seek(Duration duration) async =>
-    videoController.seekTo(duration);
-
+      videoController.seekTo(duration);
 
   @override
-  Future<void> setRate(double rate) async => videoController.setPlaybackSpeed(rate);
-
+  Future<void> setRate(double rate) async =>
+      videoController.setPlaybackSpeed(rate);
 
   @override
-  Future<void> setSubtitle(String subtitleUri, String language) async => videoController.setExternalSubtitle(subtitleUri);
-
+  Future<void> setSubtitle(String subtitleUri, String language) async =>
+      videoController.setExternalSubtitle(subtitleUri);
 
   @override
-  Future<void> setVolume(double volume) async => videoController.setVolume(volume);
+  Future<void> setVolume(double volume) async =>
+      videoController.setVolume(volume);
 
   @override
   void dispose() {
-    videoController.dispose();
     super.dispose();
+    videoController.dispose();
   }
-}
+}
diff --git a/lib/Screens/Info/Tabs/Watch/Anime/Player/Platform/BasePlayer.dart b/lib/Screens/Info/Tabs/Watch/Anime/Player/Platform/BasePlayer.dart
@@ -7,7 +7,7 @@ abstract class BasePlayer extends GetxController {
   Rx<Duration> currentPosition = const Duration(seconds: 0).obs;
   RxString maxTime = "00:00".obs;
   RxString bufferingTime = "00:00".obs;
-  RxBool isBuffering = false.obs;
+  RxBool isBuffering = true.obs;
   RxBool isPlaying = false.obs;
 
   Future<void> seek(Duration duration);
diff --git a/lib/Screens/Info/Tabs/Watch/Anime/Player/Platform/WindowsPlayer.dart b/lib/Screens/Info/Tabs/Watch/Anime/Player/Platform/WindowsPlayer.dart
@@ -52,8 +52,8 @@ class WindowsPlayer extends BasePlayer {
 
   @override
   void dispose() {
-    player.dispose();
     super.dispose();
+    player.dispose();
   }
 
   @override
diff --git a/lib/Screens/Info/Tabs/Watch/Anime/Player/Player.dart b/lib/Screens/Info/Tabs/Watch/Anime/Player/Player.dart
@@ -109,7 +109,7 @@ class MediaPlayerState extends State<MediaPlayer>
   void _initializePlayer() {
     currentQuality = widget.videos[widget.index];
     if (PrefManager.getCustomVal<bool>('tempPlayer') ?? false) {
-      videoPlayerController = AndroidPlayer();
+      videoPlayerController = AndroidPlayer(currentQuality.url,resizeMode);
     } else {
       videoPlayerController = WindowsPlayer(resizeMode, settings);
     }
diff --git a/lib/Screens/Info/Tabs/Watch/Anime/Player/PlayerController.dart b/lib/Screens/Info/Tabs/Watch/Anime/Player/PlayerController.dart
@@ -122,9 +122,10 @@ class _PlayerControllerState extends State<PlayerController> {
 
   @override
   void dispose() {
-    DiscordService.stopRPC();
-    WakelockPlus.disable();
     super.dispose();
+    if (Discord.token.isNotEmpty) DiscordService.stopRPC();
+    WakelockPlus.disable();
+
   }
 
   Future initFullScreen() async =>
diff --git a/lib/Theme/LanguageSwitcher.dart b/lib/Theme/LanguageSwitcher.dart
@@ -13,7 +13,7 @@ Widget languageSwitcher(BuildContext context) {
   return buildDropdownMenu(
     padding: const EdgeInsets.symmetric(vertical: 12.0),
     currentValue: completeLanguageName(Get.locale!.languageCode.toUpperCase()),
-    options: languageOptions.map((e) => completeLanguageName(e.toUpperCase())).toList(),
+    options: languageOptions.map((e) => completeLanguageName(e.toUpperCase())).toSet().toList(),
     onChanged: (String newValue) {
       final newLocale = Locale(completeLanguageCode(newValue).toLowerCase());
       Get.updateLocale(newLocale);

Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,8 @@ class WindowsPlayer extends BasePlayer {`
`52`	`52`
`53`	`53`	`@override`
`54`	`54`	`void dispose() {`
`55`		`- player.dispose();`
`56`	`55`	`super.dispose();`
	`56`	`+ player.dispose();`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`@override`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ class MediaPlayerState extends State<MediaPlayer>`
`109`	`109`	`void _initializePlayer() {`
`110`	`110`	`currentQuality = widget.videos[widget.index];`
`111`	`111`	`if (PrefManager.getCustomVal<bool>('tempPlayer') ?? false) {`
`112`		`- videoPlayerController = AndroidPlayer();`
	`112`	`+ videoPlayerController = AndroidPlayer(currentQuality.url,resizeMode);`
`113`	`113`	`} else {`
`114`	`114`	`videoPlayerController = WindowsPlayer(resizeMode, settings);`
`115`	`115`	`}`