Fixed Edit Server button layout and exit check
This commit is contained in:
parent
2a7ea19a0f
commit
4991eb8d13
|
@ -235,7 +235,7 @@ internal class EditServerActivity : AppCompatActivity() {
|
||||||
* Checks whether any value in the fields are changed according to their original values.
|
* Checks whether any value in the fields are changed according to their original values.
|
||||||
*/
|
*/
|
||||||
private fun areFieldsChanged(): Boolean {
|
private fun areFieldsChanged(): Boolean {
|
||||||
if (currentServerSetting == null) {
|
if (currentServerSetting == null || currentServerSetting!!.id == -1) {
|
||||||
return !serverNameEditText!!.editText?.text!!.isBlank() ||
|
return !serverNameEditText!!.editText?.text!!.isBlank() ||
|
||||||
serverAddressEditText!!.editText?.text.toString() != "http://" ||
|
serverAddressEditText!!.editText?.text.toString() != "http://" ||
|
||||||
!userNameEditText!!.editText?.text!!.isBlank() ||
|
!userNameEditText!!.editText?.text!!.isBlank() ||
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
a:layout_width="match_parent"
|
a:layout_width="match_parent"
|
||||||
a:layout_height="wrap_content"
|
a:layout_height="wrap_content"
|
||||||
a:hint="@string/settings.server_name"
|
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_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent">
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
|
@ -33,10 +33,10 @@
|
||||||
a:layout_height="wrap_content"
|
a:layout_height="wrap_content"
|
||||||
a:layout_marginBottom="20dp"
|
a:layout_marginBottom="20dp"
|
||||||
a:hint="@string/settings.server_address"
|
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_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="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
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
a:layout_width="match_parent"
|
a:layout_width="match_parent"
|
||||||
|
@ -52,19 +52,19 @@
|
||||||
a:layout_width="wrap_content"
|
a:layout_width="wrap_content"
|
||||||
a:layout_height="wrap_content"
|
a:layout_height="wrap_content"
|
||||||
a:text="@string/server_editor.authentication"
|
a:text="@string/server_editor.authentication"
|
||||||
app:layout_constraintBottom_toTopOf="@+id/edit_server_username"
|
app:layout_constraintBottom_toTopOf="@id/edit_server_username"
|
||||||
app:layout_constraintStart_toStartOf="@+id/edit_server_username"
|
app:layout_constraintStart_toStartOf="@id/edit_server_username"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/edit_server_address" />
|
app:layout_constraintTop_toBottomOf="@id/edit_server_address" />
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
a:id="@+id/edit_server_username"
|
a:id="@+id/edit_server_username"
|
||||||
a:layout_width="match_parent"
|
a:layout_width="match_parent"
|
||||||
a:layout_height="wrap_content"
|
a:layout_height="wrap_content"
|
||||||
a:hint="@string/settings.server_username"
|
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_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="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
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
a:layout_width="match_parent"
|
a:layout_width="match_parent"
|
||||||
|
@ -81,10 +81,10 @@
|
||||||
a:layout_marginBottom="21dp"
|
a:layout_marginBottom="21dp"
|
||||||
a:hint="@string/settings.server_password"
|
a:hint="@string/settings.server_password"
|
||||||
app:endIconMode="password_toggle"
|
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_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="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
|
<com.google.android.material.textfield.TextInputEditText
|
||||||
a:layout_width="match_parent"
|
a:layout_width="match_parent"
|
||||||
|
@ -100,9 +100,9 @@
|
||||||
a:layout_height="wrap_content"
|
a:layout_height="wrap_content"
|
||||||
a:layout_marginBottom="8dp"
|
a:layout_marginBottom="8dp"
|
||||||
a:text="@string/server_editor.advanced"
|
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_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/edit_server_password" />
|
app:layout_constraintTop_toBottomOf="@id/edit_server_password" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
a:id="@+id/edit_self_signed_title"
|
a:id="@+id/edit_self_signed_title"
|
||||||
|
@ -112,9 +112,9 @@
|
||||||
a:layout_marginStart="5dp"
|
a:layout_marginStart="5dp"
|
||||||
a:layout_marginLeft="5dp"
|
a:layout_marginLeft="5dp"
|
||||||
a:text="@string/settings.title.allow_self_signed_certificate"
|
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_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
|
<com.google.android.material.switchmaterial.SwitchMaterial
|
||||||
a:id="@+id/edit_self_signed"
|
a:id="@+id/edit_self_signed"
|
||||||
|
@ -126,10 +126,10 @@
|
||||||
a:layout_marginRight="5dp"
|
a:layout_marginRight="5dp"
|
||||||
a:layout_marginBottom="8dp"
|
a:layout_marginBottom="8dp"
|
||||||
a:checked="false"
|
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_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@id/edit_self_signed_title"
|
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
|
<TextView
|
||||||
a:id="@+id/edit_ldap_title"
|
a:id="@+id/edit_ldap_title"
|
||||||
|
@ -139,9 +139,9 @@
|
||||||
a:layout_marginStart="5dp"
|
a:layout_marginStart="5dp"
|
||||||
a:layout_marginLeft="5dp"
|
a:layout_marginLeft="5dp"
|
||||||
a:text="@string/settings.title.enable_ldap_users_support"
|
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_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/edit_self_signed" />
|
app:layout_constraintTop_toBottomOf="@id/edit_self_signed" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
a:id="@+id/edit_ldap_description"
|
a:id="@+id/edit_ldap_description"
|
||||||
|
@ -151,10 +151,10 @@
|
||||||
a:layout_marginStart="5dp"
|
a:layout_marginStart="5dp"
|
||||||
a:layout_marginLeft="5dp"
|
a:layout_marginLeft="5dp"
|
||||||
a:text="@string/settings.summary.enable_ldap_users_support"
|
a:text="@string/settings.summary.enable_ldap_users_support"
|
||||||
app:layout_constraintBottom_toTopOf="@+id/edit_jukebox"
|
app:layout_constraintBottom_toTopOf="@id/edit_jukebox"
|
||||||
app:layout_constraintEnd_toStartOf="@+id/edit_ldap"
|
app:layout_constraintEnd_toStartOf="@id/edit_ldap"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
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
|
<com.google.android.material.switchmaterial.SwitchMaterial
|
||||||
a:id="@+id/edit_ldap"
|
a:id="@+id/edit_ldap"
|
||||||
|
@ -165,10 +165,10 @@
|
||||||
a:layout_marginLeft="8dp"
|
a:layout_marginLeft="8dp"
|
||||||
a:layout_marginStart="8dp"
|
a:layout_marginStart="8dp"
|
||||||
a:checked="false"
|
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_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@id/edit_ldap_description"
|
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
|
<TextView
|
||||||
a:id="@+id/edit_jukebox_title"
|
a:id="@+id/edit_jukebox_title"
|
||||||
|
@ -180,7 +180,7 @@
|
||||||
a:layout_marginTop="8dp"
|
a:layout_marginTop="8dp"
|
||||||
a:text="@string/jukebox.is_default"
|
a:text="@string/jukebox.is_default"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
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
|
<com.google.android.material.switchmaterial.SwitchMaterial
|
||||||
a:id="@+id/edit_jukebox"
|
a:id="@+id/edit_jukebox"
|
||||||
|
@ -194,7 +194,7 @@
|
||||||
a:checked="false"
|
a:checked="false"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@id/edit_jukebox_title"
|
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
|
<Button
|
||||||
a:id="@+id/edit_test"
|
a:id="@+id/edit_test"
|
||||||
|
@ -204,7 +204,7 @@
|
||||||
a:layout_marginTop="8dp"
|
a:layout_marginTop="8dp"
|
||||||
a:text="@string/settings.test_connection_title"
|
a:text="@string/settings.test_connection_title"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
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_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/edit_jukebox"
|
app:layout_constraintTop_toBottomOf="@id/edit_jukebox"
|
||||||
app:layout_constraintVertical_bias="1.0" />
|
app:layout_constraintVertical_bias="1.0" />
|
||||||
|
@ -213,14 +213,13 @@
|
||||||
a:id="@+id/edit_save"
|
a:id="@+id/edit_save"
|
||||||
style="?attr/materialButtonOutlinedStyle"
|
style="?attr/materialButtonOutlinedStyle"
|
||||||
a:layout_width="0dp"
|
a:layout_width="0dp"
|
||||||
a:layout_height="wrap_content"
|
a:layout_height="0dp"
|
||||||
a:layout_marginTop="8dp"
|
|
||||||
a:text="@string/common.save"
|
a:text="@string/common.save"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="@id/edit_test"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@+id/edit_test"
|
app:layout_constraintStart_toEndOf="@id/edit_test"
|
||||||
app:layout_constraintTop_toBottomOf="@id/edit_jukebox"
|
app:layout_constraintTop_toTopOf="@id/edit_test" />
|
||||||
app:layout_constraintVertical_bias="1.0" />
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
Loading…
Reference in New Issue