Commit a87a674364de8cacf3db029cc20472f3faafd8c3
1 parent
2dec5d36
Exists in
yxb_dev
and in
2 other branches
no message
Showing
11 changed files
with
184 additions
and
2 deletions
Show diff stats
1.81 KB
483 Bytes
375 Bytes
1.08 KB
2.58 KB
1.09 KB
152 Bytes
app/src/main/res/layout/fragment_mine.xml
| 1 | <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" | 1 | <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 2 | + xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| 2 | xmlns:tools="http://schemas.android.com/tools" | 3 | xmlns:tools="http://schemas.android.com/tools" |
| 3 | android:layout_width="match_parent" | 4 | android:layout_width="match_parent" |
| 4 | android:layout_height="match_parent" | 5 | android:layout_height="match_parent" |
| @@ -8,6 +9,7 @@ | @@ -8,6 +9,7 @@ | ||
| 8 | <LinearLayout | 9 | <LinearLayout |
| 9 | android:layout_width="match_parent" | 10 | android:layout_width="match_parent" |
| 10 | android:layout_height="match_parent" | 11 | android:layout_height="match_parent" |
| 12 | + android:background="#F0eff5" | ||
| 11 | android:orientation="vertical"> | 13 | android:orientation="vertical"> |
| 12 | 14 | ||
| 13 | <LinearLayout | 15 | <LinearLayout |
| @@ -23,9 +25,140 @@ | @@ -23,9 +25,140 @@ | ||
| 23 | android:layout_gravity="center" | 25 | android:layout_gravity="center" |
| 24 | android:gravity="center" | 26 | android:gravity="center" |
| 25 | android:text="个人中心" | 27 | android:text="个人中心" |
| 26 | - android:textColor="#FC5B6A" | ||
| 27 | - /> | 28 | + android:textColor="@color/textRed" |
| 29 | + android:textSize="@dimen/txtsize_headline" /> | ||
| 30 | + | ||
| 31 | + <LinearLayout | ||
| 32 | + android:layout_width="match_parent" | ||
| 33 | + android:layout_height="wrap_content" | ||
| 34 | + android:orientation="horizontal"> | ||
| 35 | + | ||
| 36 | + <com.makeramen.roundedimageview.RoundedImageView | ||
| 37 | + android:layout_width="60dp" | ||
| 38 | + android:layout_height="60dp" | ||
| 39 | + android:layout_margin="20dp" | ||
| 40 | + android:src="@color/white" | ||
| 41 | + app:riv_corner_radius="10dp" /> | ||
| 42 | + | ||
| 43 | + <LinearLayout | ||
| 44 | + android:layout_width="wrap_content" | ||
| 45 | + android:layout_height="wrap_content" | ||
| 46 | + android:layout_marginTop="25dp" | ||
| 47 | + android:layout_weight="1" | ||
| 48 | + android:orientation="vertical"> | ||
| 49 | + | ||
| 50 | + <TextView | ||
| 51 | + android:layout_width="wrap_content" | ||
| 52 | + android:layout_height="wrap_content" | ||
| 53 | + android:text="马铂賽" | ||
| 54 | + android:textColor="@color/white" | ||
| 55 | + android:textSize="@dimen/sp_18" /> | ||
| 56 | + | ||
| 57 | + <TextView | ||
| 58 | + android:layout_width="wrap_content" | ||
| 59 | + android:layout_height="wrap_content" | ||
| 60 | + android:text="账号：12345678991" | ||
| 61 | + android:textColor="@color/white" | ||
| 62 | + android:textSize="@dimen/sp_16" | ||
| 63 | + | ||
| 64 | + /> | ||
| 65 | + | ||
| 66 | + </LinearLayout> | ||
| 67 | + | ||
| 68 | + <ImageView | ||
| 69 | + android:layout_width="30dp" | ||
| 70 | + android:layout_height="match_parent" | ||
| 71 | + android:src="@drawable/arrow_right" /> | ||
| 72 | + </LinearLayout> | ||
| 28 | </LinearLayout> | 73 | </LinearLayout> |
| 74 | + | ||
| 75 | + <LinearLayout | ||
| 76 | + android:id="@+id/center_layout" | ||
| 77 | + android:layout_width="match_parent" | ||
| 78 | + android:layout_height="match_parent" | ||
| 79 | + android:layout_margin="20dp" | ||
| 80 | + android:orientation="vertical"> | ||
| 81 | + | ||
| 82 | + <LinearLayout | ||
| 83 | + android:layout_width="match_parent" | ||
| 84 | + android:layout_height="wrap_content" | ||
| 85 | + android:background="@color/white" | ||
| 86 | + android:orientation="vertical"> | ||
| 87 | + | ||
| 88 | + <LinearLayout | ||
| 89 | + android:layout_width="match_parent" | ||
| 90 | + android:layout_height="wrap_content"> | ||
| 91 | + | ||
| 92 | + <TextView | ||
| 93 | + android:layout_width="25dp" | ||
| 94 | + android:layout_height="wrap_content" | ||
| 95 | + android:layout_marginBottom="15dp" | ||
| 96 | + android:layout_marginLeft="15dp" | ||
| 97 | + android:layout_marginRight="15dp" | ||
| 98 | + android:layout_marginTop="15dp" | ||
| 99 | + android:background="@drawable/tiaoxing" /> | ||
| 100 | + | ||
| 101 | + <TextView | ||
| 102 | + android:layout_width="wrap_content" | ||
| 103 | + android:layout_height="wrap_content" | ||
| 104 | + android:layout_gravity="center_vertical" | ||
| 105 | + android:layout_weight="1" | ||
| 106 | + android:text="我的订阅消息" | ||
| 107 | + android:textSize="@dimen/txtsize_title" /> | ||
| 108 | + | ||
| 109 | + <TextView | ||
| 110 | + android:layout_width="20dp" | ||
| 111 | + android:layout_height="wrap_content" | ||
| 112 | + android:layout_gravity="center_vertical" | ||
| 113 | + android:text="3" | ||
| 114 | + android:textSize="@dimen/sp_18" | ||
| 115 | + android:textColor="@color/textRed" | ||
| 116 | + /> | ||
| 117 | + </LinearLayout> | ||
| 118 | + | ||
| 119 | + <TextView | ||
| 120 | + android:layout_width="match_parent" | ||
| 121 | + android:layout_height="1dp" | ||
| 122 | + android:layout_marginLeft="15dp" | ||
| 123 | + android:layout_marginRight="15dp" | ||
| 124 | + android:background="@color/bottomline" /> | ||
| 125 | + | ||
| 126 | + <LinearLayout | ||
| 127 | + android:layout_width="match_parent" | ||
| 128 | + android:layout_height="wrap_content"> | ||
| 129 | + | ||
| 130 | + <TextView | ||
| 131 | + android:layout_width="25dp" | ||
| 132 | + android:layout_height="wrap_content" | ||
| 133 | + android:layout_marginBottom="15dp" | ||
| 134 | + android:layout_marginLeft="15dp" | ||
| 135 | + android:layout_marginRight="15dp" | ||
| 136 | + android:layout_marginTop="15dp" | ||
| 137 | + android:background="@drawable/tiaoxing" /> | ||
| 138 | + | ||
| 139 | + <TextView | ||
| 140 | + android:layout_width="wrap_content" | ||
| 141 | + android:layout_height="wrap_content" | ||
| 142 | + android:layout_gravity="center_vertical" | ||
| 143 | + android:layout_weight="1" | ||
| 144 | + android:text="订购详情" | ||
| 145 | + android:textSize="@dimen/txtsize_title" /> | ||
| 146 | + | ||
| 147 | + </LinearLayout> | ||
| 148 | + | ||
| 149 | + <TextView | ||
| 150 | + android:layout_width="match_parent" | ||
| 151 | + android:layout_height="1dp" | ||
| 152 | + android:layout_marginLeft="15dp" | ||
| 153 | + android:layout_marginRight="15dp" | ||
| 154 | + android:background="@color/bottomline" /> | ||
| 155 | + | ||
| 156 | + | ||
| 157 | + </LinearLayout> | ||
| 158 | + | ||
| 159 | + </LinearLayout> | ||
| 160 | + | ||
| 161 | + | ||
| 29 | </LinearLayout> | 162 | </LinearLayout> |
| 30 | 163 | ||
| 31 | </FrameLayout> | 164 | </FrameLayout> |
app/src/main/res/values/colors.xml
| @@ -7,5 +7,7 @@ | @@ -7,5 +7,7 @@ | ||
| 7 | 7 | ||
| 8 | <color name="hintTextColor">#C1C1C1</color> | 8 | <color name="hintTextColor">#C1C1C1</color> |
| 9 | <color name="bottomline">#B8B8B9</color> | 9 | <color name="bottomline">#B8B8B9</color> |
| 10 | + <color name="bg_main">#F0EFF5</color> | ||
| 11 | + <color name="textRed">#FC5B6A</color> | ||
| 10 | 12 | ||
| 11 | </resources> | 13 | </resources> |
| @@ -0,0 +1,46 @@ | @@ -0,0 +1,46 @@ | ||
| 1 | +<resources> | ||
| 2 | + | ||
| 3 | + <!-- Default screen margins, per the Android Design guidelines. --> | ||
| 4 | + <dimen name="activity_horizontal_margin">16dp</dimen> | ||
| 5 | + <dimen name="activity_vertical_margin">16dp</dimen> | ||
| 6 | + | ||
| 7 | + <!-- margin --> | ||
| 8 | + <dimen name="margin_tiny">4dp</dimen> | ||
| 9 | + <dimen name="margin_small">8dp</dimen> | ||
| 10 | + <dimen name="margin_medium">16dp</dimen> | ||
| 11 | + <dimen name="margin_large">32dp</dimen> | ||
| 12 | + <dimen name="margin_huge">64dp</dimen> | ||
| 13 | + <dimen name="margin_only_txt">48dp</dimen> | ||
| 14 | + | ||
| 15 | + <!-- txtsize --> | ||
| 16 | + <dimen name="txtsize_display1">34sp</dimen> | ||
| 17 | + <dimen name="txtsize_headline">24sp</dimen> | ||
| 18 | + <dimen name="txtsize_title">20sp</dimen> | ||
| 19 | + <dimen name="txtsize_subhead">16sp</dimen> | ||
| 20 | + <dimen name="txtsize_body">14sp</dimen> | ||
| 21 | + <dimen name="txtsize_caption">12sp</dimen> | ||
| 22 | + | ||
| 23 | + <!-- other size --> | ||
| 24 | + <dimen name="corner_radius">2dp</dimen> | ||
| 25 | + <dimen name="banner_height">136dp</dimen> | ||
| 26 | + | ||
| 27 | + <dimen name="def_height">50dp</dimen> | ||
| 28 | + <dimen name="avatarSize">50dp</dimen> | ||
| 29 | + <dimen name="smallSpace">6dp</dimen> | ||
| 30 | + | ||
| 31 | + <dimen name="dp_066">0.66dp</dimen> | ||
| 32 | + <dimen name="dp_4">4dp</dimen> | ||
| 33 | + <dimen name="dp_10">10dp</dimen> | ||
| 34 | + <dimen name="dp_14">14dp</dimen> | ||
| 35 | + <dimen name="dp_22">22dp</dimen> | ||
| 36 | + <dimen name="dp_36">36dp</dimen> | ||
| 37 | + <dimen name="dp_40">40dp</dimen> | ||
| 38 | + <dimen name="dp_60">60dp</dimen> | ||
| 39 | + <dimen name="dp_72">72dp</dimen> | ||
| 40 | + | ||
| 41 | + <dimen name="sp_12">12sp</dimen> | ||
| 42 | + <dimen name="sp_14">14sp</dimen> | ||
| 43 | + <dimen name="sp_16">16sp</dimen> | ||
| 44 | + <dimen name="sp_18">18sp</dimen> | ||
| 45 | + | ||
| 46 | +</resources> | ||
| 0 | \ No newline at end of file | 47 | \ No newline at end of file |
mvpsdk/src/main/res/values/dimens.xml
| @@ -42,4 +42,5 @@ | @@ -42,4 +42,5 @@ | ||
| 42 | <dimen name="sp_14">14sp</dimen> | 42 | <dimen name="sp_14">14sp</dimen> |
| 43 | <dimen name="sp_16">16sp</dimen> | 43 | <dimen name="sp_16">16sp</dimen> |
| 44 | <dimen name="sp_18">18sp</dimen> | 44 | <dimen name="sp_18">18sp</dimen> |
| 45 | + | ||
| 45 | </resources> | 46 | </resources> |
| 46 | \ No newline at end of file | 47 | \ No newline at end of file |