fix: history page contents filtered by current playlist

bsogulcan · bsogulcan · commit 8e442aa829fc · 2025-06-28T18:21:51.000+03:00
diff --git a/lib/services/watch_history_service.dart b/lib/services/watch_history_service.dart
@@ -2,6 +2,7 @@ import 'package:drift/drift.dart';
 import 'package:iptv_player/database/database.dart';
 import 'package:iptv_player/models/content_type.dart';
 import 'package:iptv_player/models/watch_history.dart';
+import 'package:iptv_player/services/app_state.dart';
 import 'package:iptv_player/services/service_locator.dart';
 
 class WatchHistoryService {
@@ -41,31 +42,37 @@ class WatchHistoryService {
   }
 
   Future<List<WatchHistory>> getWatchHistoryByContentType(
-    ContentType contentType,
+    ContentType contentType, String playlistId
   ) async {
     final query = _database.select(_database.watchHistories)
-      ..where((tbl) => tbl.contentType.equals(contentType.index))
+      ..where((tbl) => tbl.contentType.equals(contentType.index) & tbl.playlistId.equals(playlistId))
       ..orderBy([(tbl) => OrderingTerm.desc(tbl.lastWatched)]);
 
     final results = await query.get();
     return results.map((data) => WatchHistory.fromDrift(data)).toList();
   }
 
-  Future<List<WatchHistory>> getRecentlyWatched({int limit = 10}) async {
+  Future<List<WatchHistory>> getRecentlyWatched(
+    String playlistId, {
+    int limit = 10,
+  }) async {
     final query = _database.select(_database.watchHistories)
+      ..where((tbl) => tbl.playlistId.equals(playlistId))
       ..orderBy([(tbl) => OrderingTerm.desc(tbl.lastWatched)])
       ..limit(limit);
 
     final results = await query.get();
     return results.map((data) => WatchHistory.fromDrift(data)).toList();
   }
 
-  Future<List<WatchHistory>> getContinueWatching() async {
+  Future<List<WatchHistory>> getContinueWatching(String playlistId) async {
     final query = _database.select(_database.watchHistories)
       ..where(
-        (tbl) => tbl.watchDuration.isNotNull() & tbl.totalDuration.isNotNull(),
-        // tbl.watchDuration * 10 <tbl.totalDuration * 9,
-      ) // %90'dan az
+        (tbl) =>
+            tbl.watchDuration.isNotNull() &
+            tbl.totalDuration.isNotNull() &
+            tbl.playlistId.equals(playlistId),
+      )
       ..orderBy([(tbl) => OrderingTerm.desc(tbl.lastWatched)]);
 
     final results = await query.get();
diff --git a/lib/views/screens/movies/movide_screen.dart b/lib/views/screens/movies/movide_screen.dart
@@ -19,26 +19,12 @@ class _MovieScreenState extends State<MovieScreen> {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
-            // PlayerWidget scroll edilebilir alandan çıkarıldı
             PlayerWidget(
               contentItem: widget.contentItem,
             ),
-
-            // Expanded widget ile kalan alanı kaplıyor ve scroll edilebilir
             Expanded(
               child: SingleChildScrollView(
-                child: Container(
-                  decoration: BoxDecoration(
-                    gradient: LinearGradient(
-                      begin: Alignment.topCenter,
-                      end: Alignment.bottomCenter,
-                      colors: [
-                        Theme.of(context).scaffoldBackgroundColor.withOpacity(0.8),
-                        Theme.of(context).scaffoldBackgroundColor,
-                      ],
-                    ),
-                  ),
-                  child: Padding(
+                child: Padding(
                     padding: const EdgeInsets.all(20.0),
                     child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
@@ -131,7 +117,6 @@ class _MovieScreenState extends State<MovieScreen> {
                   ),
                 ),
               ),
-            ),
           ],
         ),
       ),
diff --git a/lib/views/screens/series/episode_screen.dart b/lib/views/screens/series/episode_screen.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:iptv_player/database/database.dart';
 import 'package:iptv_player/models/playlist_content_model.dart';
 import 'package:iptv_player/models/watch_history.dart';
-import 'package:iptv_player/services/app_state.dart';
 import 'package:iptv_player/views/widgets/player_widget.dart';
 
 class EpisodeScreen extends StatelessWidget {
@@ -28,46 +27,28 @@ class EpisodeScreen extends StatelessWidget {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
-            // PlayerWidget scroll edilebilir alandan çıkarıldı
-            PlayerWidget(
-              contentItem: contentItem,
-              // watchHistory: watchHistory,
-            ),
-
-            // Expanded widget ile kalan alanı kaplıyor ve scroll edilebilir
+            PlayerWidget(contentItem: contentItem),
             Expanded(
               child: SingleChildScrollView(
-                child: Container(
-                  decoration: BoxDecoration(
-                    gradient: LinearGradient(
-                      begin: Alignment.topCenter,
-                      end: Alignment.bottomCenter,
-                      colors: [
-                        Theme.of(context).scaffoldBackgroundColor.withOpacity(0.8),
-                        Theme.of(context).scaffoldBackgroundColor,
-                      ],
-                    ),
-                  ),
-                  child: Padding(
-                    padding: const EdgeInsets.all(20.0),
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        // Kanal Başlığı
-                        Row(
-                          children: [
-                            Expanded(
-                              child: SelectableText(
-                                contentItem.name,
-                                style: Theme.of(context).textTheme.headlineSmall
-                                    ?.copyWith(fontWeight: FontWeight.bold),
-                              ),
+                child: Padding(
+                  padding: const EdgeInsets.all(20.0),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      // Kanal Başlığı
+                      Row(
+                        children: [
+                          Expanded(
+                            child: SelectableText(
+                              contentItem.name,
+                              style: Theme.of(context).textTheme.headlineSmall
+                                  ?.copyWith(fontWeight: FontWeight.bold),
                             ),
-                          ],
-                        ),
-                        const SizedBox(height: 24),
-                      ],
-                    ),
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 24),
+                    ],
                   ),
                 ),
               ),
@@ -168,4 +149,4 @@ class EpisodeScreen extends StatelessWidget {
     // Şu an için sabit bir değer döndürüyorum
     return 'HD';
   }
-}
+}
diff --git a/lib/views/screens/watch_history/watch_history_screen.dart b/lib/views/screens/watch_history/watch_history_screen.dart
@@ -46,14 +46,23 @@ class _WatchHistoryScreenState extends State<WatchHistoryScreen> {
 
   Future<void> _loadWatchHistory() async {
     setState(() => _isLoading = true);
-
+    var playlistId = AppState.currentPlaylist!.id;
     try {
       final futures = await Future.wait([
-        _historyService.getContinueWatching(),
-        _historyService.getRecentlyWatched(limit: 20),
-        _historyService.getWatchHistoryByContentType(ContentType.liveStream),
-        _historyService.getWatchHistoryByContentType(ContentType.vod),
-        _historyService.getWatchHistoryByContentType(ContentType.series),
+        _historyService.getContinueWatching(playlistId),
+        _historyService.getRecentlyWatched(limit: 20, playlistId),
+        _historyService.getWatchHistoryByContentType(
+          ContentType.liveStream,
+          playlistId,
+        ),
+        _historyService.getWatchHistoryByContentType(
+          ContentType.vod,
+          playlistId,
+        ),
+        _historyService.getWatchHistoryByContentType(
+          ContentType.series,
+          playlistId,
+        ),
       ]);
 
       setState(() {
@@ -272,7 +281,7 @@ class _WatchHistoryScreenState extends State<WatchHistoryScreen> {
               history.title,
               history.imagePath ?? '',
               history.contentType,
-              liveStream: liveStream
+              liveStream: liveStream,
             ),
           );
         case ContentType.vod:
@@ -288,7 +297,7 @@ class _WatchHistoryScreenState extends State<WatchHistoryScreen> {
               history.imagePath ?? '',
               history.contentType,
               containerExtension: movie!.containerExtension,
-              vodStream: movie
+              vodStream: movie,
             ),
           );
         case ContentType.series:
diff --git a/lib/views/widgets/player-buttons/video_title_widget.dart b/lib/views/widgets/player-buttons/video_title_widget.dart
@@ -40,9 +40,7 @@ class _VideoTitleWidgetState extends State<VideoTitleWidget> {
     return Text(
       videoTitle,
       style: TextStyle(
-        color: Theme.of(context).brightness == Brightness.dark
-            ? Colors.white
-            : Colors.black,
+        color:  Colors.white,
       ),
       maxLines: 1,
       overflow: TextOverflow.clip,
diff --git a/lib/views/widgets/player_widget.dart b/lib/views/widgets/player_widget.dart
@@ -121,7 +121,6 @@ class _PlayerWidgetState extends State<PlayerWidget>
   Future<void> _initializeAudioService() async {
     if (!mounted) return;
 
-
     _audioHandler.setPlayer(_player);
     // _audioHandler.setCurrentMediaItem(
     //   title: contentItem.name,
@@ -286,21 +285,60 @@ class _PlayerWidgetState extends State<PlayerWidget>
 
   @override
   Widget build(BuildContext context) {
+    final screenSize = MediaQuery.of(context).size;
+    final isTablet = screenSize.shortestSide >= 600;
+    final isLandscape = screenSize.width > screenSize.height;
+    double calculateAspectRatio() {
+      if (widget.aspectRatio != null) return widget.aspectRatio!;
+
+      if (isTablet) {
+        // Tablet için daha küçük player
+        return isLandscape ? 21 / 9 : 16 / 9;
+      }
+      return 16 / 9;
+    }
+
+    // Tablet için maksimum yükseklik belirle
+    double? calculateMaxHeight() {
+      if (isTablet) {
+        if (isLandscape) {
+          return screenSize.height * 0.6; // Landscape'de ekranın %60'ı
+        } else {
+          return screenSize.height * 0.4; // Portrait'te ekranın %40'ı
+        }
+      }
+      return null;
+    }
+
+
+    Widget playerWidget = AspectRatio(
+      aspectRatio: calculateAspectRatio(),
+      child: isLoading
+          ? Container(
+        color: Colors.black,
+        child: const Center(
+          child: CircularProgressIndicator(color: Colors.white),
+        ),
+      )
+          : _buildPlayerContent(),
+    );
+
+    // Tablet için maksimum yükseklik uygula
+    if (isTablet) {
+      final maxHeight = calculateMaxHeight();
+      if (maxHeight != null) {
+        playerWidget = ConstrainedBox(
+          constraints: BoxConstraints(maxHeight: maxHeight),
+          child: playerWidget,
+        );
+      }
+    }
+
     return Container(
       color: Colors.black,
       child: Column(
         children: [
-          AspectRatio(
-            aspectRatio: widget.aspectRatio ?? 16 / 9,
-            child: isLoading
-                ? Container(
-                    color: Colors.black,
-                    child: const Center(
-                      child: CircularProgressIndicator(color: Colors.white),
-                    ),
-                  )
-                : _buildPlayerContent(),
-          ),
+          playerWidget,
         ],
       ),
     );
diff --git a/lib/views/widgets/video_widget.dart b/lib/views/widgets/video_widget.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:iptv_player/services/player_state.dart';
 import 'package:iptv_player/views/widgets/player-buttons/back_button_widget.dart';
 import 'package:iptv_player/views/widgets/player-buttons/video_settings_widget.dart';
-import 'package:iptv_player/views/widgets/player-buttons/video_title.dart';
+import 'package:iptv_player/views/widgets/player-buttons/video_title_widget.dart';
 import 'package:media_kit_video/media_kit_video.dart';
 
 Widget getVideo(BuildContext context, VideoController controller) {
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -29,13 +29,11 @@ dependencies:
       path: libs/universal/media_kit_libs_video
       ref: main
 
-
   provider: ^6.1.1
   drift: ^2.26.1
   sqlite3_flutter_libs: ^0.5.34
   cupertino_icons: ^1.0.8
   http: ^1.4.0
-  # screen_brightness: ^2.1.4
   cached_network_image: ^3.4.1
   audio_service: ^0.18.12
   just_audio: ^0.10.4
@@ -46,7 +44,6 @@ dependencies:
   shared_preferences: ^2.5.3
   audio_session: ^0.2.2
 
-# Tüm media-kit paketleri için dependency override
 dependency_overrides:
   media_kit:
     git:
