PatchesAndForks/FossifyGalleryVisibilityPatch
1
0
Fork 0
forked from Mirrors/FossifyGallery
Code Pull requests Activity

hide the bottom primary actions at editor crop intent

Browse source
This commit is contained in:
tibbi 2018-07-23 12:49:05 +02:00
parent 91bb5b70de
commit 9cfab3abc3
1 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
View file

@ -11,6 +11,7 @@ import android.os.Bundle
import android.provider.MediaStore import android.provider.MediaStore
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.widget.RelativeLayout
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.bumptech.glide.load.DataSource import com.bumptech.glide.load.DataSource
import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.engine.DiskCacheStrategy
@ -124,6 +125,11 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
} }
isCropIntent = intent.extras?.get(CROP) == "true" 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() loadDefaultImageView()
setupBottomActions() setupBottomActions()
} }
@ -182,7 +188,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
if (isCropIntent) { if (isCropIntent) {
loadCropImageView() loadCropImageView()
bottom_primary_filter.beGone() bottom_primary_filter.beGone()
bottom_primary_crop_rotate.performClick() bottomCropRotateClicked()
} }
return false return false
@ -240,24 +246,32 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
private fun setupPrimaryActionButtons() { private fun setupPrimaryActionButtons() {
bottom_primary_filter.setOnClickListener { bottom_primary_filter.setOnClickListener {
currPrimaryAction = if (currPrimaryAction == PRIMARY_ACTION_FILTER) { bottomFilterClicked()
PRIMARY_ACTION_NONE
} else {
PRIMARY_ACTION_FILTER
}
updatePrimaryActionButtons()
} }
bottom_primary_crop_rotate.setOnClickListener { bottom_primary_crop_rotate.setOnClickListener {
currPrimaryAction = if (currPrimaryAction == PRIMARY_ACTION_CROP_ROTATE) { bottomCropRotateClicked()
PRIMARY_ACTION_NONE
} else {
PRIMARY_ACTION_CROP_ROTATE
}
updatePrimaryActionButtons()
} }
} }
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() { private fun setupCropRotateActionButtons() {
bottom_rotate.setOnClickListener { bottom_rotate.setOnClickListener {
crop_image_view.rotateImage(90) crop_image_view.rotateImage(90)