Commit 0fb2d1346fdb3bf183e0b9b4b98bd8d0f7f0228b
1 parent
10cbb009
1 完成设置角色逻辑
Showing
2 changed files
with
56 additions
and
42 deletions
module_xiaojiaSoundBox/src/main/res/layout/fragment_set_friend_role.xml
| @@ -14,53 +14,67 @@ | @@ -14,53 +14,67 @@ | ||
| 14 | 14 | ||
| 15 | <FrameLayout | 15 | <FrameLayout |
| 16 | android:layout_width="match_parent" | 16 | android:layout_width="match_parent" |
| 17 | - android:layout_height="50dp" | ||
| 18 | - android:background="@color/color_F7B054"> | ||
| 19 | - | ||
| 20 | - <TextView | ||
| 21 | - android:layout_width="260dp" | ||
| 22 | - android:layout_height="wrap_content" | ||
| 23 | - android:layout_gravity="center" | ||
| 24 | - android:text="对已选用户设置角色，确立亲情关系" | ||
| 25 | - android:textColor="@color/white" | ||
| 26 | - android:textSize="16sp" /> | 17 | + android:layout_height="match_parent"> |
| 27 | 18 | ||
| 28 | <LinearLayout | 19 | <LinearLayout |
| 29 | - android:layout_width="wrap_content" | 20 | + android:layout_width="match_parent" |
| 30 | android:layout_height="match_parent" | 21 | android:layout_height="match_parent" |
| 31 | - android:layout_gravity="right" | ||
| 32 | - android:clickable="true" | ||
| 33 | - android:gravity="center" | ||
| 34 | - android:paddingRight="10dp"> | 22 | + android:orientation="vertical"> |
| 35 | 23 | ||
| 36 | - <ImageView | ||
| 37 | - android:layout_width="25dp" | ||
| 38 | - android:layout_height="25dp" | ||
| 39 | - android:background="@drawable/icon_set_role_close" /> | ||
| 40 | - </LinearLayout> | ||
| 41 | - </FrameLayout> | ||
| 42 | - <!-- --> | ||
| 43 | - <LinearLayout | ||
| 44 | - android:layout_width="match_parent" | ||
| 45 | - android:layout_height="0dp" | ||
| 46 | - android:layout_weight="1"> | 24 | + <FrameLayout |
| 25 | + android:layout_width="match_parent" | ||
| 26 | + android:layout_height="45dp" | ||
| 27 | + android:background="@color/color_F7B054"> | ||
| 47 | 28 | ||
| 48 | - <android.support.v7.widget.RecyclerView | ||
| 49 | - android:id="@+id/rv_friends_role" | ||
| 50 | - android:layout_width="match_parent" | ||
| 51 | - android:layout_height="match_parent" /> | ||
| 52 | - </LinearLayout> | 29 | + <TextView |
| 30 | + android:layout_width="260dp" | ||
| 31 | + android:layout_height="wrap_content" | ||
| 32 | + android:layout_gravity="center" | ||
| 33 | + android:text="对已选用户设置角色，确立亲情关系" | ||
| 34 | + android:textColor="@color/white" | ||
| 35 | + android:textSize="15sp" /> | ||
| 53 | 36 | ||
| 54 | - <Button | ||
| 55 | - android:id="@+id/btn_next" | ||
| 56 | - android:layout_width="match_parent" | ||
| 57 | - android:layout_height="45dp" | ||
| 58 | - android:layout_margin="30dp" | ||
| 59 | - android:background="@drawable/selector_btn_green" | ||
| 60 | - android:text="下一步" | ||
| 61 | - android:textColor="@color/white" | ||
| 62 | - android:textSize="17sp" | ||
| 63 | - android:textStyle="bold" /> | 37 | + <LinearLayout |
| 38 | + android:layout_width="wrap_content" | ||
| 39 | + android:layout_height="match_parent" | ||
| 40 | + android:layout_gravity="right" | ||
| 41 | + android:clickable="true" | ||
| 42 | + android:gravity="center" | ||
| 43 | + android:paddingRight="10dp"> | ||
| 44 | + | ||
| 45 | + <ImageView | ||
| 46 | + android:layout_width="25dp" | ||
| 47 | + android:layout_height="25dp" | ||
| 48 | + android:background="@drawable/icon_set_role_close" /> | ||
| 49 | + </LinearLayout> | ||
| 50 | + </FrameLayout> | ||
| 51 | + <!-- --> | ||
| 52 | + <LinearLayout | ||
| 53 | + android:layout_width="match_parent" | ||
| 54 | + android:layout_height="0dp" | ||
| 55 | + android:layout_weight="1"> | ||
| 56 | + | ||
| 57 | + <android.support.v7.widget.RecyclerView | ||
| 58 | + android:id="@+id/rv_friends_role" | ||
| 59 | + android:layout_width="match_parent" | ||
| 60 | + android:layout_height="match_parent" /> | ||
| 61 | + </LinearLayout> | ||
| 62 | + | ||
| 63 | + <Button | ||
| 64 | + android:id="@+id/btn_next" | ||
| 65 | + android:layout_width="match_parent" | ||
| 66 | + android:layout_height="45dp" | ||
| 67 | + android:layout_margin="30dp" | ||
| 68 | + android:background="@drawable/selector_btn_green" | ||
| 69 | + android:text="下一步" | ||
| 70 | + android:textColor="@color/white" | ||
| 71 | + android:textSize="17sp" | ||
| 72 | + android:textStyle="bold" /> | ||
| 73 | + </LinearLayout> | ||
| 74 | + <!-- --> | ||
| 75 | + | ||
| 76 | + <!-- --> | ||
| 77 | + </FrameLayout> | ||
| 64 | <!-- 结尾--> | 78 | <!-- 结尾--> |
| 65 | </LinearLayout> | 79 | </LinearLayout> |
| 66 | </layout> | 80 | </layout> |
| 67 | \ No newline at end of file | 81 | \ No newline at end of file |
module_xiaojiaSoundBox/src/main/res/layout/item_list_set_role.xml
| @@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
| 17 | 17 | ||
| 18 | <LinearLayout | 18 | <LinearLayout |
| 19 | android:layout_width="match_parent" | 19 | android:layout_width="match_parent" |
| 20 | - android:layout_height="50dp" | 20 | + android:layout_height="60dp" |
| 21 | android:gravity="center_vertical"> | 21 | android:gravity="center_vertical"> |
| 22 | 22 | ||
| 23 | <ImageView | 23 | <ImageView |