From 48c403b8d3d7b0dfb6fe1fb7b960ae6effe73b5c Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 20 Nov 2023 09:57:36 +0800 Subject: [PATCH] Fix live ui --- .../com/fongmi/android/tv/ui/activity/LiveActivity.java | 9 ++++++--- app/src/leanback/res/layout/view_widget_live.xml | 1 - .../com/fongmi/android/tv/ui/activity/LiveActivity.java | 8 +++++--- app/src/mobile/res/layout/view_widget_live.xml | 1 - 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 25874decb..4ef2610a3 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -18,6 +18,7 @@ import androidx.leanback.widget.OnChildViewHolderSelectedListener; import androidx.lifecycle.ViewModelProvider; import androidx.media3.common.C; import androidx.media3.common.Player; +import androidx.media3.common.util.Log; import androidx.media3.ui.PlayerView; import androidx.recyclerview.widget.RecyclerView; import androidx.viewbinding.ViewBinding; @@ -441,7 +442,9 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick } private void showEpg() { - mBinding.widget.play.setText(mChannel.getData().getEpg()); + String epg = mChannel.getData().getEpg(); + mBinding.widget.name.setMaxEms(epg.isEmpty() ? mChannel.getName().length() : 12); + mBinding.widget.play.setText(epg); setMetadata(); } @@ -676,8 +679,8 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick } private void setMetadata() { - String title = mChannel == null ? "" : mChannel.getName(); - String artist = mChannel == null ? "" : mChannel.getData().getEpg(); + String title = mBinding.widget.name.getText().toString(); + String artist = mBinding.widget.play.getText().toString(); MediaMetadataCompat.Builder builder = new MediaMetadataCompat.Builder(); builder.putString(MediaMetadataCompat.METADATA_KEY_TITLE, title); builder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, artist); diff --git a/app/src/leanback/res/layout/view_widget_live.xml b/app/src/leanback/res/layout/view_widget_live.xml index 11d106da9..ac25eff01 100644 --- a/app/src/leanback/res/layout/view_widget_live.xml +++ b/app/src/leanback/res/layout/view_widget_live.xml @@ -162,7 +162,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="12dp" - android:maxEms="34" android:singleLine="true" android:textColor="@color/white" android:textSize="18sp" diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 85a16b3b1..32b763f7f 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -489,7 +489,9 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List } private void showEpg() { - mBinding.widget.play.setText(mChannel.getData().getEpg()); + String epg = mChannel.getData().getEpg(); + mBinding.widget.name.setMaxEms(epg.isEmpty() ? mChannel.getName().length() : 12); + mBinding.widget.play.setText(epg); setMetadata(); } @@ -745,8 +747,8 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List } private void setMetadata() { - String title = mChannel == null ? "" : mChannel.getName(); - String artist = mChannel == null ? "" : mChannel.getData().getEpg(); + String title = mBinding.widget.name.getText().toString(); + String artist = mBinding.widget.play.getText().toString(); MediaMetadataCompat.Builder builder = new MediaMetadataCompat.Builder(); builder.putString(MediaMetadataCompat.METADATA_KEY_TITLE, title); builder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, artist); diff --git a/app/src/mobile/res/layout/view_widget_live.xml b/app/src/mobile/res/layout/view_widget_live.xml index 44063f3c0..5cea17f7c 100644 --- a/app/src/mobile/res/layout/view_widget_live.xml +++ b/app/src/mobile/res/layout/view_widget_live.xml @@ -147,7 +147,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="12dp" - android:maxEms="10" android:singleLine="true" android:textColor="@color/white" android:textSize="14sp"