Skip to content

Commit e58fead

Browse files
StypoxStypox
committed
Remove IN HISTORY label on stream info items
1 parent 360f5ac commit e58fead

8 files changed

Lines changed: 5 additions & 142 deletions

File tree

‎app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedDAO.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ abstract class FeedDAO {
2121

2222
@Query(
2323
"""
24-
SELECT s.*, sst.progress_time, (sh.stream_id IS NOT NULL) AS is_stream_in_history
24+
SELECT s.*, sst.progress_time
2525
FROM streams s
2626
2727
LEFT JOIN stream_state sst
@@ -41,7 +41,7 @@ abstract class FeedDAO {
4141

4242
@Query(
4343
"""
44-
SELECT s.*, sst.progress_time, (sh.stream_id IS NOT NULL) AS is_stream_in_history
44+
SELECT s.*, sst.progress_time
4545
FROM streams s
4646
4747
LEFT JOIN stream_state sst
@@ -66,7 +66,7 @@ abstract class FeedDAO {
6666

6767
@Query(
6868
"""
69-
SELECT s.*, sst.progress_time, (sh.stream_id IS NOT NULL) AS is_stream_in_history
69+
SELECT s.*, sst.progress_time
7070
FROM streams s
7171
7272
LEFT JOIN stream_state sst
@@ -95,7 +95,7 @@ abstract class FeedDAO {
9595

9696
@Query(
9797
"""
98-
SELECT s.*, sst.progress_time, (sh.stream_id IS NOT NULL) AS is_stream_in_history
98+
SELECT s.*, sst.progress_time
9999
FROM streams s
100100
101101
LEFT JOIN stream_state sst

‎app/src/main/java/org/schabi/newpipe/database/stream/StreamWithState.kt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,5 @@ data class StreamWithState(
1010
val stream: StreamEntity,
1111

1212
@ColumnInfo(name = StreamStateEntity.STREAM_PROGRESS_TIME)
13-
val stateProgressTime: Long?,
14-
15-
@ColumnInfo(name = "is_stream_in_history")
16-
val isInHistory: Boolean = false
13+
val stateProgressTime: Long?
1714
)

‎app/src/main/java/org/schabi/newpipe/local/feed/item/StreamItem.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ data class StreamItem(
3030

3131
private val stream: StreamEntity = streamWithState.stream
3232
private val stateProgressTime: Long? = streamWithState.stateProgressTime
33-
private val isInHistory: Boolean = streamWithState.isInHistory
3433

3534
override fun getId(): Long = stream.uid
3635

@@ -94,9 +93,6 @@ data class StreamItem(
9493
viewBinding.itemProgressView.visibility = View.GONE
9594
}
9695

97-
viewBinding.itemInHistoryIndicatorView.visibility =
98-
if (isInHistory && !isLiveStream) View.VISIBLE else View.GONE
99-
10096
ImageLoader.getInstance().displayImage(
10197
stream.thumbnailUrl, viewBinding.itemThumbnailView,
10298
ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS

‎app/src/main/res/layout/list_stream_grid_item.xml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,32 +20,6 @@
2020
android:src="@drawable/dummy_thumbnail"
2121
tools:ignore="RtlHardcoded" />
2222

23-
<TextView
24-
android:id="@+id/itemInHistoryIndicatorView"
25-
android:layout_width="wrap_content"
26-
android:layout_height="wrap_content"
27-
android:layout_alignStart="@id/itemThumbnailView"
28-
android:layout_alignTop="@id/itemThumbnailView"
29-
android:layout_alignEnd="@id/itemThumbnailView"
30-
android:layout_alignBottom="@id/itemThumbnailView"
31-
android:layout_gravity="top|left"
32-
android:background="@drawable/item_in_history_indicator_background"
33-
android:ellipsize="end"
34-
android:maxLines="1"
35-
android:paddingLeft="@dimen/item_in_history_indicator_horizontal_margin"
36-
android:paddingTop="@dimen/item_in_history_indicator_vertical_margin"
37-
android:paddingRight="@dimen/item_in_history_indicator_horizontal_margin"
38-
android:paddingBottom="@dimen/item_in_history_indicator_vertical_margin"
39-
android:text="@string/item_in_history"
40-
android:textAllCaps="true"
41-
android:textAppearance="?android:attr/textAppearanceSmall"
42-
android:textColor="@color/item_in_history_indicator_text_color"
43-
android:textSize="@dimen/item_in_history_indicator_text_size"
44-
android:textStyle="bold"
45-
android:visibility="gone"
46-
tools:ignore="RtlHardcoded"
47-
tools:visibility="visible" />
48-
4923
<TextView
5024
android:id="@+id/itemDurationView"
5125
android:layout_width="wrap_content"

‎app/src/main/res/layout/list_stream_item.xml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,6 @@
2525
app:layout_constraintBottom_toBottomOf="parent"
2626
tools:ignore="RtlHardcoded" />
2727

28-
<TextView
29-
android:id="@+id/itemInHistoryIndicatorView"
30-
android:layout_width="wrap_content"
31-
android:layout_height="wrap_content"
32-
android:layout_alignStart="@id/itemThumbnailView"
33-
android:layout_alignTop="@id/itemThumbnailView"
34-
android:layout_alignEnd="@id/itemThumbnailView"
35-
android:layout_alignBottom="@id/itemThumbnailView"
36-
android:layout_gravity="top|left"
37-
android:background="@drawable/item_in_history_indicator_background"
38-
android:ellipsize="end"
39-
android:maxLines="1"
40-
android:paddingLeft="@dimen/item_in_history_indicator_horizontal_margin"
41-
android:paddingTop="@dimen/item_in_history_indicator_vertical_margin"
42-
android:paddingRight="@dimen/item_in_history_indicator_horizontal_margin"
43-
android:paddingBottom="@dimen/item_in_history_indicator_vertical_margin"
44-
android:text="@string/item_in_history"
45-
android:textAllCaps="true"
46-
android:textAppearance="?android:attr/textAppearanceSmall"
47-
android:textColor="@color/item_in_history_indicator_text_color"
48-
android:textSize="@dimen/item_in_history_indicator_text_size"
49-
android:textStyle="bold"
50-
android:visibility="gone"
51-
tools:ignore="RtlHardcoded"
52-
tools:visibility="visible" />
53-
5428
<TextView
5529
android:id="@+id/itemDurationView"
5630
android:layout_width="wrap_content"

‎app/src/main/res/layout/list_stream_mini_item.xml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,6 @@
2222
android:src="@drawable/dummy_thumbnail"
2323
tools:ignore="RtlHardcoded" />
2424

25-
<TextView
26-
android:id="@+id/itemInHistoryIndicatorView"
27-
android:layout_width="wrap_content"
28-
android:layout_height="wrap_content"
29-
android:layout_alignStart="@id/itemThumbnailView"
30-
android:layout_alignTop="@id/itemThumbnailView"
31-
android:layout_alignEnd="@id/itemThumbnailView"
32-
android:layout_alignBottom="@id/itemThumbnailView"
33-
android:layout_gravity="top|left"
34-
android:background="@drawable/item_in_history_indicator_background"
35-
android:ellipsize="end"
36-
android:maxLines="1"
37-
android:paddingLeft="@dimen/item_in_history_indicator_horizontal_margin"
38-
android:paddingTop="@dimen/item_in_history_indicator_vertical_margin"
39-
android:paddingRight="@dimen/item_in_history_indicator_horizontal_margin"
40-
android:paddingBottom="@dimen/item_in_history_indicator_vertical_margin"
41-
android:text="@string/item_in_history"
42-
android:textAllCaps="true"
43-
android:textAppearance="?android:attr/textAppearanceSmall"
44-
android:textColor="@color/item_in_history_indicator_text_color"
45-
android:textSize="@dimen/item_in_history_indicator_text_size"
46-
android:textStyle="bold"
47-
android:visibility="gone"
48-
tools:ignore="RtlHardcoded"
49-
tools:visibility="visible" />
50-
5125
<TextView
5226
android:id="@+id/itemDurationView"
5327
android:layout_width="wrap_content"

‎app/src/main/res/layout/list_stream_playlist_grid_item.xml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,6 @@
2222
android:src="@drawable/dummy_thumbnail"
2323
tools:ignore="RtlHardcoded" />
2424

25-
<TextView
26-
android:id="@+id/itemInHistoryIndicatorView"
27-
android:layout_width="wrap_content"
28-
android:layout_height="wrap_content"
29-
android:layout_alignStart="@id/itemThumbnailView"
30-
android:layout_alignTop="@id/itemThumbnailView"
31-
android:layout_alignEnd="@id/itemThumbnailView"
32-
android:layout_alignBottom="@id/itemThumbnailView"
33-
android:layout_gravity="top|left"
34-
android:background="@drawable/item_in_history_indicator_background"
35-
android:ellipsize="end"
36-
android:maxLines="1"
37-
android:paddingLeft="@dimen/item_in_history_indicator_horizontal_margin"
38-
android:paddingTop="@dimen/item_in_history_indicator_vertical_margin"
39-
android:paddingRight="@dimen/item_in_history_indicator_horizontal_margin"
40-
android:paddingBottom="@dimen/item_in_history_indicator_vertical_margin"
41-
android:text="@string/item_in_history"
42-
android:textAllCaps="true"
43-
android:textAppearance="?android:attr/textAppearanceSmall"
44-
android:textColor="@color/item_in_history_indicator_text_color"
45-
android:textSize="@dimen/item_in_history_indicator_text_size"
46-
android:textStyle="bold"
47-
android:visibility="gone"
48-
tools:ignore="RtlHardcoded"
49-
tools:visibility="visible" />
50-
5125
<TextView
5226
android:id="@+id/itemDurationView"
5327
android:layout_width="wrap_content"

‎app/src/main/res/layout/list_stream_playlist_item.xml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,6 @@
2323
android:src="@drawable/dummy_thumbnail"
2424
tools:ignore="RtlHardcoded" />
2525

26-
<TextView
27-
android:id="@+id/itemInHistoryIndicatorView"
28-
android:layout_width="wrap_content"
29-
android:layout_height="wrap_content"
30-
android:layout_alignStart="@id/itemThumbnailView"
31-
android:layout_alignTop="@id/itemThumbnailView"
32-
android:layout_alignEnd="@id/itemThumbnailView"
33-
android:layout_alignBottom="@id/itemThumbnailView"
34-
android:layout_gravity="top|left"
35-
android:background="@drawable/item_in_history_indicator_background"
36-
android:ellipsize="end"
37-
android:maxLines="1"
38-
android:paddingLeft="@dimen/item_in_history_indicator_horizontal_margin"
39-
android:paddingTop="@dimen/item_in_history_indicator_vertical_margin"
40-
android:paddingRight="@dimen/item_in_history_indicator_horizontal_margin"
41-
android:paddingBottom="@dimen/item_in_history_indicator_vertical_margin"
42-
android:text="@string/item_in_history"
43-
android:textAllCaps="true"
44-
android:textAppearance="?android:attr/textAppearanceSmall"
45-
android:textColor="@color/item_in_history_indicator_text_color"
46-
android:textSize="@dimen/item_in_history_indicator_text_size"
47-
android:textStyle="bold"
48-
android:visibility="gone"
49-
tools:ignore="RtlHardcoded"
50-
tools:visibility="visible" />
51-
5226
<TextView
5327
android:id="@+id/itemDurationView"
5428
android:layout_width="wrap_content"

0 commit comments

Comments
 (0)