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
e4266000
authored
Jan 30, 2017
by
Fernando Martínez Santiago
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
issue #849, #850 closed
parent
7b3c5765
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
61 additions
and
73 deletions
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/User.java
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictoItemViewGenerator.java
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictogramActivity.java
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/User.java
View file @
e4266000
...
...
@@ -24,6 +24,10 @@ public class User {
return
this
.
get_id_sup
()!=
User
.
NO_SUPERVISOR
;
}
public
String
getOffice
()
{
return
null
;
}
public
final
static
class
JSON_STUDENT_ATTTRS
{
static
String
CATEGORIES
=
"categories"
;
static
String
INPUT_FEEDBACK
=
"input_feedback"
;
...
...
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictoItemViewGenerator.java
View file @
e4266000
...
...
@@ -29,7 +29,9 @@ import java.util.ArrayList;
public
class
PictoItemViewGenerator
{
public
static
final
int
LAYOUT
=
R
.
layout
.
picto_grid_item
;
public
static
final
int
LAYOUT_BIG
=
R
.
layout
.
picto_grid_item_big
;
private
static
final
byte
MAX_LINE_LENGTH
=
7
;
private
static
final
byte
MAX_LINE_LENGTH
=
9
;
private
static
final
byte
MAX_LINE_LENGTH_FULL
=
7
;
private
static
final
String
LOG_TAG
=
PictoItemViewGenerator
.
class
.
getCanonicalName
();
public
static
int
mirror_color
=
0
;
...
...
@@ -155,8 +157,7 @@ public class PictoItemViewGenerator {
redCrossImage
=
(
ImageView
)
convertView
.
findViewById
(
R
.
id
.
picto_grid_item_redcross_big
);
legend
=
(
TextView
)
convertView
.
findViewById
(
R
.
id
.
legend_text_big
);
legend_full
=
(
TextView
)
convertView
.
findViewById
(
R
.
id
.
legend_text_big_full
);
}
else
{
}
else
{
layoutWrapper
=
(
RelativeLayout
)
convertView
.
findViewById
(
R
.
id
.
picto_grid_item_layout_wrapper
);
layout
=
(
FrameLayout
)
convertView
.
findViewById
(
R
.
id
.
picto_grid_item_layout
);
pictoImage
=
(
ImageView
)
convertView
.
findViewById
(
R
.
id
.
picto_grid_item_image
);
...
...
@@ -164,82 +165,66 @@ public class PictoItemViewGenerator {
legend
=
(
TextView
)
convertView
.
findViewById
(
R
.
id
.
legend_text
);
legend_full
=
(
TextView
)
convertView
.
findViewById
(
R
.
id
.
legend_text_full
);
}
layoutWrapper
.
setBackground
(
null
);
layoutWrapper
.
setAlpha
(
PCBcontext
.
getPcbdb
().
getCurrentUser
().
is_supervisor
()
?
0.25f
:
0
);
layout
.
setBackgroundColor
(
convertView
.
getResources
()
layout
.
setBackgroundColor
(
convertView
.
getResources
()
.
getColor
(
R
.
color
.
picto_default_background
));
redCrossImage
.
setVisibility
(
View
.
GONE
);
// pictoImage.setVisibility(View.GONE);
// layoutWrapper.setVisibility(View.GONE);
if
(
picto
==
null
)
{
pictoImage
.
setImageBitmap
(
null
);
if
(
PCBcontext
.
getPcbdb
().
getCurrentUser
().
is_supervisor
())
{
layoutWrapper
.
setBackground
(
convertView
.
getResources
()
.
getDrawable
(
R
.
drawable
.
picto_grid_item_border
));
}
legend
.
setVisibility
(
View
.
GONE
);
legend_full
.
setVisibility
(
View
.
GONE
);
}
else
{
legend
.
setText
(
format_legend
(
picto
,
MAX_LINE_LENGTH
+
2
));
legend_full
.
setText
(
format_legend
(
picto
,
MAX_LINE_LENGTH
));
if
(!
picto
.
is_invisible
())
{
layoutWrapper
.
setAlpha
(
1.00f
);
}
try
{
Bitmap
bm
=
picto
.
get_bitmap
(
PCBcontext
.
getContext
());
if
(!
picto
.
get_legend
().
equals
(
"none"
))
{
if
(
picto
.
get_legend
().
equals
(
"normal"
)){
redCrossImage
.
setVisibility
(
View
.
GONE
);
if
(
PCBcontext
.
getPcbdb
().
getCurrentUser
().
is_supervisor
())
{
layoutWrapper
.
setVisibility
(
View
.
VISIBLE
);
pictoImage
.
setVisibility
(
View
.
VISIBLE
);
layoutWrapper
.
setBackground
(
convertView
.
getResources
()
.
getDrawable
(
R
.
drawable
.
picto_grid_item_border
));
}
else
if
(
picto
==
null
||
picto
.
is_invisible
()
)
{
layoutWrapper
.
setVisibility
(
View
.
GONE
);
pictoImage
.
setVisibility
(
View
.
GONE
);
legend
.
setVisibility
(
View
.
GONE
);
legend_full
.
setVisibility
(
View
.
GONE
);
}
if
(
picto
!=
null
)
{
layoutWrapper
.
setAlpha
(!
picto
.
is_invisible
()
?
1.00f
:
PCBcontext
.
getPcbdb
().
getCurrentUser
().
is_supervisor
()
?
0.25f
:
0
f
);
try
{
Bitmap
bm
=
picto
.
get_bitmap
(
PCBcontext
.
getContext
());
switch
(
picto
.
get_legend
())
{
case
"none"
:
legend
.
setVisibility
(
View
.
GONE
);
legend_full
.
setVisibility
(
View
.
GONE
);
break
;
case
"normal"
:
legend
.
setText
(
format_legend
(
picto
,
MAX_LINE_LENGTH
));
legend
.
setVisibility
(
View
.
VISIBLE
);
legend_full
.
setVisibility
(
View
.
GONE
);
}
else
{
break
;
default
:
legend_full
.
setText
(
format_legend
(
picto
,
MAX_LINE_LENGTH_FULL
));
legend
.
setVisibility
(
View
.
GONE
);
legend_full
.
setVisibility
(
View
.
VISIBLE
);
}
}
else
{
legend
.
setVisibility
(
View
.
GONE
);
legend_full
.
setVisibility
(
View
.
GONE
);
}
pictoImage
.
setImageBitmap
(
bm
);
if
(!
picto
.
is_invisible
()
||
PCBcontext
.
getPcbdb
().
getCurrentUser
().
is_supervisor
())
{
layoutWrapper
.
setVisibility
(
View
.
VISIBLE
);
pictoImage
.
setVisibility
(
View
.
VISIBLE
);
layoutWrapper
.
setBackground
(
convertView
.
getResources
()
.
getDrawable
(
R
.
drawable
.
picto_grid_item_border
));
if
(
picto
.
is_magnify
())
{
pictoImage
.
setScaleX
(
1.2f
);
pictoImage
.
setScaleY
(
1.2f
);
}
if
(
picto
.
is_disabled
())
{
redCrossImage
.
setVisibility
(
View
.
VISIBLE
);
}
if
(
picto
.
is_category
())
{
layout
.
setBackgroundColor
(
picto
.
get_color
());
}
if
(
picto
.
is_mirror
()
&&
!
preventMirror
)
{
int
color
[]={
Color
.
WHITE
,
Color
.
LTGRAY
,
Color
.
GRAY
,
Color
.
DKGRAY
,
Color
.
BLACK
,
Color
.
DKGRAY
,
Color
.
GRAY
,
Color
.
LTGRAY
,
Color
.
WHITE
};
float
scale
[]={
1
f
,
1.1f
,
1.2f
,
1.3f
,
1.4f
,
1.5f
,
1.4f
,
1.3f
,
1.2f
,
1.1f
};
mirror_color
++;
pictoImage
.
setScaleX
(
scale
[
mirror_color
%
scale
.
length
]);
pictoImage
.
setScaleY
(
scale
[
mirror_color
%
scale
.
length
]);
if
(
picto
.
is_highlight_background
())
layout
.
setBackgroundColor
(
color
[
mirror_color
%
color
.
length
]);
}
if
(
picto
.
is_magnify
())
{
pictoImage
.
setScaleX
(
1.2f
);
pictoImage
.
setScaleY
(
1.2f
);
}
if
(
picto
.
is_disabled
())
redCrossImage
.
setVisibility
(
View
.
VISIBLE
);
if
(
picto
.
is_category
())
layout
.
setBackgroundColor
(
picto
.
get_color
());
if
(
picto
.
is_mirror
()
&&
!
preventMirror
)
{
int
color
[]={
Color
.
WHITE
,
Color
.
LTGRAY
,
Color
.
GRAY
,
Color
.
DKGRAY
,
Color
.
BLACK
,
Color
.
DKGRAY
,
Color
.
GRAY
,
Color
.
LTGRAY
,
Color
.
WHITE
};
float
scale
[]={
1
f
,
1.1f
,
1.2f
,
1.3f
,
1.4f
,
1.5f
,
1.4f
,
1.3f
,
1.2f
,
1.1f
};
mirror_color
++;
pictoImage
.
setScaleX
(
scale
[
mirror_color
%
scale
.
length
]);
pictoImage
.
setScaleY
(
scale
[
mirror_color
%
scale
.
length
]);
if
(
picto
.
is_highlight_background
())
layout
.
setBackgroundColor
(
color
[
mirror_color
%
color
.
length
]);
}
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
...
...
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictogramActivity.java
View file @
e4266000
...
...
@@ -505,10 +505,9 @@ public class PictogramActivity extends Activity implements VocabularyTalk.iVocab
"{\"magnify\":false,\"highlight\":false,\"coord_y\":1,\"id_cat\":12303,\"status\":\"invisible\",\"coord_x\":4}");
*/
for
(
int
i
=
0
;
i
<
maxRows
;
i
++)
{
for
(
int
i
=
0
;
i
<
maxRows
;
i
++)
for
(
int
j
=
0
;
j
<
maxColumns
;
j
++)
ll
.
add
(
mp
[
i
][
j
]);
}
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
...
...
@@ -1021,7 +1020,7 @@ protected void showOnlyTape(boolean onlyTape) {
firstTouchX
=
event
.
getX
();
break
;
case
MotionEvent
.
ACTION_UP
:
if
(
event
.
getX
()
>
firstTouchX
+
1
0
0
)
{
//izquierda a derecha
if
(
event
.
getX
()
>
firstTouchX
+
1
5
0
)
{
//izquierda a derecha
if
(!
student_view
)
{
PCBcontext
.
getPcbdb
().
getCurrentUser
().
get_Img_sup
().
update_id
(
User
.
NO_SUPERVISOR
);
nextActivity
=
intent
;
...
...
@@ -1032,8 +1031,8 @@ protected void showOnlyTape(boolean onlyTape) {
in
=
R
.
anim
.
rightin
;
out
=
R
.
anim
.
rightout
;
overridePendingTransition
(
R
.
anim
.
leftin
,
R
.
anim
.
leftout
);
}
else
if
(
firstTouchX
>
event
.
getX
()
+
1
0
0
)
{
//derecha a izquierda
if
(!
student_view
)
{
}
else
if
(
firstTouchX
>
event
.
getX
()
+
1
5
0
)
{
//derecha a izquierda
if
(!
student_view
)
{
nextActivity
=
new
Intent
(
this
,
SessionActivity
.
class
);
}
else
{
PCBcontext
.
getPcbdb
().
getCurrentUser
().
get_Img_sup
().
update_id
(
PCBcontext
.
getDevice
().
getLastSupId
());
...
...
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