X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfileDetailFragment.java;h=f26d26949200b7630908fb592bef870e3863ba55;hp=67f28439553cf010d5e530f1d71dcd43ff52a24d;hb=998dd32a089d199a2569069415755eb3169b35b0;hpb=9e8a289a85a65d372b47ccd2c2261299972ae4dd
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 67f28439..f26d2694 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
@@ -1,18 +1,18 @@
/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
* under the term of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.ui.profiles;
@@ -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,17 @@ public class ProfileDetailFragment extends Fragment {
*/
private MobileLedgerProfile mProfile;
private TextView url;
+ private Switch postingPermitted;
+ 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
@@ -94,9 +102,6 @@ public class ProfileDetailFragment extends Fragment {
super.onCreate(savedInstanceState);
if ((getArguments() != null) && getArguments().containsKey(ARG_ITEM_ID)) {
- // Load the dummy content specified by the fragment
- // arguments. In a real-world scenario, use a Loader
- // to load content from a content provider.
int index = getArguments().getInt(ARG_ITEM_ID, -1);
if (index != -1) mProfile = Data.profiles.get(index);
@@ -117,9 +122,12 @@ 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());
+ mProfile.setPostingPermitted(postingPermitted.isChecked());
mProfile.setAuthEnabled(useAuthentication.isChecked());
mProfile.setAuthUserName(userName.getText());
mProfile.setAuthPassword(password.getText());
@@ -134,16 +142,22 @@ public class ProfileDetailFragment extends Fragment {
}
}
else {
- mProfile = new MobileLedgerProfile(profileName.getText(), url.getText(),
- useAuthentication.isChecked(), userName.getText(), password.getText());
+ mProfile = new MobileLedgerProfile(profileName.getText(), postingPermitted.isChecked(),
+ url.getText(), useAuthentication.isChecked(), userName.getText(),
+ password.getText());
mProfile.storeInDB();
Data.profiles.add(mProfile);
MobileLedgerProfile.storeProfilesOrder();
+
+ // first profile ever?
+ if (Data.profiles.getList().size() == 1) Data.profile.set(mProfile);
}
Activity activity = getActivity();
if (activity != null) activity.finish();
});
+
+ profileName.requestFocus();
}
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
@@ -151,19 +165,31 @@ 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);
+ postingPermitted = rootView.findViewById(R.id.profile_permit_posting);
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");
authParams.setVisibility(isChecked ? View.VISIBLE : View.GONE);
+ if (isChecked) userName.requestFocus();
});
+ hookClearErrorOnFocusListener(profileName, profileNameLayout);
+ hookClearErrorOnFocusListener(url, urlLayout);
+ hookClearErrorOnFocusListener(userName, userNameLayout);
+ hookClearErrorOnFocusListener(password, passwordLayout);
+
if (mProfile != null) {
profileName.setText(mProfile.getName());
+ postingPermitted.setChecked(mProfile.isPostingPermitted());
url.setText(mProfile.getUrl());
useAuthentication.setChecked(mProfile.isAuthEnabled());
authParams.setVisibility(mProfile.isAuthEnabled() ? View.VISIBLE : View.GONE);
@@ -173,6 +199,7 @@ public class ProfileDetailFragment extends Fragment {
else {
profileName.setText("");
url.setText("");
+ postingPermitted.setChecked(true);
useAuthentication.setChecked(false);
authParams.setVisibility(View.GONE);
userName.setText("");
@@ -181,4 +208,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;
+ }
}