mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-11-03 16:23:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixes #5502 updateactivity.kt

Browse source
This commit is contained in:
Kanahia 2024-02-28 22:33:13 +05:30 • committed by GitHub
parent 55346c125b
commit d36e858995
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 40 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

75
app/src/main/java/fr/free/nrw/commons/edit/EditActivity.kt
View file

@ -6,6 +6,7 @@ import android.animation.ValueAnimator
import android.content.Intent import android.content.Intent
import android.graphics.BitmapFactory import android.graphics.BitmapFactory
import android.graphics.Matrix import android.graphics.Matrix
import android.graphics.drawable.BitmapDrawable
import android.media.ExifInterface import android.media.ExifInterface
import android.os.Bundle import android.os.Bundle
import android.util.Log import android.util.Log
@ -17,7 +18,10 @@ import androidx.core.graphics.rotationMatrix
import androidx.core.graphics.scaleMatrix import androidx.core.graphics.scaleMatrix
import androidx.core.net.toUri import androidx.core.net.toUri
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import fr.free.nrw.commons.databinding.ActivityEditBinding import fr.free.nrw.commons.R
import kotlinx.android.synthetic.main.activity_edit.btn_save
import kotlinx.android.synthetic.main.activity_edit.iv
import kotlinx.android.synthetic.main.activity_edit.rotate_btn
import timber.log.Timber import timber.log.Timber
import java.io.File import java.io.File
@ -33,15 +37,15 @@ class EditActivity : AppCompatActivity() {
private var imageUri = "" private var imageUri = ""
private lateinit var vm: EditViewModel private lateinit var vm: EditViewModel
private val sourceExifAttributeList = mutableListOf<Pair<String, String?>>() private val sourceExifAttributeList = mutableListOf<Pair<String, String?>>()
private lateinit var binding: ActivityEditBinding private var totalRotation = 0
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = ActivityEditBinding.inflate(layoutInflater) setContentView(R.layout.activity_edit)
setContentView(binding.root)
supportActionBar?.title = "" supportActionBar?.title = ""
val intent = intent val intent = intent
imageUri = intent.getStringExtra("image") ?: "" imageUri = intent.getStringExtra("image") ?: ""
imageRotation = intent.getIntExtra("rotation",0)
vm = ViewModelProvider(this).get(EditViewModel::class.java) vm = ViewModelProvider(this).get(EditViewModel::class.java)
val sourceExif = imageUri.toUri().path?.let { ExifInterface(it) } val sourceExif = imageUri.toUri().path?.let { ExifInterface(it) }
val exifTags = arrayOf( val exifTags = arrayOf(
@ -85,9 +89,9 @@ class EditActivity : AppCompatActivity() {
* for the "Rotate" and "Save" buttons. * for the "Rotate" and "Save" buttons.
*/ */
private fun init() { private fun init() {
binding.iv.adjustViewBounds = true iv.adjustViewBounds = true
binding.iv.scaleType = ImageView.ScaleType.MATRIX iv.scaleType = ImageView.ScaleType.MATRIX
binding.iv.post(Runnable { iv.post(Runnable {
val options = BitmapFactory.Options() val options = BitmapFactory.Options()
options.inJustDecodeBounds = true options.inJustDecodeBounds = true
BitmapFactory.decodeFile(imageUri, options) BitmapFactory.decodeFile(imageUri, options)
@ -102,26 +106,27 @@ class EditActivity : AppCompatActivity() {
options.inSampleSize = scaleFactor options.inSampleSize = scaleFactor
options.inJustDecodeBounds = false options.inJustDecodeBounds = false
val scaledBitmap = BitmapFactory.decodeFile(imageUri, options) val scaledBitmap = BitmapFactory.decodeFile(imageUri, options)
binding.iv.setImageBitmap(scaledBitmap) iv.setImageBitmap(scaledBitmap)
// Update the ImageView with the scaled bitmap // Update the ImageView with the scaled bitmap
val scale = binding.iv.measuredWidth.toFloat() / scaledBitmap.width.toFloat() val scale = iv.measuredWidth.toFloat() / scaledBitmap.width.toFloat()
binding.iv.layoutParams.height = (scale * scaledBitmap.height).toInt() iv.layoutParams.height = (scale * scaledBitmap.height).toInt()
binding.iv.imageMatrix = scaleMatrix(scale, scale) iv.imageMatrix = scaleMatrix(scale, scale)
} else { } else {
options.inJustDecodeBounds = false options.inJustDecodeBounds = false
val bitmap = BitmapFactory.decodeFile(imageUri, options) val bitmap = BitmapFactory.decodeFile(imageUri, options)
binding.iv.setImageBitmap(bitmap) iv.setImageBitmap(bitmap)
val scale = binding.iv.measuredWidth.toFloat() / bitmapWidth.toFloat() val scale = iv.measuredWidth.toFloat() / bitmapWidth.toFloat()
binding.iv.layoutParams.height = (scale * bitmapHeight).toInt() iv.layoutParams.height = (scale * bitmapHeight).toInt()
binding.iv.imageMatrix = scaleMatrix(scale, scale) iv.imageMatrix = scaleMatrix(scale, scale)
} }
animateImageHeight(false)
}) })
binding.rotateBtn.setOnClickListener { rotate_btn.setOnClickListener {
animateImageHeight() animateImageHeight(true)
} }
binding.btnSave.setOnClickListener { btn_save.setOnClickListener {
getRotatedImage() getRotatedImage()
} }
} }
@ -131,19 +136,20 @@ class EditActivity : AppCompatActivity() {
/** /**
* Animates the height, rotation, and scale of an ImageView to provide a smooth * Animates the height, rotation, and scale of an ImageView to provide a smooth
* transition effect when rotating an image by 90 degrees. * transition effect when rotating an image by 90 degrees.
* @param shouldRotate A boolean indicating whether the image should rotate by 90 degrees.
* *
* This function calculates the new height, rotation, and scale for the ImageView * This function calculates the new height, rotation, and scale for the ImageView
* based on the current image rotation angle and animates the changes using a * based on the current image rotation angle and animates the changes using a
* ValueAnimator. It also disables a rotate button during the animation to prevent * ValueAnimator. It also disables a rotate button during the animation to prevent
* further rotation actions. * further rotation actions.
*/ */
private fun animateImageHeight() { private fun animateImageHeight(shouldRotate : Boolean) {
val drawableWidth: Float = binding.iv.getDrawable().getIntrinsicWidth().toFloat() val drawableWidth: Float = iv.getDrawable().getIntrinsicWidth().toFloat()
val drawableHeight: Float = binding.iv.getDrawable().getIntrinsicHeight().toFloat() val drawableHeight: Float = iv.getDrawable().getIntrinsicHeight().toFloat()
val viewWidth: Float = binding.iv.getMeasuredWidth().toFloat() val viewWidth: Float = iv.getMeasuredWidth().toFloat()
val viewHeight: Float = binding.iv.getMeasuredHeight().toFloat() val viewHeight: Float = iv.getMeasuredHeight().toFloat()
val rotation = imageRotation % 360 val rotation = imageRotation % 360
val newRotation = rotation + 90 val newRotation = if (shouldRotate) rotation + 90 else rotation
val newViewHeight: Int val newViewHeight: Int
val imageScale: Float val imageScale: Float
@ -171,12 +177,12 @@ class EditActivity : AppCompatActivity() {
animator.addListener(object : AnimatorListener { animator.addListener(object : AnimatorListener {
override fun onAnimationStart(animation: Animator) { override fun onAnimationStart(animation: Animator) {
binding.rotateBtn.setEnabled(false) rotate_btn.setEnabled(false)
} }
override fun onAnimationEnd(animation: Animator) { override fun onAnimationEnd(animation: Animator) {
imageRotation = newRotation % 360 imageRotation = newRotation % 360
binding.rotateBtn.setEnabled(true) rotate_btn.setEnabled(true)
} }
override fun onAnimationCancel(animation: Animator) { override fun onAnimationCancel(animation: Animator) {
@ -194,7 +200,7 @@ class EditActivity : AppCompatActivity() {
(complementaryAnimVal * viewHeight + animVal * newViewHeight).toInt() (complementaryAnimVal * viewHeight + animVal * newViewHeight).toInt()
val animatedScale = complementaryAnimVal * imageScale + animVal * newImageScale val animatedScale = complementaryAnimVal * imageScale + animVal * newImageScale
val animatedRotation = complementaryAnimVal * rotation + animVal * newRotation val animatedRotation = complementaryAnimVal * rotation + animVal * newRotation
binding.iv.getLayoutParams().height = animatedHeight iv.getLayoutParams().height = animatedHeight
val matrix: Matrix = rotationMatrix( val matrix: Matrix = rotationMatrix(
animatedRotation, animatedRotation,
drawableWidth / 2, drawableWidth / 2,
@ -207,11 +213,11 @@ class EditActivity : AppCompatActivity() {
drawableHeight / 2 drawableHeight / 2
) )
matrix.postTranslate( matrix.postTranslate(
-(drawableWidth - binding.iv.getMeasuredWidth()) / 2, -(drawableWidth - iv.getMeasuredWidth()) / 2,
-(drawableHeight - binding.iv.getMeasuredHeight()) / 2 -(drawableHeight - iv.getMeasuredHeight()) / 2
) )
binding.iv.setImageMatrix(matrix) iv.setImageMatrix(matrix)
binding.iv.requestLayout() iv.requestLayout()
} }
animator.start() animator.start()
@ -231,9 +237,7 @@ class EditActivity : AppCompatActivity() {
val filePath = imageUri.toUri().path val filePath = imageUri.toUri().path
val file = filePath?.let { File(it) } val file = filePath?.let { File(it) }
val rotatedImage = if(imageRotation == 0) file else file?.let { vm.rotateImage(imageRotation, it) }
val rotatedImage = file?.let { vm.rotateImage(imageRotation, it) }
if (rotatedImage == null) { if (rotatedImage == null) {
Toast.makeText(this, "Failed to rotate to image", Toast.LENGTH_LONG).show() Toast.makeText(this, "Failed to rotate to image", Toast.LENGTH_LONG).show()
} }
@ -241,6 +245,7 @@ class EditActivity : AppCompatActivity() {
copyExifData(editedImageExif) copyExifData(editedImageExif)
val resultIntent = Intent() val resultIntent = Intent()
resultIntent.putExtra("editedImageFilePath", rotatedImage?.toUri()?.path ?: "Error"); resultIntent.putExtra("editedImageFilePath", rotatedImage?.toUri()?.path ?: "Error");
resultIntent.putExtra("editedImageRotation",imageRotation)
setResult(RESULT_OK, resultIntent); setResult(RESULT_OK, resultIntent);
finish(); finish();
} }
@ -295,4 +300,4 @@ class EditActivity : AppCompatActivity() {
} }