briefs UI
chengzhenyu
променени са 7 файла, в които са добавени 223 реда и са изтрити 2 реда
BIN
app/src/main/res/drawable-xhdpi/demo1.jpg
app/src/main/res/drawable-xhdpi/capture_today.png → app/src/main/res/drawable-xxhdpi/capture_today.png
app/src/main/res/drawable-xhdpi/incoming_today.png → app/src/main/res/drawable-xxhdpi/incoming_today.png
app/src/main/res/drawable-xhdpi/upload.png → app/src/main/res/drawable-xxhdpi/upload.png
+ 207
- 2
app/src/main/res/layout/activity_briefs.xml
@@ -2,7 +2,7 @@ |
||
| 2 | 2 |
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | 3 |
android:layout_width="match_parent" |
| 4 | 4 |
android:layout_height="match_parent" |
| 5 |
- android:background="@color/background_white"> |
|
| 5 |
+ android:background="@color/background_light_grey_color"> |
|
| 6 | 6 |
|
| 7 | 7 |
<LinearLayout |
| 8 | 8 |
android:id="@+id/title_bar_with_back_btn" |
@@ -34,7 +34,6 @@ |
||
| 34 | 34 |
android:gravity="center" |
| 35 | 35 |
android:paddingLeft="10dp" |
| 36 | 36 |
android:paddingRight="10dp" |
| 37 |
- android:singleLine="true" |
|
| 38 | 37 |
android:text="@string/briefs" |
| 39 | 38 |
android:textColor="@color/text_white" |
| 40 | 39 |
android:textSize="@dimen/action_bar_title_medium_text_size" /> |
@@ -59,5 +58,211 @@ |
||
| 59 | 58 |
|
| 60 | 59 |
</LinearLayout> |
| 61 | 60 |
|
| 61 |
+<LinearLayout |
|
| 62 |
+ android:layout_width="match_parent" |
|
| 63 |
+ android:layout_height="wrap_content" |
|
| 64 |
+ android:orientation="vertical" |
|
| 65 |
+ android:layout_below="@id/title_bar_with_back_btn"> |
|
| 66 |
+ |
|
| 67 |
+ <RelativeLayout |
|
| 68 |
+ android:layout_width="match_parent" |
|
| 69 |
+ android:layout_height="120dp" |
|
| 70 |
+ android:background="@color/background_white"> |
|
| 71 |
+ |
|
| 72 |
+ <TextView |
|
| 73 |
+ android:id="@+id/tv_today_incoming" |
|
| 74 |
+ android:layout_width="wrap_content" |
|
| 75 |
+ android:layout_height="wrap_content" |
|
| 76 |
+ android:layout_marginTop="15dp" |
|
| 77 |
+ android:textColor="@color/_7B8088" |
|
| 78 |
+ android:textSize="14sp" |
|
| 79 |
+ android:layout_centerHorizontal="true" |
|
| 80 |
+ android:text="@string/today_incoming"/> |
|
| 81 |
+ |
|
| 82 |
+ <TextView |
|
| 83 |
+ android:id="@+id/tv_today_incoming_account" |
|
| 84 |
+ android:layout_width="wrap_content" |
|
| 85 |
+ android:layout_height="wrap_content" |
|
| 86 |
+ android:layout_below="@id/tv_today_incoming" |
|
| 87 |
+ android:layout_marginTop="12dp" |
|
| 88 |
+ android:textColor="@color/_EF4847" |
|
| 89 |
+ android:textSize="60sp" |
|
| 90 |
+ android:layout_centerHorizontal="true"/> |
|
| 91 |
+ |
|
| 92 |
+ </RelativeLayout> |
|
| 93 |
+ |
|
| 94 |
+ <LinearLayout |
|
| 95 |
+ android:layout_width="match_parent" |
|
| 96 |
+ android:layout_height="90dp" |
|
| 97 |
+ android:orientation="horizontal" |
|
| 98 |
+ android:background="@color/background_white"> |
|
| 99 |
+ |
|
| 100 |
+ <RelativeLayout |
|
| 101 |
+ android:layout_width="0dp" |
|
| 102 |
+ android:layout_weight="1" |
|
| 103 |
+ android:layout_height="match_parent"> |
|
| 104 |
+ |
|
| 105 |
+ <TextView |
|
| 106 |
+ android:id="@+id/tv_today_capture" |
|
| 107 |
+ android:layout_width="wrap_content" |
|
| 108 |
+ android:layout_height="wrap_content" |
|
| 109 |
+ android:layout_marginTop="15dp" |
|
| 110 |
+ android:textColor="@color/_7B8088" |
|
| 111 |
+ android:textSize="14sp" |
|
| 112 |
+ android:layout_centerHorizontal="true" |
|
| 113 |
+ android:text="@string/today_capture"/> |
|
| 114 |
+ |
|
| 115 |
+ <TextView |
|
| 116 |
+ android:id="@+id/tv_today_capture_num" |
|
| 117 |
+ android:layout_width="wrap_content" |
|
| 118 |
+ android:layout_height="wrap_content" |
|
| 119 |
+ android:layout_below="@id/tv_today_capture" |
|
| 120 |
+ android:layout_marginTop="12dp" |
|
| 121 |
+ android:textColor="@color/_EF4847" |
|
| 122 |
+ android:textSize="22sp" |
|
| 123 |
+ android:layout_centerHorizontal="true"/> |
|
| 124 |
+ |
|
| 125 |
+ </RelativeLayout> |
|
| 126 |
+ |
|
| 127 |
+ <RelativeLayout |
|
| 128 |
+ android:layout_width="0dp" |
|
| 129 |
+ android:layout_weight="1" |
|
| 130 |
+ android:layout_height="match_parent"> |
|
| 131 |
+ |
|
| 132 |
+ <TextView |
|
| 133 |
+ android:id="@+id/tv_average_money" |
|
| 134 |
+ android:layout_width="wrap_content" |
|
| 135 |
+ android:layout_height="wrap_content" |
|
| 136 |
+ android:layout_marginTop="15dp" |
|
| 137 |
+ android:textColor="@color/_7B8088" |
|
| 138 |
+ android:textSize="14sp" |
|
| 139 |
+ android:layout_centerHorizontal="true" |
|
| 140 |
+ android:text="@string/average_money"/> |
|
| 141 |
+ |
|
| 142 |
+ <TextView |
|
| 143 |
+ android:id="@+id/tv_average_money_amount" |
|
| 144 |
+ android:layout_width="wrap_content" |
|
| 145 |
+ android:layout_height="wrap_content" |
|
| 146 |
+ android:layout_below="@id/tv_average_money" |
|
| 147 |
+ android:layout_marginTop="12dp" |
|
| 148 |
+ android:textColor="@color/_EF4847" |
|
| 149 |
+ android:textSize="22sp" |
|
| 150 |
+ android:layout_centerHorizontal="true"/> |
|
| 151 |
+ |
|
| 152 |
+ </RelativeLayout> |
|
| 153 |
+ |
|
| 154 |
+ </LinearLayout> |
|
| 155 |
+ |
|
| 156 |
+ <LinearLayout |
|
| 157 |
+ android:id="@+id/layout_message_part" |
|
| 158 |
+ android:layout_marginTop="8dp" |
|
| 159 |
+ android:layout_width="match_parent" |
|
| 160 |
+ android:layout_height="wrap_content" |
|
| 161 |
+ android:background="@color/background_white" |
|
| 162 |
+ android:orientation="vertical"> |
|
| 163 |
+ |
|
| 164 |
+ |
|
| 165 |
+ </LinearLayout> |
|
| 166 |
+ |
|
| 167 |
+ <LinearLayout |
|
| 168 |
+ android:id="@+id/layout_history_statistic_part" |
|
| 169 |
+ android:layout_marginTop="8dp" |
|
| 170 |
+ android:layout_width="match_parent" |
|
| 171 |
+ android:layout_height="130dp" |
|
| 172 |
+ android:background="@color/background_white" |
|
| 173 |
+ android:orientation="horizontal"> |
|
| 174 |
+ |
|
| 175 |
+ <RelativeLayout |
|
| 176 |
+ android:layout_width="0dp" |
|
| 177 |
+ android:layout_weight="1" |
|
| 178 |
+ android:layout_height="match_parent"> |
|
| 179 |
+ |
|
| 180 |
+ <TextView |
|
| 181 |
+ android:id="@+id/tv_today_capture_hours" |
|
| 182 |
+ android:layout_width="wrap_content" |
|
| 183 |
+ android:layout_height="wrap_content" |
|
| 184 |
+ android:layout_marginTop="20dp" |
|
| 185 |
+ android:textColor="@color/_7B8088" |
|
| 186 |
+ android:textSize="14sp" |
|
| 187 |
+ android:drawablePadding="4dp" |
|
| 188 |
+ android:layout_centerHorizontal="true" |
|
| 189 |
+ android:drawableTop="@drawable/capture_today" |
|
| 190 |
+ android:text="@string/today_capture"/> |
|
| 191 |
+ |
|
| 192 |
+ <TextView |
|
| 193 |
+ android:id="@+id/tv_today_capture_hours_account" |
|
| 194 |
+ android:layout_width="wrap_content" |
|
| 195 |
+ android:layout_height="wrap_content" |
|
| 196 |
+ android:layout_below="@id/tv_today_capture_hours" |
|
| 197 |
+ android:layout_marginTop="12dp" |
|
| 198 |
+ android:textColor="@color/_333333" |
|
| 199 |
+ android:textSize="16sp" |
|
| 200 |
+ android:layout_centerHorizontal="true"/> |
|
| 201 |
+ |
|
| 202 |
+ </RelativeLayout> |
|
| 203 |
+ |
|
| 204 |
+ <RelativeLayout |
|
| 205 |
+ android:layout_width="0dp" |
|
| 206 |
+ android:layout_weight="1" |
|
| 207 |
+ android:layout_height="match_parent"> |
|
| 208 |
+ |
|
| 209 |
+ <TextView |
|
| 210 |
+ android:id="@+id/tv_upload_photo" |
|
| 211 |
+ android:layout_width="wrap_content" |
|
| 212 |
+ android:layout_height="wrap_content" |
|
| 213 |
+ android:layout_marginTop="20dp" |
|
| 214 |
+ android:textColor="@color/_7B8088" |
|
| 215 |
+ android:textSize="14sp" |
|
| 216 |
+ android:drawablePadding="4dp" |
|
| 217 |
+ android:layout_centerHorizontal="true" |
|
| 218 |
+ android:drawableTop="@drawable/upload" |
|
| 219 |
+ android:text="@string/photo_upload_count"/> |
|
| 220 |
+ |
|
| 221 |
+ <TextView |
|
| 222 |
+ android:id="@+id/tv_upload_photo_num" |
|
| 223 |
+ android:layout_width="wrap_content" |
|
| 224 |
+ android:layout_height="wrap_content" |
|
| 225 |
+ android:layout_below="@id/tv_upload_photo" |
|
| 226 |
+ android:layout_marginTop="12dp" |
|
| 227 |
+ android:textColor="@color/_333333" |
|
| 228 |
+ android:textSize="16sp" |
|
| 229 |
+ android:layout_centerHorizontal="true"/> |
|
| 230 |
+ |
|
| 231 |
+ </RelativeLayout> |
|
| 232 |
+ |
|
| 233 |
+ |
|
| 234 |
+ <RelativeLayout |
|
| 235 |
+ android:layout_width="0dp" |
|
| 236 |
+ android:layout_weight="1" |
|
| 237 |
+ android:layout_height="match_parent"> |
|
| 238 |
+ |
|
| 239 |
+ <TextView |
|
| 240 |
+ android:id="@+id/tv_total_incoming" |
|
| 241 |
+ android:layout_width="wrap_content" |
|
| 242 |
+ android:layout_height="wrap_content" |
|
| 243 |
+ android:layout_marginTop="20dp" |
|
| 244 |
+ android:textColor="@color/_7B8088" |
|
| 245 |
+ android:textSize="14sp" |
|
| 246 |
+ android:drawablePadding="4dp" |
|
| 247 |
+ android:layout_centerHorizontal="true" |
|
| 248 |
+ android:drawableTop="@drawable/incoming_today" |
|
| 249 |
+ android:text="@string/total_incoming"/> |
|
| 250 |
+ |
|
| 251 |
+ <TextView |
|
| 252 |
+ android:id="@+id/tv_total_incoming_account" |
|
| 253 |
+ android:layout_width="wrap_content" |
|
| 254 |
+ android:layout_height="wrap_content" |
|
| 255 |
+ android:layout_below="@id/tv_total_incoming" |
|
| 256 |
+ android:layout_marginTop="12dp" |
|
| 257 |
+ android:textColor="@color/_333333" |
|
| 258 |
+ android:textSize="16sp" |
|
| 259 |
+ android:layout_centerHorizontal="true"/> |
|
| 260 |
+ |
|
| 261 |
+ </RelativeLayout> |
|
| 262 |
+ |
|
| 263 |
+ </LinearLayout> |
|
| 264 |
+ |
|
| 265 |
+ |
|
| 266 |
+</LinearLayout> |
|
| 62 | 267 |
|
| 63 | 268 |
</RelativeLayout> |
+ 4
- 0
app/src/main/res/values/colors.xml
@@ -22,4 +22,8 @@ |
||
| 22 | 22 |
<color name="wx_login_btn_stroke">#25CA47</color> |
| 23 | 23 |
<color name="agree_protocol_text_gray_color">#B3B3B3</color> |
| 24 | 24 |
|
| 25 |
+ <color name="_7B8088">#7B8088</color> |
|
| 26 |
+ <color name="_EF4847">#EF4847</color> |
|
| 27 |
+ <color name="_333333">#333333</color> |
|
| 28 |
+ |
|
| 25 | 29 |
</resources> |
+ 12
- 0
app/src/main/res/values/strings.xml
@@ -40,4 +40,16 @@ |
||
| 40 | 40 |
<string name="new_version_found">发现新版本，正在更新中</string> |
| 41 | 41 |
|
| 42 | 42 |
<string name="app_exit_hint">再按一次退出拍爱</string> |
| 43 |
+ |
|
| 44 |
+ <string name="today_incoming">今日收入(元)</string> |
|
| 45 |
+ |
|
| 46 |
+ <string name="today_capture">今日拍摄(张)</string> |
|
| 47 |
+ |
|
| 48 |
+ <string name="average_money">平均每张</string> |
|
| 49 |
+ |
|
| 50 |
+ <string name="today_capture_hour">今日拍摄</string> |
|
| 51 |
+ |
|
| 52 |
+ <string name="photo_upload_count">累计上传</string> |
|
| 53 |
+ |
|
| 54 |
+ <string name="total_incoming">累计收入</string> |
|
| 43 | 55 |
</resources> |