Merge branch 'master' into dev_random_pk
# Conflicts: # live/src/main/res/values/strings.xml
9
live/src/main/res/drawable/bg_live_anchor_open_mic.xml
Normal file
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:width="233dp" android:height="40dp">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="#ff0fdab8" />
|
||||
<corners android:topLeftRadius="20dp" android:topRightRadius="20dp" android:bottomLeftRadius="20dp" android:bottomRightRadius="20dp" />
|
||||
</shape>
|
||||
</item>
|
||||
</selector>
|
||||
25
live/src/main/res/drawable/bg_live_mic_av.xml
Normal file
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:width="40dp" android:height="40dp">
|
||||
<shape android:shape="oval">
|
||||
<corners
|
||||
android:radius="1dp"
|
||||
android:topLeftRadius="12dp"
|
||||
android:topRightRadius="2dp"
|
||||
android:bottomLeftRadius="2dp"
|
||||
android:bottomRightRadius="2dp"/><!-- 设置圆角半径 -->
|
||||
|
||||
<gradient
|
||||
android:startColor="#fffe9afc"
|
||||
|
||||
android:endColor="#ff8ab3ff"
|
||||
android:useLevel="true"
|
||||
android:angle="45"
|
||||
android:type="linear"
|
||||
android:centerX="0"
|
||||
android:centerY="0"
|
||||
android:gradientRadius="90"/>
|
||||
|
||||
</shape>
|
||||
</item>
|
||||
</selector>
|
||||
|
Before Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 30 KiB |