diff --git a/.idea/misc.xml b/.idea/misc.xml index c0f68ed..99202cc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -25,7 +25,7 @@ - + diff --git a/app/src/main/java/com/example/user/myapp/MainActivity.java b/app/src/main/java/com/example/user/myapp/MainActivity.java index 5a07ba6..09640ca 100644 --- a/app/src/main/java/com/example/user/myapp/MainActivity.java +++ b/app/src/main/java/com/example/user/myapp/MainActivity.java @@ -18,20 +18,16 @@ public class MainActivity extends AppCompatActivity { /** Called when the user taps the Send button */ public void sendMessage(View view) { EditText editText1 = (EditText) findViewById(R.id.ipAddress); - //String ipAddress = editText1.getText().toString(); - String ipAddress ="192.168.157.16"; + String ipAddress = editText1.getText().toString(); EditText editText2 = (EditText) findViewById(R.id.port); - // int port = Integer.parseInt(editText2.getText().toString()); - int port = 503; + int port = Integer.parseInt(editText2.getText().toString()); EditText editText3 = (EditText) findViewById(R.id.ref); - // int ref = Integer.parseInt(editText3.getText().toString()); + int ref = Integer.parseInt(editText3.getText().toString()); EditText editText4 = (EditText) findViewById(R.id.count); - // int count = Integer.parseInt(editText4.getText().toString()); - int ref = 1; - int count = 8; + int count = Integer.parseInt(editText4.getText().toString()); GlobalState state = (GlobalState) getApplicationContext(); state.setIpAddress(ipAddress); diff --git a/app/src/main/res/layout/activity_display_message.xml b/app/src/main/res/layout/activity_display_message.xml index 583d364..4338afd 100644 --- a/app/src/main/res/layout/activity_display_message.xml +++ b/app/src/main/res/layout/activity_display_message.xml @@ -22,7 +22,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:text="status" + android:text="bla" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/textView1" /> @@ -32,7 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:text="exception" + android:text="foo" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/textView2" /> @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:text="finally" + android:text="bar" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/textView3" />