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
7f43ca45
authored
Mar 13, 2017
by
Fernando Martínez Santiago
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
PCB v1.1 beta2
parent
a5bd2958
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
15 additions
and
13 deletions
android/Pictogram/supervisor_tablet/build.gradle
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictoAnimation.java
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictogramActivity.java
android/Pictogram/tabletlibrary/src/main/res/layout/activity_pictogram.xml
android/Pictogram/tabletlibrary/src/main/res/layout/activity_pictogram_big.xml
android/Pictogram/tabletlibrary/src/main/res/layout/activity_serial.xml
android/Pictogram/tabletlibrary/src/main/res/values-es/strings.xml
android/Pictogram/yotta_tablet/build.gradle
android/Pictogram/supervisor_tablet/build.gradle
View file @
7f43ca45
...
...
@@ -29,14 +29,12 @@ android {
resValue
"bool"
,
"ssl_connect"
,
"false"
}
DevFlavor
{
resValue
"string"
,
"server"
,
"https://dev.
yottacode
.com"
resValue
"string"
,
"server"
,
"https://dev.
pictogramweb
.com"
resValue
"bool"
,
"ssl_connect"
,
"false"
resValue
"string"
,
"apk"
,
"pictograms_dev.apk"
}
PreFlavor
{
resValue
"string"
,
"server"
,
"https://
pre.yottacode
.com"
resValue
"string"
,
"server"
,
"https://
apk.pictogramweb
.com"
resValue
"bool"
,
"ssl_connect"
,
"true"
resValue
"string"
,
"apk"
,
"pictograms.apk"
}
LocalFlavor
{
resValue
"string"
,
"server"
,
"http://192.168.1.35:1337"
...
...
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictoAnimation.java
View file @
7f43ca45
...
...
@@ -66,13 +66,13 @@ public class PictoAnimation {
}
@Override
public
void
onAnimationEnd
(
Animator
animation
)
{
Log
.
e
(
LOG_TAG
,
"animating"
+
position
);
public
void
onAnimationEnd
(
Animator
animation
)
{
v
.
setColorFilter
(
0
);
v
.
setBackgroundColor
(
ContextCompat
.
getColor
(
PCBcontext
.
getContext
(),
R
.
color
.
picto_default_background
));
if
(
position
<
(
tapeAdapter
.
getCount
()
-
1
))
animateTapeView
(
activity
,
position
+
1
,
view
);
else
{
((
Activity
)
view
.
getContext
())
.
runOnUiThread
(
new
Runnable
()
{
activity
.
runOnUiThread
(
new
Runnable
()
{
@Override
public
void
run
()
{
if
(
tapeAdapter
.
play
())
...
...
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictogramActivity.java
View file @
7f43ca45
...
...
@@ -133,7 +133,7 @@ public class PictogramActivity extends Activity implements VocabularyTalk.iVocab
// blockNotificationBar();
requestWindowFeature
(
Window
.
FEATURE_NO_TITLE
);
this
.
getWindow
().
setFlags
(
WindowManager
.
LayoutParams
.
FLAG_FULLSCREEN
,
WindowManager
.
LayoutParams
.
FLAG_FULLSCREEN
);
// after a long inactivity, the pcbdb is discarded
...
...
@@ -273,6 +273,7 @@ public class PictogramActivity extends Activity implements VocabularyTalk.iVocab
@Override
protected
void
onResume
()
{
super
.
onResume
();
Log
.
i
(
LOG_TAG
,
"Resuming Pictogram Activity"
);
PCBcontext
.
setActivityContext
(
this
);
setConfig
();
startTTS
();
...
...
@@ -402,8 +403,7 @@ public class PictogramActivity extends Activity implements VocabularyTalk.iVocab
@Override
protected
void
onStop
()
{
super
.
onStop
();
Log
.
i
(
LOG_TAG
,
"Closing Pictogram Activity"
);
PCBcontext
.
setActivityContext
(
null
);
Log
.
e
(
LOG_TAG
,
"Closing Pictogram Activity"
);
PCBcontext
.
getNetService
().
closeNotifyStatus
();
}
...
...
android/Pictogram/tabletlibrary/src/main/res/layout/activity_pictogram.xml
View file @
7f43ca45
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
android:theme=
"@android:style/Theme.NoTitleBar.Fullscreen"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"horizontal"
...
...
android/Pictogram/tabletlibrary/src/main/res/layout/activity_pictogram_big.xml
View file @
7f43ca45
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
android:theme=
"@android:style/Theme.NoTitleBar.Fullscreen"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"horizontal"
...
...
android/Pictogram/tabletlibrary/src/main/res/layout/activity_serial.xml
View file @
7f43ca45
...
...
@@ -92,6 +92,8 @@
android:layout_below=
"@+id/serialpass"
android:layout_gravity=
"right"
android:layout_marginTop=
"25dp"
android:background=
"@color/VerdeApp"
android:textColor=
"@color/white"
android:text=
"@string/action_entrar"
android:textStyle=
"bold"
/>
...
...
android/Pictogram/tabletlibrary/src/main/res/values-es/strings.xml
View file @
7f43ca45
<resources>
<string
name=
"app_name"
>
com.yottacode.pictogram.Tablet
</string>
<string
name=
"alumnos"
>
Student
s
</string>
<string
name=
"supervisores"
>
Supervisors
</string>
<string
name=
"alumnos"
>
Estrudiante
s
</string>
<string
name=
"supervisores"
>
Supervisor
e
s
</string>
<item
name=
"maxInTape"
type=
"integer"
>
8
</item>
<item
name=
"maxInTape_big"
type=
"integer"
>
6
</item>
...
...
android/Pictogram/yotta_tablet/build.gradle
View file @
7f43ca45
...
...
@@ -29,12 +29,12 @@ android {
resValue
"bool"
,
"ssl_connect"
,
"false"
}
DevFlavor
{
resValue
"string"
,
"server"
,
"https://dev.
yottacode
.com"
resValue
"string"
,
"server"
,
"https://dev.
pictogramweb
.com"
resValue
"bool"
,
"ssl_connect"
,
"false"
resValue
"string"
,
"apk"
,
"pictogram_dev.apk"
}
PreFlavor
{
resValue
"string"
,
"server"
,
"https://
pre.yottacode
.com"
resValue
"string"
,
"server"
,
"https://
apk.pictogramweb
.com"
resValue
"bool"
,
"ssl_connect"
,
"true"
resValue
"string"
,
"apk"
,
"pictogram.apk"
}
...
...
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