Skip to content

Commit

Permalink
Remove IN HISTORY label on stream info items
Browse files Browse the repository at this point in the history
  • Loading branch information
@Stypox
Stypox committed Jun 9, 2021
1 parent 360f5ac commit e58fead
Show file tree
Hide file tree
Showing 8 changed files with 5 additions and 142 deletions.
8 changes: 4 additions & 4 deletions app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedDAO.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ abstract class FeedDAO {

@Query(
"""
SELECT s.*, sst.progress_time, (sh.stream_id IS NOT NULL) AS is_stream_in_history
SELECT s.*, sst.progress_time
FROM streams s
LEFT JOIN stream_state sst
Expand All @@ -41,7 +41,7 @@ abstract class FeedDAO {

@Query(
"""
SELECT s.*, sst.progress_time, (sh.stream_id IS NOT NULL) AS is_stream_in_history
SELECT s.*, sst.progress_time
FROM streams s
LEFT JOIN stream_state sst
Expand All @@ -66,7 +66,7 @@ abstract class FeedDAO {

@Query(
"""
SELECT s.*, sst.progress_time, (sh.stream_id IS NOT NULL) AS is_stream_in_history
SELECT s.*, sst.progress_time
FROM streams s
LEFT JOIN stream_state sst
Expand Down Expand Up @@ -95,7 +95,7 @@ abstract class FeedDAO {

@Query(
"""
SELECT s.*, sst.progress_time, (sh.stream_id IS NOT NULL) AS is_stream_in_history
SELECT s.*, sst.progress_time
FROM streams s
LEFT JOIN stream_state sst
Expand Down
5 changes: 1 addition & 4 deletions app/src/main/java/org/schabi/newpipe/database/stream/StreamWithState.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,5 @@ data class StreamWithState(
val stream: StreamEntity,

@ColumnInfo(name = StreamStateEntity.STREAM_PROGRESS_TIME)
val stateProgressTime: Long?,

@ColumnInfo(name = "is_stream_in_history")
val isInHistory: Boolean = false
val stateProgressTime: Long?
)
4 changes: 0 additions & 4 deletions app/src/main/java/org/schabi/newpipe/local/feed/item/StreamItem.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ data class StreamItem(

private val stream: StreamEntity = streamWithState.stream
private val stateProgressTime: Long? = streamWithState.stateProgressTime
private val isInHistory: Boolean = streamWithState.isInHistory

override fun getId(): Long = stream.uid

Expand Down Expand Up @@ -94,9 +93,6 @@ data class StreamItem(
viewBinding.itemProgressView.visibility = View.GONE
}

viewBinding.itemInHistoryIndicatorView.visibility =
if (isInHistory && !isLiveStream) View.VISIBLE else View.GONE

ImageLoader.getInstance().displayImage(
stream.thumbnailUrl, viewBinding.itemThumbnailView,
ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS
Expand Down
26 changes: 0 additions & 26 deletions app/src/main/res/layout/list_stream_grid_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,32 +20,6 @@
android:src="@drawable/dummy_thumbnail"
tools:ignore="RtlHardcoded" />

<TextView
android:id="@+id/itemInHistoryIndicatorView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignStart="@id/itemThumbnailView"
android:layout_alignTop="@id/itemThumbnailView"
android:layout_alignEnd="@id/itemThumbnailView"
android:layout_alignBottom="@id/itemThumbnailView"
android:layout_gravity="top|left"
android:background="@drawable/item_in_history_indicator_background"
android:ellipsize="end"
android:maxLines="1"
android:paddingLeft="@dimen/item_in_history_indicator_horizontal_margin"
android:paddingTop="@dimen/item_in_history_indicator_vertical_margin"
android:paddingRight="@dimen/item_in_history_indicator_horizontal_margin"
android:paddingBottom="@dimen/item_in_history_indicator_vertical_margin"
android:text="@string/item_in_history"
android:textAllCaps="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/item_in_history_indicator_text_color"
android:textSize="@dimen/item_in_history_indicator_text_size"
android:textStyle="bold"
android:visibility="gone"
tools:ignore="RtlHardcoded"
tools:visibility="visible" />

<TextView
android:id="@+id/itemDurationView"
android:layout_width="wrap_content"
Expand Down
26 changes: 0 additions & 26 deletions app/src/main/res/layout/list_stream_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,32 +25,6 @@
app:layout_constraintBottom_toBottomOf="parent"
tools:ignore="RtlHardcoded" />

<TextView
android:id="@+id/itemInHistoryIndicatorView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignStart="@id/itemThumbnailView"
android:layout_alignTop="@id/itemThumbnailView"
android:layout_alignEnd="@id/itemThumbnailView"
android:layout_alignBottom="@id/itemThumbnailView"
android:layout_gravity="top|left"
android:background="@drawable/item_in_history_indicator_background"
android:ellipsize="end"
android:maxLines="1"
android:paddingLeft="@dimen/item_in_history_indicator_horizontal_margin"
android:paddingTop="@dimen/item_in_history_indicator_vertical_margin"
android:paddingRight="@dimen/item_in_history_indicator_horizontal_margin"
android:paddingBottom="@dimen/item_in_history_indicator_vertical_margin"
android:text="@string/item_in_history"
android:textAllCaps="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/item_in_history_indicator_text_color"
android:textSize="@dimen/item_in_history_indicator_text_size"
android:textStyle="bold"
android:visibility="gone"
tools:ignore="RtlHardcoded"
tools:visibility="visible" />

<TextView
android:id="@+id/itemDurationView"
android:layout_width="wrap_content"
Expand Down
26 changes: 0 additions & 26 deletions app/src/main/res/layout/list_stream_mini_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,6 @@
android:src="@drawable/dummy_thumbnail"
tools:ignore="RtlHardcoded" />

<TextView
android:id="@+id/itemInHistoryIndicatorView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignStart="@id/itemThumbnailView"
android:layout_alignTop="@id/itemThumbnailView"
android:layout_alignEnd="@id/itemThumbnailView"
android:layout_alignBottom="@id/itemThumbnailView"
android:layout_gravity="top|left"
android:background="@drawable/item_in_history_indicator_background"
android:ellipsize="end"
android:maxLines="1"
android:paddingLeft="@dimen/item_in_history_indicator_horizontal_margin"
android:paddingTop="@dimen/item_in_history_indicator_vertical_margin"
android:paddingRight="@dimen/item_in_history_indicator_horizontal_margin"
android:paddingBottom="@dimen/item_in_history_indicator_vertical_margin"
android:text="@string/item_in_history"
android:textAllCaps="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/item_in_history_indicator_text_color"
android:textSize="@dimen/item_in_history_indicator_text_size"
android:textStyle="bold"
android:visibility="gone"
tools:ignore="RtlHardcoded"
tools:visibility="visible" />

<TextView
android:id="@+id/itemDurationView"
android:layout_width="wrap_content"
Expand Down
26 changes: 0 additions & 26 deletions app/src/main/res/layout/list_stream_playlist_grid_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,6 @@
android:src="@drawable/dummy_thumbnail"
tools:ignore="RtlHardcoded" />

<TextView
android:id="@+id/itemInHistoryIndicatorView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignStart="@id/itemThumbnailView"
android:layout_alignTop="@id/itemThumbnailView"
android:layout_alignEnd="@id/itemThumbnailView"
android:layout_alignBottom="@id/itemThumbnailView"
android:layout_gravity="top|left"
android:background="@drawable/item_in_history_indicator_background"
android:ellipsize="end"
android:maxLines="1"
android:paddingLeft="@dimen/item_in_history_indicator_horizontal_margin"
android:paddingTop="@dimen/item_in_history_indicator_vertical_margin"
android:paddingRight="@dimen/item_in_history_indicator_horizontal_margin"
android:paddingBottom="@dimen/item_in_history_indicator_vertical_margin"
android:text="@string/item_in_history"
android:textAllCaps="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/item_in_history_indicator_text_color"
android:textSize="@dimen/item_in_history_indicator_text_size"
android:textStyle="bold"
android:visibility="gone"
tools:ignore="RtlHardcoded"
tools:visibility="visible" />

<TextView
android:id="@+id/itemDurationView"
android:layout_width="wrap_content"
Expand Down
26 changes: 0 additions & 26 deletions app/src/main/res/layout/list_stream_playlist_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,6 @@
android:src="@drawable/dummy_thumbnail"
tools:ignore="RtlHardcoded" />

<TextView
android:id="@+id/itemInHistoryIndicatorView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignStart="@id/itemThumbnailView"
android:layout_alignTop="@id/itemThumbnailView"
android:layout_alignEnd="@id/itemThumbnailView"
android:layout_alignBottom="@id/itemThumbnailView"
android:layout_gravity="top|left"
android:background="@drawable/item_in_history_indicator_background"
android:ellipsize="end"
android:maxLines="1"
android:paddingLeft="@dimen/item_in_history_indicator_horizontal_margin"
android:paddingTop="@dimen/item_in_history_indicator_vertical_margin"
android:paddingRight="@dimen/item_in_history_indicator_horizontal_margin"
android:paddingBottom="@dimen/item_in_history_indicator_vertical_margin"
android:text="@string/item_in_history"
android:textAllCaps="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/item_in_history_indicator_text_color"
android:textSize="@dimen/item_in_history_indicator_text_size"
android:textStyle="bold"
android:visibility="gone"
tools:ignore="RtlHardcoded"
tools:visibility="visible" />

<TextView
android:id="@+id/itemDurationView"
android:layout_width="wrap_content"
Expand Down

0 comments on commit e58fead

Please sign in to comment.