X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfileDetailFragment.java;h=e531809a38ce416dd09cac7bd7b13587624fb12d;hb=9fad5003ac30c3e4f9d073e04f4569aeb31779b2;hp=2e964d1c0977ab864f486b7bf836f97b492e4c45;hpb=c9ccae28951a225ee55a107741250c1a1249aeb3;p=mobile-ledger.git 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 2e964d1c..e531809a 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,5 +1,5 @@ /* - * Copyright © 2019 Damyan Ivanov. + * Copyright © 2021 Damyan Ivanov. * 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 @@ -19,6 +19,7 @@ package net.ktnx.mobileledger.ui.profiles; import android.app.Activity; import android.app.AlertDialog; +import android.graphics.Typeface; import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; @@ -28,14 +29,16 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.widget.LinearLayout; -import android.widget.Switch; +import android.widget.PopupMenu; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.ViewModelProvider; import com.google.android.material.appbar.CollapsingToolbarLayout; import com.google.android.material.floatingactionbutton.FloatingActionButton; @@ -43,18 +46,23 @@ import com.google.android.material.textfield.TextInputLayout; import net.ktnx.mobileledger.BuildConfig; import net.ktnx.mobileledger.R; +import net.ktnx.mobileledger.databinding.ProfileDetailBinding; +import net.ktnx.mobileledger.json.API; import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.MobileLedgerProfile; +import net.ktnx.mobileledger.ui.CurrencySelectorFragment; import net.ktnx.mobileledger.ui.HueRingDialog; -import net.ktnx.mobileledger.ui.activity.ProfileDetailActivity; import net.ktnx.mobileledger.utils.Colors; +import net.ktnx.mobileledger.utils.Misc; +import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; import java.util.Objects; +import java.util.UUID; import static net.ktnx.mobileledger.utils.Logger.debug; @@ -63,38 +71,25 @@ import static net.ktnx.mobileledger.utils.Logger.debug; * a {@link ProfileDetailActivity} * on handsets. */ -public class ProfileDetailFragment extends Fragment implements HueRingDialog.HueSelectedListener { +public class ProfileDetailFragment extends Fragment { /** * The fragment argument representing the item ID that this fragment * represents. */ public static final String ARG_ITEM_ID = "item_id"; + public static final String ARG_HUE = "hue"; + @NonNls - /** - * The dummy content this fragment is presenting. - */ 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 TextInputLayout passwordLayout; - private TextView profileName; - private TextInputLayout profileNameLayout; - private TextView preferredAccountsFilter; - private TextInputLayout preferredAccountsFilterLayout; - private View huePickerView; - private View insecureWarningText; - + private boolean defaultCommoditySet; + private boolean syncingModelFromUI = false; + private ProfileDetailBinding binding; /** * Mandatory empty constructor for the fragment manager to instantiate the * fragment (e.g. upon screen orientation changes). */ public ProfileDetailFragment() { + super(R.layout.profile_detail); } @Override public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull MenuInflater inflater) { @@ -102,34 +97,8 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue super.onCreateOptionsMenu(menu, inflater); inflater.inflate(R.menu.profile_details, menu); final MenuItem menuDeleteProfile = menu.findItem(R.id.menuDelete); - menuDeleteProfile.setOnMenuItemClickListener(item -> { - AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); - builder.setTitle(mProfile.getName()); - builder.setMessage(R.string.remove_profile_dialog_message); - builder.setPositiveButton(R.string.Remove, (dialog, which) -> { - debug("profiles", - String.format("[fragment] removing profile %s", mProfile.getUuid())); - mProfile.removeFromDB(); - ArrayList oldList = Data.profiles.getValue(); - if (oldList == null) throw new AssertionError(); - ArrayList newList = - (ArrayList) oldList.clone(); - newList.remove(mProfile); - Data.profiles.setValue(newList); - if (mProfile.equals(Data.profile.getValue())) { - debug("profiles", "[fragment] setting current profile to 0"); - Data.setCurrentProfile(newList.get(0)); - } - - final FragmentActivity activity = getActivity(); - if (activity != null) activity.finish(); - }); - builder.show(); - return false; - }); + menuDeleteProfile.setOnMenuItemClickListener(item -> onDeleteProfile()); final ArrayList profiles = Data.profiles.getValue(); - menuDeleteProfile - .setVisible((mProfile != null) && (profiles != null) && (profiles.size() > 1)); if (BuildConfig.DEBUG) { final MenuItem menuWipeProfileData = menu.findItem(R.id.menuWipeData); @@ -137,27 +106,76 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue menuWipeProfileData.setVisible(mProfile != null); } } + private boolean onDeleteProfile() { + AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); + builder.setTitle(mProfile.getName()); + builder.setMessage(R.string.remove_profile_dialog_message); + builder.setPositiveButton(R.string.Remove, (dialog, which) -> { + debug("profiles", String.format("[fragment] removing profile %s", mProfile.getUuid())); + mProfile.removeFromDB(); + ArrayList oldList = Data.profiles.getValue(); + if (oldList == null) + throw new AssertionError(); + ArrayList newList = new ArrayList<>(oldList); + newList.remove(mProfile); + Data.profiles.setValue(newList); + if (mProfile.equals(Data.getProfile())) { + debug("profiles", "[fragment] setting current profile to 0"); + Data.setCurrentProfile(newList.get(0)); + } + + final FragmentActivity activity = getActivity(); + if (activity != null) + activity.finish(); + }); + builder.show(); + return false; + } private boolean onWipeDataMenuClicked() { // this is a development option, so no confirmation mProfile.wipeAllData(); - if (mProfile.equals(Data.profile.getValue())) triggerProfileChange(); + if (mProfile.equals(Data.getProfile())) + triggerProfileChange(); return true; } private void triggerProfileChange() { int index = Data.getProfileIndex(mProfile); MobileLedgerProfile newProfile = new MobileLedgerProfile(mProfile); - final ArrayList profiles = Data.profiles.getValue(); - if (profiles == null) throw new AssertionError(); + final ArrayList profiles = + Objects.requireNonNull(Data.profiles.getValue()); profiles.set(index, newProfile); - ProfilesRecyclerViewAdapter prva = ProfilesRecyclerViewAdapter.getInstance(); - if (prva != null) prva.notifyItemChanged(index); + ProfilesRecyclerViewAdapter viewAdapter = ProfilesRecyclerViewAdapter.getInstance(); + if (viewAdapter != null) + viewAdapter.notifyItemChanged(index); - if (mProfile.equals(Data.profile.getValue())) Data.profile.setValue(newProfile); + if (mProfile.equals(Data.getProfile())) + Data.setCurrentProfile(newProfile); } + private void hookTextChangeSyncRoutine(TextView view, TextChangeSyncRoutine syncRoutine) { + 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) {} + @Override + public void afterTextChanged(Editable s) { syncRoutine.onTextChanged(s.toString());} + }); + } + @Nullable @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + binding = ProfileDetailBinding.inflate(inflater, container, false); + + return binding.getRoot(); + } + @Override + public void onViewCreated(@NotNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + Activity context = getActivity(); + if (context == null) + return; if ((getArguments() != null) && getArguments().containsKey(ARG_ITEM_ID)) { int index = getArguments().getInt(ARG_ITEM_ID, -1); @@ -166,170 +184,331 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue mProfile = profiles.get(index); Activity activity = this.getActivity(); - if (activity == null) throw new AssertionError(); + if (activity == null) + throw new AssertionError(); CollapsingToolbarLayout appBarLayout = activity.findViewById(R.id.toolbar_layout); if (appBarLayout != null) { - if (mProfile != null) appBarLayout.setTitle(mProfile.getName()); - else appBarLayout.setTitle(getResources().getString(R.string.new_profile_title)); + if (mProfile != null) + appBarLayout.setTitle(mProfile.getName()); + else + appBarLayout.setTitle(getResources().getString(R.string.new_profile_title)); } } - } - @Override - public void onActivityCreated(@Nullable Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - Activity context = getActivity(); - if (context == null) return; + + final LifecycleOwner viewLifecycleOwner = getViewLifecycleOwner(); + final ProfileDetailModel model = getModel(); + + model.observeDefaultCommodity(viewLifecycleOwner, c -> { + if (c != null) + setDefaultCommodity(c.getName()); + else + resetDefaultCommodity(); + }); FloatingActionButton fab = context.findViewById(R.id.fab); fab.setOnClickListener(v -> onSaveFabClicked()); - profileName.requestFocus(); + hookTextChangeSyncRoutine(binding.profileName, model::setProfileName); + model.observeProfileName(viewLifecycleOwner, pn -> { + if (!Misc.equalStrings(pn, Misc.nullIsEmpty(binding.profileName.getText()))) + binding.profileName.setText(pn); + }); + + hookTextChangeSyncRoutine(binding.url, model::setUrl); + model.observeUrl(viewLifecycleOwner, u -> { + if (!Misc.equalStrings(u, Misc.nullIsEmpty(binding.url.getText()))) + binding.url.setText(u); + }); + + binding.defaultCommodityLayout.setOnClickListener(v -> { + CurrencySelectorFragment cpf = CurrencySelectorFragment.newInstance( + CurrencySelectorFragment.DEFAULT_COLUMN_COUNT, false); + cpf.setOnCurrencySelectedListener(model::setDefaultCommodity); + final AppCompatActivity activity = (AppCompatActivity) v.getContext(); + cpf.show(activity.getSupportFragmentManager(), "currency-selector"); + }); + + binding.profileShowCommodity.setOnCheckedChangeListener( + (buttonView, isChecked) -> model.setShowCommodityByDefault(isChecked)); + model.observeShowCommodityByDefault(viewLifecycleOwner, + binding.profileShowCommodity::setChecked); + + model.observePostingPermitted(viewLifecycleOwner, isChecked -> { + binding.profilePermitPosting.setChecked(isChecked); + binding.postingSubItems.setVisibility(isChecked ? View.VISIBLE : View.GONE); + }); + binding.profilePermitPosting.setOnCheckedChangeListener( + ((buttonView, isChecked) -> model.setPostingPermitted(isChecked))); + + model.observeShowCommentsByDefault(viewLifecycleOwner, + binding.profileShowComments::setChecked); + binding.profileShowComments.setOnCheckedChangeListener( + ((buttonView, isChecked) -> model.setShowCommentsByDefault(isChecked))); + + binding.futureDatesLayout.setOnClickListener(v -> { + MenuInflater mi = new MenuInflater(context); + PopupMenu menu = new PopupMenu(context, v); + menu.inflate(R.menu.future_dates); + menu.setOnMenuItemClickListener(item -> { + model.setFutureDates(futureDatesSettingFromMenuItemId(item.getItemId())); + return true; + }); + menu.show(); + }); + model.observeFutureDates(viewLifecycleOwner, + v -> binding.futureDatesText.setText(v.getText(getResources()))); + + model.observeApiVersion(viewLifecycleOwner, + apiVer -> binding.apiVersionText.setText(apiVer.getDescription(getResources()))); + binding.apiVersionLabel.setOnClickListener(this::chooseAPIVersion); + binding.apiVersionText.setOnClickListener(this::chooseAPIVersion); + + binding.serverVersionLabel.setOnClickListener(v -> model.triggerVersionDetection()); + model.observeDetectedVersion(viewLifecycleOwner, ver -> { + if (ver == null) + binding.detectedServerVersionText.setText(context.getResources() + .getString( + R.string.server_version_unknown_label)); + else if (ver.isPre_1_20_1()) + binding.detectedServerVersionText.setText(context.getResources() + .getString( + R.string.detected_server_pre_1_20_1)); + else + binding.detectedServerVersionText.setText(ver.toString()); + }); + binding.detectedServerVersionText.setOnClickListener(v -> model.triggerVersionDetection()); + binding.serverVersionDetectButton.setOnClickListener(v -> model.triggerVersionDetection()); + model.observeDetectingHledgerVersion(viewLifecycleOwner, + running -> binding.serverVersionDetectButton.setVisibility( + running ? View.VISIBLE : View.INVISIBLE)); + + binding.enableHttpAuth.setOnCheckedChangeListener((buttonView, isChecked) -> { + boolean wasOn = model.getUseAuthentication(); + model.setUseAuthentication(isChecked); + if (!wasOn && isChecked) + binding.authUserName.requestFocus(); + }); + model.observeUseAuthentication(viewLifecycleOwner, isChecked -> { + binding.enableHttpAuth.setChecked(isChecked); + binding.authParams.setVisibility(isChecked ? View.VISIBLE : View.GONE); + checkInsecureSchemeWithAuth(); + }); + + model.observeUserName(viewLifecycleOwner, text -> { + if (!Misc.equalStrings(text, Misc.nullIsEmpty(binding.authUserName.getText()))) + binding.authUserName.setText(text); + }); + hookTextChangeSyncRoutine(binding.authUserName, model::setAuthUserName); + + model.observePassword(viewLifecycleOwner, text -> { + if (!Misc.equalStrings(text, Misc.nullIsEmpty(binding.password.getText()))) + binding.password.setText(text); + }); + hookTextChangeSyncRoutine(binding.password, model::setAuthPassword); + + model.observeThemeId(viewLifecycleOwner, themeId -> { + final int hue = (themeId == -1) ? Colors.DEFAULT_HUE_DEG : themeId; + final int profileColor = Colors.getPrimaryColorForHue(hue); + binding.btnPickRingColor.setBackgroundColor(profileColor); + binding.btnPickRingColor.setTag(hue); + }); + + model.observePreferredAccountsFilter(viewLifecycleOwner, text -> { + if (!Misc.equalStrings(text, + Misc.nullIsEmpty(binding.preferredAccountsFilter.getText()))) + binding.preferredAccountsFilter.setText(text); + }); + hookTextChangeSyncRoutine(binding.preferredAccountsFilter, + model::setPreferredAccountsFilter); + + hookClearErrorOnFocusListener(binding.profileName, binding.profileNameLayout); + hookClearErrorOnFocusListener(binding.url, binding.urlLayout); + hookClearErrorOnFocusListener(binding.authUserName, binding.authUserNameLayout); + hookClearErrorOnFocusListener(binding.password, binding.passwordLayout); + + if (savedInstanceState == null) { + model.setValuesFromProfile(mProfile, getArguments().getInt(ARG_HUE, -1)); + } + checkInsecureSchemeWithAuth(); + + binding.url.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) {} + @Override + public void afterTextChanged(Editable s) { + checkInsecureSchemeWithAuth(); + } + }); + + binding.btnPickRingColor.setOnClickListener(v -> { + HueRingDialog d = new HueRingDialog(ProfileDetailFragment.this.requireContext(), + model.initialThemeHue, (Integer) v.getTag()); + d.show(); + d.setColorSelectedListener(model::setThemeId); + }); + + binding.profileName.requestFocus(); + } + private void chooseAPIVersion(View v) { + Activity context = getActivity(); + ProfileDetailModel model = getModel(); + MenuInflater mi = new MenuInflater(context); + PopupMenu menu = new PopupMenu(context, v); + menu.inflate(R.menu.api_version); + menu.setOnMenuItemClickListener(item -> { + API apiVer; + int itemId = item.getItemId(); + if (itemId == R.id.api_version_menu_html) { + apiVer = API.html; + } + else if (itemId == R.id.api_version_menu_1_19_1) { + apiVer = API.v1_19_1; + } + else if (itemId == R.id.api_version_menu_1_15) { + apiVer = API.v1_15; + } + else if (itemId == R.id.api_version_menu_1_14) { + apiVer = API.v1_14; + } + else { + apiVer = API.auto; + } + model.setApiVersion(apiVer); + binding.apiVersionText.setText(apiVer.getDescription(getResources())); + return true; + }); + menu.show(); + } + private MobileLedgerProfile.FutureDates futureDatesSettingFromMenuItemId(int itemId) { + if (itemId == R.id.menu_future_dates_7) { + return MobileLedgerProfile.FutureDates.OneWeek; + } + else if (itemId == R.id.menu_future_dates_14) { + return MobileLedgerProfile.FutureDates.TwoWeeks; + } + else if (itemId == R.id.menu_future_dates_30) { + return MobileLedgerProfile.FutureDates.OneMonth; + } + else if (itemId == R.id.menu_future_dates_60) { + return MobileLedgerProfile.FutureDates.TwoMonths; + } + else if (itemId == R.id.menu_future_dates_90) { + return MobileLedgerProfile.FutureDates.ThreeMonths; + } + else if (itemId == R.id.menu_future_dates_180) { + return MobileLedgerProfile.FutureDates.SixMonths; + } + else if (itemId == R.id.menu_future_dates_365) { + return MobileLedgerProfile.FutureDates.OneYear; + } + else if (itemId == R.id.menu_future_dates_all) { + return MobileLedgerProfile.FutureDates.All; + } + return MobileLedgerProfile.FutureDates.None; + } + @NotNull + private ProfileDetailModel getModel() { + return new ViewModelProvider(requireActivity()).get(ProfileDetailModel.class); } private void onSaveFabClicked() { - if (!checkValidity()) return; + if (!checkValidity()) + return; + + ProfileDetailModel model = getModel(); + final ArrayList profiles = + Objects.requireNonNull(Data.profiles.getValue()); if (mProfile != null) { - updateProfileFromUI(); -// debug("profiles", String.format("Selected item is %d", mProfile.getThemeId())); + int pos = Data.profiles.getValue() + .indexOf(mProfile); + mProfile = new MobileLedgerProfile(mProfile); + model.updateProfile(mProfile); mProfile.storeInDB(); debug("profiles", "profile stored in DB"); - triggerProfileChange(); + profiles.set(pos, mProfile); +// debug("profiles", String.format("Selected item is %d", mProfile.getThemeHue())); + + final MobileLedgerProfile currentProfile = Data.getProfile(); + if (mProfile.getUuid() + .equals(currentProfile.getUuid())) + { + Data.setCurrentProfile(mProfile); + } + + ProfilesRecyclerViewAdapter viewAdapter = ProfilesRecyclerViewAdapter.getInstance(); + if (viewAdapter != null) + viewAdapter.notifyItemChanged(pos); } else { - mProfile = new MobileLedgerProfile(); - updateProfileFromUI(); + mProfile = new MobileLedgerProfile(String.valueOf(UUID.randomUUID())); + model.updateProfile(mProfile); mProfile.storeInDB(); - final ArrayList profiles = Data.profiles.getValue(); - if (profiles == null) throw new AssertionError(); - ArrayList newList = - (ArrayList) profiles.clone(); + final ArrayList newList = new ArrayList<>(profiles); newList.add(mProfile); Data.profiles.setValue(newList); MobileLedgerProfile.storeProfilesOrder(); // first profile ever? - if (newList.size() == 1) Data.profile.setValue(mProfile); + if (newList.size() == 1) + Data.setCurrentProfile(mProfile); } Activity activity = getActivity(); - if (activity != null) activity.finish(); + if (activity != null) + activity.finish(); } - private void updateProfileFromUI() { - mProfile.setName(profileName.getText()); - mProfile.setUrl(url.getText()); - mProfile.setPostingPermitted(postingPermitted.isChecked()); - mProfile.setPreferredAccountsFilter(preferredAccountsFilter.getText()); - mProfile.setAuthEnabled(useAuthentication.isChecked()); - mProfile.setAuthUserName(userName.getText()); - mProfile.setAuthPassword(password.getText()); - mProfile.setThemeId(huePickerView.getTag()); - } - @Override - public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - 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); - huePickerView = rootView.findViewById(R.id.btn_pick_ring_color); - preferredAccountsFilter = rootView.findViewById(R.id.preferred_accounts_filter_filter); - preferredAccountsFilterLayout = - rootView.findViewById(R.id.preferred_accounts_accounts_filter_layout); - insecureWarningText = rootView.findViewById(R.id.insecure_scheme_text); - - url.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { + private boolean checkUrlValidity() { + boolean valid = true; - } - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { + ProfileDetailModel model = getModel(); + String val = model.getUrl() + .trim(); + if (val.isEmpty()) { + valid = false; + binding.urlLayout.setError(getResources().getText(R.string.err_profile_url_empty)); + } + try { + URL url = new URL(val); + String host = url.getHost(); + if (host == null || host.isEmpty()) + throw new MalformedURLException("Missing host"); + String protocol = url.getProtocol() + .toUpperCase(); + if (!protocol.equals("HTTP") && !protocol.equals("HTTPS")) { + valid = false; + binding.urlLayout.setError(getResources().getText(R.string.err_invalid_url)); } - @Override - public void afterTextChanged(Editable s) { - checkValidity(); - checkInsecureSchemeWithAuth(); - } - }); - - useAuthentication.setOnCheckedChangeListener((buttonView, isChecked) -> { - debug("profiles", isChecked ? "auth enabled " : "auth disabled"); - authParams.setVisibility(isChecked ? View.VISIBLE : View.GONE); - if (isChecked) userName.requestFocus(); - checkInsecureSchemeWithAuth(); - }); - - postingPermitted.setOnCheckedChangeListener( - ((buttonView, isChecked) -> preferredAccountsFilterLayout - .setVisibility(isChecked ? View.VISIBLE : View.GONE))); - - hookClearErrorOnFocusListener(profileName, profileNameLayout); - hookClearErrorOnFocusListener(url, urlLayout); - hookClearErrorOnFocusListener(userName, userNameLayout); - hookClearErrorOnFocusListener(password, passwordLayout); - - int profileThemeId; - 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); - userName.setText(mProfile.isAuthEnabled() ? mProfile.getAuthUserName() : ""); - password.setText(mProfile.isAuthEnabled() ? mProfile.getAuthPassword() : ""); - preferredAccountsFilter.setText(mProfile.getPreferredAccountsFilter()); - profileThemeId = mProfile.getThemeId(); } - else { - profileName.setText(""); - url.setText("https://"); - postingPermitted.setChecked(true); - useAuthentication.setChecked(false); - authParams.setVisibility(View.GONE); - userName.setText(""); - password.setText(""); - preferredAccountsFilter.setText(null); - profileThemeId = -1; + catch (MalformedURLException e) { + valid = false; + binding.urlLayout.setError(getResources().getText(R.string.err_invalid_url)); } - final int hue = (profileThemeId == -1) ? Colors.DEFAULT_HUE_DEG : profileThemeId; - final int profileColor = Colors.getPrimaryColorForHue(hue); - - huePickerView.setBackgroundColor(profileColor); - huePickerView.setTag(profileThemeId); - huePickerView.setOnClickListener(v -> { - HueRingDialog d = new HueRingDialog( - Objects.requireNonNull(ProfileDetailFragment.this.getContext()), profileThemeId, - (Integer) v.getTag()); - d.show(); - d.setColorSelectedListener(this); - }); - return rootView; + return valid; } private void checkInsecureSchemeWithAuth() { boolean showWarning = false; - if (useAuthentication.isChecked()) { - String urlText = url.getText().toString(); - if (urlText.startsWith("http") && !urlText.startsWith("https")) showWarning = true; + final ProfileDetailModel model = getModel(); + + if (model.getUseAuthentication()) { + String urlText = model.getUrl(); + if (urlText.startsWith("http") && !urlText.startsWith("https")) + showWarning = true; } - if (showWarning) insecureWarningText.setVisibility(View.VISIBLE); - else insecureWarningText.setVisibility(View.GONE); + if (showWarning) + binding.insecureSchemeText.setVisibility(View.VISIBLE); + else + binding.insecureSchemeText.setVisibility(View.GONE); } private void hookClearErrorOnFocusListener(TextView view, TextInputLayout layout) { view.setOnFocusChangeListener((v, hasFocus) -> { - if (hasFocus) layout.setError(null); + if (hasFocus) + layout.setError(null); }); view.addTextChangedListener(new TextWatcher() { @Override @@ -344,55 +523,74 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue } }); } + private void syncModelFromUI() { + if (syncingModelFromUI) + return; + + syncingModelFromUI = true; + + try { + ProfileDetailModel model = getModel(); + + model.setProfileName(binding.profileName.getText()); + model.setUrl(binding.url.getText()); + model.setPreferredAccountsFilter(binding.preferredAccountsFilter.getText()); + model.setAuthUserName(binding.authUserName.getText()); + model.setAuthPassword(binding.password.getText()); + } + finally { + syncingModelFromUI = false; + } + } private boolean checkValidity() { boolean valid = true; - String val = String.valueOf(profileName.getText()); - if (val.trim().isEmpty()) { + String val = String.valueOf(binding.profileName.getText()); + if (val.trim() + .isEmpty()) + { valid = false; - profileNameLayout.setError(getResources().getText(R.string.err_profile_name_empty)); + binding.profileNameLayout.setError( + getResources().getText(R.string.err_profile_name_empty)); } - val = String.valueOf(url.getText()).trim(); - if (val.isEmpty()) { - valid = false; - urlLayout.setError(getResources().getText(R.string.err_profile_url_empty)); - } - try { - URL url = new URL(val); - String host = url.getHost(); - if (host == null || host.isEmpty()) throw new MalformedURLException("Missing host"); - String protocol = url.getProtocol().toUpperCase(); - if (!protocol.equals("HTTP") && !protocol.equals("HTTPS")) { - valid = false; - urlLayout.setError(getResources().getText(R.string.err_invalid_url)); - } - } - catch (MalformedURLException e) { + if (!checkUrlValidity()) valid = false; - urlLayout.setError(getResources().getText(R.string.err_invalid_url)); - } - if (useAuthentication.isChecked()) { - val = String.valueOf(userName.getText()); - if (val.trim().isEmpty()) { + + if (binding.enableHttpAuth.isChecked()) { + val = String.valueOf(binding.authUserName.getText()); + if (val.trim() + .isEmpty()) + { valid = false; - userNameLayout - .setError(getResources().getText(R.string.err_profile_user_name_empty)); + binding.authUserNameLayout.setError( + getResources().getText(R.string.err_profile_user_name_empty)); } - val = String.valueOf(password.getText()); - if (val.trim().isEmpty()) { + val = String.valueOf(binding.password.getText()); + if (val.trim() + .isEmpty()) + { valid = false; - passwordLayout - .setError(getResources().getText(R.string.err_profile_password_empty)); + binding.passwordLayout.setError( + getResources().getText(R.string.err_profile_password_empty)); } } return valid; } - @Override - public void onHueSelected(int hue) { - huePickerView.setBackgroundColor(Colors.getPrimaryColorForHue(hue)); - huePickerView.setTag(hue); + private void resetDefaultCommodity() { + defaultCommoditySet = false; + binding.defaultCommodityText.setText(R.string.btn_no_currency); + binding.defaultCommodityText.setTypeface(binding.defaultCommodityText.getTypeface(), + Typeface.ITALIC); + } + private void setDefaultCommodity(@NonNull @NotNull String name) { + defaultCommoditySet = true; + binding.defaultCommodityText.setText(name); + binding.defaultCommodityText.setTypeface(Typeface.DEFAULT); + } + interface TextChangeSyncRoutine { + void onTextChanged(String text); } }