Fix color picker

2025-12-04 15:49:33 +01:00 · 2022-01-14 15:45:54 +01:00
parent bdc6a282e2
commit 3c49eb1635
5 changed files with 60 additions and 105 deletions
--- a/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt
@@ -339,12 +339,13 @@ class NestedDatabaseSettingsFragment : NestedSettingsFragment(), DatabaseRetriev
        }
    }

-    private val colorSelectedListener: ((Boolean, Int)-> Unit) = { enable, color ->
-        dbCustomColorPref?.summary = ChromaUtil.getFormattedColorString(color, false)
-        if (enable) {
+    private val colorSelectedListener: ((Int?)-> Unit) = { color ->
+        if (color != null) {
            dbCustomColorPref?.color = color
+            dbCustomColorPref?.summary = ChromaUtil.getFormattedColorString(color, false)
        } else {
            dbCustomColorPref?.color = DialogColorPreference.DISABLE_COLOR
+            dbCustomColorPref?.summary = ""
        }
    }

--- a/app/src/main/java/com/kunzisoft/keepass/settings/preference/DialogColorPreference.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/preference/DialogColorPreference.kt
@@ -41,7 +41,7 @@ class DialogColorPreference @JvmOverloads constructor(context: Context,
    }

    override fun getDialogLayoutResource(): Int {
-        return R.layout.pref_dialog_input_color
+        return R.layout.fragment_color_picker
    }

    companion object {
--- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseColorPreferenceDialogFragmentCompat.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/DatabaseColorPreferenceDialogFragmentCompat.kt
@@ -34,22 +34,53 @@ import com.kunzisoft.androidclearchroma.IndicatorMode
 import com.kunzisoft.androidclearchroma.colormode.ColorMode
 import com.kunzisoft.androidclearchroma.fragment.ChromaColorFragment
 import com.kunzisoft.androidclearchroma.fragment.ChromaColorFragment.*
+import com.kunzisoft.androidclearchroma.view.ChromaColorView
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.dialogs.ColorPickerDialogFragment
 import com.kunzisoft.keepass.database.element.Database

 class DatabaseColorPreferenceDialogFragmentCompat : DatabaseSavePreferenceDialogFragmentCompat() {

    private lateinit var rootView: View
    private lateinit var enableSwitchView: CompoundButton
-    private var chromaColorFragment: ChromaColorFragment? = null
+    private lateinit var chromaColorView: ChromaColorView

-    var onColorSelectedListener: ((enable: Boolean, color: Int) -> Unit)? = null
+    var onColorSelectedListener: ((color: Int?) -> Unit)? = null
+
+    private var mDefaultColor = Color.WHITE
+    private var mActivated = false

    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        val alertDialogBuilder = AlertDialog.Builder(requireActivity())

-        rootView = requireActivity().layoutInflater.inflate(R.layout.pref_dialog_input_color, null)
+        rootView = requireActivity().layoutInflater.inflate(R.layout.fragment_color_picker, null)
        enableSwitchView = rootView.findViewById(R.id.switch_element)
+        chromaColorView = rootView.findViewById(R.id.chroma_color_view)
+
+        if (savedInstanceState != null) {
+            if (savedInstanceState.containsKey(ARG_INITIAL_COLOR)) {
+                mDefaultColor = savedInstanceState.getInt(ARG_INITIAL_COLOR)
+            }
+            if (savedInstanceState.containsKey(ARG_ACTIVATED)) {
+                mActivated = savedInstanceState.getBoolean(ARG_ACTIVATED)
+            }
+        } else {
+            arguments?.apply {
+                if (containsKey(ARG_INITIAL_COLOR)) {
+                    mDefaultColor = getInt(ARG_INITIAL_COLOR)
+                }
+                if (containsKey(ARG_ACTIVATED)) {
+                    mActivated = getBoolean(ARG_ACTIVATED)
+                }
+            }
+        }
+        enableSwitchView.isChecked = mActivated
+        chromaColorView.currentColor = mDefaultColor
+
+        chromaColorView.setOnColorChangedListener {
+            if (!enableSwitchView.isChecked)
+                enableSwitchView.isChecked = true
+        }

        alertDialogBuilder.setPositiveButton(android.R.string.ok) { _, _ ->
            onDialogClosed(true)
@@ -67,8 +98,6 @@ class DatabaseColorPreferenceDialogFragmentCompat : DatabaseSavePreferenceDialog
        // request a window without the title
        dialog.window?.requestFeature(Window.FEATURE_NO_TITLE)

-        dialog.setOnShowListener { measureLayout(it as Dialog) }
-
        return dialog
    }

@@ -83,66 +112,41 @@ class DatabaseColorPreferenceDialogFragmentCompat : DatabaseSavePreferenceDialog
                enableSwitchView.isChecked = false
                initColor = DEFAULT_COLOR
            }
+            chromaColorView.currentColor = initColor
            arguments?.putInt(ARG_INITIAL_COLOR, initColor)
        }
-
-        val fragmentManager = childFragmentManager
-        chromaColorFragment = fragmentManager.findFragmentByTag(TAG_FRAGMENT_COLORS) as ChromaColorFragment?
-
-        if (chromaColorFragment == null) {
-            chromaColorFragment = newInstance(arguments)
-            fragmentManager.beginTransaction().apply {
-                add(com.kunzisoft.androidclearchroma.R.id.color_dialog_container, chromaColorFragment!!, TAG_FRAGMENT_COLORS)
-                commit()
-            }
-        }
    }

    override fun onDialogClosed(database: Database?, positiveResult: Boolean) {
        super.onDialogClosed(database, positiveResult)
        if (positiveResult) {
-            val customColorEnable = enableSwitchView.isChecked
-            chromaColorFragment?.currentColor?.let { currentColor ->
-                onColorSelectedListener?.invoke(customColorEnable, currentColor)
-                database?.let {
-                    val newColor = if (customColorEnable) {
-                        currentColor
-                    } else {
-                        null
-                    }
-                    val oldColor = database.customColor
-                    database.customColor = newColor
-                    saveColor(oldColor, newColor)
-                }
+            val newColor: Int? = if (enableSwitchView.isChecked)
+                chromaColorView.currentColor
+            else
+                null
+            onColorSelectedListener?.invoke(newColor)
+            database?.let {
+                val oldColor = database.customColor
+                database.customColor = newColor
+                saveColor(oldColor, newColor)
            }
        }
    }

-    /**
-     * Set new dimensions to dialog
-     * @param ad dialog
-     */
-    private fun measureLayout(ad: Dialog) {
-        val typedValue = TypedValue()
-        resources.getValue(com.kunzisoft.androidclearchroma.R.dimen.chroma_dialog_height_multiplier, typedValue, true)
-        val heightMultiplier = typedValue.float
-        val height = (ad.context.resources.displayMetrics.heightPixels * heightMultiplier).toInt()
-
-        resources.getValue(com.kunzisoft.androidclearchroma.R.dimen.chroma_dialog_width_multiplier, typedValue, true)
-        val widthMultiplier = typedValue.float
-        val width = (ad.context.resources.displayMetrics.widthPixels * widthMultiplier).toInt()
-
-        ad.window?.setLayout(width, height)
-    }
-
    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
        super.onCreateView(inflater, container, savedInstanceState)
        return rootView
    }

-    companion object {
-        private const val TAG_FRAGMENT_COLORS = "TAG_FRAGMENT_COLORS"
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putInt(ARG_INITIAL_COLOR, chromaColorView.currentColor)
+        outState.putBoolean(ARG_ACTIVATED, mActivated)
+    }

+    companion object {
+        private const val ARG_INITIAL_COLOR = "ARG_INITIAL_COLOR"
+        private const val ARG_ACTIVATED = "ARG_ACTIVATED"
        @ColorInt
        const val DEFAULT_COLOR: Int = Color.WHITE

@@ -150,9 +154,7 @@ class DatabaseColorPreferenceDialogFragmentCompat : DatabaseSavePreferenceDialog
            val fragment = DatabaseColorPreferenceDialogFragmentCompat()
            val bundle = Bundle(1)
            bundle.putString(ARG_KEY, key)
-            bundle.putInt(ARG_INITIAL_COLOR, Color.BLACK)
-            bundle.putInt(ARG_COLOR_MODE, ColorMode.RGB.ordinal)
-            bundle.putInt(ARG_INDICATOR_MODE, IndicatorMode.HEX.ordinal)
+            bundle.putInt(ARG_INITIAL_COLOR, DEFAULT_COLOR)
            fragment.arguments = bundle

            return fragment
--- a/app/src/main/res/layout/fragment_color_picker.xml
+++ b/app/src/main/res/layout/fragment_color_picker.xml
@@ -29,7 +29,7 @@
 	<com.kunzisoft.androidclearchroma.view.ChromaColorView
 		android:id="@+id/chroma_color_view"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+		android:layout_height="300dp"
 		app:chromaInitialColor="@color/white"
 		app:chromaColorMode="RGB"
 		app:chromaIndicatorMode="HEX"
@@ -43,7 +43,7 @@
 		android:layout_margin="20dp"
 		android:text="@string/enable"
 		android:background="@drawable/background_button_small"
-		android:textColor="?attr/textColorInverse"
+		android:textColor="@color/white"
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		android:minHeight="48dp"/>
--- a/app/src/main/res/layout/pref_dialog_input_color.xml
+++ b/app/src/main/res/layout/pref_dialog_input_color.xml
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2019 Jeremy Jamet / Kunzisoft.
-     
- This file is part of KeePassDX.
-
-  KeePassDX is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  KeePassDX 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 for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
-->
-<androidx.constraintlayout.widget.ConstraintLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:id="@+id/edit"
-	android:orientation="vertical"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:importantForAutofill="noExcludeDescendants"
-	tools:targetApi="o">
-	<FrameLayout
-		android:id="@+id/color_dialog_container"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		app:layout_constraintTop_toTopOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintEnd_toEndOf="parent" />
-	<androidx.appcompat.widget.SwitchCompat
-		android:id="@+id/switch_element"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_margin="20dp"
-		android:text="@string/enable"
-		android:background="@drawable/background_button_small"
-		android:textColor="?attr/textColorInverse"
-		app:layout_constraintTop_toTopOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		android:minHeight="48dp"/>
-</androidx.constraintlayout.widget.ConstraintLayout>