Skip to content

Commit f070d77

Browse files
committed
修复界面瑕疵
1 parent 43efc83 commit f070d77

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

app/src/main/res/layout/content_user.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
android:id="@+id/user_swipe"
1010
android:layout_alignParentLeft="true"
1111
android:layout_alignParentStart="true"
12-
android:layout_marginTop="60dp">
12+
android:layout_marginTop="55dp">
1313

1414

1515
<android.support.v7.widget.RecyclerView

app/src/main/res/layout/item_recycler_user.xml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
2+
<layout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto">
4+
5+
<data>
6+
7+
<variable
8+
name="theme"
9+
type="com.rayfantasy.icode.model.ICodeTheme"/>
10+
</data>
11+
<android.support.v7.widget.CardView
312
android:layout_width="match_parent"
413
android:layout_height="wrap_content"
5-
xmlns:app="http://schemas.android.com/apk/res-auto"
614
android:clickable="true"
715
android:foreground="?android:attr/selectableItemBackground"
816
android:transitionName="element_bg"
9-
app:cardCornerRadius="0dp"
10-
android:translationZ="5dp">
17+
app:cardCornerRadius="0dp">
1118

1219
<LinearLayout
1320
android:layout_width="match_parent"
@@ -43,7 +50,7 @@
4350
<TextView
4451
android:layout_width="match_parent"
4552
android:layout_height="wrap_content"
46-
android:textColor="#000000"
53+
android:textColor="@{theme.colorPrimaryDark}"
4754
android:id="@+id/user_item_username"
4855
android:text="User_Name"
4956
android:textSize="35dp"
@@ -52,4 +59,5 @@
5259

5360
</LinearLayout>
5461

55-
</android.support.v7.widget.CardView>
62+
</android.support.v7.widget.CardView>
63+
</layout>

app/src/main/res/menu/nv_menu.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
android:id="@+id/nav_home"
77
android:icon="@mipmap/ic_home_black"
88
android:title="@string/home"/>
9+
<item
10+
android:id="@+id/nav_edit"
11+
android:icon="@mipmap/ic_writecode_black"
12+
android:title="@string/write"/>
913
<item
1014
android:id="@+id/nav_setting"
1115
android:icon="@mipmap/ic_setting_black"
@@ -17,10 +21,7 @@
1721
</group>
1822
<item android:title="@string/about">
1923
<menu>
20-
<item
21-
android:id="@+id/nav_edit"
22-
android:icon="@mipmap/ic_writecode_black"
23-
android:title="@string/write"/>
24+
2425
<item
2526
android:id="@+id/nav_homepage"
2627
android:icon="@mipmap/ic_website_black"

0 commit comments

Comments
 (0)