Vista para editar picto arreglada(Ya funciona bien para editar la imagen o subir una nueva)

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

@@ -3,6 +3,7 @@ package com.yottacode.pictogram.tabletlibrary.gui.communicator;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Point;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
@@ -136,10 +137,15 @@ public class PictoMenu {
             rescaled.compress(Bitmap.CompressFormat.PNG, 100, stream);
             byte[] byteArray = stream.toByteArray();
             intent.putExtra(EditPictoActivity.IMAGE_PICTO, byteArray);
-
         }
         intent.putExtra("tipo",true);
-        activity.startActivity(intent);
+
+        Log.i("TAG_PRUEBAS","---setPicto---");
+        Log.i("TAG_PRUEBAS","row: "+row);
+        Log.i("TAG_PRUEBAS","col: "+col);
+        Log.i("TAG_PRUEBAS","expression: "+expression);
+
+        activity.startActivityForResult(intent,EditPictoActivity.EDIT_PICTO_REQUEST);
     }
 
     /**Function for build a radial menu

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

@@ -1151,27 +1151,18 @@ protected void showOnlyTape(boolean onlyTape) {
                   break;
               case EditPictoActivity.EDIT_PICTO_REQUEST:
                   if (resultCode == RESULT_OK) {
-                      Log.i("TAG_PRUEBAS","Llega a fin de nuevo");
-                      int row = getIntent().getIntExtra(Picto.JSON_ATTTRS.ROW, -1);
-                      int col = getIntent().getIntExtra(Picto.JSON_ATTTRS.COLUMN, -1);
-                      int freeRow = getIntent().getIntExtra(Picto.JSON_ATTTRS.FREE_ROW, -1);
-                      int freeColumn = getIntent().getIntExtra(Picto.JSON_ATTTRS.FREE_COLUMN, -1);
+                      Log.i("TAG_PRUEBAS","---REQUEST_OK_EDIT----");
+                      int row = data.getExtras().getInt(Picto.JSON_ATTTRS.ROW, -1);
+                      int col = data.getExtras().getInt(Picto.JSON_ATTTRS.COLUMN);
+                      int freeRow = data.getExtras().getInt(Picto.JSON_ATTTRS.FREE_ROW, -1);
+                      int freeColumn = data.getExtras().getInt(Picto.JSON_ATTTRS.FREE_COLUMN, -1);
                       
                       String path = data.getExtras().getString(EditPictoActivity.PATH);
                       String legend = data.getExtras().getString(Picto.JSON_ATTTRS.EXPRESSION);
-                      chooseTextAndSavePicto(path, row, col, freeRow, freeColumn, cat, legend);
-                  }
-                  break;
-             case EditPictoActivity.FINISH_EDIT:
-                  Log.i("TAG_PRUEBAS","Llega a fin de editar");
-                  int row = data.getIntExtra(Picto.JSON_ATTTRS.ROW, -1);
-                  int col = data.getIntExtra(Picto.JSON_ATTTRS.COLUMN, -1);
-                  int freeRow = data.getIntExtra(Picto.JSON_ATTTRS.FREE_ROW, -1);
-                  int freeColumn = data.getIntExtra(Picto.JSON_ATTTRS.FREE_COLUMN, -1);
 
-                  String path = data.getExtras().getString(EditPictoActivity.PATH);
-                  String legend = data.getExtras().getString(Picto.JSON_ATTTRS.EXPRESSION);
                       chooseTextAndSavePicto(path, row, col, freeRow, freeColumn, cat, legend);
+                      refresh();
+                  }
                   break;
           }
 

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

@@ -252,26 +252,14 @@ public class EditPictoActivity extends Activity {
                 path = getRealPathFromURI(Uri.parse(path));
                 Log.i(LOG_PATH, " New image " + title + " saved at " + path);
 
-                        //Intent intent = new Intent(EditPictoActivity.this,PictogramActivity.class);//getIntent(); //Mandar a pictogram activity el path y el texto de la imagen
-                        //intent.putExtra(PATH, path);
-                        //intent.putExtra(Picto.JSON_ATTTRS.EXPRESSION, legend.getText().toString());
-
-                        cropImageView.setImageBitmap(finalImage);
-                        if(editar){
-                            Log.i("TAG_PRUEBAS","Lanza ok de editar");
-                            //Intent intent = new Intent(EditPictoActivity.this,PictogramActivity.class);//Mandar a pictogram activity el path y el texto de la imagen
-                            Intent intent = getIntent();
-                            intent.putExtra(PATH, path);
-                            intent.putExtra(Picto.JSON_ATTTRS.EXPRESSION, legend.getText().toString());
-                            intent.setAction(String.valueOf(FINISH_EDIT));
-                            //startActivityForResult(intent, EditPictoActivity.EDIT_PICTO_REQUEST);
-                        }else{
-                            Log.i("TAG_PRUEBAS","Lanza ok de nuevo");
                 Intent intent = getIntent(); //Mandar a pictogram activity el path y el texto de la imagen
                 intent.putExtra(PATH, path);
                 intent.putExtra(Picto.JSON_ATTTRS.EXPRESSION, legend.getText().toString());
                 setResult(RESULT_OK, intent);
-                        }
+                cropImageView.setImageBitmap(finalImage);
+
+                Log.i("TAG_PRUEBAS","Lanza ok de editar");
+
                 finish(); //Termina la actividad de editar
             } else
                 Toast.makeText(getBaseContext(), R.string.crop_TextRequired, Toast.LENGTH_LONG).show();
@@ -553,18 +541,6 @@ public class EditPictoActivity extends Activity {
                     cropImageView.setImageBitmap(rescaled);
                 }
                 break;
-            /*case EditPictoActivity.EDIT_PICTO_REQUEST:
-                if (resultCode == RESULT_OK) {
-                    int row = getIntent().getIntExtra(Picto.JSON_ATTTRS.ROW, -1);
-                    int col = getIntent().getIntExtra(Picto.JSON_ATTTRS.COLUMN, -1);
-                    int freeRow = getIntent().getIntExtra(Picto.JSON_ATTTRS.FREE_ROW, -1);
-                    int freeColumn = getIntent().getIntExtra(Picto.JSON_ATTTRS.FREE_COLUMN, -1);
-
-                    String path = data.getExtras().getString(EditPictoActivity.PATH);
-                    String legend = data.getExtras().getString(Picto.JSON_ATTTRS.EXPRESSION);
-                    chooseTextAndSavePicto(path, row, col, freeRow, freeColumn, cat, legend);
-                }
-                break;*/
         }
 
     }