From 684c08ee131a2fbe485cf9665aa1dd8e00af195f Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 18 Apr 2023 23:20:55 +0800
Subject: [PATCH] [mobile] support live - part 2

---
 app/src/mobile/res/color/channel.xml          |  6 ++++++
 app/src/mobile/res/color/group.xml            |  1 +
 .../mobile/res/drawable/selector_channel.xml  |  4 ----
 app/src/mobile/res/drawable/shape_channel.xml | 19 +++++++++----------
 app/src/mobile/res/drawable/shape_group.xml   | 10 ++++++++++
 app/src/mobile/res/layout/activity_live.xml   | 12 ++++++++++++
 app/src/mobile/res/layout/adapter_channel.xml | 16 ++++++++++------
 app/src/mobile/res/layout/adapter_group.xml   | 16 ++++++++++------
 8 files changed, 58 insertions(+), 26 deletions(-)
 create mode 100644 app/src/mobile/res/color/channel.xml
 delete mode 100644 app/src/mobile/res/drawable/selector_channel.xml
 create mode 100644 app/src/mobile/res/drawable/shape_group.xml

diff --git a/app/src/mobile/res/color/channel.xml b/app/src/mobile/res/color/channel.xml
new file mode 100644
index 000000000..1d23cc3b8
--- /dev/null
+++ b/app/src/mobile/res/color/channel.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/white" android:state_focused="true" android:state_selected="true" />
+    <item android:color="@color/blue_500" android:state_selected="true" />
+    <item android:color="@color/white" />
+</selector>
\ No newline at end of file
diff --git a/app/src/mobile/res/color/group.xml b/app/src/mobile/res/color/group.xml
index 8e39ee992..6be396f57 100644
--- a/app/src/mobile/res/color/group.xml
+++ b/app/src/mobile/res/color/group.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/white" android:state_focused="true" android:state_selected="true" />
     <item android:color="@color/green_400" android:state_selected="true" />
     <item android:color="@color/white" />
 </selector>
\ No newline at end of file
diff --git a/app/src/mobile/res/drawable/selector_channel.xml b/app/src/mobile/res/drawable/selector_channel.xml
deleted file mode 100644
index 573186658..000000000
--- a/app/src/mobile/res/drawable/selector_channel.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/shape_channel" android:state_selected="true" />
-</selector>
\ No newline at end of file
diff --git a/app/src/mobile/res/drawable/shape_channel.xml b/app/src/mobile/res/drawable/shape_channel.xml
index dcc9b23dc..1a5d3149b 100644
--- a/app/src/mobile/res/drawable/shape_channel.xml
+++ b/app/src/mobile/res/drawable/shape_channel.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/blue_500" />
-
-    <corners
-        android:bottomRightRadius="28dp"
-        android:topRightRadius="28dp" />
-
-</shape>
\ No newline at end of file
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/accent">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="#f5f5f5" />
+            <corners android:radius="28dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/mobile/res/drawable/shape_group.xml b/app/src/mobile/res/drawable/shape_group.xml
new file mode 100644
index 000000000..7560a6c4e
--- /dev/null
+++ b/app/src/mobile/res/drawable/shape_group.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/green_400">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="#f5f5f5" />
+            <corners android:radius="28dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/mobile/res/layout/activity_live.xml b/app/src/mobile/res/layout/activity_live.xml
index 66a8d918d..b3fac39f7 100644
--- a/app/src/mobile/res/layout/activity_live.xml
+++ b/app/src/mobile/res/layout/activity_live.xml
@@ -64,6 +64,12 @@
             android:id="@+id/group"
             android:layout_width="120dp"
             android:layout_height="match_parent"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:paddingStart="8dp"
+            android:paddingTop="8dp"
+            android:paddingEnd="8dp"
+            android:paddingBottom="8dp"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:itemCount="5"
             tools:listitem="@layout/adapter_group" />
@@ -77,6 +83,12 @@
             android:id="@+id/channel"
             android:layout_width="260dp"
             android:layout_height="match_parent"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:paddingStart="8dp"
+            android:paddingTop="8dp"
+            android:paddingEnd="8dp"
+            android:paddingBottom="8dp"
             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 380110e14..d46dd8ddc 100644
--- a/app/src/mobile/res/layout/adapter_channel.xml
+++ b/app/src/mobile/res/layout/adapter_channel.xml
@@ -2,12 +2,16 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
-    android:layout_height="56dp"
-    android:background="@drawable/selector_channel"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="4dp"
+    android:layout_marginBottom="4dp"
+    android:background="@drawable/shape_channel"
     android:gravity="center"
     android:orientation="horizontal"
-    android:paddingStart="16dp"
-    android:paddingEnd="20dp">
+    android:paddingStart="12dp"
+    android:paddingTop="8dp"
+    android:paddingEnd="12dp"
+    android:paddingBottom="8dp">
 
     <TextView
         android:id="@+id/number"
@@ -15,7 +19,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="12dp"
         android:duplicateParentState="true"
-        android:textColor="@color/white"
+        android:textColor="@color/channel"
         android:textSize="14sp"
         tools:text="01" />
 
@@ -34,7 +38,7 @@
         android:duplicateParentState="true"
         android:ellipsize="marquee"
         android:singleLine="true"
-        android:textColor="@color/white"
+        android:textColor="@color/channel"
         android:textSize="14sp"
         tools:text="CNN" />
 
diff --git a/app/src/mobile/res/layout/adapter_group.xml b/app/src/mobile/res/layout/adapter_group.xml
index a39335d88..d54ddbe09 100644
--- a/app/src/mobile/res/layout/adapter_group.xml
+++ b/app/src/mobile/res/layout/adapter_group.xml
@@ -2,20 +2,24 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="48dp"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="4dp"
+    android:layout_marginBottom="4dp"
+    android:background="@drawable/shape_group"
     android:gravity="center"
     android:orientation="horizontal"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp">
+    android:paddingStart="12dp"
+    android:paddingTop="8dp"
+    android:paddingEnd="12dp"
+    android:paddingBottom="8dp">
 
     <ImageView
         android:id="@+id/logo"
         android:layout_width="36dp"
         android:layout_height="36dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="12dp"
         android:scaleType="fitCenter"
-        android:visibility="gone"
-        tools:visibility="visible" />
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/name"