From 0f3afecff1e0c808c3962afdb48b20660771fd46 Mon Sep 17 00:00:00 2001
From: m_broelemann <marius.broelemann@stud.th-owl.de>
Date: Sat, 2 Jan 2021 02:03:45 +0100
Subject: [PATCH] Alert Dialog erweitert um Port

---
 .../java/com/example/aped/MainActivity.java   | 27 ++++-----
 .../layout/alert_dialog_ip_pot_eingabe.xml    | 55 +++++++++++++++++++
 2 files changed, 69 insertions(+), 13 deletions(-)
 create mode 100644 APED/app/src/main/res/layout/alert_dialog_ip_pot_eingabe.xml

diff --git a/APED/app/src/main/java/com/example/aped/MainActivity.java b/APED/app/src/main/java/com/example/aped/MainActivity.java
index c0efa30..3059605 100644
--- a/APED/app/src/main/java/com/example/aped/MainActivity.java
+++ b/APED/app/src/main/java/com/example/aped/MainActivity.java
@@ -6,12 +6,15 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.MenuItem;
 
 import android.view.Menu;
+import android.view.View;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ListView;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.example.aped.communication.Communicator;
@@ -115,24 +118,22 @@ public class MainActivity extends AppCompatActivity {
             case R.id.action_set_IP:
                 MaterialAlertDialogBuilder alert = new
                         MaterialAlertDialogBuilder(MainActivity.this);
-                alert.setTitle(R.string.action_set_IP);
-                alert.setMessage("Please enter the ip address of the "
-                        + "device to be connected");
-                final EditText input = new EditText(MainActivity.this);
-                input.setText(configurationHandler.getAddress());
-                LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
-                        LinearLayout.LayoutParams.MATCH_PARENT,
-                        LinearLayout.LayoutParams.MATCH_PARENT);
-                input.setLayoutParams(lp);
-                alert.setView(input);
-                alert.setPositiveButton("connect",
+                //alert.setTitle(R.string.action_set_connection);
+                View view2 = LayoutInflater.from(MainActivity.this).inflate(R.layout.alert_dialog_ip_pot_eingabe,null);
+                EditText ipAdress = (EditText) view2.findViewById(R.id.editTextIp);
+                ipAdress.setText(configurationHandler.getAddress());
+                EditText port = (EditText) view2.findViewById(R.id.editTextPort);
+                port.setText(String.valueOf(configurationHandler.getPort()) );
+                alert.setView(view2);
+                alert.setPositiveButton("set",
                         new DialogInterface.OnClickListener() {
                             public void onClick(final DialogInterface dialog,
                                                 final int which) {
                                 // Write your code here to execute after dialog
-                                configurationHandler.setAddress(input.getText().toString());
+                                configurationHandler.setAddress(ipAdress.getText().toString());
+                                configurationHandler.setPort(Integer.parseInt(port.getText().toString()));
                                 Toast.makeText(getApplicationContext(),
-                                        configurationHandler.getAddress() + " IP connect",
+                                        configurationHandler.getAddress() + ":" + String.valueOf(configurationHandler.getPort()) + " is set",
                                         Toast.LENGTH_SHORT).show();
                                 uebergabe = new Communicator(configurationHandler.getAddress(), configurationHandler.getPort(),
                                         MainActivity.this);
diff --git a/APED/app/src/main/res/layout/alert_dialog_ip_pot_eingabe.xml b/APED/app/src/main/res/layout/alert_dialog_ip_pot_eingabe.xml
new file mode 100644
index 0000000..5ff2422
--- /dev/null
+++ b/APED/app/src/main/res/layout/alert_dialog_ip_pot_eingabe.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/textViewIp"
+        android:text="IP adress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_margin="5dp"
+        android:textSize="20dp"/>
+
+    <EditText
+        android:id="@+id/editTextIp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/textViewIp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:ems="10"
+        android:layout_margin="5dp"
+        android:textSize="25dp" />
+
+    <TextView
+        android:id="@+id/textViewPort"
+        android:text="Port"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/editTextIp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_margin="5dp"
+        android:textSize="20dp"/>
+
+    <EditText
+        android:id="@+id/editTextPort"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:ems="10"
+        android:layout_below="@id/textViewPort"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_margin="5dp"
+        android:inputType="number"
+        android:textSize="25dp" />
+
+
+</RelativeLayout>
\ No newline at end of file