fix profile color selector

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / profiles / ProfileDetailFragment.java

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 a4dd025c5ba67b3952b34023ce9081fb2d2b772e..59f27a7906798d7bae098eb68ba9cf0f5ab1bb9f 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
@@ -19,15 +19,8 @@ package net.ktnx.mobileledger.ui.profiles;
 
 import android.app.Activity;
 import android.content.Context;
-import android.os.Build;
+import android.graphics.drawable.ColorDrawable;
 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;
@@ -44,21 +37,26 @@ 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.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;
 
+import androidx.annotation.ColorInt;
+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 {
@@ -194,11 +192,12 @@ public class ProfileDetailFragment extends Fragment {
         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);
+        ColorListAdapter adapter =
+                new ColorListAdapter(rootView.getContext(), R.layout.color_selector_item);
+        adapter.add(-1);
+        for (int i = 0; i < 360; i += 15) adapter.add(i);
+        Log.d("profiles", String.format("color count: %s", adapter.getCount()));
+//        adapter.setDropDownViewResource(R.layout.color_selector_item);
         colorSpinner.setAdapter(adapter);
         colorSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
@@ -208,17 +207,9 @@ public class ProfileDetailFragment extends Fragment {
             @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)));
+                final int degrees = (Integer) 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);
-                    }
+                    primaryColor = Colors.getPrimaryColorForHue(Colors.DEFAULT_HUE_DEG);
                 }
                 else primaryColor = Colors.getPrimaryColorForHue(degrees);
 
@@ -332,41 +323,42 @@ public class ProfileDetailFragment extends Fragment {
 
         return valid;
     }
-    private class ColorListAdapter extends ArrayAdapter<String> {
+    private class ColorListAdapter extends ArrayAdapter<Integer> {
         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) {
+        public ColorListAdapter(@NonNull Context context, int resource,
+                                @NonNull Integer[] objects) {
             super(context, resource, objects);
         }
         public ColorListAdapter(@NonNull Context context, int resource, int textViewResourceId,
-                                @NonNull String[] objects) {
+                                @NonNull Integer[] objects) {
             super(context, resource, textViewResourceId, objects);
         }
         public ColorListAdapter(@NonNull Context context, int resource,
-                                @NonNull List<String> objects) {
+                                @NonNull List<Integer> objects) {
             super(context, resource, objects);
         }
         public ColorListAdapter(@NonNull Context context, int resource, int textViewResourceId,
-                                @NonNull List<String> objects) {
+                                @NonNull List<Integer> 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);
+        public @NonNull
+        View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+            Integer hueDeg = getItem(position);
+            int hue = ((hueDeg == null) || (hueDeg == -1)) ? Colors.DEFAULT_HUE_DEG : hueDeg;
             @ColorInt int primaryColor = Colors.getPrimaryColorForHue(hue);
 
             View view = convertView;
             if (convertView == null) {
-                view = getLayoutInflater().inflate(R.layout.color_selector_item, parent);
+                view = getLayoutInflater().inflate(R.layout.color_selector_item, null);
             }
 
-            view.setBackgroundColor(primaryColor);
+            view.setBackground(new ColorDrawable(primaryColor));
             return view;
         }
     }