drop unused/unneeded variables

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / profiles / ProfileDetailFragment.java

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 61d0d519f4988c96d3bc649e7e06026eb8a8d82f..46a0ea6e6abbe7dcd3c9dca6e24e81f5db89f4a9 100644 (file)
--- 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;
@@ -63,9 +61,8 @@ import org.jetbrains.annotations.NotNull;
 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 +79,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 +93,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 +103,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) {
@@ -132,7 +125,7 @@ public class ProfileDetailFragment extends Fragment {
                 ArrayList<MobileLedgerProfile> 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));
                 }
@@ -157,7 +150,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;
     }
@@ -173,10 +166,10 @@ 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) {
+    private void hookTextChangeSyncRoutine(TextView view, TextChangeSyncRoutine syncRoutine) {
         view.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
@@ -242,34 +235,37 @@ 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(
                 (buttonView, isChecked) -> model.setShowCommodityByDefault(isChecked));
         model.observeShowCommodityByDefault(viewLifecycleOwner, showCommodityByDefault::setChecked);
 
+        View postingSubItems = context.findViewById(R.id.posting_sub_items);
+
         Switch postingPermitted = context.findViewById(R.id.profile_permit_posting);
         model.observePostingPermitted(viewLifecycleOwner, isChecked -> {
             postingPermitted.setChecked(isChecked);
-            defaultCommodityLayout.setVisibility(isChecked ? View.VISIBLE : View.GONE);
-            showCommodityByDefault.setVisibility(isChecked ? View.VISIBLE : View.GONE);
-            preferredAccountsFilterLayout.setVisibility(isChecked ? View.VISIBLE : View.GONE);
-            futureDatesLayout.setVisibility(isChecked ? View.VISIBLE : View.GONE);
+            postingSubItems.setVisibility(isChecked ? View.VISIBLE : View.GONE);
         });
         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 -> {
@@ -286,9 +282,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);
@@ -321,12 +316,14 @@ public class ProfileDetailFragment extends Fragment {
         useAuthentication = context.findViewById(R.id.enable_http_auth);
         useAuthentication.setOnCheckedChangeListener((buttonView, isChecked) -> {
             model.setUseAuthentication(isChecked);
-            authParams.setVisibility(isChecked ? View.VISIBLE : View.GONE);
             if (isChecked)
                 userName.requestFocus();
+        });
+        model.observeUseAuthentication(viewLifecycleOwner, isChecked -> {
+            useAuthentication.setChecked(isChecked);
+            authParams.setVisibility(isChecked ? View.VISIBLE : View.GONE);
             checkInsecureSchemeWithAuth();
         });
-        model.observeUseAuthentication(viewLifecycleOwner, useAuthentication::setChecked);
 
         userName = context.findViewById(R.id.auth_user_name);
         model.observeUserName(viewLifecycleOwner, text -> {
@@ -358,8 +355,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);
 
@@ -385,9 +380,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);
         });
@@ -418,7 +412,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())
@@ -434,7 +428,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<MobileLedgerProfile> profiles = Data.profiles.getValue();
@@ -447,19 +441,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;
 
@@ -587,9 +575,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);
     }
 }