From 680009efb184c83efac6cf67db1e41563811b06e Mon Sep 17 00:00:00 2001 From: jgarcia162 Date: Sun, 14 Jun 2015 15:50:41 -0400 Subject: [PATCH 1/4] merged master --- MemeProject/.idea/gradle.xml | 7 ++++--- MemeProject/MemeProject.iml | 6 +++--- MemeProject/app/app.iml | 8 ++++---- .../c4q/nyc/memeproject/EditPhoto.java | 18 ------------------ 4 files changed, 11 insertions(+), 28 deletions(-) diff --git a/MemeProject/.idea/gradle.xml b/MemeProject/.idea/gradle.xml index 736c7b5..3ec5955 100644 --- a/MemeProject/.idea/gradle.xml +++ b/MemeProject/.idea/gradle.xml @@ -3,8 +3,10 @@ - - + \ No newline at end of file diff --git a/MemeProject/MemeProject.iml b/MemeProject/MemeProject.iml index 0bb6048..9a5441c 100644 --- a/MemeProject/MemeProject.iml +++ b/MemeProject/MemeProject.iml @@ -1,9 +1,10 @@ - + @@ -15,5 +16,4 @@ - - + \ No newline at end of file diff --git a/MemeProject/app/app.iml b/MemeProject/app/app.iml index d30b36b..f41a9f7 100644 --- a/MemeProject/app/app.iml +++ b/MemeProject/app/app.iml @@ -1,5 +1,5 @@ - + @@ -12,8 +12,9 @@ - - + \ No newline at end of file diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java index de54a04..a53a2cc 100644 --- a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java +++ b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java @@ -37,7 +37,6 @@ public class EditPhoto extends Activity implements View.OnTouchListener, View.OnDragListener { - Bitmap b; Bitmap bitmap; public static ImageView imageView; @@ -93,11 +92,9 @@ protected void onCreate(Bundle savedInstanceState) { editText.setTypeface(custom_font); editText2.setTypeface(custom_font); - editText.setOnTouchListener(this); editText2.setOnTouchListener(this); - //Drag and drop layouts for drag and drop EditText feature LinearLayout textTop = (LinearLayout) findViewById(R.id.textTop); LinearLayout textMid = (LinearLayout) findViewById(R.id.textMid); @@ -194,7 +191,6 @@ public void onClick(View v) { } }); - vanilla.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -204,18 +200,15 @@ public void onClick(View view) { } }); - demotivational.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { isVanilla = false; demotivate(view); - } }); instance = this; - } //----------------------------VANILLA AND DEMOTIVATIONAL METHODS--------------------------// @@ -330,7 +323,6 @@ public Bitmap getBitmapFromView(View view) { return returnedBitmap; } - //---------------------------------DRAGGING EDITTEXT METHODS------------------------------// // onTouch and onDrag work together to allow for views to be moved around within the layout @@ -347,7 +339,6 @@ public boolean onTouch(View v, MotionEvent e) { } } - public boolean onDrag(View v, DragEvent e) { if (e.getAction() == DragEvent.ACTION_DROP) {//if the shadow has been released within the view View view = (View) e.getLocalState(); @@ -357,8 +348,6 @@ public boolean onDrag(View v, DragEvent e) { if((to.getResources().getInteger(Integer.valueOf(R.id.editText)) == (from.getResources().getInteger(Integer.valueOf(R.id.editText2))))) { - - } from.removeView(view); to.addView(view); @@ -369,12 +358,10 @@ public boolean onDrag(View v, DragEvent e) { InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT); - } return true; } - //----------------------------VANILLA EDITTEXT FONT SIZE METHODS--------------------------// @@ -461,11 +448,8 @@ public void setBlue(View v) { editText.setTextColor(Color.BLUE); editText2.setTextColor(Color.BLUE); - - } - //----------------------------------IMAGE EFFECTS METHODS---------------------------------// // Applies engrave effect to image @@ -554,8 +538,6 @@ public void shadingFilterGreen(View view) { Toast.makeText(this,"Green",Toast.LENGTH_SHORT).show(); } - - public void choseColor (View v) { color = colorPicker.getColor(); linearLayout3 = (LinearLayout) findViewById(R.id.linearLayout3); From df6c3fd1342c470ccb6f63fdbdc4a943dc0e5e6c Mon Sep 17 00:00:00 2001 From: MadelynTav Date: Thu, 18 Jun 2015 08:07:54 -0400 Subject: [PATCH 2/4] before m --- .../main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java | 4 ++-- .../java/madelyntav/c4q/nyc/memeproject/MainActivity.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java index 1893958..6779e24 100644 --- a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java +++ b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java @@ -483,7 +483,7 @@ public void setBlue(View v) { // Applies engrave effect to image public void engravedImage(View view) { Handler handler= new Handler(); - handler.post(new Runnable() { + handler.postDelayed(new Runnable() { @Override public void run() { if (getIntent().hasExtra("byteArray")) { @@ -499,7 +499,7 @@ public void run() { Toast.makeText(EditPhoto.this, "Engraved", Toast.LENGTH_SHORT).show(); } - }); + },1000); } diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java index 2586787..32ae0c9 100644 --- a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java +++ b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java @@ -62,7 +62,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { Bundle extras = data.getExtras(); Bitmap imageBitmap = (Bitmap) extras.get("data"); ByteArrayOutputStream bs = new ByteArrayOutputStream(); - imageBitmap.compress(Bitmap.CompressFormat.JPEG, 100, bs); + imageBitmap.compress(Bitmap.CompressFormat.JPEG, 50, bs); intent.putExtra("byteArray", bs.toByteArray()); startActivity(intent); From 85f7211701ebe080d7fd6707bbf3b5421dcf7003 Mon Sep 17 00:00:00 2001 From: MadelynTav Date: Thu, 18 Jun 2015 18:24:36 -0400 Subject: [PATCH 3/4] fixing --- .../main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java | 4 ++-- MemeProject/app/src/main/res/layout/activity_edit_photo.xml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java index 0d973df..55152c7 100644 --- a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java +++ b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java @@ -468,7 +468,7 @@ public void setTwentyFive(View v) { // Applies engrave effect to image public void clearImage(View view) { Handler handler= new Handler(); - handler.postDelayed(new Runnable() { + handler.post(new Runnable() { @Override public void run() { imageView.setImageBitmap(uriBm); @@ -493,7 +493,7 @@ public void run() { Toast.makeText(EditPhoto.this, "Engraved", Toast.LENGTH_SHORT).show(); } - },1000); + }); } diff --git a/MemeProject/app/src/main/res/layout/activity_edit_photo.xml b/MemeProject/app/src/main/res/layout/activity_edit_photo.xml index 0e3a58b..04e2ee1 100644 --- a/MemeProject/app/src/main/res/layout/activity_edit_photo.xml +++ b/MemeProject/app/src/main/res/layout/activity_edit_photo.xml @@ -274,7 +274,8 @@ + android:layout_alignParentTop="true" + android:layout_alignEnd="@+id/demotivationalText" /> Date: Fri, 19 Jun 2015 19:53:13 -0400 Subject: [PATCH 4/4] fixed clear button --- MemeProject/app/app.iml | 1 + .../c4q/nyc/memeproject/EditPhoto.java | 110 ++++++++++++------ .../c4q/nyc/memeproject/MainActivity.java | 6 - 3 files changed, 73 insertions(+), 44 deletions(-) diff --git a/MemeProject/app/app.iml b/MemeProject/app/app.iml index 88c6a23..f41a9f7 100644 --- a/MemeProject/app/app.iml +++ b/MemeProject/app/app.iml @@ -82,6 +82,7 @@ + diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java index 8af6444..955d8f0 100644 --- a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java +++ b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/EditPhoto.java @@ -107,46 +107,47 @@ protected void onCreate(Bundle savedInstanceState) { // textMid.setOnDragListener(this); // textTop.setOnDragListener(this); - imageView = (ImageView) findViewById(R.id.mImageView); - demoImage = (ImageView) findViewById(R.id.demotivationalImage); + // imageView = (ImageView) findViewById(R.id.mImageView); + //demoImage = (ImageView) findViewById(R.id.demotivationalImage); memeLayout = (RelativeLayout) findViewById(R.id.meme); //----------------------------GET IMAGE FROM PREVIOUS INTENT--------------------------// //opens pic in this activity - if (getIntent().hasExtra("byteArray")) { - b = BitmapFactory.decodeByteArray(getIntent().getByteArrayExtra("byteArray"), 0, getIntent().getByteArrayExtra("byteArray").length); - imageView = (ImageView) findViewById(R.id.mImageView); - vanilla = (Button) findViewById(R.id.vanilla); - editText = (EditText) findViewById(R.id.editText); - editText2 = (EditText) findViewById(R.id.editText2); - demoTitle = (EditText) findViewById(R.id.demotivationalTitle); - demoText = (EditText) findViewById(R.id.demotivationalText); - imageView.setImageBitmap(b); - demoImage.setImageBitmap(b); - - - } else { - - //retrieve passed uri - Uri uri = getIntent().getExtras().getParcelable("image"); - //retrieve bitmap uri from intent - try { - bitmap = MediaStore.Images.Media.getBitmap(this.getContentResolver(), uri); - - } catch (IOException e) { - e.printStackTrace(); - } - //create bitmap for use within activity - try { - bitmap = Bitmap.createBitmap(MediaStore.Images.Media.getBitmap(this.getContentResolver(), uri)); - } catch (IOException e) { - e.printStackTrace(); - } - imageView.setImageBitmap(bitmap); - demoImage.setImageBitmap(bitmap); + if (getIntent().hasExtra("byteArray")) { + b = BitmapFactory.decodeByteArray(getIntent().getByteArrayExtra("byteArray"), 0, getIntent().getByteArrayExtra("byteArray").length); + //imageView = (ImageView) findViewById(R.id.mImageView); + vanilla = (Button) findViewById(R.id.vanilla); + editText = (EditText) findViewById(R.id.editText); + editText2 = (EditText) findViewById(R.id.editText2); + demoTitle = (EditText) findViewById(R.id.demotivationalTitle); + demoText = (EditText) findViewById(R.id.demotivationalText); + imageView.setImageBitmap(b); + demoImage.setImageBitmap(b); + + + } else { + + //retrieve passed uri + Uri uri = getIntent().getExtras().getParcelable("image"); + //retrieve bitmap uri from intent + try { + bitmap = MediaStore.Images.Media.getBitmap(this.getContentResolver(), uri); + + } catch (IOException e) { + e.printStackTrace(); + } + //create bitmap for use within activity + try { + bitmap = Bitmap.createBitmap(MediaStore.Images.Media.getBitmap(this.getContentResolver(), uri)); + } catch (IOException e) { + e.printStackTrace(); } + imageView.setImageBitmap(bitmap); + demoImage.setImageBitmap(bitmap); + } + //-----------------------------SHARE BUTTON ONCLICKLISTENER---------------------------// // Shares image via Email, Text, Bluetooth, etc... @@ -194,7 +195,6 @@ public void onClick(View v) { } }); - vanilla.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -204,7 +204,6 @@ public void onClick(View view) { } }); - demotivational.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -264,8 +263,6 @@ public void storeImage(View v) { File pictureFile = createImageFile(); addImageToFile(image, pictureFile); Toast.makeText(this, "Saved to gallery", Toast.LENGTH_SHORT).show(); - - } /** @@ -471,10 +468,14 @@ public void setBlue(View v) { // Applies engrave effect to image public void engravedImage(View view) { if (getIntent().hasExtra("byteArray")) { + imageView.setImageBitmap(null); + demoImage.setImageBitmap(null); Bitmap engraved = ApplyFilters.engrave(b); imageView.setImageBitmap(engraved); demoImage.setImageBitmap(engraved); } else { + imageView.setImageBitmap(null); + demoImage.setImageBitmap(null); Bitmap engraved = ApplyFilters.engrave(bitmap); imageView.setImageBitmap(engraved); demoImage.setImageBitmap(engraved); @@ -485,10 +486,14 @@ public void engravedImage(View view) { // Applies inverted colors effect to image public void invertColors(View view) { if (getIntent().hasExtra("byteArray")) { + imageView.setImageBitmap(null); + demoImage.setImageBitmap(null); Bitmap inverted = ApplyFilters.doInvert(b); imageView.setImageBitmap(inverted); demoImage.setImageBitmap(inverted); } else { + imageView.setImageBitmap(null); + demoImage.setImageBitmap(null); Bitmap inverted = ApplyFilters.doInvert(bitmap); imageView.setImageBitmap(inverted); demoImage.setImageBitmap(inverted); @@ -500,10 +505,14 @@ public void invertColors(View view) { // Applies greyscale effect to image public void greyscaleImage(View view) { if (getIntent().hasExtra("byteArray")) { + imageView.setImageBitmap(null); + demoImage.setImageBitmap(null); Bitmap greyscaled = ApplyFilters.doGreyscale(b); imageView.setImageBitmap(greyscaled); demoImage.setImageBitmap(greyscaled); } else { + imageView.setImageBitmap(null); + demoImage.setImageBitmap(null); Bitmap greyscaled = ApplyFilters.doGreyscale(bitmap); imageView.setImageBitmap(greyscaled); demoImage.setImageBitmap(greyscaled); @@ -514,10 +523,14 @@ public void greyscaleImage(View view) { // Applies blue shading effect to image public void shadingFilterBlue(View view) { if (getIntent().hasExtra("byteArray")) { + imageView.setImageBitmap(null); + demoImage.setImageBitmap(null); Bitmap blueShade = ApplyFilters.applyShadingFilter(b, Color.BLUE); imageView.setImageBitmap(blueShade); demoImage.setImageBitmap(blueShade); } else { + imageView.setImageBitmap(null); + demoImage.setImageBitmap(null); Bitmap blueShade = ApplyFilters.applyShadingFilter(bitmap, Color.BLUE); imageView.setImageBitmap(blueShade); demoImage.setImageBitmap(blueShade); @@ -528,10 +541,14 @@ public void shadingFilterBlue(View view) { // Applies red shading effect to image public void shadingFilterRed(View view) { if (getIntent().hasExtra("byteArray")) { + imageView.setImageBitmap(null); + demoImage.setImageBitmap(null); Bitmap redShade = ApplyFilters.applyShadingFilter(b, Color.RED); imageView.setImageBitmap(redShade); demoImage.setImageBitmap(redShade); } else { + imageView.setImageBitmap(null); + demoImage.setImageBitmap(null); Bitmap redShade = ApplyFilters.applyShadingFilter(bitmap, Color.RED); imageView.setImageBitmap(redShade); demoImage.setImageBitmap(redShade); @@ -543,10 +560,14 @@ public void shadingFilterRed(View view) { public void shadingFilterGreen(View view) { if (getIntent().hasExtra("byteArray")) { + imageView.setImageBitmap(null); + demoImage.setImageBitmap(null); Bitmap greenShade = ApplyFilters.applyShadingFilter(b, Color.GREEN); imageView.setImageBitmap(greenShade); demoImage.setImageBitmap(greenShade); } else { + imageView.setImageBitmap(null); + demoImage.setImageBitmap(null); Bitmap greenShade = ApplyFilters.applyShadingFilter(bitmap, Color.GREEN); imageView.setImageBitmap(greenShade); demoImage.setImageBitmap(greenShade); @@ -554,7 +575,20 @@ public void shadingFilterGreen(View view) { Toast.makeText(this,"Green",Toast.LENGTH_SHORT).show(); } - + public void clearImage(View view){ + if (getIntent().hasExtra("byteArray")) { + imageView.setImageBitmap(null); + imageView.setImageBitmap(b); + demoImage.setImageBitmap(null); + demoImage.setImageBitmap(b); + } else { + imageView.setImageBitmap(null); + imageView.setImageBitmap(bitmap); + demoImage.setImageBitmap(null); + demoImage.setImageBitmap(bitmap); + } + Toast.makeText(this,"Normal",Toast.LENGTH_SHORT).show(); + } public void choseColor (View v) { color = colorPicker.getColor(); diff --git a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java index d1ee61a..b6c6183 100644 --- a/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java +++ b/MemeProject/app/src/main/java/madelyntav/c4q/nyc/memeproject/MainActivity.java @@ -98,7 +98,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { targetUri = data.getData(); intent.putExtra("image", targetUri); - // Bitmap bitmap = null; // ContentResolver cr = getContentResolver(); // @@ -111,16 +110,11 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { // } catch (IOException e) { // e.printStackTrace(); // } -// -// - } //pass image to intent if (targetUri != null) { startActivity(intent); } - } - } \ No newline at end of file