Merge pull request #296 from zida106/master

#3 #33 第三次作业
hzuapps · May 15, 2017 · 31cda7f · 31cda7f
2 parents d1b0479 + b2746aa
commit 31cda7f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/...n/java/edu/hzuapps/androidlabs/homeworks/net1414080903106/Net1414080803016SelectCity.java b/...n/java/edu/hzuapps/androidlabs/homeworks/net1414080903106/Net1414080803016SelectCity.java
@@ -4,6 +4,7 @@
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageButton;
 
 import edu.hzuapps.androidlabs.R;
 
@@ -12,14 +13,14 @@
  */
 
 public class Net1414080803016SelectCity extends Activity implements View.OnClickListener {
-    private Button backBtn;
+    private ImageButton backBtn;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_net1414080903106_select_city);
 
         //绑定“返回”按钮
-        backBtn=(Button) findViewById(R.id.btn_selectCity_back);
+        backBtn=(ImageButton) findViewById(R.id.btn_selectCity_back);
         backBtn.setOnClickListener(this);
     }
 

diff --git a/AndroidLabs/app/src/main/res/drawable/back.png b/AndroidLabs/app/src/main/res/drawable/back.png
diff --git a/AndroidLabs/app/src/main/res/drawable/search.png b/AndroidLabs/app/src/main/res/drawable/search.png
diff --git a/AndroidLabs/app/src/main/res/layout/activity_net1414080903106_select_city.xml b/AndroidLabs/app/src/main/res/layout/activity_net1414080903106_select_city.xml
@@ -6,23 +6,30 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="#002F93">
-        <Button
+        <ImageButton
             android:id="@+id/btn_selectCity_back"
-            android:layout_width="wrap_content"
-            android:layout_height="45.0dp"
-            android:gravity="center_vertical"
-            android:layout_marginLeft="10.0dp"
-            android:text="返回"
-            android:textSize="20.0sp"
-            android:textColor="#FFFFFF"/>
+        android:layout_width="wrap_content"
+        android:layout_height="45.0dp"
+        android:gravity="center_vertical"
+        android:layout_marginLeft="10.0dp"
+        android:background="#002F93"
+        android:src="@drawable/back"/>
         <EditText
             android:id="@+id/et_cityName"
             android:layout_width="match_parent"
             android:layout_height="45.0dp"
             android:gravity="center_vertical"
             android:layout_toRightOf="@id/btn_selectCity_back"
             android:text="城市名"
-            android:textSize="20.0sp"
-            android:textColor="#FFFFFF"/>
+            android:textSize="20.0sp" />
+        <ImageButton
+            android:id="@+id/btn_selectCity_search"
+            android:layout_width="wrap_content"
+            android:layout_height="45.0dp"
+            android:gravity="center_vertical"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="10.0dp"
+            android:background="#002F93"
+            android:src="@drawable/search" />
     </RelativeLayout>
 </RelativeLayout>