Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
7e52e135
authored
Feb 08, 2017
by
Fernando Martínez Santiago
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
trabajando en recorte.
parent
9d03b84a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
29 deletions
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictoMenu.java
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictogramActivity.java
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictoMenu.java
View file @
7e52e135
...
@@ -2,51 +2,32 @@ package com.yottacode.pictogram.tabletlibrary.gui.communicator;
...
@@ -2,51 +2,32 @@ package com.yottacode.pictogram.tabletlibrary.gui.communicator;
import
android.app.Activity
;
import
android.app.Activity
;
import
android.app.AlertDialog
;
import
android.app.AlertDialog
;
import
android.content.Context
;
import
android.content.DialogInterface
;
import
android.content.DialogInterface
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.database.Cursor
;
import
android.database.Cursor
;
import
android.graphics.Bitmap
;
import
android.graphics.BitmapFactory
;
import
android.graphics.Color
;
import
android.net.Uri
;
import
android.net.Uri
;
import
android.os.Build
;
import
android.os.Parcelable
;
import
android.provider.MediaStore
;
import
android.provider.MediaStore
;
import
android.text.InputType
;
import
android.text.InputType
;
import
android.util.AttributeSet
;
import
android.util.Log
;
import
android.util.Log
;
import
android.view.Gravity
;
import
android.view.View
;
import
android.view.View
;
import
android.view.inputmethod.InputMethodManager
;
import
android.widget.Button
;
import
android.widget.EditText
;
import
android.widget.EditText
;
import
android.widget.ImageButton
;
import
android.widget.ImageView
;
import
android.widget.ImageView
;
import
android.widget.LinearLayout
;
import
android.widget.RelativeLayout
;
import
android.widget.RelativeLayout
;
import
android.widget.TextView
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
com.yottacode.pictogram.action.VocabularyAction
;
import
com.yottacode.pictogram.dao.Picto
;
import
com.yottacode.pictogram.dao.Picto
;
import
com.yottacode.pictogram.grammar.Vocabulary
;
import
com.yottacode.pictogram.grammar.Vocabulary
;
import
com.yottacode.pictogram.grammar.iLocalPicto
;
import
com.yottacode.pictogram.grammar.iLocalPicto
;
import
com.yottacode.pictogram.net.PictoUploader
;
import
com.yottacode.pictogram.net.PictoUploader
;
import
com.yottacode.pictogram.tabletlibrary.R
;
import
com.yottacode.pictogram.tabletlibrary.R
;
import
com.yottacode.pictogram.tabletlibrary.cropper.CropImageView
;
import
com.yottacode.pictogram.tabletlibrary.cropper.EditPictoActivity
;
import
com.yottacode.pictogram.tools.PCBcontext
;
import
com.yottacode.pictogram.tools.PCBcontext
;
import
java.io.ByteArrayOutputStream
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.List
;
import
static
android
.
graphics
.
Color
.
BLACK
;
import
static
android
.
graphics
.
Color
.
argb
;
import
static
android
.
graphics
.
Color
.
argb
;
import
static
android
.
graphics
.
Color
.
rgb
;
public
class
PictoMenu
{
public
class
PictoMenu
{
...
...
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictogramActivity.java
View file @
7e52e135
...
@@ -62,12 +62,8 @@ import org.json.JSONException;
...
@@ -62,12 +62,8 @@ import org.json.JSONException;
import
org.json.JSONObject
;
import
org.json.JSONObject
;
import
java.io.ByteArrayOutputStream
;
import
java.io.ByteArrayOutputStream
;
import
java.io.FileNotFoundException
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.Iterator
;
import
java.util.LinkedList
;
import
java.util.LinkedList
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.Locale
;
...
@@ -1091,8 +1087,7 @@ protected void showOnlyTape(boolean onlyTape) {
...
@@ -1091,8 +1087,7 @@ protected void showOnlyTape(boolean onlyTape) {
*/
*/
protected
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
protected
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
Iterator
<
String
>
keys
=
data
.
getExtras
().
keySet
().
iterator
();
while
(
keys
.
hasNext
()){
String
key
=
keys
.
next
();
Log
.
i
(
"DETALLES"
,
"Llega el intent 0: "
+
key
);}
Bitmap
imagen
=
null
;
Bitmap
imagen
=
null
;
String
legend
=
null
;
String
legend
=
null
;
switch
(
requestCode
)
{
switch
(
requestCode
)
{
...
@@ -1136,17 +1131,18 @@ protected void showOnlyTape(boolean onlyTape) {
...
@@ -1136,17 +1131,18 @@ protected void showOnlyTape(boolean onlyTape) {
/**Para cambiar la activity de PictogramActivity a EditPictoActivity
/**Para cambiar la activity de PictogramActivity a EditPictoActivity
*
*
@param textLegend
* @param image
* @param image
*/
*/
public
void
launchActivity
(
Bitmap
image
){
public
void
launchActivity
(
String
textLegend
,
Bitmap
image
){
Intent
intent
=
new
Intent
(
this
,
EditPictoActivity
.
class
);
Intent
intent
=
new
Intent
(
this
,
EditPictoActivity
.
class
);
if
(
image
!=
null
)
{
if
(
image
!=
null
)
{
int
bWidth
=
image
.
getWidth
();
int
bWidth
=
image
.
getWidth
();
int
bHeight
=
image
.
getHeight
();
int
bHeight
=
image
.
getHeight
();
//GERMAN: AQUI TIENES QUE PONER UN TAMAÑO ADECUADO que se calcule en funcion del tamaño de la pantalla y manteniendo la proporcion, SI NO DA EL MENSAJE FAILED BINDER TRANSACTION !!! ”
Bitmap
rescaled
=
Bitmap
.
createScaledBitmap
(
image
,
bWidth
*
5
,
bHeight
*
5
,
true
);
// http://stackoverflow.com/questions/23407821/how-to-solve-error-failed-binder-transaction-in-android-4-4
Bitmap
rescaled
=
Bitmap
.
createScaledBitmap
(
image
,
50
,
50
,
true
);
ByteArrayOutputStream
stream
=
new
ByteArrayOutputStream
();
ByteArrayOutputStream
stream
=
new
ByteArrayOutputStream
();
rescaled
.
compress
(
Bitmap
.
CompressFormat
.
PNG
,
100
,
stream
);
rescaled
.
compress
(
Bitmap
.
CompressFormat
.
PNG
,
100
,
stream
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment