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=a4dd025c5ba67b3952b34023ce9081fb2d2b772e;hp=b66cc053a6b51823f4425df257050205b6845376;hb=b90ee9f0732b38a4ca35265ff68ad69353330f05;hpb=e809f9bacb61890374d1b9c8c46edeaed8a838b0
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 b66cc053..a4dd025c 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,29 +1,35 @@
/*
* 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.content.Context;
+import android.os.Build;
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;
@@ -31,14 +37,23 @@ 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 net.ktnx.mobileledger.R;
import net.ktnx.mobileledger.model.Data;
import net.ktnx.mobileledger.model.MobileLedgerProfile;
+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.List;
/**
* A fragment representing a single Profile detail screen.
@@ -58,12 +73,18 @@ public class ProfileDetailFragment extends Fragment {
*/
private MobileLedgerProfile mProfile;
private TextView url;
+ private Switch postingPermitted;
+ private TextInputLayout urlLayout;
private LinearLayout authParams;
private Switch useAuthentication;
private TextView userName;
+ private TextInputLayout userNameLayout;
private TextView password;
- private FloatingActionButton fab;
+ private TextInputLayout passwordLayout;
private TextView profileName;
+ private TextInputLayout profileNameLayout;
+ private FloatingActionButton fab;
+ private Spinner colorSpinner;
/**
* Mandatory empty constructor for the fragment manager to instantiate the
@@ -94,9 +115,6 @@ public class ProfileDetailFragment extends Fragment {
super.onCreate(savedInstanceState);
if ((getArguments() != null) && getArguments().containsKey(ARG_ITEM_ID)) {
- // Load the dummy content specified by the fragment
- // arguments. In a real-world scenario, use a Loader
- // to load content from a content provider.
int index = getArguments().getInt(ARG_ITEM_ID, -1);
if (index != -1) mProfile = Data.profiles.get(index);
@@ -109,18 +127,25 @@ public class ProfileDetailFragment extends Fragment {
}
}
}
-
@Override
- public void onAttach(Context context) {
- super.onAttach(context);
- fab = ((Activity) context).findViewById(R.id.fab);
+ 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.setThemeId(colorSpinner.getSelectedItem());
+// Log.d("profiles", String.format("Selected item is %d", mProfile.getThemeId()));
mProfile.storeInDB();
Log.d("profiles", "profile stored in DB");
Data.profiles.triggerItemChangedNotification(mProfile);
@@ -132,16 +157,24 @@ public class ProfileDetailFragment extends Fragment {
}
}
else {
- mProfile = new MobileLedgerProfile(profileName.getText(), url.getText(),
- useAuthentication.isChecked(), userName.getText(), password.getText());
+ mProfile =
+ new MobileLedgerProfile(profileName.getText(), postingPermitted.isChecked(),
+ url.getText(), useAuthentication.isChecked(), userName.getText(),
+ password.getText(),
+ Integer.valueOf((String) colorSpinner.getSelectedItem()));
mProfile.storeInDB();
Data.profiles.add(mProfile);
MobileLedgerProfile.storeProfilesOrder();
+
+ // first profile ever?
+ if (Data.profiles.getList().size() == 1) Data.profile.set(mProfile);
}
Activity activity = getActivity();
if (activity != null) activity.finish();
});
+
+ profileName.requestFocus();
}
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
@@ -149,34 +182,192 @@ public class ProfileDetailFragment extends Fragment {
View rootView = inflater.inflate(R.layout.profile_detail, container, false);
profileName = rootView.findViewById(R.id.profile_name);
+ profileNameLayout = rootView.findViewById(R.id.profile_name_layout);
url = rootView.findViewById(R.id.url);
+ urlLayout = rootView.findViewById(R.id.url_layout);
+ postingPermitted = rootView.findViewById(R.id.profile_permit_posting);
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);
+ colorSpinner = rootView.findViewById(R.id.colorSpinner);
+
+ ArrayAdapter 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);
+// }
+// }
+ }
+ }
+ });
useAuthentication.setOnCheckedChangeListener((buttonView, isChecked) -> {
Log.d("profiles", isChecked ? "auth enabled " : "auth disabled");
authParams.setVisibility(isChecked ? View.VISIBLE : View.GONE);
+ if (isChecked) userName.requestFocus();
});
+ hookClearErrorOnFocusListener(profileName, profileNameLayout);
+ hookClearErrorOnFocusListener(url, urlLayout);
+ hookClearErrorOnFocusListener(userName, userNameLayout);
+ hookClearErrorOnFocusListener(password, passwordLayout);
+
if (mProfile != null) {
profileName.setText(mProfile.getName());
+ postingPermitted.setChecked(mProfile.isPostingPermitted());
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() : "");
+
+ 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++;
+ }
}
else {
profileName.setText("");
url.setText("");
+ postingPermitted.setChecked(true);
useAuthentication.setChecked(false);
authParams.setVisibility(View.GONE);
userName.setText("");
password.setText("");
+ colorSpinner.setSelection(0);
}
return rootView;
}
+ private void hookClearErrorOnFocusListener(TextView view, TextInputLayout layout) {
+ view.setOnFocusChangeListener((v, hasFocus) -> {
+ if (hasFocus) layout.setError(null);
+ });
+ view.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) {
+ layout.setError(null);
+ }
+ @Override
+ public void afterTextChanged(Editable s) {
+ }
+ });
+ }
+ boolean checkValidity() {
+ boolean valid = true;
+
+ String val = String.valueOf(profileName.getText());
+ 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()) {
+ valid = false;
+ urlLayout.setError(getResources().getText(R.string.err_profile_url_empty));
+ }
+ if (useAuthentication.isChecked()) {
+ val = String.valueOf(userName.getText());
+ if (val.trim().isEmpty()) {
+ valid = false;
+ userNameLayout
+ .setError(getResources().getText(R.string.err_profile_user_name_empty));
+ }
+
+ val = String.valueOf(password.getText());
+ if (val.trim().isEmpty()) {
+ valid = false;
+ passwordLayout
+ .setError(getResources().getText(R.string.err_profile_password_empty));
+ }
+ }
+
+ return valid;
+ }
+ private class ColorListAdapter extends ArrayAdapter {
+ 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 objects) {
+ super(context, resource, objects);
+ }
+ public ColorListAdapter(@NonNull Context context, int resource, int textViewResourceId,
+ @NonNull List 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;
+ }
+ }
}