gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-21 12:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify settings

Browse Source 
Resolves #1058

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-05-26 10:13:45 +02:00
parent 161bf5a470
commit cd07acaa1b
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/res/layout/controller_settings.xml
View File

@ -122,25 +122,11 @@
apc:roundAsCircle="true" apc:roundAsCircle="true"
tools:src="@tools:sample/avatars[0]" /> tools:src="@tools:sample/avatars[0]" />
<com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_reauthorize"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/server_age_warning_text_card"
apc:mp_title="@string/nc_settings_reauthorize" />
<com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_client_cert"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/settings_reauthorize"
apc:mp_title="@string/nc_client_cert_setup" />
<com.yarolegovich.mp.MaterialStandardPreference <com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_remove_account" android:id="@+id/settings_remove_account"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/settings_client_cert" android:layout_below="@id/server_age_warning_text_card"
apc:mp_title="@string/nc_settings_remove_account" /> apc:mp_title="@string/nc_settings_remove_account" />
</RelativeLayout> </RelativeLayout>
@ -279,7 +265,19 @@
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
apc:cardBackgroundColor="@color/bg_default" apc:cardBackgroundColor="@color/bg_default"
apc:cardElevation="0dp" apc:cardElevation="0dp"
apc:mpc_title="@string/nc_settings_proxy_title"> apc:mpc_title="@string/nc_settings_advanced_title">
<com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_reauthorize"
android:layout_width="match_parent"
android:layout_height="wrap_content"
apc:mp_title="@string/nc_settings_reauthorize" />
<com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_client_cert"
android:layout_width="match_parent"
android:layout_height="wrap_content"
apc:mp_title="@string/nc_client_cert_setup" />
<com.yarolegovich.mp.MaterialChoicePreference <com.yarolegovich.mp.MaterialChoicePreference
android:id="@+id/settings_proxy_choice" android:id="@+id/settings_proxy_choice"
@ -313,7 +311,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
apc:mp_key="@string/nc_settings_proxy_username_key" apc:mp_key="@string/nc_settings_proxy_username_key"
apc:mp_show_value="onRight" apc:mp_show_value="onRight"
apc:mp_title="@string/nc_username" /> apc:mp_title="@string/nc_settings_proxy_username_title" />
<com.yarolegovich.mp.MaterialEditTextPreference <com.yarolegovich.mp.MaterialEditTextPreference
android:id="@+id/settings_proxy_password_edit" android:id="@+id/settings_proxy_password_edit"
@ -321,7 +319,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
apc:mp_key="@string/nc_settings_proxy_password_key" apc:mp_key="@string/nc_settings_proxy_password_key"
apc:mp_show_value="onRight" apc:mp_show_value="onRight"
apc:mp_title="@string/nc_password" /> apc:mp_title="@string/nc_settings_proxy_password_title" />
<com.yarolegovich.mp.MaterialSwitchPreference <com.yarolegovich.mp.MaterialSwitchPreference
android:id="@+id/settings_proxy_use_credentials" android:id="@+id/settings_proxy_use_credentials"

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

@ -66,6 +66,7 @@
<string name="nc_certificate_error">Your SSL setup prevented connection</string> <string name="nc_certificate_error">Your SSL setup prevented connection</string>
<!-- Settings --> <!-- Settings -->
<string name="nc_settings_advanced_title">Advanced</string>
<string name="nc_settings_proxy_title">Proxy</string> <string name="nc_settings_proxy_title">Proxy</string>
<string name="nc_settings_proxy_type_key" translatable="false">proxy_type</string> <string name="nc_settings_proxy_type_key" translatable="false">proxy_type</string>
<string name="nc_settings_proxy_type_title">Proxy type</string> <string name="nc_settings_proxy_type_title">Proxy type</string>
@ -73,12 +74,14 @@
<string name="nc_settings_proxy_host_title">Proxy host</string> <string name="nc_settings_proxy_host_title">Proxy host</string>
<string name="nc_settings_proxy_port_key" translatable="false">proxy_port</string> <string name="nc_settings_proxy_port_key" translatable="false">proxy_port</string>
<string name="nc_settings_proxy_port_title">Proxy port</string> <string name="nc_settings_proxy_port_title">Proxy port</string>
<string name="nc_settings_proxy_username_title">Proxy username</string>
<string name="nc_settings_proxy_username_key" translatable="false">proxy_username</string> <string name="nc_settings_proxy_username_key" translatable="false">proxy_username</string>
<string name="nc_settings_proxy_password_title">Proxy password</string>
<string name="nc_settings_proxy_password_key" translatable="false">proxy_password</string> <string name="nc_settings_proxy_password_key" translatable="false">proxy_password</string>
<string name="nc_settings_use_credentials_title">Use credentials</string> <string name="nc_settings_use_credentials_title">Proxy requires credentials</string>
<string name="nc_settings_use_credentials_key" translatable="false">proxy_credentials</string> <string name="nc_settings_use_credentials_key" translatable="false">proxy_credentials</string>
<string name="nc_settings_switch_account">Switch between accounts</string> <string name="nc_settings_switch_account">Switch between accounts</string>
<string name="nc_settings_reauthorize">Reauthorize</string> <string name="nc_settings_reauthorize">Reauthorize account</string>
<string name="nc_client_cert_setup">Set up client certificate</string> <string name="nc_client_cert_setup">Set up client certificate</string>
<string name="nc_client_cert_change">Change client certificate</string> <string name="nc_client_cert_change">Change client certificate</string>
<string name="nc_settings_remove">Remove</string> <string name="nc_settings_remove">Remove</string>