Use android:title as color picker dialog title (#50)

* Enabled multidex * Used PreferenceFragmentCompat Used PreferenceFragmentCompat instead of Preference. This will also made the library works well with AppCompat and AndroidX * Use android:title as dialog title
attenzione · Apr 14, 2020 · e7ba5e6 · e7ba5e6
1 parent a35fc0d
commit e7ba5e6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/...ckerPreference/src/main/java/net/margaritov/preference/colorpicker/ColorPickerDialog.java b/...ckerPreference/src/main/java/net/margaritov/preference/colorpicker/ColorPickerDialog.java
@@ -16,7 +16,6 @@
 
 package net.margaritov.preference.colorpicker;
 
-import android.app.Dialog;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
@@ -34,11 +33,13 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatDialog;
+
 import java.util.Locale;
 
 public class ColorPickerDialog
         extends
-        Dialog
+        AppCompatDialog
         implements
         ColorPickerView.OnColorChangedListener,
         View.OnClickListener, ViewTreeObserver.OnGlobalLayoutListener {
@@ -56,6 +57,8 @@ public class ColorPickerDialog
     private int mOrientation;
     private View mLayout;
 
+    private String mTitle;
+
     @Override
     public void onGlobalLayout() {
         if (getContext().getResources().getConfiguration().orientation != mOrientation) {
@@ -72,9 +75,10 @@ public interface OnColorChangedListener {
         public void onColorChanged(int color);
     }
 
-    public ColorPickerDialog(Context context, int initialColor) {
+    public ColorPickerDialog(Context context, int initialColor, String title) {
         super(context);
 
+        mTitle = title;
         init(initialColor);
     }
 
@@ -96,7 +100,7 @@ private void setUp(int color) {
         mOrientation = getContext().getResources().getConfiguration().orientation;
         setContentView(mLayout);
 
-        setTitle(R.string.dialog_color_picker);
+        setTitle(mTitle);
 
         mColorPicker = (ColorPickerView) mLayout.findViewById(R.id.color_picker_view);
         mOldColor = (ColorPickerPanelView) mLayout.findViewById(R.id.old_color_panel);

diff --git a/...Preference/src/main/java/net/margaritov/preference/colorpicker/ColorPickerPreference.java b/...Preference/src/main/java/net/margaritov/preference/colorpicker/ColorPickerPreference.java
@@ -169,7 +169,7 @@ public boolean onPreferenceClick(Preference preference) {
     }
 
     protected void showDialog(Bundle state) {
-        mDialog = new ColorPickerDialog(getContext(), mValue);
+        mDialog = new ColorPickerDialog(getContext(), mValue, getTitle().toString());
         mDialog.setOnColorChangedListener(this);
         if (mAlphaSliderEnabled) {
             mDialog.setAlphaSliderVisible(true);