From db84bada319f00d35189493f3a9e0b6b65040cb1 Mon Sep 17 00:00:00 2001
From: Micah Morrison <micahmorrison95@gmail.com>
Date: Thu, 12 Feb 2026 19:48:35 -0500
Subject: [PATCH] Fix episode watched status

---
 lib/screens/season_detail_screen.dart |  6 ++++--
 lib/widgets/media_card.dart           | 19 ++++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/lib/screens/season_detail_screen.dart b/lib/screens/season_detail_screen.dart
index d9f1d564..b1ae47d4 100644
--- a/lib/screens/season_detail_screen.dart
+++ b/lib/screens/season_detail_screen.dart
@@ -376,6 +376,8 @@ class _EpisodeCardState extends State<_EpisodeCard> {
         widget.episode.viewOffset! > 0;
     final progress = hasProgress ? widget.episode.viewOffset! / widget.episode.duration! : 0.0;
 
+    final hasActiveProgress = hasProgress && widget.episode.viewOffset! < widget.episode.duration!;
+
     return FocusableWrapper(
       autofocus: widget.autofocus,
       enableLongPress: true,
@@ -459,7 +461,7 @@ class _EpisodeCardState extends State<_EpisodeCard> {
                       ),
 
                       // Progress bar at bottom
-                      if (hasProgress && !widget.episode.isWatched)
+                      if (hasActiveProgress)
                         Positioned(
                           bottom: 0,
                           left: 0,
@@ -477,7 +479,7 @@ class _EpisodeCardState extends State<_EpisodeCard> {
                           ),
                         ),
 
-                      if (widget.episode.isWatched)
+                      if (widget.episode.isWatched && !hasActiveProgress)
                         Positioned(
                           top: 4,
                           right: 4,
diff --git a/lib/widgets/media_card.dart b/lib/widgets/media_card.dart
index 5a88da2f..fecbc650 100644
--- a/lib/widgets/media_card.dart
+++ b/lib/widgets/media_card.dart
@@ -98,11 +98,14 @@ class MediaCardState extends State<MediaCard> {
     }
 
     // Add watched status
-    if (item.isWatched) {
-      baseLabel = '$baseLabel, ${t.accessibility.mediaCardWatched}';
-    } else if (item.viewOffset != null && item.duration != null && item.viewOffset! > 0) {
+    final hasActiveProgress =
+        item.viewOffset != null && item.duration != null && item.viewOffset! > 0 && item.viewOffset! < item.duration!;
+
+    if (hasActiveProgress) {
       final percent = ((item.viewOffset! / item.duration!) * 100).round();
       baseLabel = '$baseLabel, ${t.accessibility.mediaCardPartiallyWatched(percent: percent)}';
+    } else if (item.isWatched) {
+      baseLabel = '$baseLabel, ${t.accessibility.mediaCardWatched}';
     } else {
       baseLabel = '$baseLabel, ${t.accessibility.mediaCardUnwatched}';
     }
@@ -716,10 +719,16 @@ class _MediaCardHelpers {
   static Widget buildWatchProgress(BuildContext context, PlexMetadata metadata) {
     final showUnwatchedCount = context.watch<SettingsProvider>().showUnwatchedCount;
 
+    final hasActiveProgress =
+        metadata.viewOffset != null &&
+        metadata.duration != null &&
+        metadata.viewOffset! > 0 &&
+        metadata.viewOffset! < metadata.duration!;
+
     return Stack(
       children: [
         // Watched indicator (checkmark)
-        if (metadata.isWatched)
+        if (metadata.isWatched && !hasActiveProgress)
           Positioned(
             top: 4,
             right: 4,
@@ -756,7 +765,7 @@ class _MediaCardHelpers {
             ),
           ),
         // Progress bar for partially watched content (episodes/movies)
-        if (metadata.viewOffset != null && metadata.duration != null && metadata.viewOffset! > 0 && !metadata.isWatched)
+        if (hasActiveProgress)
           Positioned(
             bottom: 0,
             left: 0,