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=0843dc29eb56ba145e46a7a93bb1b34348a33af3;hp=2d58e40b76b861ccbe91755d6446415e7b7e29e8;hb=0fc2ddc465cd9b9314ae336e69535020a96a7fbc;hpb=47db6d25a06cc89d721f59a01cf47befa5d02fd2 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 2d58e40b..0843dc29 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,7 +23,6 @@ import android.content.DialogInterface; import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; -import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -38,6 +37,7 @@ 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.model.Data; import net.ktnx.mobileledger.model.MobileLedgerProfile; @@ -45,11 +45,17 @@ import net.ktnx.mobileledger.ui.HueRingDialog; import net.ktnx.mobileledger.ui.activity.ProfileDetailActivity; import net.ktnx.mobileledger.utils.Colors; +import org.jetbrains.annotations.NotNull; + +import java.util.ArrayList; import java.util.Objects; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; + +import static net.ktnx.mobileledger.utils.Logger.debug; /** * A fragment representing a single Profile detail screen. @@ -78,6 +84,8 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue private TextInputLayout passwordLayout; private TextView profileName; private TextInputLayout profileNameLayout; + private TextView preferredAccountsFilter; + private TextInputLayout preferredAccountsFilterLayout; private View huePickerView; /** @@ -87,8 +95,8 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue public ProfileDetailFragment() { } @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - Log.d("profiles", "[fragment] Creating profile details options menu"); + public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull MenuInflater inflater) { + debug("profiles", "[fragment] Creating profile details options menu"); super.onCreateOptionsMenu(menu, inflater); inflater.inflate(R.menu.profile_details, menu); final MenuItem menuDeleteProfile = menu.findItem(R.id.menuDelete); @@ -96,23 +104,49 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); builder.setTitle(mProfile.getName()); builder.setMessage(R.string.remove_profile_dialog_message); - builder.setPositiveButton(R.string.Remove, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - Log.d("profiles", String.format("[fragment] removing profile %s", mProfile.getUuid())); - mProfile.removeFromDB(); - Data.profiles.remove(mProfile); - if (Data.profile.get().equals(mProfile)) { - Log.d("profiles", "[fragment] setting current profile to 0"); - Data.setCurrentProfile(Data.profiles.get(0)); - } - getActivity().finish(); + builder.setPositiveButton(R.string.Remove, (dialog, which) -> { + debug("profiles", + String.format("[fragment] removing profile %s", mProfile.getUuid())); + mProfile.removeFromDB(); + ArrayList oldList = Data.profiles.getValue(); + assert oldList != null; + ArrayList newList = + (ArrayList) oldList.clone(); + 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.setVisible((mProfile != null) && (Data.profiles.size() > 1)); + 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); + menuWipeProfileData.setOnMenuItemClickListener(ignored -> onWipeDataMenuClicked()); + menuWipeProfileData.setVisible(mProfile != null); + } + } + private boolean onWipeDataMenuClicked() { + // this is a development option, so no confirmation + mProfile.wipeAllData(); + if (mProfile.equals(Data.profile.getValue())) triggerProfileChange(); + return true; + } + private void triggerProfileChange() { + int index = Data.getProfileIndex(mProfile); + MobileLedgerProfile newProfile = new MobileLedgerProfile(mProfile); + final ArrayList profiles = Data.profiles.getValue(); + assert profiles != null; + profiles.set(index, newProfile); + if (mProfile.equals(Data.profile.getValue())) Data.profile.setValue(newProfile); } @Override public void onCreate(Bundle savedInstanceState) { @@ -120,7 +154,9 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue if ((getArguments() != null) && getArguments().containsKey(ARG_ITEM_ID)) { int index = getArguments().getInt(ARG_ITEM_ID, -1); - if (index != -1) mProfile = Data.profiles.get(index); + 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(); @@ -138,49 +174,49 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue if (context == null) return; FloatingActionButton fab = context.findViewById(R.id.fab); - fab.setOnClickListener(v -> { - if (!checkValidity()) return; + fab.setOnClickListener(v -> onSaveFabClicked()); - if (mProfile != null) { - updateProfileFromUI(); -// Log.d("profiles", String.format("Selected item is %d", mProfile.getThemeId())); - mProfile.storeInDB(); - Log.d("profiles", "profile stored in DB"); - Data.profiles.triggerItemChangedNotification(mProfile); - - - if (mProfile.getUuid().equals(Data.profile.get().getUuid())) { - // dummy update to notify the observers of the possibly new name/URL - Data.profile.set(mProfile); - } - } - else { - mProfile = - new MobileLedgerProfile(profileName.getText(), postingPermitted.isChecked(), - url.getText(), useAuthentication.isChecked(), userName.getText(), - password.getText(), (int) huePickerView.getTag()); - mProfile.storeInDB(); - Data.profiles.add(mProfile); - MobileLedgerProfile.storeProfilesOrder(); + profileName.requestFocus(); + } + private void onSaveFabClicked() { + if (!checkValidity()) return; - // first profile ever? - if (Data.profiles.size() == 1) Data.profile.set(mProfile); - } + if (mProfile != null) { + updateProfileFromUI(); +// debug("profiles", String.format("Selected item is %d", mProfile.getThemeId())); + mProfile.storeInDB(); + debug("profiles", "profile stored in DB"); + triggerProfileChange(); + } + else { + mProfile = new MobileLedgerProfile(); + updateProfileFromUI(); + mProfile.storeInDB(); + final ArrayList profiles = Data.profiles.getValue(); + assert profiles != null; + ArrayList newList = + (ArrayList) profiles.clone(); + newList.add(mProfile); + Data.profiles.setValue(newList); + MobileLedgerProfile.storeProfilesOrder(); - Activity activity = getActivity(); - if (activity != null) activity.finish(); - }); + // first profile ever? + if (newList.size() == 1) Data.profile.setValue(mProfile); + } - profileName.requestFocus(); + 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()); + } @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -198,13 +234,20 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue password = rootView.findViewById(R.id.password); passwordLayout = rootView.findViewById(R.id.password_layout); huePickerView = rootView.findViewById(R.id.btn_pick_ring_color); + preferredAccountsFilter = rootView.findViewById(R.id.preferred_accounts_filter_filter); + preferredAccountsFilterLayout = + rootView.findViewById(R.id.preferred_accounts_accounts_filter_layout); useAuthentication.setOnCheckedChangeListener((buttonView, isChecked) -> { - Log.d("profiles", isChecked ? "auth enabled " : "auth disabled"); + debug("profiles", isChecked ? "auth enabled " : "auth disabled"); authParams.setVisibility(isChecked ? View.VISIBLE : View.GONE); if (isChecked) userName.requestFocus(); }); + postingPermitted.setOnCheckedChangeListener(((buttonView, isChecked) -> { + preferredAccountsFilterLayout.setVisibility(isChecked ? View.VISIBLE : View.GONE); + })); + hookClearErrorOnFocusListener(profileName, profileNameLayout); hookClearErrorOnFocusListener(url, urlLayout); hookClearErrorOnFocusListener(userName, userNameLayout); @@ -219,6 +262,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue 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 { @@ -229,6 +273,7 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue authParams.setVisibility(View.GONE); userName.setText(""); password.setText(""); + preferredAccountsFilter.setText(null); profileThemeId = -1; } @@ -239,7 +284,8 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue huePickerView.setTag(profileThemeId); huePickerView.setOnClickListener(v -> { HueRingDialog d = new HueRingDialog( - Objects.requireNonNull(ProfileDetailFragment.this.getContext()), hue); + Objects.requireNonNull(ProfileDetailFragment.this.getContext()), + profileThemeId, (Integer) v.getTag()); d.show(); d.setColorSelectedListener(this); });