From 58eca7fa8ea194d77c6ec8ba6b077e607243e23a Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 3 Apr 2025 16:33:39 +0800 Subject: [PATCH] Fix ui --- app/src/leanback/res/layout/adapter_vod.xml | 13 +++---------- app/src/leanback/res/layout/adapter_vod_rect.xml | 15 ++++----------- .../res/drawable/shape_vod_remark.xml | 0 .../res/drawable/shape_vod_site.xml | 0 .../res/drawable/shape_vod_year.xml | 0 5 files changed, 7 insertions(+), 21 deletions(-) rename app/src/{mobile => main}/res/drawable/shape_vod_remark.xml (100%) rename app/src/{mobile => main}/res/drawable/shape_vod_site.xml (100%) rename app/src/{mobile => main}/res/drawable/shape_vod_year.xml (100%) diff --git a/app/src/leanback/res/layout/adapter_vod.xml b/app/src/leanback/res/layout/adapter_vod.xml index 70c86a084..cd50d8dfb 100644 --- a/app/src/leanback/res/layout/adapter_vod.xml +++ b/app/src/leanback/res/layout/adapter_vod.xml @@ -31,10 +31,7 @@ android:id="@+id/year" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:background="#CC2196F3" - android:ellipsize="end" - android:padding="4dp" + android:background="@drawable/shape_vod_year" android:singleLine="true" android:textColor="@color/white" android:textSize="14sp" @@ -46,10 +43,7 @@ android:id="@+id/site" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:background="#CCF44336" - android:ellipsize="end" - android:padding="4dp" + android:background="@drawable/shape_vod_site" android:singleLine="true" android:textColor="@color/white" android:textSize="14sp" @@ -62,9 +56,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_above="@+id/name" - android:background="#CC177535" + android:background="@drawable/shape_vod_remark" android:ellipsize="marquee" - android:padding="4dp" android:singleLine="true" android:textColor="@color/white" android:textSize="14sp" diff --git a/app/src/leanback/res/layout/adapter_vod_rect.xml b/app/src/leanback/res/layout/adapter_vod_rect.xml index 9ddf445c2..b6dc1af04 100644 --- a/app/src/leanback/res/layout/adapter_vod_rect.xml +++ b/app/src/leanback/res/layout/adapter_vod_rect.xml @@ -20,10 +20,7 @@ android:id="@+id/year" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:background="#CC2196F3" - android:ellipsize="end" - android:padding="4dp" + android:background="@drawable/shape_vod_year" android:singleLine="true" android:textColor="@color/white" android:textSize="14sp" @@ -35,10 +32,7 @@ android:id="@+id/site" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:background="#CCF44336" - android:ellipsize="end" - android:padding="4dp" + android:background="@drawable/shape_vod_site" android:singleLine="true" android:textColor="@color/white" android:textSize="14sp" @@ -51,9 +45,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_above="@+id/name" - android:background="#CC177535" - android:ellipsize="end" - android:padding="4dp" + android:background="@drawable/shape_vod_remark" + android:ellipsize="marquee" android:singleLine="true" android:textColor="@color/white" android:textSize="14sp" diff --git a/app/src/mobile/res/drawable/shape_vod_remark.xml b/app/src/main/res/drawable/shape_vod_remark.xml similarity index 100% rename from app/src/mobile/res/drawable/shape_vod_remark.xml rename to app/src/main/res/drawable/shape_vod_remark.xml diff --git a/app/src/mobile/res/drawable/shape_vod_site.xml b/app/src/main/res/drawable/shape_vod_site.xml similarity index 100% rename from app/src/mobile/res/drawable/shape_vod_site.xml rename to app/src/main/res/drawable/shape_vod_site.xml diff --git a/app/src/mobile/res/drawable/shape_vod_year.xml b/app/src/main/res/drawable/shape_vod_year.xml similarity index 100% rename from app/src/mobile/res/drawable/shape_vod_year.xml rename to app/src/main/res/drawable/shape_vod_year.xml