diff --git a/CHANGELOG.md b/CHANGELOG.md index 24b891de62..f10ec66b31 100644 --- 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 index e2ab9a0e62..835aeef0c1 100644 --- 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.. 0 && skipped == max + binding.imageViewSeasonCollected.isVisible = collected in 1.. 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 index eb45fbb3e3..e82a8895dc 100644 --- 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" /> + + + + @@ -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" />