pull/123/head
FongMi 3 years ago
parent 8e06a43e3c
commit a52929344c
  1. 28
      app/src/mobile/res/drawable/shape_item.xml
  2. 28
      app/src/mobile/res/drawable/shape_text.xml
  3. 2
      app/src/mobile/res/layout/adapter_config.xml
  4. 1
      app/src/mobile/res/layout/adapter_live.xml
  5. 3
      app/src/mobile/res/layout/adapter_site.xml
  6. 3
      app/src/mobile/res/layout/adapter_vod.xml
  7. 2
      app/src/mobile/res/layout/dialog_config.xml
  8. 16
      app/src/mobile/res/layout/fragment_setting.xml

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/black_20" />
<corners android:radius="4dp" />
<padding
android:bottom="8dp"
android:left="12dp"
android:right="12dp"
android:top="8dp" />
</shape>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/ripple_material_light">
<item android:id="@android:id/background">
<shape android:shape="rectangle">
<solid android:color="@color/black_20" />
<corners android:radius="4dp" />
<padding
android:bottom="8dp"
android:left="12dp"
android:right="12dp"
android:top="8dp" />
</shape>
</item>
</ripple>

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/black_50" />
<corners android:radius="4dp" />
<padding
android:bottom="8dp"
android:left="12dp"
android:right="12dp"
android:top="8dp" />
</shape>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/ripple_material_light">
<item android:id="@android:id/background">
<shape android:shape="rectangle">
<solid android:color="@color/black_50" />
<corners android:radius="4dp" />
<padding
android:bottom="8dp"
android:left="12dp"
android:right="12dp"
android:top="8dp" />
</shape>
</item>
</ripple>

@ -12,7 +12,6 @@
android:layout_weight="1"
android:background="@drawable/shape_text"
android:ellipsize="middle"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:singleLine="true"
android:textColor="@color/white"
@ -25,7 +24,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:background="@drawable/shape_text"
android:foreground="?android:attr/selectableItemBackground"
android:padding="7dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_delete_config" />

@ -6,7 +6,6 @@
android:layout_height="wrap_content"
android:background="@drawable/shape_text"
android:ellipsize="middle"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:singleLine="true"
android:textColor="@color/text"

@ -12,7 +12,6 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/shape_text"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:singleLine="true"
android:textColor="@color/text"
@ -25,7 +24,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:background="@drawable/shape_text"
android:foreground="?android:attr/selectableItemBackground"
android:padding="7dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_search_on"
@ -37,7 +35,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:background="@drawable/shape_text"
android:foreground="?android:attr/selectableItemBackground"
android:padding="7dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_filter_on"

@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="150dp"
android:layout_height="200dp">
android:layout_height="200dp"
android:foreground="@drawable/shape_vod">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/image"

@ -29,7 +29,6 @@
android:layout_marginEnd="16dp"
android:layout_weight="1"
android:background="@drawable/shape_text"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:text="@string/dialog_positive"
android:textColor="@color/white"
@ -41,7 +40,6 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/shape_text"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:text="@string/dialog_negative"
android:textColor="@color/white"

@ -36,7 +36,6 @@
android:layout_marginEnd="12dp"
android:layout_weight="1"
android:background="@drawable/shape_item"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="horizontal">
<TextView
@ -66,7 +65,6 @@
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:background="@drawable/shape_item"
android:foreground="?android:attr/selectableItemBackground"
android:padding="7dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_home" />
@ -76,7 +74,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_item"
android:foreground="?android:attr/selectableItemBackground"
android:padding="7dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_history" />
@ -96,7 +93,6 @@
android:layout_marginEnd="12dp"
android:layout_weight="1"
android:background="@drawable/shape_item"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="horizontal">
<TextView
@ -126,7 +122,6 @@
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:background="@drawable/shape_item"
android:foreground="?android:attr/selectableItemBackground"
android:padding="7dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_home" />
@ -136,7 +131,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_item"
android:foreground="?android:attr/selectableItemBackground"
android:padding="7dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_history" />
@ -156,7 +150,6 @@
android:layout_marginEnd="12dp"
android:layout_weight="1"
android:background="@drawable/shape_item"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="horizontal">
<TextView
@ -186,7 +179,6 @@
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:background="@drawable/shape_item"
android:foreground="?android:attr/selectableItemBackground"
android:padding="7dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_home" />
@ -196,7 +188,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_item"
android:foreground="?android:attr/selectableItemBackground"
android:padding="7dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_setting_refresh" />
@ -209,7 +200,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/shape_item"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="horizontal">
<TextView
@ -237,7 +227,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/shape_item"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="horizontal">
<TextView
@ -265,7 +254,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/shape_item"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="horizontal">
<TextView
@ -293,7 +281,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/shape_item"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="horizontal">
<TextView
@ -321,7 +308,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/shape_item"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="horizontal">
<TextView
@ -349,7 +335,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/shape_item"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="horizontal">
<TextView
@ -377,7 +362,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/shape_item"
android:foreground="?android:attr/selectableItemBackground"
android:orientation="horizontal">
<TextView

Loading…
Cancel
Save