diff --git a/app/src/mobile/res/color/channel.xml b/app/src/mobile/res/color/channel.xml deleted file mode 100644 index 1d23cc3b8..000000000 --- a/app/src/mobile/res/color/channel.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/mobile/res/color/group.xml b/app/src/mobile/res/color/group.xml deleted file mode 100644 index 1d23cc3b8..000000000 --- a/app/src/mobile/res/color/group.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/mobile/res/color/epg.xml b/app/src/mobile/res/color/live.xml similarity index 100% rename from app/src/mobile/res/color/epg.xml rename to app/src/mobile/res/color/live.xml diff --git a/app/src/mobile/res/drawable/shape_group.xml b/app/src/mobile/res/drawable/shape_group.xml deleted file mode 100644 index 4984dbbc7..000000000 --- a/app/src/mobile/res/drawable/shape_group.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/mobile/res/drawable/shape_channel.xml b/app/src/mobile/res/drawable/shape_live.xml similarity index 92% rename from app/src/mobile/res/drawable/shape_channel.xml rename to app/src/mobile/res/drawable/shape_live.xml index 4984dbbc7..7a5b02398 100644 --- a/app/src/mobile/res/drawable/shape_channel.xml +++ b/app/src/mobile/res/drawable/shape_live.xml @@ -1,6 +1,6 @@ + android:color="#80FFF176"> diff --git a/app/src/mobile/res/layout/adapter_channel.xml b/app/src/mobile/res/layout/adapter_channel.xml index e9c1887b9..a05876494 100644 --- a/app/src/mobile/res/layout/adapter_channel.xml +++ b/app/src/mobile/res/layout/adapter_channel.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:layout_marginTop="6dp" android:layout_marginBottom="6dp" - android:background="@drawable/shape_channel" + android:background="@drawable/shape_live" android:gravity="center" android:orientation="horizontal"> @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="12dp" android:duplicateParentState="true" - android:textColor="@color/channel" + android:textColor="@color/live" android:textSize="14sp" tools:text="01" /> @@ -33,7 +33,7 @@ android:duplicateParentState="true" android:ellipsize="marquee" android:singleLine="true" - android:textColor="@color/channel" + android:textColor="@color/live" android:textSize="14sp" tools:text="CNN" /> diff --git a/app/src/mobile/res/layout/adapter_epg_data.xml b/app/src/mobile/res/layout/adapter_epg_data.xml index 96bb6e036..ce63407a6 100644 --- a/app/src/mobile/res/layout/adapter_epg_data.xml +++ b/app/src/mobile/res/layout/adapter_epg_data.xml @@ -13,7 +13,7 @@ android:duplicateParentState="true" android:ellipsize="marquee" android:singleLine="true" - android:textColor="@color/epg" + android:textColor="@color/live" android:textSize="14sp" tools:text="七龍珠" /> @@ -24,7 +24,7 @@ android:duplicateParentState="true" android:ellipsize="marquee" android:singleLine="true" - android:textColor="@color/epg" + android:textColor="@color/live" android:textSize="12sp" tools:text="18:00 ~ 19:00" /> diff --git a/app/src/mobile/res/layout/adapter_group.xml b/app/src/mobile/res/layout/adapter_group.xml index cfa9df59e..9de2a9851 100644 --- a/app/src/mobile/res/layout/adapter_group.xml +++ b/app/src/mobile/res/layout/adapter_group.xml @@ -12,11 +12,11 @@ android:id="@+id/name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/shape_group" + android:background="@drawable/shape_live" android:duplicateParentState="true" android:ellipsize="marquee" android:singleLine="true" - android:textColor="@color/group" + android:textColor="@color/live" android:textSize="14sp" tools:text="收藏" />