From fec8442c511e04b79ded91cd4ac88d6222ebc61e Mon Sep 17 00:00:00 2001 From: FongMi Date: Sun, 6 Aug 2023 23:33:29 +0800 Subject: [PATCH] Adjust oval style --- app/src/leanback/java/com/fongmi/android/tv/Product.java | 1 + app/src/leanback/res/drawable/shape_vod_oval_focused.xml | 2 +- app/src/leanback/res/layout/adapter_vod_oval.xml | 3 ++- app/src/mobile/java/com/fongmi/android/tv/Product.java | 1 + app/src/mobile/res/layout/adapter_vod_oval.xml | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/Product.java b/app/src/leanback/java/com/fongmi/android/tv/Product.java index 151d95f6a..173daf685 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/Product.java +++ b/app/src/leanback/java/com/fongmi/android/tv/Product.java @@ -27,6 +27,7 @@ public class Product { public static int[] getSpec(int viewType) { int column = getColumn(viewType); int space = ResUtil.dp2px(48) + ResUtil.dp2px(16 * (column - 1)); + if (viewType == ViewType.OVAL) space += ResUtil.dp2px(column * 16); return getSpec(space, column, viewType); } diff --git a/app/src/leanback/res/drawable/shape_vod_oval_focused.xml b/app/src/leanback/res/drawable/shape_vod_oval_focused.xml index 829b75d96..0ef858270 100644 --- a/app/src/leanback/res/drawable/shape_vod_oval_focused.xml +++ b/app/src/leanback/res/drawable/shape_vod_oval_focused.xml @@ -3,7 +3,7 @@ android:shape="oval"> \ No newline at end of file diff --git a/app/src/leanback/res/layout/adapter_vod_oval.xml b/app/src/leanback/res/layout/adapter_vod_oval.xml index d6c455855..a776b047b 100644 --- a/app/src/leanback/res/layout/adapter_vod_oval.xml +++ b/app/src/leanback/res/layout/adapter_vod_oval.xml @@ -12,6 +12,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@color/black_20" + android:layout_margin="8dp" android:scaleType="center" app:shapeAppearanceOverlay="@style/Vod.Circle" tools:src="@drawable/ic_img_loading" /> @@ -23,7 +24,7 @@ android:layout_below="@+id/image" android:layout_alignStart="@+id/image" android:layout_alignEnd="@+id/image" - android:layout_marginTop="12dp" + android:layout_marginTop="4dp" android:ellipsize="marquee" android:gravity="center" android:singleLine="true" diff --git a/app/src/mobile/java/com/fongmi/android/tv/Product.java b/app/src/mobile/java/com/fongmi/android/tv/Product.java index 069a4b265..52fe5d4e4 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/Product.java +++ b/app/src/mobile/java/com/fongmi/android/tv/Product.java @@ -29,6 +29,7 @@ public class Product { public static int[] getSpec(Context context, int viewType) { int column = getColumn(viewType); int space = ResUtil.dp2px(32) + ResUtil.dp2px(16 * (column - 1)); + if (viewType == ViewType.OVAL) space += ResUtil.dp2px(column * 16); return getSpec(context, space, column, viewType); } diff --git a/app/src/mobile/res/layout/adapter_vod_oval.xml b/app/src/mobile/res/layout/adapter_vod_oval.xml index 931c9137e..92a50b7f8 100644 --- a/app/src/mobile/res/layout/adapter_vod_oval.xml +++ b/app/src/mobile/res/layout/adapter_vod_oval.xml @@ -10,6 +10,7 @@ android:id="@+id/image" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_margin="8dp" android:background="@color/black_20" android:foreground="@drawable/shape_vod_oval" android:scaleType="center" @@ -23,7 +24,6 @@ android:layout_below="@+id/image" android:layout_alignStart="@+id/image" android:layout_alignEnd="@+id/image" - android:layout_marginTop="8dp" android:gravity="center" android:shadowColor="@color/grey_900" android:shadowDx="0.5"