From 301ac6dfb0f0c5d3feee40aa5e0d483773ec6bed Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 22 Jan 2019 20:27:10 +0100 Subject: [PATCH] fix #1222, adding some B&W theme improvements to the editor --- .../gallery/pro/activities/EditActivity.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt index be4ce6d94..7971b1994 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt @@ -106,6 +106,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener override fun onResume() { super.onResume() isEditingWithThirdParty = false + bottom_draw_width.setColors(config.textColor, getAdjustedPrimaryColor(), config.backgroundColor) } override fun onStop() { @@ -566,7 +567,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener else -> null } - currentPrimaryActionButton?.applyColorFilter(config.primaryColor) + currentPrimaryActionButton?.applyColorFilter(getAdjustedPrimaryColor()) bottom_editor_filter_actions.beVisibleIf(currPrimaryAction == PRIMARY_ACTION_FILTER) bottom_editor_crop_rotate_actions.beVisibleIf(currPrimaryAction == PRIMARY_ACTION_CROP_ROTATE) bottom_editor_draw_actions.beVisibleIf(currPrimaryAction == PRIMARY_ACTION_DRAW) @@ -656,7 +657,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener else -> bottom_aspect_ratio_other } - currentAspectRatioButton.setTextColor(config.primaryColor) + currentAspectRatioButton.setTextColor(getAdjustedPrimaryColor()) } private fun updateCropRotateActionButtons() { @@ -669,7 +670,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener else -> null } - primaryActionView?.applyColorFilter(config.primaryColor) + primaryActionView?.applyColorFilter(getAdjustedPrimaryColor()) } private fun updateDrawColor(color: Int) {