diff --git a/app/src/main/java/com/example/flightgearcontrollerapp/views/MainActivity.kt b/app/src/main/java/com/example/flightgearcontrollerapp/views/MainActivity.kt index 20637d6..7dfae72 100644 --- a/app/src/main/java/com/example/flightgearcontrollerapp/views/MainActivity.kt +++ b/app/src/main/java/com/example/flightgearcontrollerapp/views/MainActivity.kt @@ -4,6 +4,7 @@ import android.os.Bundle import android.view.View import android.widget.Button import android.widget.EditText +import android.widget.Toast import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import com.example.flightgearcontrollerapp.R @@ -27,11 +28,19 @@ class MainActivity : AppCompatActivity() { if (!isConnected) { val editTextIP = findViewById(ip_address) val editTextPort = findViewById(port_address) + if (editTextIP.text.toString() ==""){ + Toast.makeText(applicationContext, "Please write IP address", Toast.LENGTH_SHORT).show() + return + } + if (editTextPort.text.toString()==""){ + Toast.makeText(applicationContext, "Please write port address", Toast.LENGTH_SHORT).show() + return + } val builder = AlertDialog.Builder(this) builder.setTitle(getString(R.string.alert_dialog_flightgear_connection)) builder.setMessage(getString(R.string.alert_instruction)) builder.setPositiveButton(getString(R.string.ok_btn)){ dialog, _ -> - if ((editTextIP.text.toString() !="")&&(editTextPort.text.toString()!="")&&(vmConnection.connectToFG(editTextIP.text.toString(),editTextPort.text.toString()))) { + if (vmConnection.connectToFG(editTextIP.text.toString(),editTextPort.text.toString())) { btnConnection.setText(R.string.disconnect) isConnected = true } else { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 38f941a..732861e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -138,13 +138,13 @@ @@ -210,10 +211,13 @@ android:textStyle="bold" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fbdcc5d..b143b1c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -8,7 +8,7 @@ Rudder disconnect FlightGear Connection - For connecting to FlightGear App,\nFirst open the app.\nThen, copy these lines to Setting-> Additional Setting:\n\n --generic=socket,in,10,\'ip\',\'port\',tcp,playback_small \n --fdm=null\n\n and now just press fly! + For connecting to FlightGear App,\nFirst open the app.\nThen, copy these lines to Setting-> Additional Setting:\n\n --telnet=socket,in,10,\'ip\',\'port\',tcp,playback_small \n\n and now just press fly! continue FlightGear Connection Connection failed!