third-party-mirrors/ultrasonic
1
0
Fork 0
mirror of https://gitlab.com/ultrasonic/ultrasonic.git synced 2025-04-19 10:37:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #314 from nitehu/fix/edit_server

Browse Source 
Fixed Edit Server button layout and exit check
This commit is contained in:
Nite 2020-09-25 20:19:01 +02:00 committed by GitHub
commit ff97c0138c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/EditServerActivity.kt
View File

@ -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() ||

63
ultrasonic/src/main/res/layout/server_edit.xml
View File

@ -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>