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=e43e20e35a4d7585fa6c84d37c6173ddf4e13c10;hp=8ec562b6b5cee139ef00bade5ba2f4206f0b739a;hb=HEAD;hpb=b04c98250e8e2abcf1d652e2a20cff0f9b98784b 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 8ec562b6..99934543 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,8 @@ package net.ktnx.mobileledger.ui.profiles; import android.app.Activity; import android.app.AlertDialog; +import android.app.backup.BackupManager; +import android.graphics.Typeface; import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; @@ -28,34 +30,41 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.widget.LinearLayout; import android.widget.PopupMenu; -import android.widget.Switch; 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; import com.google.android.material.textfield.TextInputLayout; import net.ktnx.mobileledger.BuildConfig; import net.ktnx.mobileledger.R; +import net.ktnx.mobileledger.dao.BaseDAO; +import net.ktnx.mobileledger.dao.ProfileDAO; +import net.ktnx.mobileledger.databinding.ProfileDetailBinding; +import net.ktnx.mobileledger.db.DB; +import net.ktnx.mobileledger.db.Profile; +import net.ktnx.mobileledger.json.API; import net.ktnx.mobileledger.model.Data; -import net.ktnx.mobileledger.model.MobileLedgerProfile; +import net.ktnx.mobileledger.model.FutureDates; +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.List; import java.util.Objects; import static net.ktnx.mobileledger.utils.Logger.debug; @@ -65,43 +74,24 @@ 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 - private static final String HTTPS_URL_START = "https://"; - - /** - * 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 TextView futureDatesText; - private MobileLedgerProfile.FutureDates futureDates; - private View futureDatesLayout; + 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) { @@ -109,279 +99,335 @@ 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 = new ArrayList<>(oldList); - 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; - }); - final ArrayList profiles = Data.profiles.getValue(); - menuDeleteProfile.setVisible( - (mProfile != null) && (profiles != null) && (profiles.size() > 1)); + menuDeleteProfile.setOnMenuItemClickListener(item -> onDeleteProfile()); + final List profiles = Data.profiles.getValue(); - if (BuildConfig.DEBUG) { - final MenuItem menuWipeProfileData = menu.findItem(R.id.menuWipeData); + final MenuItem menuWipeProfileData = menu.findItem(R.id.menuWipeData); + if (BuildConfig.DEBUG) menuWipeProfileData.setOnMenuItemClickListener(ignored -> onWipeDataMenuClicked()); - menuWipeProfileData.setVisible(mProfile != null); - } + + getModel().getProfileId() + .observe(getViewLifecycleOwner(), id -> { + menuDeleteProfile.setVisible(id > 0); + if (BuildConfig.DEBUG) + menuWipeProfileData.setVisible(id > 0); + }); + } + private boolean onDeleteProfile() { + AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); + @NotNull ProfileDetailModel model = getModel(); + builder.setTitle(model.getProfileName()); + builder.setMessage(R.string.remove_profile_dialog_message); + builder.setPositiveButton(R.string.Remove, (dialog, which) -> { + final long profileId = Objects.requireNonNull(model.getProfileId() + .getValue()); + debug("profiles", String.format("[fragment] removing profile %s", profileId)); + ProfileDAO dao = DB.get() + .getProfileDAO(); + dao.getById(profileId) + .observe(getViewLifecycleOwner(), profile -> { + if (profile != null) + BaseDAO.runAsync(() -> DB.get() + .runInTransaction(() -> { + dao.deleteSync(profile); + dao.updateOrderSync(dao.getAllOrderedSync()); + })); + }); + + 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(); + DB.get() + .getProfileDAO() + .getById(Objects.requireNonNull(getModel().getProfileId() + .getValue())) + .observe(getViewLifecycleOwner(), profile -> { + if (profile != null) + profile.wipeAllData(); + }); 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(); - profiles.set(index, newProfile); - - ProfilesRecyclerViewAdapter prva = ProfilesRecyclerViewAdapter.getInstance(); - if (prva != null) - prva.notifyItemChanged(index); - - if (mProfile.equals(Data.profile.getValue())) - Data.profile.setValue(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 onActivityCreated(@Nullable Bundle savedInstanceState) { - super.onActivityCreated(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); - ArrayList profiles = Data.profiles.getValue(); - if ((profiles != null) && (index != -1) && (index < profiles.size())) - mProfile = profiles.get(index); - - Activity activity = this.getActivity(); - 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)); - } - } + final LifecycleOwner viewLifecycleOwner = getViewLifecycleOwner(); + final ProfileDetailModel model = getModel(); + + model.observeDefaultCommodity(viewLifecycleOwner, c -> { + if (c != null) + setDefaultCommodity(c); + else + resetDefaultCommodity(); + }); - FloatingActionButton fab = context.findViewById(R.id.fab); + FloatingActionButton fab = context.findViewById(R.id.fabAdd); fab.setOnClickListener(v -> onSaveFabClicked()); - profileName = context.findViewById(R.id.profile_name); - profileNameLayout = context.findViewById(R.id.profile_name_layout); - url = context.findViewById(R.id.url); - urlLayout = context.findViewById(R.id.url_layout); - postingPermitted = context.findViewById(R.id.profile_permit_posting); - futureDatesLayout = context.findViewById(R.id.future_dates_layout); - 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 -> { - switch (item.getItemId()) { - case R.id.menu_future_dates_30: - futureDates = MobileLedgerProfile.FutureDates.OneMonth; - break; - case R.id.menu_future_dates_60: - futureDates = MobileLedgerProfile.FutureDates.TwoMonths; - break; - case R.id.menu_future_dates_90: - futureDates = MobileLedgerProfile.FutureDates.ThreeMonths; - break; - case R.id.menu_future_dates_180: - futureDates = MobileLedgerProfile.FutureDates.SixMonths; - break; - case R.id.menu_future_dates_365: - futureDates = MobileLedgerProfile.FutureDates.OneYear; - break; - case R.id.menu_future_dates_all: - futureDates = MobileLedgerProfile.FutureDates.All; - break; - default: - futureDates = MobileLedgerProfile.FutureDates.None; - } - futureDatesText.setText(futureDates.getText(getResources())); - return true; - }); - menu.show(); - }); - authParams = context.findViewById(R.id.auth_params); - useAuthentication = context.findViewById(R.id.enable_http_auth); - userName = context.findViewById(R.id.auth_user_name); - userNameLayout = context.findViewById(R.id.auth_user_name_layout); - password = context.findViewById(R.id.password); - passwordLayout = context.findViewById(R.id.password_layout); - huePickerView = context.findViewById(R.id.btn_pick_ring_color); - preferredAccountsFilter = context.findViewById(R.id.preferred_accounts_filter_filter); - preferredAccountsFilterLayout = - context.findViewById(R.id.preferred_accounts_accounts_filter_layout); - insecureWarningText = context.findViewById(R.id.insecure_scheme_text); - - useAuthentication.setOnCheckedChangeListener((buttonView, isChecked) -> { - debug("profiles", isChecked ? "auth enabled " : "auth disabled"); - authParams.setVisibility(isChecked ? View.VISIBLE : View.GONE); - if (isChecked) - userName.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(); }); - postingPermitted.setOnCheckedChangeListener(((buttonView, isChecked) -> { - preferredAccountsFilterLayout.setVisibility(isChecked ? View.VISIBLE : View.GONE); - futureDatesLayout.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()); - futureDates = mProfile.getFutureDates(); - futureDatesText.setText(futureDates.getText(getResources())); - 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_URL_START); - postingPermitted.setChecked(true); - futureDates = MobileLedgerProfile.FutureDates.None; - futureDatesText.setText(futureDates.getText(getResources())); - useAuthentication.setChecked(false); - authParams.setVisibility(View.GONE); - userName.setText(""); - password.setText(""); - preferredAccountsFilter.setText(null); - profileThemeId = -1; - } + model.observeUserName(viewLifecycleOwner, text -> { + if (!Misc.equalStrings(text, Misc.nullIsEmpty(binding.authUserName.getText()))) + binding.authUserName.setText(text); + }); + hookTextChangeSyncRoutine(binding.authUserName, model::setAuthUserName); - checkInsecureSchemeWithAuth(); + model.observePassword(viewLifecycleOwner, text -> { + if (!Misc.equalStrings(text, Misc.nullIsEmpty(binding.password.getText()))) + binding.password.setText(text); + }); + hookTextChangeSyncRoutine(binding.password, model::setAuthPassword); - url.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { + 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); + }); - } - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { + 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); + + 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(); } }); - 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()); + binding.btnPickRingColor.setOnClickListener(v -> { + HueRingDialog d = new HueRingDialog(ProfileDetailFragment.this.requireContext(), + model.initialThemeHue, (Integer) v.getTag()); d.show(); - d.setColorSelectedListener(this); + d.setColorSelectedListener(model::setThemeId); }); - profileName.requestFocus(); + 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_23) { + apiVer = API.v1_23; + } + 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 FutureDates futureDatesSettingFromMenuItemId(int itemId) { + if (itemId == R.id.menu_future_dates_7) { + return FutureDates.OneWeek; + } + else if (itemId == R.id.menu_future_dates_14) { + return FutureDates.TwoWeeks; + } + else if (itemId == R.id.menu_future_dates_30) { + return FutureDates.OneMonth; + } + else if (itemId == R.id.menu_future_dates_60) { + return FutureDates.TwoMonths; + } + else if (itemId == R.id.menu_future_dates_90) { + return FutureDates.ThreeMonths; + } + else if (itemId == R.id.menu_future_dates_180) { + return FutureDates.SixMonths; + } + else if (itemId == R.id.menu_future_dates_365) { + return FutureDates.OneYear; + } + else if (itemId == R.id.menu_future_dates_all) { + return FutureDates.All; + } + return FutureDates.None; + } + @NotNull + private ProfileDetailModel getModel() { + return new ViewModelProvider(requireActivity()).get(ProfileDetailModel.class); } private void onSaveFabClicked() { if (!checkValidity()) return; - if (mProfile != null) { - updateProfileFromUI(); -// debug("profiles", String.format("Selected item is %d", mProfile.getThemeId())); - mProfile.storeInDB(); + ProfileDetailModel model = getModel(); + ProfileDAO dao = DB.get() + .getProfileDAO(); + + Profile profile = new Profile(); + model.updateProfile(profile); + if (profile.getId() > 0) { + dao.update(profile); debug("profiles", "profile stored in DB"); - triggerProfileChange(); +// debug("profiles", String.format("Selected item is %d", mProfile.getThemeHue())); } else { - mProfile = new MobileLedgerProfile(); - updateProfileFromUI(); - mProfile.storeInDB(); - final ArrayList profiles = Data.profiles.getValue(); - if (profiles == null) - throw new AssertionError(); - 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); + dao.insertLast(profile, null); } + BackupManager.dataChanged(BuildConfig.APPLICATION_ID); + Activity activity = getActivity(); 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()); - mProfile.setFutureDates(futureDates); - } - @Override - public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - View rootView = inflater.inflate(R.layout.profile_detail, container, false); - - return rootView; - } private boolean checkUrlValidity() { boolean valid = true; - String val = String.valueOf(url.getText()) - .trim(); + ProfileDetailModel model = getModel(); + + String val = model.getUrl() + .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); @@ -392,12 +438,12 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue .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; @@ -405,17 +451,19 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue private void checkInsecureSchemeWithAuth() { boolean showWarning = false; - if (useAuthentication.isChecked()) { - String urlText = url.getText() - .toString(); - if (urlText.startsWith("http") && !urlText.startsWith("https")) + final ProfileDetailModel model = getModel(); + + if (model.getUseAuthentication()) { + String urlText = model.getUrl(); + if (urlText.startsWith("http://") || + urlText.length() >= 8 && !urlText.startsWith("https://")) showWarning = true; } 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) -> { @@ -435,45 +483,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()); + 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)); } } 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); } }