Vista para Recortar modificada

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

@@ -6,17 +6,22 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.Window;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
 import android.widget.EditText;
+import android.widget.FrameLayout;
 import android.widget.ImageButton;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -47,17 +52,48 @@ public class EditPictoActivity extends Activity {
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.edit_picto_layout);
 
+        DisplayMetrics metrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(metrics);
+        LinearLayout ll = (LinearLayout)findViewById(R.id.image_layout);
+        Log.i("DETALLES", "Tam menu imagen: "+ ll.getLayoutParams().width);
+        ll.getLayoutParams().width = (int) (metrics.widthPixels * 0.75 ) - (int) getResources().getDimension(R.dimen.activity_vertical_margin);
+        Log.i("DETALLES", "Tam menu imagen: "+ ll.getLayoutParams().width);
+        ll.requestLayout();
+
+        FrameLayout fl = (FrameLayout)findViewById(R.id.legend_menu);
+        Log.i("DETALLES", "Tam menu leyenda: "+ fl.getLayoutParams().width);
+        fl.getLayoutParams().width = (int) (metrics.widthPixels * 0.25) - (int) getResources().getDimension(R.dimen.activity_vertical_margin);
+        Log.i("DETALLES", "Tam menu leyenda: "+ fl.getLayoutParams().width);
+        fl.requestLayout();
+
+
+
+
+
         // Initialize Views.
         final CropImageView cropImageView = (CropImageView) findViewById(R.id.CropImageView);
         final EditText legend = (EditText) findViewById(R.id.edtLegend);
-        final ImageButton okButton = (ImageButton) findViewById(R.id.okButton);
-        final ImageButton cancelButton = (ImageButton) findViewById(R.id.cancelButton);
+        final Button okButton = (Button) findViewById(R.id.okButton);
+        final Button cancelButton = (Button) findViewById(R.id.cancelButton);
         String transcription=getIntent().getExtras().getString(TRANSCRIPTION);
 
         cropImageView.setFixedAspectRatio(true);
         cropImageView.setGuidelines(2);
         cropImageView.setAspectRatio(1,1);
-        legend.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+
+        if(transcription != null && transcription.length()>0) { //Si tenia leyenda(editarlo)
+            legend.setText(transcription);
+        }else{ //Si no tenia el picto leyenda
+            legend.setTextColor(Color.GRAY);
+            legend.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    legend.setText("");
+                }
+            });
+        }
+
+        /*legend.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
                 if ((actionId== EditorInfo.IME_ACTION_DONE )   )
@@ -72,7 +108,7 @@ public class EditPictoActivity extends Activity {
                 return false;
 
             }
-        });
+        });*/
 
         //Obtener imagen del intent
         byte[] byteArray = getIntent().getByteArrayExtra(EditPictoActivity.IMAGE_PICTO);