Merge branch 'dev_random_pk'
# Conflicts: # common/src/main/res/values/strings.xml # config.gradle # live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java # live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java # live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
This commit is contained in:
9
live/src/main/res/drawable/background_7792d0.xml
Normal file
9
live/src/main/res/drawable/background_7792d0.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>
|
||||
<shape android:shape="rectangle">
|
||||
<corners android:radius="20dp" />
|
||||
<solid android:color="#337792D0" />
|
||||
</shape>
|
||||
</item>
|
||||
</selector>
|
||||
9
live/src/main/res/drawable/bg_item_random_pk_type_1.xml
Normal file
9
live/src/main/res/drawable/bg_item_random_pk_type_1.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="355dp" android:height="36dp">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="#337792d0" />
|
||||
<corners android:radius="8dp" />
|
||||
</shape>
|
||||
</item>
|
||||
</selector>
|
||||
9
live/src/main/res/drawable/bg_item_random_pk_type_2.xml
Normal file
9
live/src/main/res/drawable/bg_item_random_pk_type_2.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="355dp" android:height="36dp">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="#000000" />
|
||||
<corners android:radius="8dp" />
|
||||
</shape>
|
||||
</item>
|
||||
</selector>
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:width="188dp" android:height="42dp">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="#ffffbe41" />
|
||||
<corners android:radius="21dp" />
|
||||
</shape>
|
||||
</item>
|
||||
</selector>
|
||||
21
live/src/main/res/drawable/bg_live_random_pk_info_switch.xml
Normal file
21
live/src/main/res/drawable/bg_live_random_pk_info_switch.xml
Normal file
@@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<!--开关按钮关闭时的导轨样式-->
|
||||
<item android:state_checked="false">
|
||||
<shape>
|
||||
<size android:height="25dp" android:width="40dp"/>
|
||||
<corners android:radius="20dp"/>
|
||||
<solid android:color="#33000000"/>
|
||||
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
<!--开关按钮打开时的导轨样式-->
|
||||
<item android:state_checked="true">
|
||||
<shape>
|
||||
<size android:height="25dp" android:width="40dp"/>
|
||||
<corners android:radius="20dp"/>
|
||||
<solid android:color="#F7B500"/>
|
||||
</shape>
|
||||
</item>
|
||||
</selector>
|
||||
@@ -0,0 +1,43 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<!--开关按钮关闭时的导轨样式-->
|
||||
<item android:state_checked="false">
|
||||
<layer-list>
|
||||
<item android:bottom="-1px" android:top="-1px" android:left="-1px" android:right="-1px">
|
||||
<shape android:shape="oval">
|
||||
<size android:width="24dp" android:height="24dp" />
|
||||
<solid android:color="#33EEEEEE" />
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape>
|
||||
<size android:height="25dp" android:width="25dp"/>
|
||||
<corners android:radius="20dp"/>
|
||||
<solid android:color="#FFFFFF"/>
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
</layer-list>
|
||||
|
||||
|
||||
</item>
|
||||
|
||||
<item android:state_checked="true">
|
||||
<layer-list>
|
||||
<item android:bottom="-1px" android:top="-1px" android:left="-1px" android:right="-1px">
|
||||
<shape android:shape="oval">
|
||||
<size android:width="24dp" android:height="24dp" />
|
||||
<solid android:color="#33EEEEEE" />
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape>
|
||||
<size android:height="25dp" android:width="25dp"/>
|
||||
<corners android:radius="20dp"/>
|
||||
<solid android:color="#FFFFFF"/>
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
|
||||
</item>
|
||||
</selector>
|
||||
@@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_checked="false">
|
||||
<shape>
|
||||
<solid android:color="#00000000" />
|
||||
<corners android:radius="30dp" />
|
||||
|
||||
</shape>
|
||||
</item>
|
||||
<item android:state_checked="true">
|
||||
<shape>
|
||||
<solid android:color="#00000000" />
|
||||
|
||||
<corners android:radius="32dp" />
|
||||
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:width="96dp" android:height="28dp">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="#fffa6400" />
|
||||
<corners android:radius="21dp" />
|
||||
</shape>
|
||||
</item>
|
||||
</selector>
|
||||
9
live/src/main/res/drawable/bg_random_pk_rv_search.xml
Normal file
9
live/src/main/res/drawable/bg_random_pk_rv_search.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="355dp" android:height="32dp">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="#33ffffff" />
|
||||
<corners android:radius="16dp" />
|
||||
</shape>
|
||||
</item>
|
||||
</selector>
|
||||
13
live/src/main/res/drawable/random_pk_shape_tab_indicator.xml
Normal file
13
live/src/main/res/drawable/random_pk_shape_tab_indicator.xml
Normal file
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item
|
||||
android:width="14dp"
|
||||
android:height="3dp"
|
||||
android:gravity="center">
|
||||
<shape>
|
||||
<corners android:radius="1.5dp" />
|
||||
<!--color无效,源码用tabIndicatorColor-->
|
||||
<solid android:color="#FFF" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
Reference in New Issue
Block a user