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 275c73b63..9e7c0f303 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 @@ -272,7 +272,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener } private void setWidth(Live live) { - int padding = ResUtil.dp2px(36); + int padding = ResUtil.dp2px(48); if (live.getWidth() == 0) for (Group item : live.getGroups()) live.setWidth(Math.max(live.getWidth(), ResUtil.getTextWidth(item.getName(), 14))); int width = live.getWidth() == 0 ? 0 : Math.min(live.getWidth() + padding, ResUtil.getScreenWidth() / 4); setWidth(mBinding.group, width); @@ -281,7 +281,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener @Override public void setWidth(Group group) { int logo = ResUtil.dp2px(56); - int padding = ResUtil.dp2px(48); + int padding = ResUtil.dp2px(60); 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(), 14))); int width = group.getWidth() == 0 ? 0 : Math.min(group.getWidth() + padding, ResUtil.getScreenWidth() / 2); @@ -289,7 +289,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener } private void setWidth(Epg epg) { - int padding = ResUtil.dp2px(36); + int padding = ResUtil.dp2px(48); if (epg.getList().isEmpty()) return; int minWidth = ResUtil.getTextWidth(epg.getList().get(0).getTime(), 12); if (epg.getWidth() == 0) for (EpgData item : epg.getList()) epg.setWidth(Math.max(epg.getWidth(), ResUtil.getTextWidth(item.getTitle(), 14))); diff --git a/app/src/mobile/res/drawable/shape_live.xml b/app/src/mobile/res/drawable/shape_live.xml index 2c8d9b3d5..a63c59674 100644 --- a/app/src/mobile/res/drawable/shape_live.xml +++ b/app/src/mobile/res/drawable/shape_live.xml @@ -7,8 +7,8 @@ diff --git a/app/src/mobile/res/layout/activity_live.xml b/app/src/mobile/res/layout/activity_live.xml index 18395fef5..cf95d4c18 100644 --- a/app/src/mobile/res/layout/activity_live.xml +++ b/app/src/mobile/res/layout/activity_live.xml @@ -69,7 +69,7 @@ android:clipChildren="false" android:clipToPadding="false" android:padding="8dp" - android:translationX="-8dp" + android:translationX="-16dp" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" tools:itemCount="5" tools:listitem="@layout/adapter_channel" /> diff --git a/app/src/mobile/res/layout/adapter_channel.xml b/app/src/mobile/res/layout/adapter_channel.xml index b9444fc13..03d6ec0c0 100644 --- a/app/src/mobile/res/layout/adapter_channel.xml +++ b/app/src/mobile/res/layout/adapter_channel.xml @@ -3,6 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:background="@drawable/shape_live" android:gravity="center" android:orientation="horizontal"> diff --git a/app/src/mobile/res/layout/adapter_epg_data.xml b/app/src/mobile/res/layout/adapter_epg_data.xml index f2f473b7c..6038b1e54 100644 --- a/app/src/mobile/res/layout/adapter_epg_data.xml +++ b/app/src/mobile/res/layout/adapter_epg_data.xml @@ -3,6 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:background="@drawable/shape_live" android:orientation="vertical"> diff --git a/app/src/mobile/res/layout/adapter_group.xml b/app/src/mobile/res/layout/adapter_group.xml index bbc220a2a..345fcc96d 100644 --- a/app/src/mobile/res/layout/adapter_group.xml +++ b/app/src/mobile/res/layout/adapter_group.xml @@ -3,6 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:gravity="center" android:orientation="horizontal">