Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 581e3016 authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

#21 »URL« should be called »Server address« (less technical), the OK button... 

#21 »URL« should be called »Server address« (less technical), the OK button should be called »Connect« and have a spinner after clicked, and say »Connecting«. Also the input fields should be disabled to give better feedback that the process is running
parent a22051cd

app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -132,7 +132,11 @@ public class SettingsActivity extends AppCompatActivity { 




        @Override

        @Override

        protected void onPreExecute() {

        protected void onPreExecute() {

            field_url.setEnabled(false);

            field_username.setEnabled(false);

            field_password.setEnabled(false);

            btn_submit.setEnabled(false);

            btn_submit.setEnabled(false);

            btn_submit.setText(R.string.settings_submitting);

        }

        }





        /**

        /**
@@ -171,6 +175,10 @@ public class SettingsActivity extends AppCompatActivity { 
            } else {

            } else {

                Log.e("Note", "invalid login");

                Log.e("Note", "invalid login");

                btn_submit.setEnabled(true);

                btn_submit.setEnabled(true);

                field_url.setEnabled(true);

                field_username.setEnabled(true);

                field_password.setEnabled(true);

                btn_submit.setText(R.string.settings_submit);

                //TODO Show Error Message

                //TODO Show Error Message

            }

            }

        }

        }

app/src/main/res/values-de/strings.xml

+3 −2
Original line number Original line Diff line number Diff line
@@ -34,13 +34,14 @@ 
    <!-- Settings -->

    <!-- Settings -->





    <string name="settings_server">Server</string>

    <string name="settings_server">Server</string>

    <string name="settings_url">URL</string>

    <string name="settings_url">Server Adresse</string>

    <string name="settings_url_check_description">Zeigt an, ob die angegebene URL erreichbar ist.</string>

    <string name="settings_url_check_description">Zeigt an, ob die angegebene URL erreichbar ist.</string>

    <string name="settings_url_warn_http">WARNUNG: "http" ist unsicher. Bitte benutzen Sie "https".</string>

    <string name="settings_url_warn_http">WARNUNG: "http" ist unsicher. Bitte benutzen Sie "https".</string>

    <string name="settings_username">Benutzername</string>

    <string name="settings_username">Benutzername</string>

    <string name="settings_password">Passwort</string>

    <string name="settings_password">Passwort</string>

    <string name="settings_password_check_description">Zeigt an, ob die angegebenen Zugangsdaten korrekt sind.</string>

    <string name="settings_password_check_description">Zeigt an, ob die angegebenen Zugangsdaten korrekt sind.</string>

    <string name="settings_submit">OK</string>

    <string name="settings_submit">Verbinden</string>

    <string name="settings_submitting">Verbindet&#8230;</string>





    <!-- Network -->

    <!-- Network -->

app/src/main/res/values/strings.xml

+3 −2
Original line number Original line Diff line number Diff line
@@ -34,13 +34,14 @@ 
    <!-- Settings -->

    <!-- Settings -->





    <string name="settings_server">Server</string>

    <string name="settings_server">Server</string>

    <string name="settings_url">URL</string>

    <string name="settings_url">Server address</string>

    <string name="settings_url_check_description">Shows if the URL can be pinged.</string>

    <string name="settings_url_check_description">Shows if the URL can be pinged.</string>

    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Please use "https".</string>

    <string name="settings_url_warn_http">WARNING: "http" is unsafe. Please use "https".</string>

    <string name="settings_username">Username</string>

    <string name="settings_username">Username</string>

    <string name="settings_password">Password</string>

    <string name="settings_password">Password</string>

    <string name="settings_password_check_description">Shows if the given credentials are correct.</string>

    <string name="settings_password_check_description">Shows if the given credentials are correct.</string>

    <string name="settings_submit">OK</string>

    <string name="settings_submit">Connect</string>

    <string name="settings_submitting">Connecting&#8230;</string>





    <!-- Network -->

    <!-- Network -->