Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-20 11:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix image-editor build.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-11-12 09:09:19 -05:00
parent dcdfe0b762
commit 58d9127ae4
1 changed files with 52 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
image-editor/app/src/main/java/org/signal/imageeditor/app/MainActivity.java
View File

@@ -1,7 +1,6 @@
package org.signal.imageeditor.app; package org.signal.imageeditor.app;
import android.Manifest; import android.Manifest;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.Bitmap; import android.graphics.Bitmap;
@@ -27,9 +26,7 @@ import androidx.core.content.ContextCompat;
import org.signal.imageeditor.app.renderers.UriRenderer; import org.signal.imageeditor.app.renderers.UriRenderer;
import org.signal.imageeditor.app.renderers.UrlRenderer; import org.signal.imageeditor.app.renderers.UrlRenderer;
import org.signal.imageeditor.core.ImageEditorView; import org.signal.imageeditor.core.ImageEditorView;
import org.signal.imageeditor.core.Renderer;
import org.signal.imageeditor.core.RendererContext; import org.signal.imageeditor.core.RendererContext;
import org.signal.imageeditor.core.UndoRedoStackListener;
import org.signal.imageeditor.core.model.EditorElement; import org.signal.imageeditor.core.model.EditorElement;
import org.signal.imageeditor.core.model.EditorModel; import org.signal.imageeditor.core.model.EditorModel;
import org.signal.imageeditor.core.renderers.MultiLineTextRenderer; import org.signal.imageeditor.core.renderers.MultiLineTextRenderer;
@@ -176,52 +173,44 @@ public final class MainActivity extends AppCompatActivity {
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { int itemId = item.getItemId();
case R.id.action_undo: if (itemId == R.id.action_undo) {
imageEditorView.getModel().undo(); imageEditorView.getModel().undo();
Log.d(TAG, String.format("Model is %s", imageEditorView.getModel().isChanged() ? "changed" : "unchanged")); Log.d(TAG, String.format("Model is %s", imageEditorView.getModel().isChanged() ? "changed" : "unchanged"));
return true; return true;
} else if (itemId == R.id.action_redo) {
case R.id.action_redo:
imageEditorView.getModel().redo(); imageEditorView.getModel().redo();
return true; return true;
} else if (itemId == R.id.action_crop) {
case R.id.action_crop:
imageEditorView.setMode(ImageEditorView.Mode.MoveAndResize); imageEditorView.setMode(ImageEditorView.Mode.MoveAndResize);
imageEditorView.getModel().startCrop(); imageEditorView.getModel().startCrop();
return true; return true;
} else if (itemId == R.id.action_done) {
case R.id.action_done:
imageEditorView.setMode(ImageEditorView.Mode.MoveAndResize); imageEditorView.setMode(ImageEditorView.Mode.MoveAndResize);
imageEditorView.getModel().doneCrop(); imageEditorView.getModel().doneCrop();
return true; return true;
} else if (itemId == R.id.action_draw) {
case R.id.action_draw:
imageEditorView.setDrawingBrushColor(0xffffff00); imageEditorView.setDrawingBrushColor(0xffffff00);
imageEditorView.startDrawing(0.02f, Paint.Cap.ROUND, false); imageEditorView.startDrawing(0.02f, Paint.Cap.ROUND, false);
return true; return true;
} else if (itemId == R.id.action_rotate_left_90) {
case R.id.action_rotate_left_90:
imageEditorView.getModel().rotate90anticlockwise(); imageEditorView.getModel().rotate90anticlockwise();
return true; return true;
} else if (itemId == R.id.action_flip_horizontal) {
case R.id.action_flip_horizontal:
imageEditorView.getModel().flipHorizontal(); imageEditorView.getModel().flipHorizontal();
return true; return true;
} else if (itemId == R.id.action_edit_text) {
case R.id.action_edit_text:
editText(); editText();
return true; return true;
} else if (itemId == R.id.action_lock_crop_aspect) {
case R.id.action_lock_crop_aspect:
imageEditorView.getModel().setCropAspectLock(!imageEditorView.getModel().isCropAspectLocked()); imageEditorView.getModel().setCropAspectLock(!imageEditorView.getModel().isCropAspectLocked());
return true; return true;
} else if (itemId == R.id.action_save) {
case R.id.action_save:
if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)
!= PackageManager.PERMISSION_GRANTED) { != PackageManager.PERMISSION_GRANTED)
{
ActivityCompat.requestPermissions(this, ActivityCompat.requestPermissions(this,
new String[]{ Manifest.permission.WRITE_EXTERNAL_STORAGE }, new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE },
0); 0);
} else { } else {
Bitmap bitmap = imageEditorView.getModel().render(this, typefaceProvider); Bitmap bitmap = imageEditorView.getModel().render(this, typefaceProvider);
@@ -238,10 +227,8 @@ public final class MainActivity extends AppCompatActivity {
} }
} }
return true; return true;
default:
return super.onOptionsItemSelected(item);
} }
return super.onOptionsItemSelected(item);
} }
private void editText() { private void editText() {