Skip to content

yotta / pictogram

Go to a project
Commit 91316a7f by Germán Callejas Alcántara
Options

Cambios de parametros en los intents para editar pictos (Falta arreglar añadir uno nuevo)

parent bb59a400
Inline Side-by-side
Showing with 9 additions and 7 deletions
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictogramActivity.java
......@@ -1127,7 +1127,8 @@ protected void showOnlyTape(boolean onlyTape) {
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
boolean edit = data.getBooleanExtra("tipo",false);
int cat = data.getIntExtra(Picto.JSON_ATTTRS.CATEGORY, -1);// getIntent().getIntExtra("cat", -1);
Log.i("TAG_PRUEBAS","categoria antes de switch: "+String.valueOf(cat));
Bitmap imagen = null;
switch(requestCode) {
......@@ -1151,14 +1152,15 @@ protected void showOnlyTape(boolean onlyTape) {
break;
case EditPictoActivity.EDIT_PICTO_REQUEST:
if (resultCode == RESULT_OK) {
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);
int row = edit ? data.getExtras().getInt(Picto.JSON_ATTTRS.ROW) : getIntent().getIntExtra(Picto.JSON_ATTTRS.ROW, -1);
int col = edit ? data.getExtras().getInt(Picto.JSON_ATTTRS.COLUMN) : getIntent().getIntExtra(Picto.JSON_ATTTRS.COLUMN, -1);
int freeRow = edit ? data.getExtras().getInt(Picto.JSON_ATTTRS.FREE_ROW) : getIntent().getIntExtra(Picto.JSON_ATTTRS.FREE_ROW, -1);
int freeColumn = edit ? data.getExtras().getInt(Picto.JSON_ATTTRS.FREE_COLUMN) : getIntent().getIntExtra(Picto.JSON_ATTTRS.FREE_COLUMN, -1);
int cat = edit ? data.getIntExtra(Picto.JSON_ATTTRS.CATEGORY, -1) : getIntent().getIntExtra(Picto.JSON_ATTTRS.CATEGORY, -1);
//int category = data.getExtras().getInt("cat");
//Log.i("TAG_PRUEBAS","categoria: "+String.valueOf(category));
String path = data.getExtras().getString(EditPictoActivity.PATH);
String legend = data.getExtras().getString(Picto.JSON_ATTTRS.EXPRESSION);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment