X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;ds=inline;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfileDetailFragment.java;h=3f74bfa2f967c0764cacef978cb8e384d7668cc0;hb=9fc964d2191f987c6ba26274d9af005e944f2bfa;hp=0288378393766a3331270154616079a0ecb3d937;hpb=0e2937f7e472c52675d47ff7a5dcb214adbeb35d;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 02883783..3f74bfa2 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,33 +1,27 @@
/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * 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
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.ui.profiles;
import android.app.Activity;
+import android.app.AlertDialog;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.TextInputLayout;
-import android.support.v4.app.Fragment;
import android.text.Editable;
import android.text.TextWatcher;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -35,26 +29,50 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
+import android.widget.PopupMenu;
import android.widget.Switch;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
+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;
-import net.ktnx.mobileledger.ui.activity.ProfileListActivity;
+import net.ktnx.mobileledger.ui.HueRingDialog;
+import net.ktnx.mobileledger.ui.activity.ProfileDetailActivity;
+import net.ktnx.mobileledger.utils.Colors;
+
+import org.jetbrains.annotations.NonNls;
+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.Logger.debug;
/**
* A fragment representing a single Profile detail screen.
- * This fragment is either contained in a {@link ProfileListActivity}
- * in two-pane mode (on tablets) or a {@link ProfileDetailActivity}
+ * a {@link ProfileDetailActivity}
* on handsets.
*/
-public class ProfileDetailFragment extends Fragment {
+public class ProfileDetailFragment extends Fragment implements HueRingDialog.HueSelectedListener {
/**
* The fragment argument representing the item ID that this fragment
* represents.
*/
public static final String ARG_ITEM_ID = "item_id";
+ @NonNls
+ private static final String HTTPS_URL_START = "https://";
/**
* The dummy content this fragment is presenting.
@@ -71,7 +89,13 @@ public class ProfileDetailFragment extends Fragment {
private TextInputLayout passwordLayout;
private TextView profileName;
private TextInputLayout profileNameLayout;
- private FloatingActionButton fab;
+ private TextView preferredAccountsFilter;
+ private TextInputLayout preferredAccountsFilterLayout;
+ private View huePickerView;
+ private View insecureWarningText;
+ private TextView futureDatesText;
+ private MobileLedgerProfile.FutureDates futureDates;
+ private View futureDatesLayout;
/**
* Mandatory empty constructor for the fragment manager to instantiate the
@@ -80,22 +104,68 @@ public class ProfileDetailFragment extends Fragment {
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);
menuDeleteProfile.setOnMenuItemClickListener(item -> {
- 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));
- }
+ 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.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();
+ if (profiles == null)
+ throw new AssertionError();
+ profiles.set(index, newProfile);
+
+ ProfilesRecyclerViewAdapter prva = ProfilesRecyclerViewAdapter.getInstance();
+ if (prva != null)
+ prva.notifyItemChanged(index);
+
+ if (mProfile.equals(Data.profile.getValue()))
+ Data.profile.setValue(newProfile);
}
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -103,14 +173,19 @@ public class ProfileDetailFragment extends Fragment {
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();
+ if (activity == null)
+ throw new AssertionError();
CollapsingToolbarLayout appBarLayout = activity.findViewById(R.id.toolbar_layout);
if (appBarLayout != null) {
- if (mProfile != null) appBarLayout.setTitle(mProfile.getName());
- else appBarLayout.setTitle(getResources().getString(R.string.new_profile_title));
+ if (mProfile != null)
+ appBarLayout.setTitle(mProfile.getName());
+ else
+ appBarLayout.setTitle(getResources().getString(R.string.new_profile_title));
}
}
}
@@ -118,47 +193,57 @@ public class ProfileDetailFragment extends Fragment {
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
Activity context = getActivity();
- if (context == null) return;
-
- fab = context.findViewById(R.id.fab);
- fab.setOnClickListener(v -> {
- if (!checkValidity()) return;
-
- if (mProfile != null) {
- mProfile.setName(profileName.getText());
- mProfile.setUrl(url.getText());
- mProfile.setPostingPermitted(postingPermitted.isChecked());
- mProfile.setAuthEnabled(useAuthentication.isChecked());
- mProfile.setAuthUserName(userName.getText());
- mProfile.setAuthPassword(password.getText());
- 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());
- mProfile.storeInDB();
- Data.profiles.add(mProfile);
- MobileLedgerProfile.storeProfilesOrder();
-
- // first profile ever?
- if (Data.profiles.getList().size() == 1) Data.profile.set(mProfile);
- }
+ if (context == null)
+ return;
- Activity activity = getActivity();
- if (activity != null) activity.finish();
- });
+ FloatingActionButton fab = context.findViewById(R.id.fab);
+ fab.setOnClickListener(v -> onSaveFabClicked());
profileName.requestFocus();
}
+ private void onSaveFabClicked() {
+ if (!checkValidity())
+ return;
+
+ 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();
+ if (profiles == null)
+ throw new AssertionError();
+ ArrayList newList = new ArrayList<>(profiles);
+ newList.add(mProfile);
+ Data.profiles.setValue(newList);
+ MobileLedgerProfile.storeProfilesOrder();
+
+ // first profile ever?
+ if (newList.size() == 1)
+ Data.profile.setValue(mProfile);
+ }
+
+ 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());
+ mProfile.setFutureDates(futureDates);
+ }
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
@@ -169,48 +254,177 @@ public class ProfileDetailFragment extends Fragment {
url = rootView.findViewById(R.id.url);
urlLayout = rootView.findViewById(R.id.url_layout);
postingPermitted = rootView.findViewById(R.id.profile_permit_posting);
+ futureDatesLayout = rootView.findViewById(R.id.future_dates_layout);
+ futureDatesText = rootView.findViewById(R.id.future_dates_text);
+ rootView.findViewById(R.id.future_dates_layout)
+ .setOnClickListener(v -> {
+ MenuInflater mi = new MenuInflater(getContext());
+ PopupMenu menu = new PopupMenu(getContext(), v);
+ menu.inflate(R.menu.future_dates);
+ menu.setOnMenuItemClickListener(item -> {
+ switch (item.getItemId()) {
+ case R.id.menu_future_dates_30:
+ futureDates = MobileLedgerProfile.FutureDates.OneMonth;
+ break;
+ case R.id.menu_future_dates_60:
+ futureDates = MobileLedgerProfile.FutureDates.TwoMonths;
+ break;
+ case R.id.menu_future_dates_90:
+ futureDates = MobileLedgerProfile.FutureDates.ThreeMonths;
+ break;
+ case R.id.menu_future_dates_180:
+ futureDates = MobileLedgerProfile.FutureDates.SixMonths;
+ break;
+ case R.id.menu_future_dates_365:
+ futureDates = MobileLedgerProfile.FutureDates.OneYear;
+ break;
+ case R.id.menu_future_dates_all:
+ futureDates = MobileLedgerProfile.FutureDates.All;
+ break;
+ default:
+ futureDates = MobileLedgerProfile.FutureDates.None;
+ }
+ futureDatesText.setText(futureDates.getText(getResources()));
+ return true;
+ });
+ menu.show();
+ });
authParams = rootView.findViewById(R.id.auth_params);
useAuthentication = rootView.findViewById(R.id.enable_http_auth);
userName = rootView.findViewById(R.id.auth_user_name);
userNameLayout = rootView.findViewById(R.id.auth_user_name_layout);
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);
+ insecureWarningText = rootView.findViewById(R.id.insecure_scheme_text);
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();
+ if (isChecked)
+ userName.requestFocus();
+ checkInsecureSchemeWithAuth();
});
+ postingPermitted.setOnCheckedChangeListener(((buttonView, isChecked) -> {
+ preferredAccountsFilterLayout.setVisibility(isChecked ? View.VISIBLE : View.GONE);
+ futureDatesLayout.setVisibility(isChecked ? View.VISIBLE : View.GONE);
+ }));
+
hookClearErrorOnFocusListener(profileName, profileNameLayout);
hookClearErrorOnFocusListener(url, urlLayout);
hookClearErrorOnFocusListener(userName, userNameLayout);
hookClearErrorOnFocusListener(password, passwordLayout);
+ int profileThemeId;
if (mProfile != null) {
profileName.setText(mProfile.getName());
postingPermitted.setChecked(mProfile.isPostingPermitted());
+ futureDates = mProfile.getFutureDates();
+ futureDatesText.setText(futureDates.getText(getResources()));
url.setText(mProfile.getUrl());
useAuthentication.setChecked(mProfile.isAuthEnabled());
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 {
profileName.setText("");
- url.setText("");
+ url.setText(HTTPS_URL_START);
postingPermitted.setChecked(true);
+ futureDates = MobileLedgerProfile.FutureDates.None;
+ futureDatesText.setText(futureDates.getText(getResources()));
useAuthentication.setChecked(false);
authParams.setVisibility(View.GONE);
userName.setText("");
password.setText("");
+ preferredAccountsFilter.setText(null);
+ profileThemeId = -1;
}
+ checkInsecureSchemeWithAuth();
+
+ url.addTextChangedListener(new TextWatcher() {
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+ }
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+ }
+ @Override
+ public void afterTextChanged(Editable s) {
+ checkInsecureSchemeWithAuth();
+ }
+ });
+
+ final int hue = (profileThemeId == -1) ? Colors.DEFAULT_HUE_DEG : profileThemeId;
+ final int profileColor = Colors.getPrimaryColorForHue(hue);
+
+ huePickerView.setBackgroundColor(profileColor);
+ huePickerView.setTag(profileThemeId);
+ huePickerView.setOnClickListener(v -> {
+ HueRingDialog d = new HueRingDialog(
+ Objects.requireNonNull(ProfileDetailFragment.this.getContext()), profileThemeId,
+ (Integer) v.getTag());
+ d.show();
+ d.setColorSelectedListener(this);
+ });
return rootView;
}
+ private boolean checkUrlValidity() {
+ boolean valid = true;
+
+ String val = String.valueOf(url.getText())
+ .trim();
+ if (val.isEmpty()) {
+ valid = false;
+ urlLayout.setError(getResources().getText(R.string.err_profile_url_empty));
+ }
+ try {
+ URL url = new URL(val);
+ String host = url.getHost();
+ if (host == null || host.isEmpty())
+ throw new MalformedURLException("Missing host");
+ String protocol = url.getProtocol()
+ .toUpperCase();
+ if (!protocol.equals("HTTP") && !protocol.equals("HTTPS")) {
+ valid = false;
+ urlLayout.setError(getResources().getText(R.string.err_invalid_url));
+ }
+ }
+ catch (MalformedURLException e) {
+ valid = false;
+ urlLayout.setError(getResources().getText(R.string.err_invalid_url));
+ }
+
+ return valid;
+ }
+ private void checkInsecureSchemeWithAuth() {
+ boolean showWarning = false;
+
+ if (useAuthentication.isChecked()) {
+ String urlText = url.getText()
+ .toString();
+ if (urlText.startsWith("http") && !urlText.startsWith("https"))
+ showWarning = true;
+ }
+
+ if (showWarning)
+ insecureWarningText.setVisibility(View.VISIBLE);
+ else
+ insecureWarningText.setVisibility(View.GONE);
+ }
private void hookClearErrorOnFocusListener(TextView view, TextInputLayout layout) {
view.setOnFocusChangeListener((v, hasFocus) -> {
- if (hasFocus) layout.setError(null);
+ if (hasFocus)
+ layout.setError(null);
});
view.addTextChangedListener(new TextWatcher() {
@Override
@@ -225,36 +439,45 @@ public class ProfileDetailFragment extends Fragment {
}
});
}
- boolean checkValidity() {
+ private boolean checkValidity() {
boolean valid = true;
String val = String.valueOf(profileName.getText());
- if (val.trim().isEmpty()) {
+ if (val.trim()
+ .isEmpty())
+ {
valid = false;
profileNameLayout.setError(getResources().getText(R.string.err_profile_name_empty));
}
- val = String.valueOf(url.getText());
- if (val.trim().isEmpty()) {
+ if (!checkUrlValidity())
valid = false;
- urlLayout.setError(getResources().getText(R.string.err_profile_url_empty));
- }
+
if (useAuthentication.isChecked()) {
val = String.valueOf(userName.getText());
- if (val.trim().isEmpty()) {
+ if (val.trim()
+ .isEmpty())
+ {
valid = false;
- userNameLayout
- .setError(getResources().getText(R.string.err_profile_user_name_empty));
+ userNameLayout.setError(
+ getResources().getText(R.string.err_profile_user_name_empty));
}
val = String.valueOf(password.getText());
- if (val.trim().isEmpty()) {
+ if (val.trim()
+ .isEmpty())
+ {
valid = false;
- passwordLayout
- .setError(getResources().getText(R.string.err_profile_password_empty));
+ passwordLayout.setError(
+ getResources().getText(R.string.err_profile_password_empty));
}
}
return valid;
}
+ @Override
+ public void onHueSelected(int hue) {
+ huePickerView.setBackgroundColor(Colors.getPrimaryColorForHue(hue));
+ huePickerView.setTag(hue);
+ }
}