diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsFragment.java b/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsFragment.java index c1f63bd06f..917af8cd56 100644 --- a/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsFragment.java +++ b/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsFragment.java @@ -423,8 +423,6 @@ protected MyDetailsOverviewRow doInBackground(BaseItemDto... params) { String primaryImageUrl = imageHelper.getValue().getLogoImageUrl(mBaseItem, 600, true); if (primaryImageUrl == null) { primaryImageUrl = imageHelper.getValue().getPrimaryImageUrl(mBaseItem, false, null, posterHeight); - if (item.getRunTimeTicks() != null && item.getRunTimeTicks() > 0 && item.getUserData() != null && item.getUserData().getPlaybackPositionTicks() > 0) - mDetailsOverviewRow.setProgress(((int) (item.getUserData().getPlaybackPositionTicks() * 100.0 / item.getRunTimeTicks()))); } mDetailsOverviewRow.setSummary(item.getOverview()); diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/ItemListFragment.java b/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/ItemListFragment.java index 5952421d58..b53069b9a2 100644 --- a/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/ItemListFragment.java +++ b/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/ItemListFragment.java @@ -14,7 +14,6 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.PopupMenu; -import android.widget.RelativeLayout; import android.widget.ScrollView; import android.widget.TextView; @@ -116,12 +115,6 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c mItemList = binding.songs; mScrollView = binding.scrollView; - //adjust left frame - RelativeLayout leftFrame = detailsBinding.leftFrame; - ViewGroup.LayoutParams params = leftFrame.getLayoutParams(); - params.width = Utils.convertDpToPixel(requireContext(), 100); - - mMetrics = new DisplayMetrics(); requireActivity().getWindowManager().getDefaultDisplay().getMetrics(mMetrics); mBottomScrollThreshold = (int) (mMetrics.heightPixels * .6); diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/MusicFavoritesListFragment.java b/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/MusicFavoritesListFragment.java index b45a3ccfd9..a991b30b4f 100644 --- a/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/MusicFavoritesListFragment.java +++ b/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/MusicFavoritesListFragment.java @@ -12,7 +12,6 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.PopupMenu; -import android.widget.RelativeLayout; import android.widget.ScrollView; import androidx.annotation.NonNull; @@ -76,11 +75,6 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c mItemList = binding.songs; mScrollView = binding.scrollView; - //adjust left frame - RelativeLayout leftFrame = detailsBinding.leftFrame; - ViewGroup.LayoutParams params = leftFrame.getLayoutParams(); - params.width = Utils.convertDpToPixel(requireContext(), 100); - mMetrics = new DisplayMetrics(); requireActivity().getWindowManager().getDefaultDisplay().getMetrics(mMetrics); mBottomScrollThreshold = (int) (mMetrics.heightPixels * .6); diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/MyDetailsOverviewRow.kt b/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/MyDetailsOverviewRow.kt index bae106ec45..9abe734a4b 100644 --- a/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/MyDetailsOverviewRow.kt +++ b/app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/MyDetailsOverviewRow.kt @@ -10,7 +10,6 @@ class MyDetailsOverviewRow @JvmOverloads constructor( val item: BaseItemDto, var imageDrawable: String? = null, var summary: String? = null, - var progress: Int = 0, var infoItem1: InfoItem? = null, var infoItem2: InfoItem? = null, var infoItem3: InfoItem? = null, diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/presentation/MyDetailsOverviewRowPresenter.kt b/app/src/main/java/org/jellyfin/androidtv/ui/presentation/MyDetailsOverviewRowPresenter.kt index 30dbecc324..2b6f9dcd5e 100644 --- a/app/src/main/java/org/jellyfin/androidtv/ui/presentation/MyDetailsOverviewRowPresenter.kt +++ b/app/src/main/java/org/jellyfin/androidtv/ui/presentation/MyDetailsOverviewRowPresenter.kt @@ -1,15 +1,12 @@ package org.jellyfin.androidtv.ui.presentation import android.view.ViewGroup -import android.widget.RelativeLayout import androidx.core.view.isVisible -import androidx.core.view.updateLayoutParams import androidx.leanback.widget.RowPresenter import org.jellyfin.androidtv.ui.DetailRowView import org.jellyfin.androidtv.ui.itemdetail.MyDetailsOverviewRow import org.jellyfin.androidtv.util.InfoLayoutHelper import org.jellyfin.androidtv.util.MarkdownRenderer -import org.jellyfin.androidtv.util.dp import org.jellyfin.sdk.model.api.BaseItemKind class MyDetailsOverviewRowPresenter( @@ -38,24 +35,11 @@ class MyDetailsOverviewRowPresenter( binding.mainImage.load(row.imageDrawable, null, null, 1.0, 0) - if (row.progress > 0 && row.imageDrawable != null) { - binding.fdProgress.progress = row.progress - binding.fdProgress.isVisible = true - } - setSummary(row.summary) if (row.item.type == BaseItemKind.PERSON) { - binding.fdSummaryText.updateLayoutParams { - topMargin = 10 - height = 185.dp(view.context) - } - binding.fdSummaryText.maxLines = 9 binding.fdGenreRow.isVisible = false - binding.leftFrame.updateLayoutParams { - width = 100.dp(view.context) - } } binding.fdButtonRow.removeAllViews() @@ -69,11 +53,6 @@ class MyDetailsOverviewRowPresenter( fun setTitle(title: String?) { binding.fdTitle.text = title - if (binding.fdTitle.text.length > 28) { - binding.fdTitle.updateLayoutParams { - topMargin = 55.dp(view.context) - } - } } fun setSummary(summary: String?) { diff --git a/app/src/main/res/drawable/expanded_text.xml b/app/src/main/res/drawable/expanded_text.xml index 2c9ad086d9..9c241cd7ee 100644 --- a/app/src/main/res/drawable/expanded_text.xml +++ b/app/src/main/res/drawable/expanded_text.xml @@ -2,6 +2,7 @@ + diff --git a/app/src/main/res/layout/view_row_details.xml b/app/src/main/res/layout/view_row_details.xml index 7f42d00d5d..35205c6301 100644 --- a/app/src/main/res/layout/view_row_details.xml +++ b/app/src/main/res/layout/view_row_details.xml @@ -1,182 +1,212 @@ - - + + + + + + + + + + + + + + + + + + + + + + + android:textSize="14sp" + app:layout_constraintEnd_toEndOf="@id/guide_left_end" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/guide_top" + tools:text="infoTitle1" /> + android:textSize="14sp" + app:layout_constraintEnd_toStartOf="@id/guide_left_end" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/infoTitle1" + tools:text="infoValue1" /> + android:textSize="14sp" + app:layout_constraintEnd_toStartOf="@id/guide_left_end" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/infoValue1" + tools:text="infoTitle2" /> + android:textSize="14sp" + app:layout_constraintEnd_toStartOf="@id/guide_left_end" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/infoTitle2" + tools:text="infoValue2" /> + android:textSize="14sp" + app:layout_constraintEnd_toStartOf="@id/guide_left_end" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/infoValue2" + tools:text="infoTitle3" /> - - - - - + android:textSize="14sp" + app:layout_constraintEnd_toStartOf="@id/guide_left_end" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/infoTitle3" + tools:text="infoValue3" /> - - - + + app:layout_constraintBottom_toBottomOf="@id/infoValue3" + app:layout_constraintEnd_toEndOf="@id/guide_main_end" + app:layout_constraintStart_toStartOf="@id/guide_main_start" + app:layout_constraintTop_toBottomOf="@id/fdGenreRow" + tools:text="fdSummaryText" /> - - - - - - - - - + app:layout_constraintEnd_toEndOf="@id/guide_main_end" + app:layout_constraintStart_toStartOf="@id/guide_main_start" + app:layout_constraintTop_toBottomOf="@id/fdSummaryText" /> + + + + + + + +