Merge branch 'pandorapan_社区相关' into dev_改版主分支
# Conflicts: # common/build.gradle # common/src/main/java/com/yunbao/common/bean/MessageUserInfoBean.java # common/src/main/java/com/yunbao/common/http/PDLiveApi.java # common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java # common/src/main/java/com/yunbao/common/utils/RouteUtil.java # common/src/main/res/values/strings.xml # main/src/main/java/com/yunbao/main/activity/MainActivity.java
This commit is contained in:
5
common/src/main/res/drawable/bg_community_comment.xml
Normal file
5
common/src/main/res/drawable/bg_community_comment.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<corners android:radius="45dp" />
|
||||
<solid android:color="#FEF8F8" />
|
||||
</shape>
|
||||
12
common/src/main/res/drawable/bg_flow_tag.xml
Normal file
12
common/src/main/res/drawable/bg_flow_tag.xml
Normal file
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||
|
||||
<solid android:color="#FFF6E8" />
|
||||
|
||||
<corners
|
||||
android:bottomLeftRadius="20dp"
|
||||
android:bottomRightRadius="20dp"
|
||||
android:topLeftRadius="20dp"
|
||||
android:topRightRadius="20dp" />
|
||||
|
||||
</shape>
|
||||
5
common/src/main/res/drawable/bg_item_active_img.xml
Normal file
5
common/src/main/res/drawable/bg_item_active_img.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<corners android:radius="5dp"/>
|
||||
<solid android:color="#F7F9FB"/>
|
||||
</shape>
|
||||
12
common/src/main/res/drawable/bg_item_comment.xml
Normal file
12
common/src/main/res/drawable/bg_item_comment.xml
Normal file
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||
|
||||
<solid android:color="#FEF8F8" />
|
||||
|
||||
<corners
|
||||
android:bottomLeftRadius="20dp"
|
||||
android:bottomRightRadius="20dp"
|
||||
android:topLeftRadius="20dp"
|
||||
android:topRightRadius="20dp" />
|
||||
|
||||
</shape>
|
||||
12
common/src/main/res/drawable/bg_main_com_author.xml
Normal file
12
common/src/main/res/drawable/bg_main_com_author.xml
Normal file
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<gradient
|
||||
android:angle="-45"
|
||||
android:endColor="#FE629D"
|
||||
android:startColor="#FA5180" />
|
||||
<corners
|
||||
android:bottomLeftRadius="90dp"
|
||||
android:bottomRightRadius="90dp"
|
||||
android:topLeftRadius="90dp"
|
||||
android:topRightRadius="90dp" />
|
||||
</shape>
|
||||
12
common/src/main/res/drawable/bg_main_com_type.xml
Normal file
12
common/src/main/res/drawable/bg_main_com_type.xml
Normal file
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<gradient
|
||||
android:angle="-45"
|
||||
android:endColor="#EB6FFF"
|
||||
android:startColor="#FF83C6" />
|
||||
<corners
|
||||
android:bottomLeftRadius="90dp"
|
||||
android:bottomRightRadius="90dp"
|
||||
android:topLeftRadius="90dp"
|
||||
android:topRightRadius="90dp" />
|
||||
</shape>
|
||||
12
common/src/main/res/drawable/bg_main_com_type_1.xml
Normal file
12
common/src/main/res/drawable/bg_main_com_type_1.xml
Normal file
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<gradient
|
||||
android:angle="-45"
|
||||
android:endColor="#DFDFDF"
|
||||
android:startColor="#DFDFDF" />
|
||||
<corners
|
||||
android:bottomLeftRadius="90dp"
|
||||
android:bottomRightRadius="90dp"
|
||||
android:topLeftRadius="90dp"
|
||||
android:topRightRadius="90dp" />
|
||||
</shape>
|
||||
12
common/src/main/res/drawable/bg_user_home_04.xml
Normal file
12
common/src/main/res/drawable/bg_user_home_04.xml
Normal file
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||
|
||||
<solid android:color="#E5ECFF" />
|
||||
|
||||
<corners
|
||||
android:bottomLeftRadius="10dp"
|
||||
android:bottomRightRadius="10dp"
|
||||
android:topLeftRadius="10dp"
|
||||
android:topRightRadius="10dp" />
|
||||
|
||||
</shape>
|
||||
12
common/src/main/res/drawable/bg_user_home_bottom.xml
Normal file
12
common/src/main/res/drawable/bg_user_home_bottom.xml
Normal file
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<solid android:color="@android:color/white" />
|
||||
|
||||
<corners
|
||||
android:bottomLeftRadius="0dp"
|
||||
android:bottomRightRadius="0dp"
|
||||
android:topLeftRadius="25dp"
|
||||
android:topRightRadius="25dp" />
|
||||
|
||||
</shape>
|
||||
5
common/src/main/res/drawable/main_community_send.xml
Normal file
5
common/src/main/res/drawable/main_community_send.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<corners android:radius="45dp" />
|
||||
<solid android:color="#EB6FFF" />
|
||||
</shape>
|
||||
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<corners android:radius="15dp" />
|
||||
<solid android:color="@color/white" />
|
||||
</shape>
|
||||
Reference in New Issue
Block a user