From 9cfab3abc30dc199607dc2750288ab03f08171af Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 23 Jul 2018 12:49:05 +0200 Subject: [PATCH] hide the bottom primary actions at editor crop intent --- .../gallery/activities/EditActivity.kt | 40 +++++++++++++------ 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt index f2ae48e70..3aca45b31 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt @@ -11,6 +11,7 @@ import android.os.Bundle import android.provider.MediaStore import android.view.Menu import android.view.MenuItem +import android.widget.RelativeLayout import com.bumptech.glide.Glide import com.bumptech.glide.load.DataSource import com.bumptech.glide.load.engine.DiskCacheStrategy @@ -124,6 +125,11 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener } isCropIntent = intent.extras?.get(CROP) == "true" + if (isCropIntent) { + bottom_editor_primary_actions.beGone() + (bottom_editor_crop_rotate_actions.layoutParams as RelativeLayout.LayoutParams).addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, 1) + } + loadDefaultImageView() setupBottomActions() } @@ -182,7 +188,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener if (isCropIntent) { loadCropImageView() bottom_primary_filter.beGone() - bottom_primary_crop_rotate.performClick() + bottomCropRotateClicked() } return false @@ -240,24 +246,32 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener private fun setupPrimaryActionButtons() { bottom_primary_filter.setOnClickListener { - currPrimaryAction = if (currPrimaryAction == PRIMARY_ACTION_FILTER) { - PRIMARY_ACTION_NONE - } else { - PRIMARY_ACTION_FILTER - } - updatePrimaryActionButtons() + bottomFilterClicked() } bottom_primary_crop_rotate.setOnClickListener { - currPrimaryAction = if (currPrimaryAction == PRIMARY_ACTION_CROP_ROTATE) { - PRIMARY_ACTION_NONE - } else { - PRIMARY_ACTION_CROP_ROTATE - } - updatePrimaryActionButtons() + bottomCropRotateClicked() } } + private fun bottomFilterClicked() { + currPrimaryAction = if (currPrimaryAction == PRIMARY_ACTION_FILTER) { + PRIMARY_ACTION_NONE + } else { + PRIMARY_ACTION_FILTER + } + updatePrimaryActionButtons() + } + + private fun bottomCropRotateClicked() { + currPrimaryAction = if (currPrimaryAction == PRIMARY_ACTION_CROP_ROTATE) { + PRIMARY_ACTION_NONE + } else { + PRIMARY_ACTION_CROP_ROTATE + } + updatePrimaryActionButtons() + } + private fun setupCropRotateActionButtons() { bottom_rotate.setOnClickListener { crop_image_view.rotateImage(90)