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 9fd66da7b..4fb00e132 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
@@ -265,7 +265,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
}
private void setWidth(Live live) {
- int padding = ResUtil.dp2px(48);
+ int padding = ResUtil.dp2px(52);
if (live.getWidth() == 0) for (Group item : live.getGroups()) live.setWidth(Math.max(live.getWidth(), ResUtil.getTextWidth(item.getName(), 16)));
int width = live.getWidth() == 0 ? 0 : Math.min(live.getWidth() + padding, ResUtil.getScreenWidth() / 4);
setWidth(mBinding.group, width);
@@ -273,7 +273,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
private Group setWidth(Group group) {
int logo = ResUtil.dp2px(60);
- int padding = ResUtil.dp2px(60);
+ int padding = ResUtil.dp2px(64);
if (group.isKeep()) group.setWidth(0);
if (group.getWidth() == 0) for (Channel item : group.getChannel()) group.setWidth(Math.max(group.getWidth(), (item.getLogo().isEmpty() ? 0 : logo) + ResUtil.getTextWidth(item.getNumber() + item.getName(), 16)));
int width = group.getWidth() == 0 ? 0 : Math.min(group.getWidth() + padding, ResUtil.getScreenWidth() / 2);
@@ -282,9 +282,9 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
}
private void setWidth(Epg epg) {
- int padding = ResUtil.dp2px(48);
+ int padding = ResUtil.dp2px(52);
if (epg.getList().isEmpty()) return;
- int minWidth = ResUtil.getTextWidth(epg.getList().get(0).getTime(), 16);
+ int minWidth = ResUtil.getTextWidth(epg.getList().get(0).getTime(), 14);
if (epg.getWidth() == 0) for (EpgData item : epg.getList()) epg.setWidth(Math.max(epg.getWidth(), ResUtil.getTextWidth(item.getTitle(), 16)));
int width = epg.getWidth() == 0 ? 0 : Math.min(Math.max(epg.getWidth(), minWidth) + padding, ResUtil.getScreenWidth() / 2);
setWidth(mBinding.epgData, width);
diff --git a/app/src/leanback/res/drawable/shape_live_focused.xml b/app/src/leanback/res/drawable/shape_live_focused.xml
index 62e3c4997..dfac27b03 100644
--- a/app/src/leanback/res/drawable/shape_live_focused.xml
+++ b/app/src/leanback/res/drawable/shape_live_focused.xml
@@ -10,8 +10,8 @@
\ No newline at end of file
diff --git a/app/src/leanback/res/drawable/shape_live_list.xml b/app/src/leanback/res/drawable/shape_live_list.xml
index a2664c9fd..4e1460f19 100644
--- a/app/src/leanback/res/drawable/shape_live_list.xml
+++ b/app/src/leanback/res/drawable/shape_live_list.xml
@@ -4,7 +4,7 @@
diff --git a/app/src/leanback/res/layout/activity_live.xml b/app/src/leanback/res/layout/activity_live.xml
index fb88de18f..9262a9576 100644
--- a/app/src/leanback/res/layout/activity_live.xml
+++ b/app/src/leanback/res/layout/activity_live.xml
@@ -56,6 +56,9 @@
android:id="@+id/group"
android:layout_width="0dp"
android:layout_height="match_parent"
+ android:clipChildren="false"
+ android:clipToPadding="false"
+ android:padding="12dp"
tools:itemCount="5"
tools:listitem="@layout/adapter_group" />
@@ -63,6 +66,10 @@
android:id="@+id/channel"
android:layout_width="0dp"
android:layout_height="match_parent"
+ android:clipChildren="false"
+ android:translationX="-12dp"
+ android:clipToPadding="false"
+ android:padding="12dp"
tools:itemCount="5"
tools:listitem="@layout/adapter_channel" />
@@ -70,6 +77,9 @@
android:id="@+id/epgData"
android:layout_width="0dp"
android:layout_height="match_parent"
+ android:clipChildren="false"
+ android:clipToPadding="false"
+ android:padding="12dp"
tools:itemCount="5"
tools:listitem="@layout/adapter_epg_data" />
diff --git a/app/src/leanback/res/layout/adapter_channel.xml b/app/src/leanback/res/layout/adapter_channel.xml
index 5444110e2..64003492a 100644
--- a/app/src/leanback/res/layout/adapter_channel.xml
+++ b/app/src/leanback/res/layout/adapter_channel.xml
@@ -3,7 +3,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_margin="1.5dp"
android:background="@drawable/selector_live"
android:focusable="true"
android:focusableInTouchMode="true"
@@ -16,6 +15,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:duplicateParentState="true"
+ android:fontFeatureSettings="tnum"
android:textColor="@color/live"
android:textSize="16sp"
tools:text="01" />
diff --git a/app/src/leanback/res/layout/adapter_epg_data.xml b/app/src/leanback/res/layout/adapter_epg_data.xml
index 15a882633..f8a4ee308 100644
--- a/app/src/leanback/res/layout/adapter_epg_data.xml
+++ b/app/src/leanback/res/layout/adapter_epg_data.xml
@@ -1,9 +1,8 @@