From 4991eb8d1369fdcef98d038e851707e05af37ee7 Mon Sep 17 00:00:00 2001
From: Nite <shunite@gmail.com>
Date: Fri, 25 Sep 2020 20:02:59 +0200
Subject: [PATCH] Fixed Edit Server button layout and exit check

---
 .../ultrasonic/activity/EditServerActivity.kt |  2 +-
 .../src/main/res/layout/server_edit.xml       | 63 +++++++++----------
 2 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/EditServerActivity.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/EditServerActivity.kt
index 4cb914a4..5383d6d1 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/EditServerActivity.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/EditServerActivity.kt
@@ -235,7 +235,7 @@ internal class EditServerActivity : AppCompatActivity() {
      * Checks whether any value in the fields are changed according to their original values.
      */
     private fun areFieldsChanged(): Boolean {
-        if (currentServerSetting == null) {
+        if (currentServerSetting == null || currentServerSetting!!.id == -1) {
             return !serverNameEditText!!.editText?.text!!.isBlank() ||
                 serverAddressEditText!!.editText?.text.toString() != "http://" ||
                 !userNameEditText!!.editText?.text!!.isBlank() ||
diff --git a/ultrasonic/src/main/res/layout/server_edit.xml b/ultrasonic/src/main/res/layout/server_edit.xml
index a8f32ccc..1058c3f6 100644
--- a/ultrasonic/src/main/res/layout/server_edit.xml
+++ b/ultrasonic/src/main/res/layout/server_edit.xml
@@ -14,7 +14,7 @@
         a:layout_width="match_parent"
         a:layout_height="wrap_content"
         a:hint="@string/settings.server_name"
-        app:layout_constraintBottom_toTopOf="@+id/edit_server_address"
+        app:layout_constraintBottom_toTopOf="@id/edit_server_address"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -33,10 +33,10 @@
         a:layout_height="wrap_content"
         a:layout_marginBottom="20dp"
         a:hint="@string/settings.server_address"
-        app:layout_constraintBottom_toTopOf="@+id/edit_authentication_header"
+        app:layout_constraintBottom_toTopOf="@id/edit_authentication_header"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/edit_server_name">
+        app:layout_constraintTop_toBottomOf="@id/edit_server_name">
 
         <com.google.android.material.textfield.TextInputEditText
             a:layout_width="match_parent"
@@ -52,19 +52,19 @@
         a:layout_width="wrap_content"
         a:layout_height="wrap_content"
         a:text="@string/server_editor.authentication"
-        app:layout_constraintBottom_toTopOf="@+id/edit_server_username"
-        app:layout_constraintStart_toStartOf="@+id/edit_server_username"
-        app:layout_constraintTop_toBottomOf="@+id/edit_server_address" />
+        app:layout_constraintBottom_toTopOf="@id/edit_server_username"
+        app:layout_constraintStart_toStartOf="@id/edit_server_username"
+        app:layout_constraintTop_toBottomOf="@id/edit_server_address" />
 
     <com.google.android.material.textfield.TextInputLayout
         a:id="@+id/edit_server_username"
         a:layout_width="match_parent"
         a:layout_height="wrap_content"
         a:hint="@string/settings.server_username"
-        app:layout_constraintBottom_toTopOf="@+id/edit_server_password"
+        app:layout_constraintBottom_toTopOf="@id/edit_server_password"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/edit_authentication_header">
+        app:layout_constraintTop_toBottomOf="@id/edit_authentication_header">
 
         <com.google.android.material.textfield.TextInputEditText
             a:layout_width="match_parent"
@@ -81,10 +81,10 @@
         a:layout_marginBottom="21dp"
         a:hint="@string/settings.server_password"
         app:endIconMode="password_toggle"
-        app:layout_constraintBottom_toTopOf="@+id/edit_advanced_header"
+        app:layout_constraintBottom_toTopOf="@id/edit_advanced_header"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/edit_server_username">
+        app:layout_constraintTop_toBottomOf="@id/edit_server_username">
 
         <com.google.android.material.textfield.TextInputEditText
             a:layout_width="match_parent"
@@ -100,9 +100,9 @@
         a:layout_height="wrap_content"
         a:layout_marginBottom="8dp"
         a:text="@string/server_editor.advanced"
-        app:layout_constraintBottom_toTopOf="@+id/edit_self_signed"
+        app:layout_constraintBottom_toTopOf="@id/edit_self_signed"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/edit_server_password" />
+        app:layout_constraintTop_toBottomOf="@id/edit_server_password" />
 
     <TextView
         a:id="@+id/edit_self_signed_title"
@@ -112,9 +112,9 @@
         a:layout_marginStart="5dp"
         a:layout_marginLeft="5dp"
         a:text="@string/settings.title.allow_self_signed_certificate"
-        app:layout_constraintBottom_toTopOf="@+id/edit_ldap_title"
+        app:layout_constraintBottom_toTopOf="@id/edit_ldap_title"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/edit_advanced_header" />
+        app:layout_constraintTop_toBottomOf="@id/edit_advanced_header" />
 
     <com.google.android.material.switchmaterial.SwitchMaterial
         a:id="@+id/edit_self_signed"
@@ -126,10 +126,10 @@
         a:layout_marginRight="5dp"
         a:layout_marginBottom="8dp"
         a:checked="false"
-        app:layout_constraintBottom_toTopOf="@+id/edit_ldap_title"
+        app:layout_constraintBottom_toTopOf="@id/edit_ldap_title"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/edit_self_signed_title"
-        app:layout_constraintTop_toBottomOf="@+id/edit_advanced_header" />
+        app:layout_constraintTop_toBottomOf="@id/edit_advanced_header" />
 
     <TextView
         a:id="@+id/edit_ldap_title"
@@ -139,9 +139,9 @@
         a:layout_marginStart="5dp"
         a:layout_marginLeft="5dp"
         a:text="@string/settings.title.enable_ldap_users_support"
-        app:layout_constraintBottom_toTopOf="@+id/edit_ldap_description"
+        app:layout_constraintBottom_toTopOf="@id/edit_ldap_description"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/edit_self_signed" />
+        app:layout_constraintTop_toBottomOf="@id/edit_self_signed" />
 
     <TextView
         a:id="@+id/edit_ldap_description"
@@ -151,10 +151,10 @@
         a:layout_marginStart="5dp"
         a:layout_marginLeft="5dp"
         a:text="@string/settings.summary.enable_ldap_users_support"
-        app:layout_constraintBottom_toTopOf="@+id/edit_jukebox"
-        app:layout_constraintEnd_toStartOf="@+id/edit_ldap"
+        app:layout_constraintBottom_toTopOf="@id/edit_jukebox"
+        app:layout_constraintEnd_toStartOf="@id/edit_ldap"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/edit_ldap_title" />
+        app:layout_constraintTop_toBottomOf="@id/edit_ldap_title" />
 
     <com.google.android.material.switchmaterial.SwitchMaterial
         a:id="@+id/edit_ldap"
@@ -165,10 +165,10 @@
         a:layout_marginLeft="8dp"
         a:layout_marginStart="8dp"
         a:checked="false"
-        app:layout_constraintBottom_toBottomOf="@+id/edit_ldap_description"
+        app:layout_constraintBottom_toBottomOf="@id/edit_ldap_description"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/edit_ldap_description"
-        app:layout_constraintTop_toTopOf="@+id/edit_ldap_title" />
+        app:layout_constraintTop_toTopOf="@id/edit_ldap_title" />
 
     <TextView
         a:id="@+id/edit_jukebox_title"
@@ -180,7 +180,7 @@
         a:layout_marginTop="8dp"
         a:text="@string/jukebox.is_default"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/edit_ldap_description" />
+        app:layout_constraintTop_toBottomOf="@id/edit_ldap_description" />
 
     <com.google.android.material.switchmaterial.SwitchMaterial
         a:id="@+id/edit_jukebox"
@@ -194,7 +194,7 @@
         a:checked="false"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/edit_jukebox_title"
-        app:layout_constraintTop_toBottomOf="@+id/edit_ldap_description" />
+        app:layout_constraintTop_toBottomOf="@id/edit_ldap_description" />
 
     <Button
         a:id="@+id/edit_test"
@@ -204,7 +204,7 @@
         a:layout_marginTop="8dp"
         a:text="@string/settings.test_connection_title"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/edit_save"
+        app:layout_constraintEnd_toStartOf="@id/edit_save"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/edit_jukebox"
         app:layout_constraintVertical_bias="1.0" />
@@ -213,14 +213,13 @@
         a:id="@+id/edit_save"
         style="?attr/materialButtonOutlinedStyle"
         a:layout_width="0dp"
-        a:layout_height="wrap_content"
-        a:layout_marginTop="8dp"
+        a:layout_height="0dp"
         a:text="@string/common.save"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/edit_test"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/edit_test"
-        app:layout_constraintTop_toBottomOf="@id/edit_jukebox"
-        app:layout_constraintVertical_bias="1.0" />
+        app:layout_constraintStart_toEndOf="@id/edit_test"
+        app:layout_constraintTop_toTopOf="@id/edit_test" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file