rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix color picker fragment

Browse Source
This commit is contained in:
J-Jamet
2022-01-12 17:01:35 +01:00
parent d4818c5567
commit 05fad24eda
2 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
View File

@@ -247,7 +247,8 @@ class EntryEditActivity : DatabaseLockActivity(),
}
mEntryEditViewModel.requestColorSelection.observe(this) { color ->
ColorPickerDialogFragment().show(supportFragmentManager, "ColorPickerFragment")
ColorPickerDialogFragment.newInstance(color)
.show(supportFragmentManager, "ColorPickerFragment")
}
mColorPickerViewModel.colorPicked.observe(this) { color ->

41
app/src/main/java/com/kunzisoft/keepass/activities/dialogs/ColorPickerDialogFragment.kt
View File

@@ -19,6 +19,7 @@ class ColorPickerDialogFragment : DatabaseDialogFragment() {
private lateinit var chromaColorView: ChromaColorView
private var mDefaultColor = Color.WHITE
private var mActivated = false
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
@@ -27,16 +28,25 @@ class ColorPickerDialogFragment : DatabaseDialogFragment() {
enableSwitchView = root.findViewById(R.id.switch_element)
chromaColorView = root.findViewById(R.id.chroma_color_view)
var activated = false
arguments?.apply {
if (containsKey(ARG_INITIAL_COLOR)) {
mDefaultColor = getInt(ARG_INITIAL_COLOR)
if (savedInstanceState != null) {
if (savedInstanceState.containsKey(ARG_INITIAL_COLOR)) {
mDefaultColor = savedInstanceState.getInt(ARG_INITIAL_COLOR)
}
if (containsKey(ARG_ACTIVATED)) {
activated = getBoolean(ARG_ACTIVATED)
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 = activated
enableSwitchView.isChecked = mActivated
chromaColorView.currentColor = mDefaultColor
val builder = AlertDialog.Builder(activity)
builder.setView(root)
@@ -56,6 +66,12 @@ class ColorPickerDialogFragment : DatabaseDialogFragment() {
return super.onCreateDialog(savedInstanceState)
}
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"
@@ -63,11 +79,12 @@ class ColorPickerDialogFragment : DatabaseDialogFragment() {
fun newInstance(
@ColorInt initialColor: Int?,
): ColorPickerDialogFragment {
val colorPickerDialogFragment = ColorPickerDialogFragment()
val args = Bundle()
args.putInt(ARG_INITIAL_COLOR, initialColor ?: Color.WHITE)
args.putBoolean(ARG_ACTIVATED, initialColor != null)
return colorPickerDialogFragment
return ColorPickerDialogFragment().apply {
arguments = Bundle().apply {
putInt(ARG_INITIAL_COLOR, initialColor ?: Color.WHITE)
putBoolean(ARG_ACTIVATED, initialColor != null)
}
}
}
}
}