Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use MediaStream from SDK in MediaInfoCardView and InfoCardPresenter #1997

Merged
merged 1 commit into from
Aug 20, 2022
Merged

Use MediaStream from SDK in MediaInfoCardView and InfoCardPresenter #1997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions app/src/main/java/org/jellyfin/androidtv/ui/card/MediaInfoCardView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
package org.jellyfin.androidtv.ui.card

import android.content.Context
import android.widget.FrameLayout
import android.view.LayoutInflater
import android.widget.LinearLayout
import android.graphics.Typeface
import android.text.SpannableString
import android.text.SpannableStringBuilder
import android.text.TextUtils
import android.util.AttributeSet
import android.widget.TextView
import android.view.LayoutInflater
import android.widget.FrameLayout
import androidx.core.text.bold
import androidx.core.text.toSpannable
import org.jellyfin.androidtv.databinding.ViewCardMediaInfoBinding
import org.jellyfin.androidtv.util.Utils
import org.jellyfin.apiclient.model.entities.MediaStream
import org.jellyfin.apiclient.model.entities.MediaStreamType
import org.jellyfin.sdk.model.api.MediaStream
import org.jellyfin.sdk.model.api.MediaStreamType
import java.text.NumberFormat
import java.util.*

class MediaInfoCardView @JvmOverloads constructor(
context: Context,
Expand All @@ -30,13 +22,13 @@ class MediaInfoCardView @JvmOverloads constructor(
fun setMediaStream(mediaStream: MediaStream) {
binding.title.text = mediaStream.type.toString()
binding.entries.text = SpannableStringBuilder().apply {
if (mediaStream.type != MediaStreamType.Video) mediaStream.language?.let { addRow("Language", it) }
if (mediaStream.type != MediaStreamType.VIDEO) mediaStream.language?.let { addRow("Language", it) }
mediaStream.codec?.let { addRow("Codec", it) }
mediaStream.profile?.let { addRow("Profile", it) }
mediaStream.level?.let { addRow("Level", it.toString()) }
mediaStream.channelLayout?.let { addRow("Layout", it) }

if (mediaStream.type == MediaStreamType.Video) {
if (mediaStream.type == MediaStreamType.VIDEO) {
if (mediaStream.width != null && mediaStream.height != null) addRow("Resolution", "${mediaStream.width}x${mediaStream.height}")
if (mediaStream.isAnamorphic == true) addRow("Anamorphic")
if (mediaStream.isInterlaced) addRow("Interlaced")
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@
import org.jellyfin.apiclient.serialization.GsonJsonSerializer;
import org.jellyfin.sdk.model.api.BaseItemKind;
import org.jellyfin.sdk.model.api.BaseItemPerson;
import org.jellyfin.sdk.model.constant.PersonType;
import org.jellyfin.sdk.model.constant.ItemSortBy;
import org.jellyfin.sdk.model.constant.MediaType;
import org.jellyfin.sdk.model.constant.PersonType;
import org.koin.java.KoinJavaComponent;

import java.util.ArrayList;
Expand Down Expand Up @@ -753,7 +753,7 @@ private void addInfoRows(ArrayObjectAdapter adapter) {
HeaderItem header = new HeaderItem("Media Details"+(ms.getContainer() != null ? " (" +ms.getContainer()+")" : ""));
ArrayObjectAdapter infoAdapter = new ArrayObjectAdapter(new InfoCardPresenter());
for (MediaStream stream : ms.getMediaStreams()) {
infoAdapter.add(stream);
infoAdapter.add(ModelCompat.asSdk(stream));
}

adapter.add(new ListRow(header, infoAdapter));
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/java/org/jellyfin/androidtv/ui/presentation/InfoCardPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import androidx.leanback.widget.Presenter;

import org.jellyfin.androidtv.ui.card.MediaInfoCardView;
import org.jellyfin.apiclient.model.entities.MediaStream;
import org.jellyfin.sdk.model.api.MediaStream;

public class InfoCardPresenter extends Presenter {
class ViewHolder extends Presenter.ViewHolder {
Expand All @@ -15,7 +15,6 @@ class ViewHolder extends Presenter.ViewHolder {
public ViewHolder(View view) {
super(view);
mInfoCardView = (MediaInfoCardView) view;

}

public void setItem(MediaStream ms) {
Expand Down Expand Up @@ -44,6 +43,5 @@ public void onBindViewHolder(Presenter.ViewHolder viewHolder, Object item) {

@Override
public void onUnbindViewHolder(Presenter.ViewHolder viewHolder) {
//Log.d(TAG, "onUnbindViewHolder");
}
}