Use MediaStream from SDK in MediaInfoCardView and InfoCardPresenter

(cherry picked from commit acc4533)
jellyfin · Oct 4, 2022 · 7a478a7 · 7a478a7
1 parent 9723da6
commit 7a478a7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/card/MediaInfoCardView.kt b/app/src/main/java/org/jellyfin/androidtv/ui/card/MediaInfoCardView.kt
@@ -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,
@@ -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")

diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsActivity.java b/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsActivity.java
@@ -756,7 +756,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));

diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/presentation/InfoCardPresenter.java b/app/src/main/java/org/jellyfin/androidtv/ui/presentation/InfoCardPresenter.java
@@ -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 {
@@ -15,7 +15,6 @@ class ViewHolder extends Presenter.ViewHolder {
  public ViewHolder(View view) {
  super(view);
  mInfoCardView = (MediaInfoCardView) view;
-
  }
 
  public void setItem(MediaStream ms) {
@@ -44,6 +43,5 @@ public void onBindViewHolder(Presenter.ViewHolder viewHolder, Object item) {
 
  @Override
  public void onUnbindViewHolder(Presenter.ViewHolder viewHolder) {
- //Log.d(TAG, "onUnbindViewHolder");
  }
 }