Commit e02ba35f7e50509fe00c4f51eb008b3518feae83
Merge remote-tracking branch 'origin/master'
Showing
8 changed files
with
17 additions
and
5 deletions
moudle_pedometer/src/main/res/drawable-hdpi/sport_location.png
moudle_pedometer/src/main/res/drawable-hdpi/sport_time.png
moudle_pedometer/src/main/res/drawable-xhdpi/sport_location.png
moudle_pedometer/src/main/res/drawable-xhdpi/sport_time.png
moudle_pedometer/src/main/res/drawable-xxhdpi/sport_location.png
moudle_pedometer/src/main/res/drawable-xxhdpi/sport_time.png
moudle_pedometer/src/main/res/layout/item_my_record.xml
| @@ -13,15 +13,14 @@ | @@ -13,15 +13,14 @@ | ||
| 13 | android:id="@+id/has_report" | 13 | android:id="@+id/has_report" |
| 14 | android:layout_width="wrap_content" | 14 | android:layout_width="wrap_content" |
| 15 | android:layout_height="wrap_content" | 15 | android:layout_height="wrap_content" |
| 16 | - android:src="@drawable/yplx_registered" | ||
| 17 | android:layout_alignParentRight="true" | 16 | android:layout_alignParentRight="true" |
| 18 | - /> | 17 | + android:src="@drawable/yplx_registered" /> |
| 19 | 18 | ||
| 20 | <LinearLayout | 19 | <LinearLayout |
| 21 | android:layout_width="match_parent" | 20 | android:layout_width="match_parent" |
| 22 | android:layout_height="wrap_content" | 21 | android:layout_height="wrap_content" |
| 23 | - android:padding="10dp" | ||
| 24 | - android:orientation="vertical"> | 22 | + android:orientation="vertical" |
| 23 | + android:padding="10dp"> | ||
| 25 | 24 | ||
| 26 | <TextView | 25 | <TextView |
| 27 | android:id="@+id/line_name" | 26 | android:id="@+id/line_name" |
| @@ -91,11 +90,22 @@ | @@ -91,11 +90,22 @@ | ||
| 91 | FivePersonIconView:showRightFlag="false" /> | 90 | FivePersonIconView:showRightFlag="false" /> |
| 92 | 91 | ||
| 93 | <TextView | 92 | <TextView |
| 93 | + android:id="@+id/people_part" | ||
| 94 | android:layout_width="wrap_content" | 94 | android:layout_width="wrap_content" |
| 95 | android:layout_height="wrap_content" | 95 | android:layout_height="wrap_content" |
| 96 | android:layout_gravity="center" | 96 | android:layout_gravity="center" |
| 97 | android:layout_marginLeft="10dp" | 97 | android:layout_marginLeft="10dp" |
| 98 | - android:text="123人参与" /> | 98 | + android:text="@string/_123" |
| 99 | + android:textColor="#333333" | ||
| 100 | + android:textSize="15sp" /> | ||
| 101 | + | ||
| 102 | + <TextView | ||
| 103 | + android:layout_width="wrap_content" | ||
| 104 | + android:layout_height="wrap_content" | ||
| 105 | + android:layout_gravity="center" | ||
| 106 | + android:text="@string/has_part" | ||
| 107 | + android:textColor="#333333" | ||
| 108 | + android:textSize="12sp" /> | ||
| 99 | 109 | ||
| 100 | </LinearLayout> | 110 | </LinearLayout> |
| 101 | 111 |
moudle_pedometer/src/main/res/values/strings.xml
| @@ -50,5 +50,7 @@ | @@ -50,5 +50,7 @@ | ||
| 50 | <string name="beijing">北京</string> | 50 | <string name="beijing">北京</string> |
| 51 | <string name="goline">约跑线路</string> | 51 | <string name="goline">约跑线路</string> |
| 52 | <string name="myactivity">我的活动</string> | 52 | <string name="myactivity">我的活动</string> |
| 53 | + <string name="_123">123</string> | ||
| 54 | + <string name="has_part">人已参与</string> | ||
| 53 | <!----> | 55 | <!----> |
| 54 | </resources> | 56 | </resources> |