X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfileDetailFragment.java;h=b712f29da87ca248bbd6923e7407740e5b9db1a8;hb=14f60602fa419409b68e9c41c37c6aedda3bc526;hp=522de24787b3374e8cbf9d18b79aa79cce2047a0;hpb=6be2c106704f8b378ec3febaa3ad65bce7d3aad9;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 522de247..b712f29d 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 © 2020 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,12 +23,10 @@ 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.view.ViewGroup; import android.widget.LinearLayout; import android.widget.PopupMenu; import android.widget.Switch; @@ -64,8 +62,8 @@ 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.Colors.profileThemeId; import static net.ktnx.mobileledger.utils.Logger.debug; /** @@ -82,12 +80,9 @@ public class ProfileDetailFragment extends Fragment { public static final String ARG_HUE = "hue"; @NonNls - /** - * The content this fragment is presenting. - */ private MobileLedgerProfile mProfile; + private MobileLedgerProfile mProfile; private TextView url; private TextView defaultCommodity; - private View defaultCommodityLayout; private boolean defaultCommoditySet; private TextInputLayout urlLayout; private LinearLayout authParams; @@ -99,11 +94,9 @@ public class ProfileDetailFragment extends Fragment { private TextView profileName; private TextInputLayout profileNameLayout; private TextView preferredAccountsFilter; - private TextInputLayout preferredAccountsFilterLayout; private View huePickerView; private View insecureWarningText; private TextView futureDatesText; - private View futureDatesLayout; private TextView apiVersionText; private boolean syncingModelFromUI = false; /** @@ -111,6 +104,7 @@ public class ProfileDetailFragment extends Fragment { * fragment (e.g. upon screen orientation changes). */ public ProfileDetailFragment() { + super(R.layout.profile_detail); } @Override public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull MenuInflater inflater) { @@ -118,35 +112,8 @@ public class ProfileDetailFragment extends Fragment { 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; - }); + 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); @@ -154,29 +121,53 @@ public class ProfileDetailFragment extends Fragment { 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())) + 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 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, TextChangeSyncProc syncRoutine) { + private void hookTextChangeSyncRoutine(TextView view, TextChangeSyncRoutine syncRoutine) { view.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) {} @@ -242,14 +233,14 @@ public class ProfileDetailFragment extends Fragment { urlLayout = context.findViewById(R.id.url_layout); - defaultCommodityLayout = context.findViewById(R.id.default_commodity_layout); - 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"); - }); + 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"); + }); Switch showCommodityByDefault = context.findViewById(R.id.profile_show_commodity); showCommodityByDefault.setOnCheckedChangeListener( @@ -266,9 +257,13 @@ public class ProfileDetailFragment extends Fragment { postingPermitted.setOnCheckedChangeListener( ((buttonView, isChecked) -> model.setPostingPermitted(isChecked))); + Switch showCommentsByDefault = context.findViewById(R.id.profile_show_comments); + model.observeShowCommentsByDefault(viewLifecycleOwner, showCommentsByDefault::setChecked); + showCommentsByDefault.setOnCheckedChangeListener( + ((buttonView, isChecked) -> model.setShowCommentsByDefault(isChecked))); + defaultCommodity = context.findViewById(R.id.default_commodity_text); - 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 -> { @@ -285,9 +280,8 @@ public class ProfileDetailFragment extends Fragment { v -> futureDatesText.setText(v.getText(getResources()))); apiVersionText = context.findViewById(R.id.api_version_text); - model.observeApiVersion(viewLifecycleOwner, apiVer -> { - apiVersionText.setText(apiVer.getDescription(getResources())); - }); + model.observeApiVersion(viewLifecycleOwner, + apiVer -> apiVersionText.setText(apiVer.getDescription(getResources()))); context.findViewById(R.id.api_version_layout) .setOnClickListener(v -> { MenuInflater mi = new MenuInflater(context); @@ -359,8 +353,6 @@ public class ProfileDetailFragment extends Fragment { preferredAccountsFilter.setText(text); }); hookTextChangeSyncRoutine(preferredAccountsFilter, model::setPreferredAccountsFilter); - preferredAccountsFilterLayout = - context.findViewById(R.id.preferred_accounts_accounts_filter_layout); insecureWarningText = context.findViewById(R.id.insecure_scheme_text); @@ -386,9 +378,8 @@ public class ProfileDetailFragment extends Fragment { }); huePickerView.setOnClickListener(v -> { - HueRingDialog d = new HueRingDialog( - Objects.requireNonNull(ProfileDetailFragment.this.getContext()), profileThemeId, - (Integer) v.getTag()); + HueRingDialog d = new HueRingDialog(ProfileDetailFragment.this.requireContext(), + model.initialThemeHue, (Integer) v.getTag()); d.show(); d.setColorSelectedListener(model::setThemeId); }); @@ -419,7 +410,7 @@ public class ProfileDetailFragment extends Fragment { } @NotNull private ProfileDetailModel getModel() { - return new ViewModelProvider(this).get(ProfileDetailModel.class); + return new ViewModelProvider(requireActivity()).get(ProfileDetailModel.class); } private void onSaveFabClicked() { if (!checkValidity()) @@ -435,7 +426,7 @@ public class ProfileDetailFragment extends Fragment { triggerProfileChange(); } else { - mProfile = new MobileLedgerProfile(); + mProfile = new MobileLedgerProfile(String.valueOf(UUID.randomUUID())); model.updateProfile(mProfile); mProfile.storeInDB(); final ArrayList profiles = Data.profiles.getValue(); @@ -448,19 +439,13 @@ public class ProfileDetailFragment extends Fragment { // first profile ever? if (newList.size() == 1) - Data.profile.setValue(mProfile); + Data.setCurrentProfile(mProfile); } Activity activity = getActivity(); if (activity != null) activity.finish(); } - @Override - public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - - return inflater.inflate(R.layout.profile_detail, container, false); - } private boolean checkUrlValidity() { boolean valid = true; @@ -588,9 +573,9 @@ public class ProfileDetailFragment extends Fragment { private void setDefaultCommodity(@NonNull @NotNull String name) { defaultCommoditySet = true; defaultCommodity.setText(name); - defaultCommodity.setTypeface(defaultCommodity.getTypeface(), Typeface.BOLD); + defaultCommodity.setTypeface(Typeface.DEFAULT); } - interface TextChangeSyncProc { + interface TextChangeSyncRoutine { void onTextChanged(String text); } }