Skip to content

yotta / pictogram

Go to a project
Commit 7f43ca45 by Fernando Martínez Santiago
Options

PCB v1.1 beta2

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