Image editor: refactoring

This commit is contained in:
M66B
2025-01-06 14:33:22 +01:00
parent 2bdd42ee54
commit 9ba758fdaa
5 changed files with 256 additions and 134 deletions

View File

@@ -0,0 +1,175 @@
package eu.faircode.email;
/*
This file is part of FairEmail.
FairEmail is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
FairEmail 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 General Public License for more details.
You should have received a copy of the GNU General Public License
along with FairEmail. If not, see <http://www.gnu.org/licenses/>.
Copyright 2018-2025 by Marcel Bokhorst (M66B)
*/
import static android.app.Activity.RESULT_OK;
import android.app.Dialog;
import android.content.Context;
import android.graphics.Bitmap;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageButton;
import android.widget.ProgressBar;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import com.canhub.cropper.CropImageView;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
public class FragmentDialogEditImage extends FragmentDialogBase {
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
Bundle args = getArguments();
Context context = getContext();
View dview = LayoutInflater.from(context).inflate(R.layout.dialog_edit_image, null);
ImageButton ibRotate = dview.findViewById(R.id.ibRotate);
ImageButton ibFlip = dview.findViewById(R.id.ibFlip);
ImageButton ibCancel = dview.findViewById(R.id.ibCancel);
ImageButton ibSave = dview.findViewById(R.id.ibSave);
CropImageView civ = dview.findViewById(R.id.civ);
ProgressBar pbWait = dview.findViewById(R.id.pbWait);
Dialog dialog = new AlertDialog.Builder(context)
.setView(dview)
.create();
ibRotate.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
civ.rotateImage(90);
}
});
ibFlip.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
civ.flipImageHorizontally();
}
});
ibCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
dialog.dismiss();
}
});
ibSave.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
new SimpleTask<Void>() {
@Override
protected void onPreExecute(Bundle args) {
ibSave.setEnabled(true);
pbWait.setVisibility(View.VISIBLE);
}
@Override
protected void onPostExecute(Bundle args) {
ibSave.setEnabled(true);
pbWait.setVisibility(View.GONE);
}
@Override
protected Void onExecute(Context context, Bundle args) throws Throwable {
long id = args.getLong("id");
DB db = DB.getInstance(context);
EntityAttachment attachment = db.attachment().getAttachment(id);
if (attachment == null)
return null;
Bitmap bm = civ.getCroppedImage();
if (bm == null)
return null;
File file = attachment.getFile(context);
try (OutputStream os = new BufferedOutputStream(new FileOutputStream(file))) {
bm.compress(Bitmap.CompressFormat.PNG, 90, os);
}
db.attachment().setName(id, attachment.name, "image/png", file.length());
return null;
}
@Override
protected void onExecuted(Bundle args, Void data) {
sendResult(RESULT_OK);
dismiss();
}
@Override
protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(getParentFragment(), ex);
}
}.execute(FragmentDialogEditImage.this, args, "save:image");
}
});
new SimpleTask<EntityAttachment>() {
@Override
protected void onPreExecute(Bundle args) {
pbWait.setVisibility(View.VISIBLE);
ibSave.setEnabled(false);
}
@Override
protected void onPostExecute(Bundle args) {
pbWait.setVisibility(View.GONE);
ibSave.setEnabled(true);
}
@Override
protected EntityAttachment onExecute(Context context, Bundle args) {
long id = args.getLong("id");
DB db = DB.getInstance(context);
return db.attachment().getAttachment(id);
}
@Override
protected void onExecuted(Bundle args, EntityAttachment attachment) {
if (attachment == null)
return;
civ.setImageUriAsync(attachment.getUri(context));
}
@Override
protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "edit:image");
return dialog;
}
}