-
-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add stream segments to VideoPlayerImpl
- Loading branch information
Showing
7 changed files
with
333 additions
and
1 deletion.
There are no files selected for viewing
70 changes: 70 additions & 0 deletions
70
app/src/main/java/org/schabi/newpipe/info_list/StreamSegmentAdapter.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| package org.schabi.newpipe.info_list | ||
|
|
||
| import android.util.Log | ||
| import com.xwray.groupie.GroupAdapter | ||
| import com.xwray.groupie.GroupieViewHolder | ||
| import org.schabi.newpipe.extractor.stream.StreamInfo | ||
| import kotlin.math.max | ||
|
|
||
| /** | ||
| * Custom RecyclerView.Adapter for [StreamSegmentItem] for handling selection state. | ||
| */ | ||
| class StreamSegmentAdapter( | ||
| private val listener: StreamSegmentListener | ||
| ) : GroupAdapter<GroupieViewHolder>() { | ||
|
|
||
| var currentIndex: Int = 0 | ||
| private set | ||
|
|
||
| /** | ||
| * Returns `true` if the provided [StreamInfo] contains segments, `false` otherwise. | ||
| */ | ||
| fun setItems(info: StreamInfo): Boolean { | ||
| if (info.streamSegments.isNotEmpty()) { | ||
| clear() | ||
| val list = arrayListOf<StreamSegmentItem>() | ||
| info.streamSegments.forEach { | ||
| list.add(StreamSegmentItem(it, listener)) | ||
| } | ||
| addAll(list) | ||
| return true | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| fun selectSegment(segment: StreamSegmentItem) { | ||
| unSelectCurrentSegment() | ||
| currentIndex = max(0, getAdapterPosition(segment)) | ||
| segment.isSelected = true | ||
| segment.notifyChanged(StreamSegmentItem.PAYLOAD_SELECT) | ||
| } | ||
|
|
||
| fun selectSegmentAt(position: Int) { | ||
| try { | ||
| selectSegment(getGroupAtAdapterPosition(position) as StreamSegmentItem) | ||
| } catch (e: IndexOutOfBoundsException) { | ||
| // Just to make sure that getGroupAtAdapterPosition doesn't close the app | ||
| // Shouldn't happen since setItems is always called before select-methods but just in case | ||
| currentIndex = 0 | ||
| Log.e("StreamSegmentAdapter", "selectSegmentAt: ${e.message}") | ||
| } | ||
| } | ||
|
|
||
| private fun unSelectCurrentSegment() { | ||
| try { | ||
| val segmentItem = getGroupAtAdapterPosition(currentIndex) as StreamSegmentItem | ||
| currentIndex = 0 | ||
| segmentItem.isSelected = false | ||
| segmentItem.notifyChanged(StreamSegmentItem.PAYLOAD_SELECT) | ||
| } catch (e: IndexOutOfBoundsException) { | ||
| // Just to make sure that getGroupAtAdapterPosition doesn't close the app | ||
| // Shouldn't happen since setItems is always called before select-methods but just in case | ||
| currentIndex = 0 | ||
| Log.e("StreamSegmentAdapter", "unSelectCurrentSegment: ${e.message}") | ||
| } | ||
| } | ||
|
|
||
| interface StreamSegmentListener { | ||
| fun onItemClick(item: StreamSegmentItem, secondsInMillis: Long) | ||
| } | ||
| } |
63 changes: 63 additions & 0 deletions
63
app/src/main/java/org/schabi/newpipe/info_list/StreamSegmentItem.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| package org.schabi.newpipe.info_list | ||
|
|
||
| import android.widget.ImageView | ||
| import android.widget.TextView | ||
| import com.nostra13.universalimageloader.core.ImageLoader | ||
| import com.xwray.groupie.GroupieViewHolder | ||
| import com.xwray.groupie.Item | ||
| import org.schabi.newpipe.R | ||
| import org.schabi.newpipe.extractor.stream.StreamSegment | ||
| import org.schabi.newpipe.util.ImageDisplayConstants | ||
| import java.util.concurrent.TimeUnit | ||
|
|
||
| class StreamSegmentItem( | ||
| private val item: StreamSegment, | ||
| private val onClick: StreamSegmentAdapter.StreamSegmentListener | ||
| ) : Item<GroupieViewHolder>() { | ||
|
|
||
| companion object { | ||
| const val PAYLOAD_SELECT = 1 | ||
| } | ||
|
|
||
| var isSelected = false | ||
|
|
||
| override fun bind(viewHolder: GroupieViewHolder, position: Int) { | ||
| item.previewUrl?.let { | ||
| ImageLoader.getInstance().displayImage( | ||
| it, viewHolder.root.findViewById<ImageView>(R.id.previewImage), | ||
| ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS | ||
| ) | ||
| } | ||
| viewHolder.root.findViewById<TextView>(R.id.textViewTitle).text = item.title | ||
| viewHolder.root.findViewById<TextView>(R.id.textViewStartSeconds).text = | ||
| secondsToString(item.startTimeSeconds.toLong()) | ||
| viewHolder.root.setOnClickListener { onClick.onItemClick(this, item.startTimeSeconds * 1000L) } | ||
| viewHolder.root.isSelected = isSelected | ||
| } | ||
|
|
||
| override fun bind(viewHolder: GroupieViewHolder, position: Int, payloads: MutableList<Any>) { | ||
| if (payloads.contains(PAYLOAD_SELECT)) { | ||
| viewHolder.root.isSelected = isSelected | ||
| return | ||
| } | ||
| super.bind(viewHolder, position, payloads) | ||
| } | ||
|
|
||
| private fun secondsToString(seconds: Long): String { | ||
| val hours = TimeUnit.SECONDS.toHours(seconds) | ||
| val minutes = TimeUnit.SECONDS.toMinutes(seconds) | ||
| .minus(TimeUnit.HOURS.toMinutes(hours)) | ||
| val sec = seconds | ||
| .minus(TimeUnit.HOURS.toSeconds(hours)) | ||
| .minus(TimeUnit.MINUTES.toSeconds(minutes)) | ||
|
|
||
| return if (hours == 0L) String.format("%02d:%02d", minutes, sec) | ||
| else String.format("%02d:%02d:%02d", hours, minutes, sec) | ||
| } | ||
|
|
||
| override fun getLayout() = R.layout.item_stream_segment | ||
|
|
||
| interface ClickListener { | ||
| fun onClick(segmentItem: StreamSegmentItem, positionInMillis: Long) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
app/src/main/res/drawable/ic_format_list_numbered_white_24.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:tint="#FFFFFF" | ||
| android:viewportWidth="24" | ||
| android:viewportHeight="24"> | ||
| <path | ||
| android:fillColor="@android:color/white" | ||
| android:pathData="M2,17h2v0.5L3,17.5v1h1v0.5L2,19v1h3v-4L2,16v1zM3,8h1L4,4L2,4v1h1v3zM2,11h1.8L2,13.1v0.9h3v-1L3.2,13L5,10.9L5,10L2,10v1zM7,5v2h14L21,5L7,5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2z" /> | ||
| </vector> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.