Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove IN HISTORY label on stream info items

Browse source
This commit is contained in:
Stypox 2021-03-26 11:35:54 +01:00
parent 360f5ac6f7
commit e58feadba9
No known key found for this signature in database
GPG key ID: 4BDF1B40A49FDD23
8 changed files with 5 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/schabi/newpipe/database/feed/dao/FeedDAO.kt
View file

@ -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
@ -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
@ -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
@ -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

5
app/src/main/java/org/schabi/newpipe/database/stream/StreamWithState.kt
View file

@ -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
app/src/main/java/org/schabi/newpipe/local/feed/item/StreamItem.kt
View file

@ -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
@ -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