X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfileDetailFragment.java;h=7a8dc50e6316c82fc08442a2682d6d5045684b81;hb=414c274799a9936ca19821c005e3d326a8384103;hp=f6323d5134571b2443d2c6e5700b28faec202e30;hpb=05c2c408dabdda9e042744c5f4e4f126a7fb30d1;p=mobile-ledger-staging.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 f6323d51..7a8dc50e 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 @@ -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; @@ -63,9 +61,7 @@ import org.jetbrains.annotations.NotNull; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; -import java.util.Objects; -import static net.ktnx.mobileledger.utils.Colors.profileThemeId; import static net.ktnx.mobileledger.utils.Logger.debug; /** @@ -111,6 +107,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) { @@ -393,8 +390,8 @@ public class ProfileDetailFragment extends Fragment { }); huePickerView.setOnClickListener(v -> { - HueRingDialog d = new HueRingDialog( - Objects.requireNonNull(ProfileDetailFragment.this.getContext()), profileThemeId, + HueRingDialog d = new HueRingDialog(ProfileDetailFragment.this.requireContext(), + model.initialThemeHue, (Integer) v.getTag()); d.show(); d.setColorSelectedListener(model::setThemeId); @@ -426,7 +423,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()) @@ -462,12 +459,6 @@ public class ProfileDetailFragment extends Fragment { 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; @@ -595,7 +586,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);