package net.ktnx.mobileledger.ui.profiles;
import android.app.Activity;
-import android.content.Context;
-import android.os.Build;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
import android.os.Bundle;
-import android.support.annotation.ColorInt;
-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;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
import android.widget.LinearLayout;
-import android.widget.Spinner;
import android.widget.Switch;
import android.widget.TextView;
+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.HueRingDialog;
import net.ktnx.mobileledger.ui.activity.ProfileDetailActivity;
-import net.ktnx.mobileledger.ui.activity.ProfileListActivity;
import net.ktnx.mobileledger.utils.Colors;
-import org.jetbrains.annotations.NotNull;
+import java.util.Objects;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
-import java.util.List;
+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.
private TextInputLayout passwordLayout;
private TextView profileName;
private TextInputLayout profileNameLayout;
- private FloatingActionButton fab;
- private Spinner colorSpinner;
+ private TextView preferredAccountsFilter;
+ private TextInputLayout preferredAccountsFilterLayout;
+ private View huePickerView;
/**
* Mandatory empty constructor for the fragment manager to instantiate the
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- Log.d("profiles", "[fragment] Creating profile details options menu");
+ 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, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ debug("profiles",
+ String.format("[fragment] removing profile %s", mProfile.getUuid()));
+ mProfile.removeFromDB();
+ Data.profiles.remove(mProfile);
+ if (Data.profile.get().equals(mProfile)) {
+ debug("profiles", "[fragment] setting current profile to 0");
+ Data.setCurrentProfile(Data.profiles.get(0));
+ }
+ getActivity().finish();
+ }
+ });
+ builder.show();
return false;
});
menuDeleteProfile.setVisible((mProfile != null) && (Data.profiles.size() > 1));
+
+ if (BuildConfig.DEBUG) {
+ final MenuItem menuWipeProfileData = menu.findItem(R.id.menuWipeData);
+ menuWipeProfileData.setOnMenuItemClickListener(this::onWipeDataMenuClicked);
+ menuWipeProfileData.setVisible(mProfile != null);
+ }
+ }
+ private boolean onWipeDataMenuClicked(MenuItem item) {
+ // this is a development option, so no confirmation
+ mProfile.wipeAllData();
+ Data.profile.forceNotifyObservers();
+ return true;
}
@Override
public void onCreate(Bundle savedInstanceState) {
Activity context = getActivity();
if (context == null) return;
- fab = context.findViewById(R.id.fab);
+ FloatingActionButton 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.setThemeId(colorSpinner.getSelectedItem());
-// Log.d("profiles", String.format("Selected item is %d", mProfile.getThemeId()));
+ updateProfileFromUI();
+// debug("profiles", String.format("Selected item is %d", mProfile.getThemeId()));
mProfile.storeInDB();
- Log.d("profiles", "profile stored in DB");
+ debug("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);
+ Data.profile.forceNotifyObservers();
}
}
else {
- mProfile =
- new MobileLedgerProfile(profileName.getText(), postingPermitted.isChecked(),
- url.getText(), useAuthentication.isChecked(), userName.getText(),
- password.getText(),
- Integer.valueOf((String) colorSpinner.getSelectedItem()));
+ mProfile = new MobileLedgerProfile();
+ updateProfileFromUI();
mProfile.storeInDB();
Data.profiles.add(mProfile);
MobileLedgerProfile.storeProfilesOrder();
// first profile ever?
- if (Data.profiles.getList().size() == 1) Data.profile.set(mProfile);
+ if (Data.profiles.size() == 1) Data.profile.set(mProfile);
}
Activity activity = getActivity();
profileName.requestFocus();
}
+ 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) {
userNameLayout = rootView.findViewById(R.id.auth_user_name_layout);
password = rootView.findViewById(R.id.password);
passwordLayout = rootView.findViewById(R.id.password_layout);
- colorSpinner = rootView.findViewById(R.id.colorSpinner);
-
- ArrayAdapter<CharSequence> adapter = ColorListAdapter
- .createFromResource(rootView.getContext(), R.array.profile_colors,
- R.layout.color_selector_item);
-// Log.d("profiles", String.format("color count: %s", adapter.getCount()));
- adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
- colorSpinner.setAdapter(adapter);
- colorSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
- @Override
- public void onNothingSelected(AdapterView<?> parent) {
-
- }
- @Override
- public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
- final int primaryColor;
- final int degrees =
- Integer.valueOf((String) (parent.getAdapter().getItem(position)));
- if (degrees < 0) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
- if (getActivity() != null) primaryColor = getResources()
- .getColor(R.color.colorPrimary, getActivity().getTheme());
- else primaryColor = Colors.getPrimaryColorForHue(Colors.DEFAULT_HUE_DEG);
- }
- else {
- primaryColor = getResources().getColor(R.color.colorPrimary);
- }
- }
- else primaryColor = Colors.getPrimaryColorForHue(degrees);
-
- if (colorSpinner != null) {
- colorSpinner.setBackgroundColor(primaryColor);
-// for (int i = 0; i < colorSpinner.getChildCount(); i++) {
-// View v = colorSpinner.getChildAt(i);
-//
-// if (v instanceof TextView) {
-// ((TextView) v).setTextColor(Color.TRANSPARENT);
-// }
-// }
- }
- }
- });
+ 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);
hookClearErrorOnFocusListener(password, passwordLayout);
+ int profileThemeId;
if (mProfile != null) {
profileName.setText(mProfile.getName());
postingPermitted.setChecked(mProfile.isPostingPermitted());
authParams.setVisibility(mProfile.isAuthEnabled() ? View.VISIBLE : View.GONE);
userName.setText(mProfile.isAuthEnabled() ? mProfile.getAuthUserName() : "");
password.setText(mProfile.isAuthEnabled() ? mProfile.getAuthPassword() : "");
-
- colorSpinner.setSelection(0);
- int i = 0;
- int sought = mProfile.getThemeId();
-// Log.d("profiles", String.format("Looking for %d",sought));
- while (i < adapter.getCount()) {
- int item = Integer.valueOf(String.valueOf(adapter.getItem(i)));
-// Log.d("profiles", String.format("Item %d is %d", i, item));
- if (item == sought) {
- colorSpinner.setSelection(i);
- break;
- }
-
- i++;
- }
+ preferredAccountsFilter.setText(mProfile.getPreferredAccountsFilter());
+ profileThemeId = mProfile.getThemeId();
}
else {
profileName.setText("");
- url.setText("");
+ url.setText("https://");
postingPermitted.setChecked(true);
useAuthentication.setChecked(false);
authParams.setVisibility(View.GONE);
userName.setText("");
password.setText("");
- colorSpinner.setSelection(0);
+ preferredAccountsFilter.setText(null);
+ profileThemeId = -1;
}
+ 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 void hookClearErrorOnFocusListener(TextView view, TextInputLayout layout) {
}
});
}
- boolean checkValidity() {
+ private boolean checkValidity() {
boolean valid = true;
String val = String.valueOf(profileName.getText());
return valid;
}
- private class ColorListAdapter extends ArrayAdapter<String> {
- public ColorListAdapter(@NonNull Context context, int resource) {
- super(context, resource);
- }
- public ColorListAdapter(@NonNull Context context, int resource, int textViewResourceId) {
- super(context, resource, textViewResourceId);
- }
- public ColorListAdapter(@NonNull Context context, int resource, @NonNull String[] objects) {
- super(context, resource, objects);
- }
- public ColorListAdapter(@NonNull Context context, int resource, int textViewResourceId,
- @NonNull String[] objects) {
- super(context, resource, textViewResourceId, objects);
- }
- public ColorListAdapter(@NonNull Context context, int resource,
- @NonNull List<String> objects) {
- super(context, resource, objects);
- }
- public ColorListAdapter(@NonNull Context context, int resource, int textViewResourceId,
- @NonNull List<String> objects) {
- super(context, resource, textViewResourceId, objects);
- }
- @NotNull
- @Override
- public View getView(int position, View convertView, @NotNull ViewGroup parent) {
- String hueStr = getItem(position);
- int hue = (hueStr == null) ? -1 : Integer.valueOf(hueStr);
- @ColorInt int primaryColor = Colors.getPrimaryColorForHue(hue);
-
- View view = convertView;
- if (convertView == null) {
- view = getLayoutInflater().inflate(R.layout.color_selector_item, parent);
- }
-
- view.setBackgroundColor(primaryColor);
- return view;
- }
+ @Override
+ public void onHueSelected(int hue) {
+ huePickerView.setBackgroundColor(Colors.getPrimaryColorForHue(hue));
+ huePickerView.setTag(hue);
}
}
projects / mobile-ledger.git / blobdiff