X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfileDetailFragment.java;h=7a7afef6221f2ec7c25b133b49a2119b2b4d2676;hb=0ce370cea3c5c980b6eeb14acf965188ae951f51;hp=6ead2af668029934d22046ced859dc746df2f361;hpb=846e58adc99c200e4c2b8c76343d2284ff04178e;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 6ead2af6..7a7afef6 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 @@ -61,6 +61,7 @@ import org.jetbrains.annotations.NotNull; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; +import java.util.UUID; import static net.ktnx.mobileledger.utils.Logger.debug; @@ -78,9 +79,7 @@ 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; @@ -129,7 +128,7 @@ public class ProfileDetailFragment extends Fragment { ArrayList newList = new ArrayList<>(oldList); newList.remove(mProfile); Data.profiles.setValue(newList); - if (mProfile.equals(Data.profile.getValue())) { + if (mProfile.equals(Data.getProfile())) { debug("profiles", "[fragment] setting current profile to 0"); Data.setCurrentProfile(newList.get(0)); } @@ -154,7 +153,7 @@ public class ProfileDetailFragment extends Fragment { 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; } @@ -170,8 +169,8 @@ public class ProfileDetailFragment extends Fragment { 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) { view.addTextChangedListener(new TextWatcher() { @@ -391,8 +390,7 @@ public class ProfileDetailFragment extends Fragment { huePickerView.setOnClickListener(v -> { HueRingDialog d = new HueRingDialog(ProfileDetailFragment.this.requireContext(), - model.initialThemeHue, - (Integer) v.getTag()); + model.initialThemeHue, (Integer) v.getTag()); d.show(); d.setColorSelectedListener(model::setThemeId); }); @@ -439,7 +437,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(); @@ -452,7 +450,7 @@ public class ProfileDetailFragment extends Fragment { // first profile ever? if (newList.size() == 1) - Data.profile.setValue(mProfile); + Data.setCurrentProfile(mProfile); } Activity activity = getActivity(); @@ -586,7 +584,7 @@ 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 { void onTextChanged(String text);