Skip to content

pay ui #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DeboYan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

pay ui #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added app/src/main/res/drawable-xhdpi/ic_check.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxhdpi/ic_check.png
100755 → 100644
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion app/src/main/res/layout/activity_pay.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
app:cusTitleText="@string/pay"
app:cusLeftBackgroud="@drawable/core__back_btn"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:background="@color/main_color"
>
</com.malalaoshi.android.core.view.TitleBarView>
<View
android:layout_width="match_parent"
Expand Down
50 changes: 20 additions & 30 deletions app/src/main/res/layout/fragment_pay.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,31 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_white_f6f6f6"
android:background="@color/main_bg"
>

<RelativeLayout
android:id="@+id/rl_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@color/color_white_ffffff">
android:layout_marginTop="6dp"
android:background="@color/color_white_ffffff"
android:padding="10dp"
>

<TextView
style="@style/mala.widget.title.text.small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="16dp"
android:text="应付金额" />

<TextView
android:id="@+id/tv_total"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginBottom="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:text="¥0.00"
android:textColor="@color/color_red_e36a5d"
android:textColor="@color/color_red_fe3059"
android:textSize="14sp" />

</RelativeLayout>
Expand All @@ -40,17 +36,17 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/rl_top"
android:layout_marginBottom="16dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="4dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="6dp"
android:text="选择支付方式"
android:textColor="@color/color_black_6c6c6c"
android:textSize="13sp" />
android:textSize="10sp" />

<RelativeLayout
android:id="@+id/rl_ali"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_height="45dp"
android:layout_below="@id/tv_pay_type"
android:background="@color/color_white_ffffff"
android:paddingLeft="16dp"
Expand Down Expand Up @@ -95,23 +91,19 @@
android:layout_centerVertical="true"
android:scaleType="center"
android:src="@drawable/ic_check_out" />

<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_alignParentBottom="true"
android:background="@color/color_gray_e5e5e5" />
</RelativeLayout>


<RelativeLayout
android:id="@+id/rl_wx"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_height="45dp"
android:layout_below="@id/rl_ali"
android:background="@color/color_white_ffffff"
android:paddingLeft="16dp"
android:paddingRight="16dp">
android:paddingRight="16dp"
android:layout_marginTop="0.5dp"
>

<ImageView
android:id="@+id/iv_wx"
Expand Down Expand Up @@ -156,11 +148,13 @@
<RelativeLayout
android:id="@+id/rl_qr"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_height="45dp"
android:layout_below="@id/rl_wx"
android:background="@color/color_white_ffffff"
android:paddingLeft="16dp"
android:paddingRight="16dp">
android:paddingRight="16dp"
android:layout_marginTop="0.5dp"
>

<ImageView
android:id="@+id/iv_qr"
Expand Down Expand Up @@ -203,11 +197,7 @@
android:src="@drawable/ic_check_out" />
</RelativeLayout>

<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_below="@id/rl_wx"
android:background="@color/color_gray_e5e5e5" />

<TextView
android:id="@+id/tv_pay"
style="@style/pay_buttom_btn"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@
<item name="android:layout_marginLeft">24dp</item>
<item name="android:layout_marginRight">24dp</item>
<item name="android:layout_marginTop">10dp</item>
<item name="android:background">@drawable/bg_blue_rectangle_btn</item>
<item name="android:background">@drawable/selector_gradient_semicircle_blue_btn_bg</item>
<item name="android:gravity">center</item>
<item name="android:textColor">@color/white</item>
<item name="android:textSize">@dimen/text_size_normal_high</item>
Expand Down