Showing
2 changed files
with
94 additions
and
96 deletions
... | @@ -19,16 +19,15 @@ | ... | @@ -19,16 +19,15 @@ |
19 | android:layout_alignParentBottom="true" | 19 | android:layout_alignParentBottom="true" |
20 | android:layout_alignParentRight="true" | 20 | android:layout_alignParentRight="true" |
21 | android:background="@drawable/p7725_sdk_btn_7725_login" /> | 21 | android:background="@drawable/p7725_sdk_btn_7725_login" /> |
22 | - | 22 | + |
23 | <Button | 23 | <Button |
24 | android:id="@+id/btn_to_quick_login" | 24 | android:id="@+id/btn_to_quick_login" |
25 | android:layout_width="wrap_content" | 25 | android:layout_width="wrap_content" |
26 | - android:layout_height="wrap_content" | 26 | + android:layout_height="wrap_content" |
27 | android:layout_alignParentBottom="true" | 27 | android:layout_alignParentBottom="true" |
28 | android:layout_centerHorizontal="true" | 28 | android:layout_centerHorizontal="true" |
29 | - android:background="@drawable/p7725_sdk_btn_7725_quick_login" | 29 | + android:background="@drawable/p7725_sdk_btn_7725_quick_login" /> |
30 | - /> | 30 | + |
31 | - | ||
32 | <RelativeLayout | 31 | <RelativeLayout |
33 | android:id="@+id/layout_clause" | 32 | android:id="@+id/layout_clause" |
34 | android:layout_width="wrap_content" | 33 | android:layout_width="wrap_content" |
... | @@ -36,55 +35,55 @@ | ... | @@ -36,55 +35,55 @@ |
36 | android:layout_alignParentBottom="true" | 35 | android:layout_alignParentBottom="true" |
37 | android:layout_centerInParent="true" | 36 | android:layout_centerInParent="true" |
38 | android:layout_gravity="center" > | 37 | android:layout_gravity="center" > |
39 | - | 38 | + |
40 | <CheckBox | 39 | <CheckBox |
41 | android:id="@+id/chck_clause" | 40 | android:id="@+id/chck_clause" |
41 | + style="@style/p7725_sdk_checkbox" | ||
42 | android:layout_width="wrap_content" | 42 | android:layout_width="wrap_content" |
43 | android:layout_height="wrap_content" | 43 | android:layout_height="wrap_content" |
44 | - style="@style/p7725_sdk_checkbox" | 44 | + android:layout_alignParentBottom="true" |
45 | - android:layout_alignParentBottom="true" | ||
46 | android:checked="true" | 45 | android:checked="true" |
47 | - android:text="@string/p7725_sdk_chck_clause" | 46 | + android:text="@string/p7725_sdk_chck_clause" |
48 | - android:textColor="@color/p7725_sdk_clause"/> | 47 | + android:textColor="@color/p7725_sdk_clause" |
49 | - | 48 | + android:visibility="gone" /> |
50 | - <Button | 49 | + |
51 | - android:id="@+id/btn_agree_privacy" | 50 | + <Button |
52 | - android:layout_width="wrap_content" | 51 | + android:id="@+id/btn_agree_privacy" |
53 | - android:layout_height="wrap_content" | 52 | + android:layout_width="wrap_content" |
54 | - android:layout_alignBaseline="@+id/chck_clause" | 53 | + android:layout_height="wrap_content" |
55 | - android:layout_alignBottom="@+id/chck_clause" | 54 | + android:layout_alignBaseline="@+id/chck_clause" |
56 | - android:layout_toRightOf="@+id/chck_clause" | 55 | + android:layout_alignBottom="@+id/chck_clause" |
57 | - android:background="@color/p7725_sdk_transparent" | 56 | + android:layout_toRightOf="@+id/chck_clause" |
58 | - android:text="@string/p7725_sdk_txt_agree_privacy" | 57 | + android:background="@color/p7725_sdk_transparent" |
59 | - android:textAppearance="?android:attr/textAppearanceSmall" | 58 | + android:text="@string/p7725_sdk_txt_agree_privacy" |
60 | - android:textColor="@color/p7725_sdk_clause" | 59 | + android:textAppearance="?android:attr/textAppearanceSmall" |
61 | - /> | 60 | + android:textColor="@color/p7725_sdk_clause" |
62 | - | 61 | + android:visibility="gone" /> |
62 | + | ||
63 | <TextView | 63 | <TextView |
64 | - android:id="@+id/txt_agree_and" | 64 | + android:id="@+id/txt_agree_and" |
65 | - android:layout_width="wrap_content" | 65 | + android:layout_width="wrap_content" |
66 | - android:layout_height="wrap_content" | 66 | + android:layout_height="wrap_content" |
67 | - android:layout_alignBaseline="@+id/btn_agree_privacy" | 67 | + android:layout_alignBaseline="@+id/btn_agree_privacy" |
68 | - android:layout_alignBottom="@+id/btn_agree_privacy" | 68 | + android:layout_alignBottom="@+id/btn_agree_privacy" |
69 | - android:layout_toRightOf="@+id/btn_agree_privacy" | 69 | + android:layout_toRightOf="@+id/btn_agree_privacy" |
70 | - android:text="@string/p7725_sdk_txt_agree_and" | 70 | + android:text="@string/p7725_sdk_txt_agree_and" |
71 | - android:textAppearance="?android:attr/textAppearanceSmall" | 71 | + android:textAppearance="?android:attr/textAppearanceSmall" |
72 | - android:textColor="@color/p7725_sdk_clause" /> | 72 | + android:textColor="@color/p7725_sdk_clause" |
73 | + android:visibility="gone" /> | ||
73 | 74 | ||
74 | - <Button | 75 | + <Button |
75 | - android:id="@+id/btn_agree_clause" | 76 | + android:id="@+id/btn_agree_clause" |
76 | - android:layout_width="wrap_content" | 77 | + android:layout_width="wrap_content" |
77 | - android:layout_height="wrap_content" | 78 | + android:layout_height="wrap_content" |
78 | - android:layout_alignBaseline="@+id/txt_agree_and" | 79 | + android:layout_alignBaseline="@+id/txt_agree_and" |
79 | - android:layout_alignBottom="@+id/txt_agree_and" | 80 | + android:layout_alignBottom="@+id/txt_agree_and" |
80 | - android:layout_toRightOf="@+id/txt_agree_and" | 81 | + android:layout_toRightOf="@+id/txt_agree_and" |
81 | - android:background="@color/p7725_sdk_transparent" | 82 | + android:background="@color/p7725_sdk_transparent" |
82 | - android:text="@string/p7725_sdk_txt_agree_clause" | 83 | + android:text="@string/p7725_sdk_txt_agree_clause" |
83 | - android:textAppearance="?android:attr/textAppearanceSmall" | 84 | + android:textAppearance="?android:attr/textAppearanceSmall" |
84 | - android:textColor="@color/p7725_sdk_clause" | 85 | + android:textColor="@color/p7725_sdk_clause" |
85 | - /> | 86 | + android:visibility="gone" /> |
86 | - | ||
87 | </RelativeLayout> | 87 | </RelativeLayout> |
88 | - | 88 | + |
89 | - | ||
90 | </RelativeLayout> | 89 | </RelativeLayout> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -19,16 +19,15 @@ | ... | @@ -19,16 +19,15 @@ |
19 | android:layout_alignParentBottom="true" | 19 | android:layout_alignParentBottom="true" |
20 | android:layout_alignParentRight="true" | 20 | android:layout_alignParentRight="true" |
21 | android:background="@drawable/p7725_sdk_btn_7725_login" /> | 21 | android:background="@drawable/p7725_sdk_btn_7725_login" /> |
22 | - | 22 | + |
23 | <Button | 23 | <Button |
24 | android:id="@+id/btn_to_quick_login" | 24 | android:id="@+id/btn_to_quick_login" |
25 | android:layout_width="wrap_content" | 25 | android:layout_width="wrap_content" |
26 | - android:layout_height="wrap_content" | 26 | + android:layout_height="wrap_content" |
27 | android:layout_alignParentBottom="true" | 27 | android:layout_alignParentBottom="true" |
28 | android:layout_centerHorizontal="true" | 28 | android:layout_centerHorizontal="true" |
29 | - android:background="@drawable/p7725_sdk_btn_7725_quick_login" | 29 | + android:background="@drawable/p7725_sdk_btn_7725_quick_login" /> |
30 | - /> | 30 | + |
31 | - | ||
32 | <RelativeLayout | 31 | <RelativeLayout |
33 | android:id="@+id/layout_clause" | 32 | android:id="@+id/layout_clause" |
34 | android:layout_width="wrap_content" | 33 | android:layout_width="wrap_content" |
... | @@ -36,55 +35,55 @@ | ... | @@ -36,55 +35,55 @@ |
36 | android:layout_alignParentBottom="true" | 35 | android:layout_alignParentBottom="true" |
37 | android:layout_centerInParent="true" | 36 | android:layout_centerInParent="true" |
38 | android:layout_gravity="center" > | 37 | android:layout_gravity="center" > |
39 | - | 38 | + |
40 | <CheckBox | 39 | <CheckBox |
41 | android:id="@+id/chck_clause" | 40 | android:id="@+id/chck_clause" |
41 | + style="@style/p7725_sdk_checkbox" | ||
42 | android:layout_width="wrap_content" | 42 | android:layout_width="wrap_content" |
43 | android:layout_height="wrap_content" | 43 | android:layout_height="wrap_content" |
44 | - style="@style/p7725_sdk_checkbox" | 44 | + android:layout_alignParentBottom="true" |
45 | - android:layout_alignParentBottom="true" | ||
46 | android:checked="true" | 45 | android:checked="true" |
47 | - android:text="@string/p7725_sdk_chck_clause" | 46 | + android:text="@string/p7725_sdk_chck_clause" |
48 | - android:textColor="@color/p7725_sdk_clause"/> | 47 | + android:textColor="@color/p7725_sdk_clause" |
49 | - | 48 | + android:visibility="gone" /> |
50 | - <Button | 49 | + |
51 | - android:id="@+id/btn_agree_privacy" | 50 | + <Button |
52 | - android:layout_width="wrap_content" | 51 | + android:id="@+id/btn_agree_privacy" |
53 | - android:layout_height="wrap_content" | 52 | + android:layout_width="wrap_content" |
54 | - android:layout_alignBaseline="@+id/chck_clause" | 53 | + android:layout_height="wrap_content" |
55 | - android:layout_alignBottom="@+id/chck_clause" | 54 | + android:layout_alignBaseline="@+id/chck_clause" |
56 | - android:layout_toRightOf="@+id/chck_clause" | 55 | + android:layout_alignBottom="@+id/chck_clause" |
57 | - android:background="@color/p7725_sdk_transparent" | 56 | + android:layout_toRightOf="@+id/chck_clause" |
58 | - android:text="@string/p7725_sdk_txt_agree_privacy" | 57 | + android:background="@color/p7725_sdk_transparent" |
59 | - android:textAppearance="?android:attr/textAppearanceSmall" | 58 | + android:text="@string/p7725_sdk_txt_agree_privacy" |
60 | - android:textColor="@color/p7725_sdk_clause" | 59 | + android:textAppearance="?android:attr/textAppearanceSmall" |
61 | - /> | 60 | + android:textColor="@color/p7725_sdk_clause" |
62 | - | 61 | + android:visibility="gone" /> |
62 | + | ||
63 | <TextView | 63 | <TextView |
64 | - android:id="@+id/txt_agree_and" | 64 | + android:id="@+id/txt_agree_and" |
65 | - android:layout_width="wrap_content" | 65 | + android:layout_width="wrap_content" |
66 | - android:layout_height="wrap_content" | 66 | + android:layout_height="wrap_content" |
67 | - android:layout_alignBaseline="@+id/btn_agree_privacy" | 67 | + android:layout_alignBaseline="@+id/btn_agree_privacy" |
68 | - android:layout_alignBottom="@+id/btn_agree_privacy" | 68 | + android:layout_alignBottom="@+id/btn_agree_privacy" |
69 | - android:layout_toRightOf="@+id/btn_agree_privacy" | 69 | + android:layout_toRightOf="@+id/btn_agree_privacy" |
70 | - android:text="@string/p7725_sdk_txt_agree_and" | 70 | + android:text="@string/p7725_sdk_txt_agree_and" |
71 | - android:textAppearance="?android:attr/textAppearanceSmall" | 71 | + android:textAppearance="?android:attr/textAppearanceSmall" |
72 | - android:textColor="@color/p7725_sdk_clause" /> | 72 | + android:textColor="@color/p7725_sdk_clause" |
73 | + android:visibility="gone" /> | ||
73 | 74 | ||
74 | - <Button | 75 | + <Button |
75 | - android:id="@+id/btn_agree_clause" | 76 | + android:id="@+id/btn_agree_clause" |
76 | - android:layout_width="wrap_content" | 77 | + android:layout_width="wrap_content" |
77 | - android:layout_height="wrap_content" | 78 | + android:layout_height="wrap_content" |
78 | - android:layout_alignBaseline="@+id/txt_agree_and" | 79 | + android:layout_alignBaseline="@+id/txt_agree_and" |
79 | - android:layout_alignBottom="@+id/txt_agree_and" | 80 | + android:layout_alignBottom="@+id/txt_agree_and" |
80 | - android:layout_toRightOf="@+id/txt_agree_and" | 81 | + android:layout_toRightOf="@+id/txt_agree_and" |
81 | - android:background="@color/p7725_sdk_transparent" | 82 | + android:background="@color/p7725_sdk_transparent" |
82 | - android:text="@string/p7725_sdk_txt_agree_clause" | 83 | + android:text="@string/p7725_sdk_txt_agree_clause" |
83 | - android:textAppearance="?android:attr/textAppearanceSmall" | 84 | + android:textAppearance="?android:attr/textAppearanceSmall" |
84 | - android:textColor="@color/p7725_sdk_clause" | 85 | + android:textColor="@color/p7725_sdk_clause" |
85 | - /> | 86 | + android:visibility="gone" /> |
86 | - | ||
87 | </RelativeLayout> | 87 | </RelativeLayout> |
88 | - | 88 | + |
89 | - | ||
90 | </RelativeLayout> | 89 | </RelativeLayout> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
-
Please register or login to post a comment