Skip to content

Commit

Permalink
add support for drawing arrows
Browse files Browse the repository at this point in the history
  • Loading branch information
@jiwansvmx
jiwansvmx committed Apr 3, 2023
1 parent 158b494 commit 2b13e21
Show file tree
Hide file tree
Showing 5 changed files with 344 additions and 90 deletions.
57 changes: 31 additions & 26 deletions android/src/main/java/com/ahmedadeltito/photoeditor/PhotoEditorActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import android.graphics.BitmapFactory;
import android.graphics.Color;
import android.graphics.Matrix;
import android.graphics.Paint;
import android.graphics.Typeface;
import android.net.Uri;
import android.os.Build;
Expand All @@ -22,6 +21,7 @@
import android.os.Environment;
import android.provider.DocumentsContract;
import android.provider.MediaStore;

import androidx.annotation.NonNull;
import androidx.exifinterface.media.ExifInterface;
import androidx.core.app.ActivityCompat;
Expand All @@ -33,11 +33,11 @@
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import android.widget.ImageView;
Expand All @@ -50,7 +50,7 @@
import android.view.WindowManager;

import com.ahmedadeltito.photoeditor.widget.SlidingUpPanelLayout;
import com.ahmedadeltito.photoeditorsdk.BrushDrawingView;
import com.ahmedadeltito.photoeditorsdk.CustomBrushDrawingView;
import com.ahmedadeltito.photoeditorsdk.OnPhotoEditorSDKListener;
import com.ahmedadeltito.photoeditorsdk.PhotoEditorSDK;
import com.ahmedadeltito.photoeditorsdk.ViewType;
Expand Down Expand Up @@ -102,7 +102,7 @@ public class PhotoEditorActivity extends AppCompatActivity implements View.OnCli
private boolean hideBottomControls = true;

private ImageView photoEditImageView;
private BrushDrawingView brushDrawingView;
private CustomBrushDrawingView brushDrawingView;


@Override
Expand Down Expand Up @@ -141,12 +141,13 @@ protected void onCreate(Bundle savedInstanceState) {

emojiFont = getFontFromRes(R.raw.emojioneandroid);

brushDrawingView = (BrushDrawingView) findViewById(R.id.drawing_view);
brushDrawingView = (CustomBrushDrawingView) findViewById(R.id.drawing_view);
drawingViewColorPickerRecyclerView = (RecyclerView) findViewById(R.id.drawing_view_color_picker_recycler_view);
parentImageRelativeLayout = (RelativeLayout) findViewById(R.id.parent_image_rl);
ImageView closeTextView = (ImageView) findViewById(R.id.close_tv);
ImageView addTextView = (ImageView) findViewById(R.id.add_text_tv);
ImageView addPencil = (ImageView) findViewById(R.id.add_pencil_tv);
ImageView arrowPencil = (ImageView) findViewById(R.id.add_arrow_tv);
RelativeLayout deleteRelativeLayout = (RelativeLayout) findViewById(R.id.delete_rl);
ImageView deleteTextView = (ImageView) findViewById(R.id.delete_tv);
TextView addImageEmojiTextView = (TextView) findViewById(R.id.add_image_emoji_tv);
Expand All @@ -165,8 +166,8 @@ protected void onCreate(Bundle savedInstanceState) {

ViewPager pager = (ViewPager) findViewById(R.id.image_emoji_view_pager);
PageIndicator indicator = (PageIndicator) findViewById(R.id.image_emoji_indicator);
// Changing width of an imageview to maintain aspect ratio

// Changing width of an imageview to maintain aspect ratio
// and to fix image perfectly in parent relative layout
int width = rotatedBitmap.getWidth();
int height = rotatedBitmap.getHeight();
Expand Down Expand Up @@ -236,6 +237,7 @@ public void onPageScrollStateChanged(int state) {
addCropTextView.setOnClickListener(this);
addTextView.setOnClickListener(this);
addPencil.setOnClickListener(this);
arrowPencil.setOnClickListener(this);
saveTextView.setOnClickListener(this);
doneDrawingTextView.setOnClickListener(this);
clearAllTextView.setOnClickListener(this);
Expand Down Expand Up @@ -274,24 +276,24 @@ public void onFinish() {
}.start();

ArrayList hiddenControls = (ArrayList<Integer>) getIntent().getExtras().getSerializable("hiddenControls");
for (int i = 0;i < hiddenControls.size();i++) {
for (int i = 0; i < hiddenControls.size(); i++) {
if (hiddenControls.get(i).toString().equalsIgnoreCase("text")) {
addTextView.setVisibility(View.INVISIBLE);
addTextView.setVisibility(View.GONE);
}
if (hiddenControls.get(i).toString().equalsIgnoreCase("clear")) {
clearAllTextView.setVisibility(View.INVISIBLE);
clearAllTextView.setVisibility(View.GONE);
}
if (hiddenControls.get(i).toString().equalsIgnoreCase("draw")) {
addPencil.setVisibility(View.INVISIBLE);
addPencil.setVisibility(View.GONE);
}
if (hiddenControls.get(i).toString().equalsIgnoreCase("save")) {
saveTextView.setVisibility(View.INVISIBLE);
saveTextView.setVisibility(View.GONE);
}
if (hiddenControls.get(i).toString().equalsIgnoreCase("sticker")) {
addImageEmojiTextView.setVisibility(View.INVISIBLE);
addImageEmojiTextView.setVisibility(View.GONE);
}
if (hiddenControls.get(i).toString().equalsIgnoreCase("crop")) {
addCropTextView.setVisibility(View.INVISIBLE);
addCropTextView.setVisibility(View.GONE);
}
}
}
Expand Down Expand Up @@ -408,6 +410,11 @@ public void onColorPickerClickListener(int colorCode) {
}
}

private void updateArrowDrawingView() {
brushDrawingView.setDrawingMode(CustomBrushDrawingView.DrawingMode.Arrow);
updateBrushDrawingView(true);
}

private void returnBackWithSavedImage() {
int permissionCheck = PermissionChecker.checkCallingOrSelfPermission(this,
android.Manifest.permission.WRITE_EXTERNAL_STORAGE);
Expand Down Expand Up @@ -575,11 +582,13 @@ public void onClick(View v) {
onBackPressed();
} else if (v.getId() == R.id.add_image_emoji_tv) {
mLayout.setPanelState(SlidingUpPanelLayout.PanelState.EXPANDED);
} else if(v.getId() == R.id.add_crop_tv) {
} else if (v.getId() == R.id.add_crop_tv) {
System.out.println("CROP IMAGE DUD");
startCropping();
} else if (v.getId() == R.id.add_text_tv) {
openAddTextPopupWindow("", -1);
} else if (v.getId() == R.id.add_arrow_tv) {
updateArrowDrawingView();
} else if (v.getId() == R.id.add_pencil_tv) {
updateBrushDrawingView(true);
} else if (v.getId() == R.id.done_drawing_tv) {
Expand Down Expand Up @@ -679,26 +688,23 @@ public int getCount() {
}
}

private Typeface getFontFromRes(int resource)
{
private Typeface getFontFromRes(int resource) {
Typeface tf = null;
InputStream is = null;
try {
is = getResources().openRawResource(resource);
}
catch(Resources.NotFoundException e) {
} catch (Resources.NotFoundException e) {
Log.e(TAG, "Could not find font in resources!");
}

String outPath = getCacheDir() + "/tmp" + System.currentTimeMillis() + ".raw";

try
{
try {
byte[] buffer = new byte[is.available()];
BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(outPath));

int l = 0;
while((l = is.read(buffer)) > 0)
while ((l = is.read(buffer)) > 0)
bos.write(buffer, 0, l);

bos.close();
Expand All @@ -707,9 +713,7 @@ private Typeface getFontFromRes(int resource)

// clean up
new File(outPath).delete();
}
catch (IOException e)
{
} catch (IOException e) {
Log.e(TAG, "Error reading in font!");
return null;
}
Expand Down Expand Up @@ -759,7 +763,7 @@ public void onActivityResult(final int requestCode, final int resultCode, final
if (resultUri != null) {
try {
selectedImagePath = resultUri.toString();
Bitmap bitmap = MediaStore.Images.Media.getBitmap(this.getContentResolver() , resultUri);
Bitmap bitmap = MediaStore.Images.Media.getBitmap(this.getContentResolver(), resultUri);
photoEditImageView.setImageBitmap(bitmap);
} catch (Exception ex) {
System.out.println("NO IMAGE DATA FOUND");
Expand All @@ -772,6 +776,7 @@ public void onActivityResult(final int requestCode, final int resultCode, final
}
}
}

@TargetApi(Build.VERSION_CODES.KITKAT)
protected String getPath(final Uri uri) {
// DocumentProvider
Expand Down
Loading

0 comments on commit 2b13e21

Please sign in to comment.