-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11746 from nextcloud/image-editor
Add image editor
- Loading branch information
Showing
17 changed files
with
459 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
191 changes: 191 additions & 0 deletions
191
app/src/main/java/com/nextcloud/client/editimage/EditImageActivity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,191 @@ | ||
| /* | ||
| * Nextcloud Android client application | ||
| * | ||
| * @author ZetaTom | ||
| * Copyright (C) 2023 ZetaTom | ||
| * Copyright (C) 2023 Nextcloud GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
| package com.nextcloud.client.editimage | ||
|
|
||
| import android.graphics.Bitmap | ||
| import android.net.Uri | ||
| import android.os.Build | ||
| import android.os.Bundle | ||
| import android.view.Menu | ||
| import android.view.MenuItem | ||
| import android.view.View | ||
| import androidx.appcompat.content.res.AppCompatResources | ||
| import androidx.core.content.ContextCompat | ||
| import androidx.core.graphics.drawable.DrawableCompat | ||
| import com.canhub.cropper.CropImageView | ||
| import com.nextcloud.client.di.Injectable | ||
| import com.owncloud.android.R | ||
| import com.owncloud.android.databinding.ActivityEditImageBinding | ||
| import com.owncloud.android.datamodel.OCFile | ||
| import com.owncloud.android.files.services.FileUploader | ||
| import com.owncloud.android.files.services.NameCollisionPolicy | ||
| import com.owncloud.android.lib.common.operations.OnRemoteOperationListener | ||
| import com.owncloud.android.operations.UploadFileOperation | ||
| import com.owncloud.android.ui.activity.FileActivity | ||
| import com.owncloud.android.utils.DisplayUtils | ||
| import com.owncloud.android.utils.FilesUploadHelper | ||
| import com.owncloud.android.utils.MimeType | ||
| import java.io.File | ||
|
|
||
| class EditImageActivity : | ||
| FileActivity(), | ||
| OnRemoteOperationListener, | ||
| CropImageView.OnSetImageUriCompleteListener, | ||
| CropImageView.OnCropImageCompleteListener, | ||
| Injectable { | ||
|
|
||
| private lateinit var binding: ActivityEditImageBinding | ||
| private lateinit var file: OCFile | ||
| private lateinit var format: Bitmap.CompressFormat | ||
|
|
||
| companion object { | ||
| const val EXTRA_FILE = "FILE" | ||
| const val OPEN_IMAGE_EDITOR = "OPEN_IMAGE_EDITOR" | ||
|
|
||
| private val supportedMimeTypes = arrayOf( | ||
| MimeType.PNG, | ||
| MimeType.JPEG, | ||
| MimeType.WEBP, | ||
| MimeType.TIFF, | ||
| MimeType.BMP, | ||
| MimeType.HEIC | ||
| ) | ||
|
|
||
| fun canBePreviewed(file: OCFile): Boolean { | ||
| return file.mimeType in supportedMimeTypes | ||
| } | ||
| } | ||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
|
|
||
| binding = ActivityEditImageBinding.inflate(layoutInflater) | ||
| setContentView(binding.root) | ||
|
|
||
| file = intent.extras?.getParcelable(EXTRA_FILE) ?: throw IllegalArgumentException("Missing file argument") | ||
|
|
||
| setSupportActionBar(binding.toolbar) | ||
| supportActionBar?.apply { | ||
| title = file.fileName | ||
| setDisplayHomeAsUpEnabled(true) | ||
| } | ||
|
|
||
| window.statusBarColor = ContextCompat.getColor(this, R.color.black) | ||
| window.navigationBarColor = getColor(R.color.black) | ||
| window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN | ||
|
|
||
| setupCropper() | ||
| } | ||
|
|
||
| override fun onCropImageComplete(view: CropImageView, result: CropImageView.CropResult) { | ||
| if (!result.isSuccessful) { | ||
| DisplayUtils.showSnackMessage(this, getString(R.string.image_editor_unable_to_edit_image)) | ||
| return | ||
| } | ||
| val resultUri = result.getUriFilePath(this, false) | ||
| val newFileName = file.fileName.substring(0, file.fileName.lastIndexOf('.')) + | ||
| " " + getString(R.string.image_editor_file_edited_suffix) + | ||
| resultUri?.substring(resultUri.lastIndexOf('.')) | ||
|
|
||
| FilesUploadHelper().uploadNewFiles( | ||
| user = storageManager.user, | ||
| localPaths = arrayOf(resultUri!!), | ||
| remotePaths = arrayOf(file.parentRemotePath + File.separator + newFileName), | ||
| createRemoteFolder = false, | ||
| createdBy = UploadFileOperation.CREATED_BY_USER, | ||
| requiresWifi = false, | ||
| requiresCharging = false, | ||
| nameCollisionPolicy = NameCollisionPolicy.RENAME, | ||
| localBehavior = FileUploader.LOCAL_BEHAVIOUR_DELETE | ||
| ) | ||
| } | ||
|
|
||
| override fun onSetImageUriComplete(view: CropImageView, uri: Uri, error: Exception?) { | ||
| if (error != null) { | ||
| DisplayUtils.showSnackMessage(this, getString(R.string.image_editor_unable_to_edit_image)) | ||
| return | ||
| } | ||
| view.visibility = View.VISIBLE | ||
| } | ||
|
|
||
| override fun onCreateOptionsMenu(menu: Menu?): Boolean { | ||
| // add save button to action bar | ||
| menuInflater.inflate(R.menu.custom_menu_placeholder, menu) | ||
| val saveIcon = AppCompatResources.getDrawable(this, R.drawable.ic_check)?.also { | ||
| DrawableCompat.setTint(it, resources.getColor(R.color.white, theme)) | ||
| } | ||
| menu?.findItem(R.id.custom_menu_placeholder_item)?.apply { | ||
| icon = saveIcon | ||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { | ||
| contentDescription = getString(R.string.common_save) | ||
| } | ||
| } | ||
| return true | ||
| } | ||
|
|
||
| override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) { | ||
| R.id.custom_menu_placeholder_item -> { | ||
| binding.cropImageView.croppedImageAsync(format) | ||
| finish() | ||
| true | ||
| } | ||
| else -> { | ||
| finish() | ||
| true | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Set up image cropper and image editor control strip. | ||
| */ | ||
| private fun setupCropper() { | ||
| val cropper = binding.cropImageView | ||
|
|
||
| @Suppress("MagicNumber") | ||
| binding.rotateLeft.setOnClickListener { | ||
| cropper.rotateImage(-90) | ||
| } | ||
|
|
||
| @Suppress("MagicNumber") | ||
| binding.rotateRight.setOnClickListener { | ||
| cropper.rotateImage(90) | ||
| } | ||
|
|
||
| binding.flipVertical.setOnClickListener { | ||
| cropper.flipImageVertically() | ||
| } | ||
|
|
||
| binding.flipHorizontal.setOnClickListener { | ||
| cropper.flipImageHorizontally() | ||
| } | ||
|
|
||
| cropper.setOnSetImageUriCompleteListener(this) | ||
| cropper.setOnCropImageCompleteListener(this) | ||
| cropper.setImageUriAsync(file.storageUri) | ||
|
|
||
| // determine output file format | ||
| format = when (file.mimeType) { | ||
| MimeType.PNG -> Bitmap.CompressFormat.PNG | ||
| MimeType.WEBP -> Bitmap.CompressFormat.WEBP | ||
| else -> Bitmap.CompressFormat.JPEG | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.