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=e531809a38ce416dd09cac7bd7b13587624fb12d;hp=672acf0ec4a58cb37d7ba0a897c8065b9433feae;hb=9fad5003ac30c3e4f9d073e04f4569aeb31779b2;hpb=b296570e4c84379133927f7f35e1220b9b1d6862 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 672acf0e..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 © 2020 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 @@ -23,11 +23,12 @@ import android.graphics.Typeface; import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; +import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import android.widget.LinearLayout; +import android.view.ViewGroup; import android.widget.PopupMenu; import android.widget.TextView; @@ -41,17 +42,16 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.appbar.CollapsingToolbarLayout; import com.google.android.material.floatingactionbutton.FloatingActionButton; -import com.google.android.material.switchmaterial.SwitchMaterial; import com.google.android.material.textfield.TextInputLayout; import net.ktnx.mobileledger.BuildConfig; import net.ktnx.mobileledger.R; -import net.ktnx.mobileledger.async.SendTransactionTask; +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; @@ -81,24 +81,9 @@ public class ProfileDetailFragment extends Fragment { @NonNls private MobileLedgerProfile mProfile; - private TextView url; - private TextView defaultCommodity; private boolean defaultCommoditySet; - private TextInputLayout urlLayout; - private LinearLayout authParams; - private SwitchMaterial useAuthentication; - private TextView userName; - private TextInputLayout userNameLayout; - private TextView password; - private TextInputLayout passwordLayout; - private TextView profileName; - private TextInputLayout profileNameLayout; - private TextView preferredAccountsFilter; - private View huePickerView; - private View insecureWarningText; - private TextView futureDatesText; - private TextView apiVersionText; private boolean syncingModelFromUI = false; + private ProfileDetailBinding binding; /** * Mandatory empty constructor for the fragment manager to instantiate the * fragment (e.g. upon screen orientation changes). @@ -177,6 +162,14 @@ public class ProfileDetailFragment extends Fragment { public void afterTextChanged(Editable s) { syncRoutine.onTextChanged(s.toString());} }); } + @Nullable + @Override + 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); @@ -215,154 +208,130 @@ public class ProfileDetailFragment extends Fragment { FloatingActionButton fab = context.findViewById(R.id.fab); fab.setOnClickListener(v -> onSaveFabClicked()); - profileName = context.findViewById(R.id.profile_name); - hookTextChangeSyncRoutine(profileName, model::setProfileName); + hookTextChangeSyncRoutine(binding.profileName, model::setProfileName); model.observeProfileName(viewLifecycleOwner, pn -> { - if (!Misc.equalStrings(pn, profileName.getText())) - profileName.setText(pn); + if (!Misc.equalStrings(pn, Misc.nullIsEmpty(binding.profileName.getText()))) + binding.profileName.setText(pn); }); - profileNameLayout = context.findViewById(R.id.profile_name_layout); - - url = context.findViewById(R.id.url); - hookTextChangeSyncRoutine(url, model::setUrl); + hookTextChangeSyncRoutine(binding.url, model::setUrl); model.observeUrl(viewLifecycleOwner, u -> { - if (!Misc.equalStrings(u, url.getText())) - url.setText(u); + if (!Misc.equalStrings(u, Misc.nullIsEmpty(binding.url.getText()))) + binding.url.setText(u); }); - urlLayout = context.findViewById(R.id.url_layout); - - context.findViewById(R.id.default_commodity_layout) - .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.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"); + }); - SwitchMaterial showCommodityByDefault = context.findViewById(R.id.profile_show_commodity); - showCommodityByDefault.setOnCheckedChangeListener( + binding.profileShowCommodity.setOnCheckedChangeListener( (buttonView, isChecked) -> model.setShowCommodityByDefault(isChecked)); - model.observeShowCommodityByDefault(viewLifecycleOwner, showCommodityByDefault::setChecked); + model.observeShowCommodityByDefault(viewLifecycleOwner, + binding.profileShowCommodity::setChecked); - View postingSubItems = context.findViewById(R.id.posting_sub_items); - - SwitchMaterial postingPermitted = context.findViewById(R.id.profile_permit_posting); model.observePostingPermitted(viewLifecycleOwner, isChecked -> { - postingPermitted.setChecked(isChecked); - postingSubItems.setVisibility(isChecked ? View.VISIBLE : View.GONE); + binding.profilePermitPosting.setChecked(isChecked); + binding.postingSubItems.setVisibility(isChecked ? View.VISIBLE : View.GONE); }); - postingPermitted.setOnCheckedChangeListener( + binding.profilePermitPosting.setOnCheckedChangeListener( ((buttonView, isChecked) -> model.setPostingPermitted(isChecked))); - SwitchMaterial showCommentsByDefault = context.findViewById(R.id.profile_show_comments); - model.observeShowCommentsByDefault(viewLifecycleOwner, showCommentsByDefault::setChecked); - showCommentsByDefault.setOnCheckedChangeListener( + model.observeShowCommentsByDefault(viewLifecycleOwner, + binding.profileShowComments::setChecked); + binding.profileShowComments.setOnCheckedChangeListener( ((buttonView, isChecked) -> model.setShowCommentsByDefault(isChecked))); - defaultCommodity = context.findViewById(R.id.default_commodity_text); - - futureDatesText = context.findViewById(R.id.future_dates_text); - context.findViewById(R.id.future_dates_layout) - .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(); - }); + 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 -> futureDatesText.setText(v.getText(getResources()))); + v -> binding.futureDatesText.setText(v.getText(getResources()))); - apiVersionText = context.findViewById(R.id.api_version_text); model.observeApiVersion(viewLifecycleOwner, - apiVer -> apiVersionText.setText(apiVer.getDescription(getResources()))); - context.findViewById(R.id.api_version_label) - .setOnClickListener(this::chooseAPIVersion); - context.findViewById(R.id.api_version_text) - .setOnClickListener(this::chooseAPIVersion); + apiVer -> binding.apiVersionText.setText(apiVer.getDescription(getResources()))); + binding.apiVersionLabel.setOnClickListener(this::chooseAPIVersion); + binding.apiVersionText.setOnClickListener(this::chooseAPIVersion); - TextView detectedApiVersion = context.findViewById(R.id.detected_version_text); + binding.serverVersionLabel.setOnClickListener(v -> model.triggerVersionDetection()); model.observeDetectedVersion(viewLifecycleOwner, ver -> { if (ver == null) - detectedApiVersion.setText(context.getResources() - .getString(R.string.api_version_unknown_label)); - else if (ver.isPre_1_20()) - detectedApiVersion.setText(context.getResources() - .getString(R.string.api_pre_1_19)); + 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 - detectedApiVersion.setText(ver.toString()); - }); - detectedApiVersion.setOnClickListener(v -> model.triggerVersionDetection()); - final View detectButton = context.findViewById(R.id.api_version_detect_button); - detectButton.setOnClickListener(v -> model.triggerVersionDetection()); - model.observeDetectingHledgerVersion(viewLifecycleOwner, running -> { - detectButton.setVisibility(running ? View.VISIBLE : View.INVISIBLE); + binding.detectedServerVersionText.setText(ver.toString()); }); - - authParams = context.findViewById(R.id.auth_params); - - useAuthentication = context.findViewById(R.id.enable_http_auth); - useAuthentication.setOnCheckedChangeListener((buttonView, isChecked) -> { + 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 (isChecked) - userName.requestFocus(); + if (!wasOn && isChecked) + binding.authUserName.requestFocus(); }); model.observeUseAuthentication(viewLifecycleOwner, isChecked -> { - useAuthentication.setChecked(isChecked); - authParams.setVisibility(isChecked ? View.VISIBLE : View.GONE); + binding.enableHttpAuth.setChecked(isChecked); + binding.authParams.setVisibility(isChecked ? View.VISIBLE : View.GONE); checkInsecureSchemeWithAuth(); }); - userName = context.findViewById(R.id.auth_user_name); model.observeUserName(viewLifecycleOwner, text -> { - if (!Misc.equalStrings(text, userName.getText())) - userName.setText(text); + if (!Misc.equalStrings(text, Misc.nullIsEmpty(binding.authUserName.getText()))) + binding.authUserName.setText(text); }); - hookTextChangeSyncRoutine(userName, model::setAuthUserName); - userNameLayout = context.findViewById(R.id.auth_user_name_layout); + hookTextChangeSyncRoutine(binding.authUserName, model::setAuthUserName); - password = context.findViewById(R.id.password); model.observePassword(viewLifecycleOwner, text -> { - if (!Misc.equalStrings(text, password.getText())) - password.setText(text); + if (!Misc.equalStrings(text, Misc.nullIsEmpty(binding.password.getText()))) + binding.password.setText(text); }); - hookTextChangeSyncRoutine(password, model::setAuthPassword); - passwordLayout = context.findViewById(R.id.password_layout); + hookTextChangeSyncRoutine(binding.password, model::setAuthPassword); - huePickerView = context.findViewById(R.id.btn_pick_ring_color); model.observeThemeId(viewLifecycleOwner, themeId -> { final int hue = (themeId == -1) ? Colors.DEFAULT_HUE_DEG : themeId; final int profileColor = Colors.getPrimaryColorForHue(hue); - huePickerView.setBackgroundColor(profileColor); - huePickerView.setTag(hue); + binding.btnPickRingColor.setBackgroundColor(profileColor); + binding.btnPickRingColor.setTag(hue); }); - preferredAccountsFilter = context.findViewById(R.id.preferred_accounts_filter_filter); model.observePreferredAccountsFilter(viewLifecycleOwner, text -> { - if (!Misc.equalStrings(text, preferredAccountsFilter.getText())) - preferredAccountsFilter.setText(text); + if (!Misc.equalStrings(text, + Misc.nullIsEmpty(binding.preferredAccountsFilter.getText()))) + binding.preferredAccountsFilter.setText(text); }); - hookTextChangeSyncRoutine(preferredAccountsFilter, model::setPreferredAccountsFilter); - - insecureWarningText = context.findViewById(R.id.insecure_scheme_text); + hookTextChangeSyncRoutine(binding.preferredAccountsFilter, + model::setPreferredAccountsFilter); - hookClearErrorOnFocusListener(profileName, profileNameLayout); - hookClearErrorOnFocusListener(url, urlLayout); - hookClearErrorOnFocusListener(userName, userNameLayout); - hookClearErrorOnFocusListener(password, passwordLayout); + 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(); - url.addTextChangedListener(new TextWatcher() { + binding.url.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) {} @Override @@ -373,14 +342,14 @@ public class ProfileDetailFragment extends Fragment { } }); - huePickerView.setOnClickListener(v -> { + binding.btnPickRingColor.setOnClickListener(v -> { HueRingDialog d = new HueRingDialog(ProfileDetailFragment.this.requireContext(), model.initialThemeHue, (Integer) v.getTag()); d.show(); d.setColorSelectedListener(model::setThemeId); }); - profileName.requestFocus(); + binding.profileName.requestFocus(); } private void chooseAPIVersion(View v) { Activity context = getActivity(); @@ -389,48 +358,55 @@ public class ProfileDetailFragment extends Fragment { PopupMenu menu = new PopupMenu(context, v); menu.inflate(R.menu.api_version); menu.setOnMenuItemClickListener(item -> { - SendTransactionTask.API apiVer; - switch (item.getItemId()) { - case R.id.api_version_menu_html: - apiVer = SendTransactionTask.API.html; - break; - case R.id.api_version_menu_post_1_14: - apiVer = SendTransactionTask.API.post_1_14; - break; - case R.id.api_version_menu_pre_1_15: - apiVer = SendTransactionTask.API.pre_1_15; - break; - case R.id.api_version_menu_auto: - default: - apiVer = SendTransactionTask.API.auto; + 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); - apiVersionText.setText(apiVer.getDescription(getResources())); + binding.apiVersionText.setText(apiVer.getDescription(getResources())); return true; }); menu.show(); } private MobileLedgerProfile.FutureDates futureDatesSettingFromMenuItemId(int itemId) { - switch (itemId) { - case R.id.menu_future_dates_7: - return MobileLedgerProfile.FutureDates.OneWeek; - case R.id.menu_future_dates_14: - return MobileLedgerProfile.FutureDates.TwoWeeks; - case R.id.menu_future_dates_30: - return MobileLedgerProfile.FutureDates.OneMonth; - case R.id.menu_future_dates_60: - return MobileLedgerProfile.FutureDates.TwoMonths; - case R.id.menu_future_dates_90: - return MobileLedgerProfile.FutureDates.ThreeMonths; - case R.id.menu_future_dates_180: - return MobileLedgerProfile.FutureDates.SixMonths; - case R.id.menu_future_dates_365: - return MobileLedgerProfile.FutureDates.OneYear; - case R.id.menu_future_dates_all: - return MobileLedgerProfile.FutureDates.All; - default: - return MobileLedgerProfile.FutureDates.None; + 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() { @@ -492,7 +468,7 @@ public class ProfileDetailFragment extends Fragment { .trim(); if (val.isEmpty()) { valid = false; - urlLayout.setError(getResources().getText(R.string.err_profile_url_empty)); + binding.urlLayout.setError(getResources().getText(R.string.err_profile_url_empty)); } try { URL url = new URL(val); @@ -503,12 +479,12 @@ public class ProfileDetailFragment extends Fragment { .toUpperCase(); if (!protocol.equals("HTTP") && !protocol.equals("HTTPS")) { valid = false; - urlLayout.setError(getResources().getText(R.string.err_invalid_url)); + binding.urlLayout.setError(getResources().getText(R.string.err_invalid_url)); } } catch (MalformedURLException e) { valid = false; - urlLayout.setError(getResources().getText(R.string.err_invalid_url)); + binding.urlLayout.setError(getResources().getText(R.string.err_invalid_url)); } return valid; @@ -525,9 +501,9 @@ public class ProfileDetailFragment extends Fragment { } if (showWarning) - insecureWarningText.setVisibility(View.VISIBLE); + binding.insecureSchemeText.setVisibility(View.VISIBLE); else - insecureWarningText.setVisibility(View.GONE); + binding.insecureSchemeText.setVisibility(View.GONE); } private void hookClearErrorOnFocusListener(TextView view, TextInputLayout layout) { view.setOnFocusChangeListener((v, hasFocus) -> { @@ -556,11 +532,11 @@ public class ProfileDetailFragment extends Fragment { try { ProfileDetailModel model = getModel(); - model.setProfileName(profileName.getText()); - model.setUrl(url.getText()); - model.setPreferredAccountsFilter(preferredAccountsFilter.getText()); - model.setAuthUserName(userName.getText()); - model.setAuthPassword(password.getText()); + 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; @@ -569,33 +545,34 @@ public class ProfileDetailFragment extends Fragment { private boolean checkValidity() { boolean valid = true; - String val = String.valueOf(profileName.getText()); + 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)); } if (!checkUrlValidity()) valid = false; - if (useAuthentication.isChecked()) { - val = String.valueOf(userName.getText()); + if (binding.enableHttpAuth.isChecked()) { + val = String.valueOf(binding.authUserName.getText()); if (val.trim() .isEmpty()) { valid = false; - userNameLayout.setError( + binding.authUserNameLayout.setError( getResources().getText(R.string.err_profile_user_name_empty)); } - val = String.valueOf(password.getText()); + val = String.valueOf(binding.password.getText()); if (val.trim() .isEmpty()) { valid = false; - passwordLayout.setError( + binding.passwordLayout.setError( getResources().getText(R.string.err_profile_password_empty)); } } @@ -604,13 +581,14 @@ public class ProfileDetailFragment extends Fragment { } private void resetDefaultCommodity() { defaultCommoditySet = false; - defaultCommodity.setText(R.string.btn_no_currency); - defaultCommodity.setTypeface(defaultCommodity.getTypeface(), Typeface.ITALIC); + 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; - defaultCommodity.setText(name); - defaultCommodity.setTypeface(Typeface.DEFAULT); + binding.defaultCommodityText.setText(name); + binding.defaultCommodityText.setTypeface(Typeface.DEFAULT); } interface TextChangeSyncRoutine { void onTextChanged(String text);