Skip to content

Commit

Permalink
修复布局BUG
Browse files Browse the repository at this point in the history
  • Loading branch information
limuyang2 committed Sep 13, 2017
1 parent be5e144 commit 8b3246f
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 41 deletions.
3 changes: 1 addition & 2 deletions .gitignore
@@ -1,10 +1,9 @@
*.iml
.gradle
/local.properties
/.idea/workspace.xml
/.idea/libraries
.DS_Store
/build
/captures
.externalNativeBuild
/app/build
.idea/
54 changes: 30 additions & 24 deletions searchview/src/main/res/layout/search_view.xml
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>


<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/cardView_search"
Expand All @@ -19,55 +17,63 @@
<LinearLayout
android:id="@+id/search_layout"
android:layout_width="match_parent"
android:layout_height="48dp">
android:layout_height="48dp"
android:orientation="horizontal">

<ImageView
android:id="@+id/iv_search_back"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:padding="12dp"
android:src="@drawable/ic_arrow_back_black_24dp"
/>
android:paddingBottom="5dp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingTop="5dp"
android:src="@drawable/ic_arrow_back_black_24dp" />

<EditText
android:id="@+id/et_search"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="#fff"
android:gravity="center_vertical"
android:hint="请输入内容"
android:hint="@string/enter_content"
android:imeOptions="actionSearch"
android:inputType="textCapWords"
android:paddingLeft="12dp"
android:paddingRight="8dp"
android:paddingBottom="5dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="5dp"
android:singleLine="true" />

<ImageView
android:id="@+id/clearSearch"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:padding="12dp"
android:src="@drawable/ic_clean_input"
/>
android:paddingBottom="5dp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingTop="5dp"
android:src="@drawable/ic_clean_input" />
</LinearLayout>

<TextView
android:id="@+id/clearHistory"
android:layout_below="@id/search_layout"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:textSize="13sp"
android:textColor="@android:color/darker_gray"
android:text="清除历史记录"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@id/search_layout"
android:layout_centerHorizontal="true"
/>
android:layout_marginRight="10dp"
android:text="@string/clear_history"
android:textColor="@android:color/darker_gray"
android:textSize="13sp" />

<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView"
Expand Down
15 changes: 0 additions & 15 deletions searchview/src/main/res/layout/view_item_clear_history.xml

This file was deleted.

6 changes: 6 additions & 0 deletions searchview/src/main/res/values-en/strings.xml
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">SearchView</string>
<string name="clear_history">Clear history</string>
<string name="enter_content">Please enter the content</string>
</resources>
2 changes: 2 additions & 0 deletions searchview/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
<resources>
<string name="app_name">SearchView</string>
<string name="clear_history">清除历史记录</string>
<string name="enter_content">请输入内容</string>
</resources>

0 comments on commit 8b3246f

Please sign in to comment.