profile details: validation on save

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
index d7b740e7dfcef5b383fc423bea9deafa8f6b6c30..004763a7ac87a45343018d67b095872aa612efc6 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
@@ -23,7 +23,10 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.CollapsingToolbarLayout;
 import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.TextInputLayout;
 import android.support.v4.app.Fragment;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -58,12 +61,16 @@ public class ProfileDetailFragment extends Fragment {
      */
     private MobileLedgerProfile mProfile;
     private TextView url;
+    private TextInputLayout urlLayout;
     private LinearLayout authParams;
     private Switch useAuthentication;
     private TextView userName;
+    private TextInputLayout userNameLayout;
     private TextView password;
-    private FloatingActionButton fab;
+    private TextInputLayout passwordLayout;
     private TextView profileName;
+    private TextInputLayout profileNameLayout;
+    private FloatingActionButton fab;
 
     /**
      * Mandatory empty constructor for the fragment manager to instantiate the
@@ -114,6 +121,8 @@ public class ProfileDetailFragment extends Fragment {
 
         fab = context.findViewById(R.id.fab);
         fab.setOnClickListener(v -> {
+            if (!checkValidity()) return;
+
             if (mProfile != null) {
                 mProfile.setName(profileName.getText());
                 mProfile.setUrl(url.getText());
@@ -141,6 +150,8 @@ public class ProfileDetailFragment extends Fragment {
             Activity activity = getActivity();
             if (activity != null) activity.finish();
         });
+
+        profileName.requestFocus();
     }
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
@@ -148,11 +159,15 @@ public class ProfileDetailFragment extends Fragment {
         View rootView = inflater.inflate(R.layout.profile_detail, container, false);
 
         profileName = rootView.findViewById(R.id.profile_name);
+        profileNameLayout = rootView.findViewById(R.id.profile_name_layout);
         url = rootView.findViewById(R.id.url);
+        urlLayout = rootView.findViewById(R.id.url_layout);
         authParams = rootView.findViewById(R.id.auth_params);
         useAuthentication = rootView.findViewById(R.id.enable_http_auth);
         userName = rootView.findViewById(R.id.auth_user_name);
+        userNameLayout = rootView.findViewById(R.id.auth_user_name_layout);
         password = rootView.findViewById(R.id.password);
+        passwordLayout = rootView.findViewById(R.id.password_layout);
 
         useAuthentication.setOnCheckedChangeListener((buttonView, isChecked) -> {
             Log.d("profiles", isChecked ? "auth enabled " : "auth disabled");
@@ -160,6 +175,11 @@ public class ProfileDetailFragment extends Fragment {
             if (isChecked) userName.requestFocus();
         });
 
+        hookClearErrorOnFocusListener(profileName, profileNameLayout);
+        hookClearErrorOnFocusListener(url, urlLayout);
+        hookClearErrorOnFocusListener(userName, userNameLayout);
+        hookClearErrorOnFocusListener(password, passwordLayout);
+
         if (mProfile != null) {
             profileName.setText(mProfile.getName());
             url.setText(mProfile.getUrl());
@@ -179,4 +199,53 @@ public class ProfileDetailFragment extends Fragment {
 
         return rootView;
     }
+    private void hookClearErrorOnFocusListener(TextView view, TextInputLayout layout) {
+        view.setOnFocusChangeListener((v, hasFocus) -> {
+            if (hasFocus) layout.setError(null);
+        });
+        view.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                layout.setError(null);
+            }
+            @Override
+            public void afterTextChanged(Editable s) {
+            }
+        });
+    }
+    boolean checkValidity() {
+        boolean valid = true;
+
+        String val = String.valueOf(profileName.getText());
+        if (val.trim().isEmpty()) {
+            valid = false;
+            profileNameLayout.setError(getResources().getText(R.string.err_profile_name_empty));
+        }
+
+        val = String.valueOf(url.getText());
+        if (val.trim().isEmpty()) {
+            valid = false;
+            urlLayout.setError(getResources().getText(R.string.err_profile_url_empty));
+        }
+        if (useAuthentication.isChecked()) {
+            val = String.valueOf(userName.getText());
+            if (val.trim().isEmpty()) {
+                valid = false;
+                userNameLayout
+                        .setError(getResources().getText(R.string.err_profile_user_name_empty));
+            }
+
+            val = String.valueOf(password.getText());
+            if (val.trim().isEmpty()) {
+                valid = false;
+                passwordLayout
+                        .setError(getResources().getText(R.string.err_profile_password_empty));
+            }
+        }
+
+        return valid;
+    }
 }

diff --git a/app/src/main/res/layout/profile_detail.xml b/app/src/main/res/layout/profile_detail.xml
index dfecf9d78dbc8b0b7a6b009486f23a1a52e8a351..cab0eb668630b7828ffeb9d7ad1e9166243cd25c 100644 (file)
--- a/app/src/main/res/layout/profile_detail.xml
+++ b/app/src/main/res/layout/profile_detail.xml
@@ -27,6 +27,7 @@
     tools:context=".ui.profiles.ProfileDetailFragment">
 
     <android.support.design.widget.TextInputLayout
+        android:id="@+id/profile_name_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -36,12 +37,11 @@
             android:layout_height="wrap_content"
             android:ems="10"
             android:hint="@string/profile_name_label"
-            android:inputType="textPersonName"
-            android:text="Name"
-            tools:ignore="HardcodedText" />
+            android:inputType="textPersonName" />
     </android.support.design.widget.TextInputLayout>
 
     <android.support.design.widget.TextInputLayout
+        android:id="@+id/url_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -74,9 +74,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingStart="8dp">
+            android:paddingStart="8dp"
+            tools:ignore="RtlSymmetry">
 
             <android.support.design.widget.TextInputLayout
+                android:id="@+id/auth_user_name_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="16dp"
@@ -88,11 +90,11 @@
                     android:layout_height="wrap_content"
                     android:ems="10"
                     android:hint="@string/pref_title_backend_auth_user"
-                    android:inputType="textPersonName"
-                    android:text="Name" />
+                    android:inputType="textPersonName" />
             </android.support.design.widget.TextInputLayout>
 
             <android.support.design.widget.TextInputLayout
+                android:id="@+id/password_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 492bc605e4077b69e9503bc44545e4c29a722e54..d894ffaebdcfb11d17f8f422528ae8ed3b19f500 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -113,6 +113,10 @@
     <string name="text_welcome">Welcome</string>
     <string name="text_welcome_profile_needed">A profile for connecting to the backend hledger-web instance needs to be created first</string>
     <string name="create_profile_label">Create profile</string>
+    <string name="err_profile_name_empty">Profile name cannot be empty</string>
+    <string name="err_profile_url_empty">Please enter backend URL, e.g. https://server/location</string>
+    <string name="err_profile_user_name_empty">User name is required when authentication is switched on</string>
+    <string name="err_profile_password_empty">Password is mandatory</string>
     <string-array name="month_names">
         <item>January</item>
         <item>February</item>