Ventana de recorte modificada, tamaño de recorte correcto en caso de que sea…

Ventana de recorte modificada, tamaño de recorte correcto en caso de que sea editar picto. Colores cambiados a los corporativos

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictogramActivity.java

@@ -1126,7 +1126,7 @@ protected void showOnlyTape(boolean onlyTape) {
      */
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        
+
         Bitmap imagen = null;
           switch(requestCode) {
               case CAMERA_PIC_REQUEST: //Captura de foto

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/cropper/CropImageView.java

@@ -31,7 +31,7 @@ import com.yottacode.pictogram.tabletlibrary.gui.communicator.cropper.util.Paint
  *
  * Class to see it on the image to crop
  */
-public class CropImageView extends ImageView {
+public class CropImageView extends android.support.v7.widget.AppCompatImageView {
 
 
 

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/cropper/EditPictoActivity.java

@@ -219,7 +219,7 @@ public class EditPictoActivity extends Activity {
 
         cropImageView.setFixedAspectRatio(true);
         cropImageView.setGuidelines(2);
-        cropImageView.setAspectRatio(1, 1);
+        //cropImageView.setAspectRatio(cropImageView.getWidth(),cropImageView.getHeight());
 
         if (transcription != null && transcription.length() > 0)
             legend.setText(transcription);
@@ -227,9 +227,13 @@ public class EditPictoActivity extends Activity {
         legend.setMaxLines(1);
         legend.setSingleLine(true);
 
+        editar = getIntent().getBooleanExtra("tipo",false);
+        titulo.setText(editar ? R.string.titleCropperEdit : R.string.titleCropperNew);
+
         //Obtener imagen del intent
         byte[] byteArray = getIntent().getByteArrayExtra(EditPictoActivity.IMAGE_PICTO);
         Bitmap imagePicto = BitmapFactory.decodeByteArray(byteArray, 0, byteArray.length);
+        cropImageView.setAspectRatio(editar ? imagePicto.getWidth() : 4,editar ? imagePicto.getHeight() : 3); //Si es editar un picto la ventana de recorte mantiene el tamaño de la imagen, sino 4:3
         cropImageView.setImageBitmap(imagePicto);
         cropImageView.setMaxWidth(imagePicto.getWidth());
         cropImageView.setMaxHeight(imagePicto.getHeight());
@@ -246,14 +250,12 @@ public class EditPictoActivity extends Activity {
 
             if (legend.getText().toString().trim().length() > 0) {
                 final Bitmap croppedImage = cropImageView.getCroppedImage();
-                //Escalar imagen
-                Bitmap finalImage = croppedImage.createScaledBitmap(croppedImage, 100, 100, true);
 
                 //Guardar imagen en galeria y obtener la ruta
                 ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-                finalImage.compress(Bitmap.CompressFormat.JPEG, 100, bytes);
+                croppedImage.compress(Bitmap.CompressFormat.PNG, 100, bytes);
                 String title = getResources().getString(R.string.app_name) + ' ' + legend.getText().toString();
-                String path = MediaStore.Images.Media.insertImage(PCBcontext.getContext().getContentResolver(), finalImage, title, null);
+                String path = MediaStore.Images.Media.insertImage(getContentResolver(), croppedImage, title, null);
                 path = getRealPathFromURI(Uri.parse(path));
                 Log.i(LOG_PATH, " New image " + title + " saved at " + path);
 
@@ -263,9 +265,7 @@ public class EditPictoActivity extends Activity {
                 intent.putExtra(Picto.JSON_ATTTRS.CATEGORY,getIntent().getIntExtra(Picto.JSON_ATTTRS.CATEGORY, -1));
                 intent.putExtra("tipo",editar); //Para saber despues si estas editando o añadiendo nuevo y coger los datos de intent o de data en OnActivityResult
                 setResult(RESULT_OK, intent);
-                cropImageView.setImageBitmap(finalImage);
-
-                //Log.i("TAG_PRUEBAS","Lanza ok de editar");
+                cropImageView.setImageBitmap(croppedImage);
 
                 finish(); //Termina la actividad de editar
             } else

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/cropper/util/PaintUtil.java

@@ -22,7 +22,7 @@ public class PaintUtil {
         final Paint paint = new Paint();
         paint.setStyle(Paint.Style.STROKE);
         paint.setStrokeWidth(resources.getDimension(R.dimen.border_thickness));
-        paint.setColor(resources.getColor(R.color.border));
+        paint.setColor(resources.getColor(R.color.VerdeApp));
 
         return paint;
     }
@@ -35,7 +35,7 @@ public class PaintUtil {
         final Paint paint = new Paint();
         paint.setStyle(Paint.Style.STROKE);
         paint.setStrokeWidth(resources.getDimension(R.dimen.guideline_thickness));
-        paint.setColor(resources.getColor(R.color.guideline));
+        paint.setColor(resources.getColor(R.color.VerdeApp));
 
         return paint;
     }
@@ -62,7 +62,7 @@ public class PaintUtil {
         final Paint paint = new Paint();
         paint.setStyle(Paint.Style.STROKE);
         paint.setStrokeWidth(resources.getDimension(R.dimen.corner_thickness));
-        paint.setColor(resources.getColor(R.color.corner));
+        paint.setColor(resources.getColor(R.color.VerdeApp));
 
         return paint;
     }