kadu/gotify-android-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cherry-picked Advanced Settings dialog

Browse Source 
- Switched raw strings to string resources

- Removed unused fields / views from LoginActivity

- Reset 'Check Version' button text when changing SSL settings

- Fixed formatting
This commit is contained in:
Galen Abell
2018-11-10 10:59:33 -05:00
parent bcfa8ac221
commit 24e0495f19
7 changed files with 19 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
app/src/main/res/layout/activity_login.xml
View File

@@ -110,78 +110,6 @@
app:layout_constraintWidth_max="280dp"
tools:text="Password" />
<LinearLayout
android:id="@+id/sslGroup"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:orientation="vertical"
app:layout_constraintWidth_max="280dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/login">
<Button
android:id="@+id/showAdvanced"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorPrimaryDark"
android:textColor="@android:color/white"
android:ems="10"
android:text="@string/show_advanced"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<CheckBox
android:id="@+id/disableValidateSSL"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:text="@string/disabled_validate_ssl"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/showAdvanced" />
<TextView
android:id="@+id/or"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="center"
android:ems="10"
android:text="@string/or"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/disableValidateSSL" />
<Button
android:id="@+id/selectCACertificate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:text="@string/select_ca_certificate"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/or" />
<TextView
android:id="@+id/caFile"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:text="@string/no_ca_selected"
android:textAlignment="center"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/selectCACertificate" />
</LinearLayout>
<Button
android:id="@+id/login"
android:layout_width="0dp"

8
app/src/main/res/layout/advanced_settings_dialog.xml
View File

@@ -8,17 +8,17 @@
android:id="@+id/disableSSL"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Disable SSL Validation" />
android:text="@string/disabled_validate_ssl" />
<Button
android:id="@+id/toggle_ca_cert"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Select CA Certificate" />
android:text="@string/select_ca_certificate" />
<TextView
android:id="@+id/seleceted_ca_cert"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="No Certificate selected" />
</LinearLayout>
android:text="@string/no_certificate_selected" />
</LinearLayout>

6
app/src/main/res/values/strings.xml
View File

@@ -35,10 +35,8 @@
<string name="disabled_validate_ssl">Disable SSL Validation</string>
<string name="select_ca_certificate">Select CA Certificate</string>
<string name="select_ca_file">Select a Certificate File</string>
<string name="or">OR</string>
<string name="please_install_file_browser">Please install a file browser</string>
<string name="select_ca_failed">Failed to read CA: %s</string>
<string name="no_ca_selected">No CA selected</string>
<string name="login">Login</string>
<string name="check_url">Check URL</string>
<string name="gotify_logo">gotify logo</string>
@@ -52,4 +50,8 @@
<string name="websocket_init">Initializing</string>
<string name="connection">%s@%s</string>
<string name="server_version">Gotify-Server v%s</string>
<string name="advanced_settings">Advanced Settings</string>
<string name="done">Done</string>
<string name="no_certificate_selected">No certificate selected</string>
<string name="remove_ca_certificate">Remove CA Certificate</string>
</resources>