Merge remote-tracking branch 'origin/dev_1.1.2' into dev_1.1.2

This commit is contained in:
董宏宇
2020-08-11 11:38:43 +08:00
6 changed files with 91 additions and 32 deletions

View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="24px" />
<gradient
android:angle="180"
android:endColor="#5CC1FF"
android:startColor="#256BFF"/>
</shape>

View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="40px"
android:paddingTop="40px">
<Button
android:id="@+id/event_share_load_status"
android:layout_width="220px"
android:layout_height="wrap_content"
android:paddingTop="12px"
android:paddingBottom="12px"
android:layout_centerInParent="true"
android:background="@drawable/bg_v2x_event_share_type_blue"
android:text="查看更早记录"
android:textColor="#FFFFFF"
android:textSize="18px" />
</RelativeLayout>

View File

@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="40px"
android:paddingBottom="40px">
<TextView
android:id="@+id/event_share_load_no_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:alpha="0.6"
android:paddingTop="12px"
android:paddingBottom="12px"
android:text="没有更多记录了"
android:textColor="#FFFFFF"
android:textSize="18px" />
<ImageView
android:id="@+id/left_line"
android:layout_width="wrap_content"
android:layout_height="0.5px"
android:alpha="0.5"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="46px"
android:layout_marginRight="16px"
android:layout_toLeftOf="@id/event_share_load_no_more"
android:background="#FFFFFF" />
<ImageView
android:id="@+id/right_line"
android:layout_width="wrap_content"
android:layout_height="0.5px"
android:alpha="0.5"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginLeft="16px"
android:layout_marginRight="46px"
android:layout_toRightOf="@id/event_share_load_no_more"
android:background="#FFFFFF" />
</RelativeLayout>

View File

@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">
<Button
android:id="@+id/event_share_load_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="没有更多了"
android:textColor="#000000"
android:textSize="18sp"/>
</RelativeLayout>