fix #1222, adding some B&W theme improvements to the editor

This commit is contained in:
tibbi 2019-01-22 20:27:10 +01:00
parent 487984f9e4
commit 301ac6dfb0

View file

@ -106,6 +106,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
isEditingWithThirdParty = false isEditingWithThirdParty = false
bottom_draw_width.setColors(config.textColor, getAdjustedPrimaryColor(), config.backgroundColor)
} }
override fun onStop() { override fun onStop() {
@ -566,7 +567,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
else -> null else -> null
} }
currentPrimaryActionButton?.applyColorFilter(config.primaryColor) currentPrimaryActionButton?.applyColorFilter(getAdjustedPrimaryColor())
bottom_editor_filter_actions.beVisibleIf(currPrimaryAction == PRIMARY_ACTION_FILTER) bottom_editor_filter_actions.beVisibleIf(currPrimaryAction == PRIMARY_ACTION_FILTER)
bottom_editor_crop_rotate_actions.beVisibleIf(currPrimaryAction == PRIMARY_ACTION_CROP_ROTATE) bottom_editor_crop_rotate_actions.beVisibleIf(currPrimaryAction == PRIMARY_ACTION_CROP_ROTATE)
bottom_editor_draw_actions.beVisibleIf(currPrimaryAction == PRIMARY_ACTION_DRAW) bottom_editor_draw_actions.beVisibleIf(currPrimaryAction == PRIMARY_ACTION_DRAW)
@ -656,7 +657,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
else -> bottom_aspect_ratio_other else -> bottom_aspect_ratio_other
} }
currentAspectRatioButton.setTextColor(config.primaryColor) currentAspectRatioButton.setTextColor(getAdjustedPrimaryColor())
} }
private fun updateCropRotateActionButtons() { private fun updateCropRotateActionButtons() {
@ -669,7 +670,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
else -> null else -> null
} }
primaryActionView?.applyColorFilter(config.primaryColor) primaryActionView?.applyColorFilter(getAdjustedPrimaryColor())
} }
private fun updateDrawColor(color: Int) { private fun updateDrawColor(color: Int) {