Add port select

Author: nikita-yfh

app/src/main/java/ru/nikita/adb/ADBActivity.java

@@ -10,10 +10,9 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.widget.EditText;
+import android.text.InputType;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.text.InputType;
-import android.text.method.DigitsKeyListener;
 import ru.nikita.adb.Binary;
 import ru.nikita.adb.Device;
 import ru.nikita.adb.AppListActivity;
@@ -64,18 +63,20 @@ protected Device[] getDevices(String log){
 
 	public void connectDevice(View view){
 		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(R.string.ip);
+		builder.setTitle(R.string.connect_device);
 
-		final EditText input = new EditText(this);
-		input.setInputType(InputType.TYPE_CLASS_TEXT);
-		input.setKeyListener(DigitsKeyListener.getInstance("0123456789."));
-		builder.setView(input);
+		View layout = getLayoutInflater().inflate(R.layout.connect_device, null);
+		builder.setView(layout);
+
+		final EditText inputIP = (EditText)layout.findViewById(R.id.input_ip);
+		final EditText inputPort = (EditText)layout.findViewById(R.id.input_port);
 
 		builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
-				String ip=input.getText().toString();
-				new ADBTask(text,binary).connectDevice(ip);
+				String ip=inputIP.getText().toString();
+				String port=inputPort.getText().toString();
+				new ADBTask(text,binary).connectDevice(ip, port);
 				refreshDeviceList(null);
 			}
 		});

app/src/main/java/ru/nikita/adb/ADBTask.java

@@ -18,8 +18,8 @@ public void reboot(Device device, String arg){
 	public void installAppFromFile(final Device device, String fileName){
 		execute(device,"install '"+fileName+"'");
 	}
-	public void connectDevice(String ip){
-		execute("connect "+ip);
+	public void connectDevice(String ip, String port){
+		execute(String.format("connect %s:%s", ip, port));
 	}
 	public void push(Device device, String src, String dest){
 		execute(String.format("push '%s' '%s'",src,dest));

app/src/main/res/layout/main_activity.xml renamed to app/src/main/res/layout/connect_device.xml

@@ -5,14 +5,24 @@
 	android:orientation="vertical"
 	android:padding="20dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
-	<Button
+	<TextView
+		android:text="@string/ip"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"/>
+	<EditText
+		android:id="@+id/input_ip"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:onClick="onADBClicked"
-		android:text="@string/adb" />
-	<Button
+		android:inputType="number|numberDecimal"
+		android:digits="0123456789."/>
+	<TextView
+		android:text="@string/port"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"/>
+	<EditText
+		android:id="@+id/input_port"
+		android:text="5555"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:onClick="onFastbootClicked"
-		android:text="@string/fastboot" />
+		android:inputType="number"/>
 </LinearLayout>

app/src/main/res/values/strings.xml

@@ -15,7 +15,7 @@
 	<string name="apps">App control</string>
 	<string name="device">Device</string>
 	<string name="ip">Device IP</string>
-	<string name="port">Input port</string>
+	<string name="port">Device port</string>
 	<string name="app_list">App list</string>
 	<string name="app_loading">Loading applications...</string>
 	<string name="show_installed_apps">Show only installed apps</string>