修改 UI

Author: thinaaron

app/src/main/java/net/coding/program/search/SearchProjectActivity.java

@@ -19,6 +19,7 @@
 import android.widget.TextView;
 
 import net.coding.program.R;
+import net.coding.program.common.Global;
 import net.coding.program.common.SearchProjectCache;
 import net.coding.program.common.adapter.SearchHistoryListAdapter;
 import net.coding.program.common.ui.BackActivity;
@@ -71,6 +72,7 @@ void init() {
         btnCancel = actionBar.findViewById(R.id.btnCancel);
         btnCancel.setOnClickListener(v -> {
             editText.setText("");
+            Global.popSoftkeyboard(this, editText, true);
         });
 
         editText = (EditText) actionBar.findViewById(R.id.editText);
@@ -249,17 +251,19 @@ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
     @Override
     public void onTextChanged(CharSequence s, int start, int before, int count) {
-
     }
 
     @Override
     public void afterTextChanged(Editable s) {
-        if (s == null || TextUtils.isEmpty(s)) {
+        if (TextUtils.isEmpty(s)) {
             emptyListView.setVisibility(View.VISIBLE);
             pager.setVisibility(View.GONE);
             tabs.setVisibility(View.GONE);
             mSearchData = "";
             loadSearchCache();
+            btnCancel.setVisibility(View.INVISIBLE);
+        } else {
+            btnCancel.setVisibility(View.VISIBLE);
         }
     }
 }

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

@@ -3,7 +3,6 @@
     android:layout_height="55dp"
     android:background="@color/color_primary"
     android:gravity="center_vertical"
-
     android:orientation="horizontal">
 
     <EditText
@@ -41,8 +40,9 @@
 
     <ImageView
         android:id="@+id/btnCancel"
-        android:layout_width="96dp"
-        android:layout_height="96dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:visibility="invisible"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:src="@drawable/ic_actionbar_cancel"