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
a4658668
authored
Jul 26, 2017
by
Sebastián Collado Montañez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
error message fixed when moving to session without inet
parent
1b41b14b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
13 deletions
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/VOCA.java
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/VocabularyManager.java
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/VOCA.java
View file @
a4658668
...
...
@@ -1136,12 +1136,7 @@ public class VOCA extends Activity implements VocabularyTalk.iVocabularyListener
}
else
if
(
firstTouchX
>
event
.
getX
()
+
150
)
{
//derecha a izquierda
// Pasa de voca a VocabularyManager
if
(!
PCBcontext
.
getNetService
().
online
()){
GUITools
.
show_alert
(
VOCA
.
this
,
R
.
string
.
session_noinet
);
}
else
{
nextActivity
=
new
Intent
(
this
,
VocabularyManager
.
class
);
}
nextActivity
=
new
Intent
(
this
,
VocabularyManager
.
class
);
}
in
=
R
.
anim
.
leftin
;
out
=
R
.
anim
.
leftout
;
...
...
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/VocabularyManager.java
View file @
a4658668
...
...
@@ -786,13 +786,9 @@ public class VocabularyManager extends Activity implements VocabularyTalk.iVocab
if
(
event
.
getX
()
>
firstTouchX
+
150
)
{
// izquierda a derecha
// Pasa de VocabularyManager a voca
if
(!
PCBcontext
.
getNetService
().
online
()){
GUITools
.
show_alert
(
VocabularyManager
.
this
,
R
.
string
.
session_noinet
);
}
else
{
nextActivity
=
new
Intent
(
this
,
VOCA
.
class
);
in
=
R
.
anim
.
rightin
;
out
=
R
.
anim
.
rightout
;
}
nextActivity
=
new
Intent
(
this
,
VOCA
.
class
);
in
=
R
.
anim
.
rightin
;
out
=
R
.
anim
.
rightout
;
}
else
if
(
firstTouchX
>
event
.
getX
()
+
150
)
{
//derecha a izquierda
...
...
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