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=7ef511d00656c2badc098dcedec3ba21a78b1a52;hp=5a1b729a205cb4bc9e3c1e434012659500593a7b;hb=a588974b72e78f9cd1ff5ec9cb0c4d0ae36a7746;hpb=5288da587233a9203d4abcaf7840dc62db2fb294 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 5a1b729a..7ef511d0 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 @@ -18,12 +18,15 @@ package net.ktnx.mobileledger.ui.profiles; import android.app.Activity; -import android.content.Context; import android.os.Bundle; 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 @@ -81,8 +88,9 @@ public class ProfileDetailFragment extends Fragment { Log.d("profiles", String.format("[fragment] removing profile %s", mProfile.getUuid())); mProfile.removeFromDB(); Data.profiles.remove(mProfile); - if (Data.profile.get().getUuid().equals(mProfile.getUuid())) { - Data.profile.set(Data.profiles.get(0)); + if (Data.profile.get().equals(mProfile)) { + Log.d("profiles", "[fragment] setting current profile to 0"); + Data.setCurrentProfile(Data.profiles.get(0)); } return false; }); @@ -93,12 +101,8 @@ 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. - String uuid = getArguments().getString(ARG_ITEM_ID); - if (uuid != null) mProfile = - MobileLedgerProfile.loadUUIDFromDB(getArguments().getString(ARG_ITEM_ID)); + int index = getArguments().getInt(ARG_ITEM_ID, -1); + if (index != -1) mProfile = Data.profiles.get(index); Activity activity = this.getActivity(); if (activity == null) throw new AssertionError(); @@ -109,12 +113,16 @@ public class ProfileDetailFragment extends Fragment { } } } - @Override - public void onAttach(Context context) { - super.onAttach(context); - fab = ((Activity) context).findViewById(R.id.fab); + public void onActivityCreated(@Nullable Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + Activity context = getActivity(); + if (context == null) return; + + fab = context.findViewById(R.id.fab); fab.setOnClickListener(v -> { + if (!checkValidity()) return; + if (mProfile != null) { mProfile.setName(profileName.getText()); mProfile.setUrl(url.getText()); @@ -122,9 +130,12 @@ public class ProfileDetailFragment extends Fragment { mProfile.setAuthUserName(userName.getText()); mProfile.setAuthPassword(password.getText()); mProfile.storeInDB(); + Log.d("profiles", "profile stored in DB"); + Data.profiles.triggerItemChangedNotification(mProfile); if (mProfile.getUuid().equals(Data.profile.get().getUuid())) { + // dummy update to notify the observers of the possibly new name/URL Data.profile.set(mProfile); } } @@ -134,11 +145,16 @@ public class ProfileDetailFragment extends Fragment { 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, @@ -146,17 +162,27 @@ 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"); 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()); url.setText(mProfile.getUrl()); @@ -176,4 +202,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; + } }