Skip to content

yotta / pictogram

Go to a project
Commit 684b8794 by German Callejas
Options

Vista para Recortar modificada

parent 3eddf895
Inline Side-by-side
Showing with 168 additions and 110 deletions
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);
......
android/Pictogram/tabletlibrary/src/main/res/layout/edit_picto_layout.xml
<?xml version="1.0" encoding="utf-8"?>
<!--<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:id="@+id/TotalLayout"
android:background="@color/black_translucent">
<TextView
android:paddingTop="@dimen/content_padding"
android:id="@+id/crop_title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:text="@string/titleCropper"
android:textSize="24sp"
android:textStyle="bold"
android:textColor="@android:color/holo_blue_light"
android:textAlignment="center"
android:layout_gravity="center_horizontal"
/>
<LinearLayout
android:orientation="horizontal"
android:id="@+id/TotalLayout"
android:background="#b4000000">-->
<!--<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">-->
<!--<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:id="@+id/crop_legend"
android:layout_gravity="center_horizontal">
<LinearLayout
android:orientation="horizontal"
android:id="@+id/backgroundImage"
app:srcCompat="@color/black_translucent" />-->
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:id="@+id/image_layout"
android:layout_marginTop="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_vertical_margin"
android:gravity="center">
<com.yottacode.pictogram.tabletlibrary.gui.communicator.cropper.CropImageView
android:id="@+id/CropImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:layout_gravity="center"
android:cropToPadding="false"
/>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
</LinearLayout>
<!-- <LinearLayout
android:orientation="vertical"
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:id="@+id/legend_menu"
android:layout_gravity="right"
android:layout_marginRight="@dimen/activity_vertical_margin"
android:weightSum="1"
android:layout_marginTop="@dimen/activity_vertical_margin"
android:gravity="center_vertical|center">-->
<FrameLayout
android:orientation="vertical"
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:id="@+id/legend_menu"
android:layout_gravity="right"
android:layout_marginRight="@dimen/activity_vertical_margin"
android:weightSum="1"
android:layout_marginTop="@dimen/activity_vertical_margin"
android:gravity="center_vertical|center">
<LinearLayout
android:orientation="vertical"
android:id="@+id/TotalLayout"
android:background="@color/black_translucent">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical">
<TextView
android:paddingTop="@dimen/content_padding"
android:id="@+id/crop_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/titleCropper"
android:textSize="24sp"
android:textStyle="bold"
android:textColor="@android:color/holo_blue_light"
android:textAlignment="center"
android:layout_gravity="center_horizontal"
/>
android:textColor="#33B5E5"
android:textSize="20sp"
android:text="@string/legendText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/textLegend"
android:layout_gravity="center"
android:gravity="center" />
<GridLayout
android:orientation="horizontal"
<EditText
android:textSize="20sp"
android:imeOptions="actionDone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:id="@+id/edtLegend"
android:textColor="@android:color/white"
android:layout_below="@+id/textLegend"
android:layout_gravity="center"
android:gravity="center" />
</LinearLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:gravity="bottom|center_horizontal"
android:layout_marginBottom="@dimen/activity_horizontal_margin">
<Button
android:id="@+id/cancelButton"
android:layout_width="wrap_content"
android:id="@+id/crop_legend"
android:layout_gravity="center_horizontal"
android:paddingLeft="@dimen/content_padding"
android:paddingTop="@dimen/content_padding"
>
<com.yottacode.pictogram.tabletlibrary.gui.communicator.cropper.CropImageView
android:id="@+id/CropImageView"
android:layout_height="wrap_content"
android:textColor="#33B5E5"
android:textSize="20sp"
android:textAlignment="center"
android:text="@string/cancel"
android:gravity="center_horizontal"
android:layout_marginRight="10dp" />
<Button
android:id="@+id/okButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:adjustViewBounds="true"
android:scaleType="centerInside"
android:layout_gravity="center_horizontal"
android:cropToPadding="false"
android:layout_row="1"
android:layout_column="1"
android:layout_columnSpan="2"
/>
<TextView
android:layout_gravity="right"
android:textColor="#33B5E5"
android:textSize="20sp"
android:text="@string/legendText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/textLegend"
android:layout_row="2"
android:layout_column="1"
/>
<EditText
android:layout_gravity="center_horizontal"
android:textSize="20sp"
android:imeOptions="actionDone"
android:inputType="textImeMultiLine"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="10"
android:id="@+id/edtLegend"
android:textColor="@android:color/white"
android:layout_row="2"
android:layout_column="2"
/>
<ImageButton
android:id="@+id/cancelButton"
android:layout_width="80dp"
android:layout_height="80dp"
android:background="@drawable/session_fail"
android:layout_marginTop="10dp"
android:layout_marginLeft="10dp"
android:layout_row="1"
android:layout_column="3"/>
<ImageButton
android:id="@+id/okButton"
android:layout_width="80dp"
android:layout_height="80dp"
android:background="@drawable/session_ok"
android:layout_gravity="bottom"
android:layout_marginBottom="10dp"
android:layout_marginLeft="10dp"
android:clickable="false"
android:layout_row="1"
android:layout_column="3"
android:elevation="1dp" />
</GridLayout>
android:textColor="#33B5E5"
android:textSize="20sp"
android:textAlignment="center"
android:text="@string/accept"
android:gravity="center_horizontal"
android:layout_marginLeft="10dp" />
</LinearLayout>
</LinearLayout>
</FrameLayout>
<!--</LinearLayout>-->
</LinearLayout>
</LinearLayout>
<!--</FrameLayout>-->
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