Seasons: different indicators if some or all are skipped/collected

UweTrottmann · Mar 13, 2024 · f563a95 · f563a95
1 parent ba88df2
commit f563a95
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,8 @@ Version 72
 ----------
 *in development*
 
+* 🔧 Seasons: different indicators if only some or all episodes are skipped or in collection.
+
 #### 72.0.5 🧪
 *2024-03-08*
 

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/overview/SeasonsAdapter.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/SeasonsAdapter.kt
@@ -7,7 +7,7 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.isGone
+import androidx.core.view.isVisible
 import androidx.core.widget.TextViewCompat
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
@@ -87,8 +87,10 @@ class SeasonsAdapter(
             // Skipped and collected indicator
             val skipped = stats.skipped
             val collected = stats.collected
-            binding.imageViewSeasonSkipped.isGone = skipped == 0
-            binding.imageViewSeasonCollected.isGone = collected == 0
+            binding.imageViewSeasonSkipped.isVisible = skipped in 1..<max
+            binding.imageViewSeasonSkippedAll.isVisible = skipped > 0 && skipped == max
+            binding.imageViewSeasonCollected.isVisible = collected in 1..<max
+            binding.imageViewSeasonCollectedAll.isVisible = collected > 0 && collected == max
 
             // Status text
             val countText = StringBuilder()

diff --git a/app/src/main/res/layout/item_season.xml b/app/src/main/res/layout/item_season.xml
@@ -62,6 +62,16 @@
         android:layout_alignParentLeft="true"
         android:layout_marginRight="4dp"
         android:contentDescription="@null"
+        app:srcCompat="@drawable/ic_skip_black_24dp" />
+
+    <ImageView
+        android:id="@+id/imageViewSeasonSkippedAll"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_below="@id/progressBarSeason"
+        android:layout_marginRight="4dp"
+        android:layout_toRightOf="@id/imageViewSeasonSkipped"
+        android:contentDescription="@null"
         app:srcCompat="@drawable/ic_skipped_24dp" />
 
     <ImageView
@@ -70,7 +80,17 @@
         android:layout_height="16dp"
         android:layout_below="@id/progressBarSeason"
         android:layout_marginRight="4dp"
-        android:layout_toRightOf="@id/imageViewSeasonSkipped"
+        android:layout_toRightOf="@id/imageViewSeasonSkippedAll"
+        android:contentDescription="@null"
+        app:srcCompat="@drawable/ic_collect_black_24dp" />
+
+    <ImageView
+        android:id="@+id/imageViewSeasonCollectedAll"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_below="@id/progressBarSeason"
+        android:layout_marginRight="4dp"
+        android:layout_toRightOf="@id/imageViewSeasonCollected"
         android:contentDescription="@null"
         app:srcCompat="@drawable/ic_collected_24dp" />
 
@@ -80,7 +100,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/progressBarSeason"
         android:layout_toLeftOf="@id/imageViewContextMenu"
-        android:layout_toRightOf="@id/imageViewSeasonCollected"
+        android:layout_toRightOf="@id/imageViewSeasonCollectedAll"
         android:paddingBottom="@dimen/large_padding"
         android:textAppearance="@style/TextAppearance.SeriesGuide.Caption.Narrow"
         tools:text="77 remaining - 7 skipped - 7 in collection" />