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=57fe6b995267b9a7d5c8f5495544f0f0ef7ceb1e;hp=0288378393766a3331270154616079a0ecb3d937;hb=83cac114e375728080194fb09758b49c50a8119b;hpb=0e2937f7e472c52675d47ff7a5dcb214adbeb35d
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..57fe6b99 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,30 +1,24 @@
/*
* 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.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;
@@ -38,18 +32,29 @@ import android.widget.LinearLayout;
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.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 java.util.Objects;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
/**
* 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.
@@ -71,7 +76,7 @@ public class ProfileDetailFragment extends Fragment {
private TextInputLayout passwordLayout;
private TextView profileName;
private TextInputLayout profileNameLayout;
- private FloatingActionButton fab;
+ private View huePickerView;
/**
* Mandatory empty constructor for the fragment manager to instantiate the
@@ -120,7 +125,7 @@ public class ProfileDetailFragment extends Fragment {
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;
@@ -131,6 +136,8 @@ public class ProfileDetailFragment extends Fragment {
mProfile.setAuthEnabled(useAuthentication.isChecked());
mProfile.setAuthUserName(userName.getText());
mProfile.setAuthPassword(password.getText());
+ mProfile.setThemeId(huePickerView.getTag());
+// Log.d("profiles", String.format("Selected item is %d", mProfile.getThemeId()));
mProfile.storeInDB();
Log.d("profiles", "profile stored in DB");
Data.profiles.triggerItemChangedNotification(mProfile);
@@ -142,15 +149,16 @@ public class ProfileDetailFragment extends Fragment {
}
}
else {
- mProfile = new MobileLedgerProfile(profileName.getText(), postingPermitted.isChecked(),
- url.getText(), useAuthentication.isChecked(), userName.getText(),
- password.getText());
+ 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();
// 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();
@@ -175,6 +183,7 @@ public class ProfileDetailFragment extends Fragment {
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);
useAuthentication.setOnCheckedChangeListener((buttonView, isChecked) -> {
Log.d("profiles", isChecked ? "auth enabled " : "auth disabled");
@@ -187,6 +196,7 @@ public class ProfileDetailFragment extends Fragment {
hookClearErrorOnFocusListener(userName, userNameLayout);
hookClearErrorOnFocusListener(password, passwordLayout);
+ int profileThemeId;
if (mProfile != null) {
profileName.setText(mProfile.getName());
postingPermitted.setChecked(mProfile.isPostingPermitted());
@@ -195,6 +205,7 @@ public class ProfileDetailFragment extends Fragment {
authParams.setVisibility(mProfile.isAuthEnabled() ? View.VISIBLE : View.GONE);
userName.setText(mProfile.isAuthEnabled() ? mProfile.getAuthUserName() : "");
password.setText(mProfile.isAuthEnabled() ? mProfile.getAuthPassword() : "");
+ profileThemeId = mProfile.getThemeId();
}
else {
profileName.setText("");
@@ -204,8 +215,20 @@ public class ProfileDetailFragment extends Fragment {
authParams.setVisibility(View.GONE);
userName.setText("");
password.setText("");
+ 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()), hue);
+ d.show();
+ d.setColorSelectedListener(this);
+ });
return rootView;
}
private void hookClearErrorOnFocusListener(TextView view, TextInputLayout layout) {
@@ -225,7 +248,7 @@ public class ProfileDetailFragment extends Fragment {
}
});
}
- boolean checkValidity() {
+ private boolean checkValidity() {
boolean valid = true;
String val = String.valueOf(profileName.getText());
@@ -257,4 +280,9 @@ public class ProfileDetailFragment extends Fragment {
return valid;
}
+ @Override
+ public void onHueSelected(int hue) {
+ huePickerView.setBackgroundColor(Colors.getPrimaryColorForHue(hue));
+ huePickerView.setTag(hue);
+ }
}