Skip to content

yotta / pictogram

Go to a project
Commit 0dc5b3ce by Fernando Martínez Santiago
Options

working on Pictogram 1.6 beta9

parent 4ae8577b
Expand all
Inline Side-by-side
Showing with 176 additions and 199 deletions
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/PCBDBHelper.java
...@@ -174,13 +174,12 @@ public class PCBDBHelper extends SQLiteOpenHelper { ...@@ -174,13 +174,12 @@ public class PCBDBHelper extends SQLiteOpenHelper {
SQLiteDatabase db = this.getReadableDatabase(); SQLiteDatabase db = this.getReadableDatabase();
Cursor cursor = db.rawQuery("SELECT id_stu, id_picto, id_grid, id_child_grid, id_stupicto, url, translation, attributes FROM collection_detail WHERE id_stu = "+id_stu,null); Cursor cursor = db.rawQuery("SELECT id_stu, id_picto, id_grid, id_child_grid, id_stupicto, url, translation, attributes FROM collection_detail WHERE id_stu = "+id_stu,null);
Log.i(LOG_TAG, "Local recovering " + cursor.getCount() + " pictos for student " + id_stu + " from local DB Scene:"+id_grid); Log.e(LOG_TAG, "*************************Local recovering " + cursor.getCount() + " pictos for student " + id_stu + " from local DB Scene:"+id_grid);
cursor.moveToFirst(); cursor.moveToFirst();
vocabulary.clear();
if (cursor.getCount()>0) do{ if (cursor.getCount()>0) do{
Picto picto = new Picto(cursor.getInt(1), cursor.getString(5),cursor.getInt(4),cursor.getInt(2),cursor.getInt(3),new JSONObject(cursor.getString(7))); Picto picto = new Picto(cursor.getInt(1), cursor.getString(5),cursor.getInt(4),cursor.getInt(2),cursor.getInt(3),new JSONObject(cursor.getString(7)));
vocabulary.addPicto(picto); vocabulary.addPicto(picto);
}while (cursor.moveToNext()); }while (cursor.moveToNext());
cursor.close(); cursor.close();
//db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/Picto.java
...@@ -479,7 +479,7 @@ public class Picto extends Img { ...@@ -479,7 +479,7 @@ public class Picto extends Img {
* toString method * toString method
*/ */
public String toString(){ public String toString(){
return "(" + get_ImgId() + ") - ["+ get_row() +","+ get_column()+"]" + get_translation() + " - " + get_url() + " --- " + get_json_attrs(); return "( img:" + get_ImgId() + ", grid: "+get_grid()+ ", id:"+get_stupicto_id()+") - ["+ get_row() +","+ get_column()+"]" + get_translation() + " - " + get_url() + " --- " + get_json_attrs()+"."+super.toString();
} }
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/grammar/Vocabulary.java
...@@ -156,10 +156,10 @@ public class Vocabulary implements Iterable<Picto> { ...@@ -156,10 +156,10 @@ public class Vocabulary implements Iterable<Picto> {
LinkedList<Picto> pictos_cat = this.pictos.get(grid_id); LinkedList<Picto> pictos_cat = this.pictos.get(grid_id);
int index=-1; int index=-1;
if (pictos_cat!=null) if (pictos_cat!=null)
for (int i=0; i<pictos_cat.size() && index==-1; i++) for (int i=0; i<pictos_cat.size() ; i++)
if (pictos_cat.get(i).get_ImgId()==pic_id) { if (pictos_cat.get(i).get_ImgId()==pic_id) {
index=i; index=i;
Log.e(LOG_TAG,"FOUNDDDDDDDDDDDDDDDDDDDDDDDDDDDDD"+pic_id+"..."+grid_id+"..."+pic_id); Log.e(LOG_TAG,"INDEX==-1 TO BE INCLUDED FOR: FOUNDDDDDDDDDDDDDDDDDDDDDDDDDDDDD"+pic_id+"..."+grid_id+"..."+pic_id);
} }
return index; return index;
...@@ -235,6 +235,7 @@ public class Vocabulary implements Iterable<Picto> { ...@@ -235,6 +235,7 @@ public class Vocabulary implements Iterable<Picto> {
Picto picto = this.pictos.get(pic_grid).get(index); Picto picto = this.pictos.get(pic_grid).get(index);
String old_legend=picto.get_legend(); String old_legend=picto.get_legend();
picto.set_json_attr(attrs); picto.set_json_attr(attrs);
Log.e(LOG_TAG,"*********************PICTO MODIFIED:"+picto);
if (!old_legend.equals(picto.get_legend())) //puede ocurrir que se cambie la leyenda de TODOS los pictos if (!old_legend.equals(picto.get_legend())) //puede ocurrir que se cambie la leyenda de TODOS los pictos
this.synchronize(); this.synchronize();
PCBcontext.getPcbdb().modifyPicto(pic_grid, pic_id, attrs.toString()); PCBcontext.getPcbdb().modifyPicto(pic_grid, pic_id, attrs.toString());
...@@ -244,7 +245,7 @@ public class Vocabulary implements Iterable<Picto> { ...@@ -244,7 +245,7 @@ public class Vocabulary implements Iterable<Picto> {
else else
Log.i(this.getClass().getCanonicalName(),"Trying to modify an unregistered picto:"+pic_id+" grid:"+pic_grid); Log.i(this.getClass().getCanonicalName(),"Trying to modify an unregistered picto:"+pic_id+" grid:"+pic_grid);
Picto p=find_picto(pic_grid,0,0); Picto p=find_picto(pic_grid,0,0);
try{ Log.e("LOG_TAG","**********o,o"+p.toString()+" ACTIVE GRID:"+PCBcontext.getPcbdb().getCurrentUser().get_active_grid());}catch (Exception e){} try{ Log.e(LOG_TAG,"**********o,o"+p.toString()+" ACTIVE GRID:"+PCBcontext.getPcbdb().getCurrentUser().get_active_grid());}catch (Exception e){}
} }
/** /**
...@@ -262,6 +263,8 @@ try{ Log.e("LOG_TAG","**********o,o"+p.toString()+" ACTIVE GRID:"+PCBcontex ...@@ -262,6 +263,8 @@ try{ Log.e("LOG_TAG","**********o,o"+p.toString()+" ACTIVE GRID:"+PCBcontex
this.pictos.put(new Integer(picto.get_grid()),pictos_grid); this.pictos.put(new Integer(picto.get_grid()),pictos_grid);
} }
pictos_grid.add(picto); pictos_grid.add(picto);
if (find_picto_index(picto.get_grid(),picto.get_ImgId())>-1)
Log.e(LOG_TAG,"ADDPICTO DUPLICATED!!!!!!!!!!! "+picto.get_legend());
} }
...@@ -375,4 +378,8 @@ try{ Log.e("LOG_TAG","**********o,o"+p.toString()+" ACTIVE GRID:"+PCBcontex ...@@ -375,4 +378,8 @@ try{ Log.e("LOG_TAG","**********o,o"+p.toString()+" ACTIVE GRID:"+PCBcontex
return vocabulary; return vocabulary;
} }
public void clear() {
this.pictos.clear();
}
} }
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/tools/Img.java
...@@ -188,5 +188,5 @@ public class Img { ...@@ -188,5 +188,5 @@ public class Img {
/** /**
* @overide * @overide
*/ */
public String toString() {return this.type+"."+this.id;} public String toString() {return this.type+"."+this.id+"."+super.toString();}
} }
android/Pictogram/communicator/build/generated/res/resValues/DevFlavor/debug/values/generated.xml
...@@ -4,13 +4,14 @@ ...@@ -4,13 +4,14 @@
<!-- Automatically generated file. DO NOT MODIFY --> <!-- Automatically generated file. DO NOT MODIFY -->
<!-- Values from product flavor: DevFlavor --> <!-- Values from product flavor: DevFlavor -->
<string name="apk" translatable="false">pictogram_dev.apk</string>
<string name="server" translatable="false">https://dev.pictogramweb.com</string> <string name="server" translatable="false">https://dev.pictogramweb.com</string>
<bool name="ssl_connect">false</bool> <bool name="ssl_connect">false</bool>
<!-- Values from default config. --> <!-- Values from default config. -->
<bool name="NotifyAllwaysVisible">true</bool> <bool name="NotifyAllwaysVisible">false</bool>
<string name="VersionManagerClass" translatable="false">com.yottacode.pictogram.communicator.VersionManager</string> <string name="VersionManagerClass" translatable="false">com.yottacode.pictogram.communicator.net.VersionManager</string>
<string name="apk" translatable="false">pictograms.apk</string>
<string name="google_play_apk" translatable="false">https://play.google.com/store/apps/details?id=com.yottacode.pictogram.communicator</string>
</resources> </resources>
android/Pictogram/communicator/build/generated/source/buildConfig/DevFlavor/debug/com/yottacode/pictogram/communicator/BuildConfig.java
...@@ -5,9 +5,9 @@ package com.yottacode.pictogram.communicator; ...@@ -5,9 +5,9 @@ package com.yottacode.pictogram.communicator;
public final class BuildConfig { public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true"); public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String APPLICATION_ID = "com.yottacode.pictogram.yotta_tablet"; public static final String APPLICATION_ID = "com.yottacode.pictogram.communicator";
public static final String BUILD_TYPE = "debug"; public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "DevFlavor"; public static final String FLAVOR = "DevFlavor";
public static final int VERSION_CODE = 6; public static final int VERSION_CODE = 3;
public static final String VERSION_NAME = "1.6"; public static final String VERSION_NAME = "1.5";
} }
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/android/support/v7/appcompat/R.java
...@@ -499,7 +499,7 @@ public final class R { ...@@ -499,7 +499,7 @@ public final class R {
public static final int abc_textfield_search_default_mtrl_alpha = 0x7f070050; public static final int abc_textfield_search_default_mtrl_alpha = 0x7f070050;
public static final int abc_textfield_search_material = 0x7f070051; public static final int abc_textfield_search_material = 0x7f070051;
public static final int abc_vector_test = 0x7f070052; public static final int abc_vector_test = 0x7f070052;
public static final int notification_template_icon_bg = 0x7f070090; public static final int notification_template_icon_bg = 0x7f07008e;
} }
public static final class id { public static final class id {
public static final int action0 = 0x7f080001; public static final int action0 = 0x7f080001;
...@@ -678,8 +678,8 @@ public final class R { ...@@ -678,8 +678,8 @@ public final class R {
public static final int abc_shareactionprovider_share_with = 0x7f0e001d; public static final int abc_shareactionprovider_share_with = 0x7f0e001d;
public static final int abc_shareactionprovider_share_with_application = 0x7f0e001e; public static final int abc_shareactionprovider_share_with_application = 0x7f0e001e;
public static final int abc_toolbar_collapse_description = 0x7f0e001f; public static final int abc_toolbar_collapse_description = 0x7f0e001f;
public static final int search_menu_title = 0x7f0e007e; public static final int search_menu_title = 0x7f0e007f;
public static final int status_bar_notification_info_overflow = 0x7f0e0081; public static final int status_bar_notification_info_overflow = 0x7f0e0082;
} }
public static final class style { public static final class style {
public static final int AlertDialog_AppCompat = 0x7f0f0000; public static final int AlertDialog_AppCompat = 0x7f0f0000;
......
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/com/google/android/gms/R.java
...@@ -140,8 +140,8 @@ public final class R { ...@@ -140,8 +140,8 @@ public final class R {
public static final int create_calendar_message = 0x7f0e004b; public static final int create_calendar_message = 0x7f0e004b;
public static final int create_calendar_title = 0x7f0e004c; public static final int create_calendar_title = 0x7f0e004c;
public static final int decline = 0x7f0e004f; public static final int decline = 0x7f0e004f;
public static final int store_picture_message = 0x7f0e0082; public static final int store_picture_message = 0x7f0e0083;
public static final int store_picture_title = 0x7f0e0083; public static final int store_picture_title = 0x7f0e0084;
} }
public static final class style { public static final class style {
public static final int Theme_IAPTheme = 0x7f0f00fd; public static final int Theme_IAPTheme = 0x7f0f00fd;
......
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/com/yottacode/pictogram/commonlibrary/R.java
...@@ -604,7 +604,7 @@ public final class R { ...@@ -604,7 +604,7 @@ public final class R {
public static final int common_plus_signin_btn_text_light_focused = 0x7f07007e; public static final int common_plus_signin_btn_text_light_focused = 0x7f07007e;
public static final int common_plus_signin_btn_text_light_normal = 0x7f07007f; public static final int common_plus_signin_btn_text_light_normal = 0x7f07007f;
public static final int common_plus_signin_btn_text_light_pressed = 0x7f070080; public static final int common_plus_signin_btn_text_light_pressed = 0x7f070080;
public static final int notification_template_icon_bg = 0x7f070090; public static final int notification_template_icon_bg = 0x7f07008e;
} }
public static final class id { public static final class id {
public static final int action0 = 0x7f080001; public static final int action0 = 0x7f080001;
...@@ -863,55 +863,55 @@ public final class R { ...@@ -863,55 +863,55 @@ public final class R {
public static final int fa_user_plus = 0x7f0e005e; public static final int fa_user_plus = 0x7f0e005e;
public static final int firstlogin = 0x7f0e005f; public static final int firstlogin = 0x7f0e005f;
public static final int getLicenseStudent = 0x7f0e0060; public static final int getLicenseStudent = 0x7f0e0060;
public static final int google_play_student_apk = 0x7f0e0061; public static final int google_play_student_apk = 0x7f0e0062;
public static final int google_play_supervisor_apk = 0x7f0e0062; public static final int google_play_supervisor_apk = 0x7f0e0063;
public static final int imguserLoadingErrMsg = 0x7f0e0064; public static final int imguserLoadingErrMsg = 0x7f0e0065;
public static final int imguserLoadingMsg = 0x7f0e0065; public static final int imguserLoadingMsg = 0x7f0e0066;
public static final int loadingGrammar = 0x7f0e0066; public static final int loadingGrammar = 0x7f0e0067;
public static final int loginErrorMsg = 0x7f0e0067; public static final int loginErrorMsg = 0x7f0e0068;
public static final int loginErrorTxt = 0x7f0e0068; public static final int loginErrorTxt = 0x7f0e0069;
public static final int loginExpiredLicenseMsg = 0x7f0e0069; public static final int loginExpiredLicenseMsg = 0x7f0e006a;
public static final int loginNoLicenseMsg = 0x7f0e006a; public static final int loginNoLicenseMsg = 0x7f0e006b;
public static final int loginTitle = 0x7f0e006b; public static final int loginTitle = 0x7f0e006c;
public static final int login_ilegaluser = 0x7f0e006c; public static final int login_ilegaluser = 0x7f0e006d;
public static final int login_web = 0x7f0e006d; public static final int login_web = 0x7f0e006e;
public static final int logout = 0x7f0e006e; public static final int logout = 0x7f0e006f;
public static final int mirror_mode_off = 0x7f0e006f; public static final int mirror_mode_off = 0x7f0e0070;
public static final int mirror_mode_on = 0x7f0e0070; public static final int mirror_mode_on = 0x7f0e0071;
public static final int newEscapeCode = 0x7f0e0071; public static final int newEscapeCode = 0x7f0e0072;
public static final int new_version_title = 0x7f0e0073; public static final int new_version_title = 0x7f0e0074;
public static final int noInternetConnection = 0x7f0e0074; public static final int noInternetConnection = 0x7f0e0075;
public static final int noStudentsError = 0x7f0e0075; public static final int noStudentsError = 0x7f0e0076;
public static final int ok = 0x7f0e0076; public static final int ok = 0x7f0e0077;
public static final int picto_delete_fail = 0x7f0e0077; public static final int picto_delete_fail = 0x7f0e0078;
public static final int picto_delete_ok = 0x7f0e0078; public static final int picto_delete_ok = 0x7f0e0079;
public static final int pictogram_offline = 0x7f0e0079; public static final int pictogram_offline = 0x7f0e007a;
public static final int pictogram_online = 0x7f0e007a; public static final int pictogram_online = 0x7f0e007b;
public static final int prompt_serial_mail = 0x7f0e007b; public static final int prompt_serial_mail = 0x7f0e007c;
public static final int prompt_serial_pass = 0x7f0e007c; public static final int prompt_serial_pass = 0x7f0e007d;
public static final int reEnterNewEscapeCode = 0x7f0e007d; public static final int reEnterNewEscapeCode = 0x7f0e007e;
public static final int search_menu_title = 0x7f0e007e; public static final int search_menu_title = 0x7f0e007f;
public static final int server = 0x7f0e007f; public static final int server = 0x7f0e0080;
public static final int serverError = 0x7f0e0080; public static final int serverError = 0x7f0e0081;
public static final int status_bar_notification_info_overflow = 0x7f0e0081; public static final int status_bar_notification_info_overflow = 0x7f0e0082;
public static final int store_picture_message = 0x7f0e0082; public static final int store_picture_message = 0x7f0e0083;
public static final int store_picture_title = 0x7f0e0083; public static final int store_picture_title = 0x7f0e0084;
public static final int supervisorapp_name = 0x7f0e0084; public static final int supervisorapp_name = 0x7f0e0085;
public static final int systemMessage = 0x7f0e0085; public static final int systemMessage = 0x7f0e0086;
public static final int title_activity_login = 0x7f0e0086; public static final int title_activity_login = 0x7f0e0087;
public static final int title_activity_login_activity_fragment = 0x7f0e0087; public static final int title_activity_login_activity_fragment = 0x7f0e0088;
public static final int title_activity_login_activity_fragments = 0x7f0e0088; public static final int title_activity_login_activity_fragments = 0x7f0e0089;
public static final int title_activity_pictogram = 0x7f0e0089; public static final int title_activity_pictogram = 0x7f0e008a;
public static final int title_activity_serial = 0x7f0e008a; public static final int title_activity_serial = 0x7f0e008b;
public static final int title_activity_splash_screen = 0x7f0e008b; public static final int title_activity_splash_screen = 0x7f0e008c;
public static final int toStudentList = 0x7f0e008c; public static final int toStudentList = 0x7f0e008d;
public static final int upload_duplicated = 0x7f0e008d; public static final int upload_duplicated = 0x7f0e008e;
public static final int upload_error = 0x7f0e008e; public static final int upload_error = 0x7f0e008f;
public static final int upload_ok = 0x7f0e008f; public static final int upload_ok = 0x7f0e0090;
public static final int userInetErrorMsg = 0x7f0e0090; public static final int userInetErrorMsg = 0x7f0e0091;
public static final int userLoadingMsg = 0x7f0e0091; public static final int userLoadingMsg = 0x7f0e0092;
public static final int userLoadingTxt = 0x7f0e0092; public static final int userLoadingTxt = 0x7f0e0093;
public static final int wrongCode = 0x7f0e0094; public static final int wrongCode = 0x7f0e0095;
} }
public static final class style { public static final class style {
public static final int AlertDialog_AppCompat = 0x7f0f0000; public static final int AlertDialog_AppCompat = 0x7f0f0000;
......
android/Pictogram/communicator/build/intermediates/manifests/full/DevFlavor/debug/AndroidManifest.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.yottacode.pictogram.yotta_tablet" package="com.yottacode.pictogram.communicator"
android:versionCode="6" android:versionCode="3"
android:versionName="1.6" > android:versionName="1.5" >
<uses-sdk <uses-sdk
android:minSdkVersion="21" android:minSdkVersion="21"
......
android/Pictogram/communicator/build/intermediates/symbols/DevFlavor/debug/R.txt
...@@ -13,8 +13,6 @@ int anim leftout 0x7f01000b ...@@ -13,8 +13,6 @@ int anim leftout 0x7f01000b
int anim pulse 0x7f01000c int anim pulse 0x7f01000c
int anim rightin 0x7f01000d int anim rightin 0x7f01000d
int anim rightout 0x7f01000e int anim rightout 0x7f01000e
int anim slide_in 0x7f01000f
int anim slide_out 0x7f010010
int array androidcolors 0x7f020000 int array androidcolors 0x7f020000
int attr actionBarDivider 0x7f030000 int attr actionBarDivider 0x7f030000
int attr actionBarItemBackground 0x7f030001 int attr actionBarItemBackground 0x7f030001
...@@ -622,44 +620,41 @@ int drawable common_plus_signin_btn_text_light_disabled 0x7f07007d ...@@ -622,44 +620,41 @@ int drawable common_plus_signin_btn_text_light_disabled 0x7f07007d
int drawable common_plus_signin_btn_text_light_focused 0x7f07007e int drawable common_plus_signin_btn_text_light_focused 0x7f07007e
int drawable common_plus_signin_btn_text_light_normal 0x7f07007f int drawable common_plus_signin_btn_text_light_normal 0x7f07007f
int drawable common_plus_signin_btn_text_light_pressed 0x7f070080 int drawable common_plus_signin_btn_text_light_pressed 0x7f070080
int drawable descarga 0x7f070081 int drawable disabled_picto 0x7f070081
int drawable disabled_picto 0x7f070082 int drawable edit 0x7f070082
int drawable edit 0x7f070083 int drawable edit_picture 0x7f070083
int drawable edit_picture 0x7f070084 int drawable edit_text 0x7f070084
int drawable edit_text 0x7f070085 int drawable edit_text_login_style 0x7f070085
int drawable edit_text_login_style 0x7f070086 int drawable editpicto_edittext_style 0x7f070086
int drawable editpicto_edittext_style 0x7f070087 int drawable emptyvocab 0x7f070087
int drawable emptyvocab 0x7f070088 int drawable eye_blocked 0x7f070088
int drawable eye_blocked 0x7f070089 int drawable gallery 0x7f070089
int drawable flash 0x7f07008a int drawable ic_launcher 0x7f07008a
int drawable gallery 0x7f07008b int drawable login_image 0x7f07008b
int drawable ic_launcher 0x7f07008c int drawable micro 0x7f07008c
int drawable login_image 0x7f07008d int drawable micro_negro 0x7f07008d
int drawable micro 0x7f07008e int drawable notification_template_icon_bg 0x7f07008e
int drawable micro_negro 0x7f07008f int drawable photo_camera 0x7f07008f
int drawable notification_template_icon_bg 0x7f070090 int drawable photo_gallery 0x7f070090
int drawable photo_camera 0x7f070091 int drawable picto_grid_item_border 0x7f070091
int drawable photo_gallery 0x7f070092 int drawable pictogram_logo 0x7f070092
int drawable picto_grid_item_border 0x7f070093 int drawable record_animation 0x7f070093
int drawable pictogram_logo 0x7f070094 int drawable remove_picto_from_tape 0x7f070094
int drawable record_animation 0x7f070095 int drawable round_design_photo_green 0x7f070095
int drawable remove_picto_from_tape 0x7f070096 int drawable round_design_photo_white 0x7f070096
int drawable round_design_photo_green 0x7f070097 int drawable send_tape 0x7f070097
int drawable round_design_photo_white 0x7f070098 int drawable session_category 0x7f070098
int drawable send_tape 0x7f070099 int drawable session_discarded 0x7f070099
int drawable session_category 0x7f07009a int drawable session_fail 0x7f07009a
int drawable session_discarded 0x7f07009b int drawable session_model 0x7f07009b
int drawable session_fail 0x7f07009c int drawable session_notevaluated 0x7f07009c
int drawable session_model 0x7f07009d int drawable session_ok 0x7f07009d
int drawable session_notevaluated 0x7f07009e int drawable session_spontaneous 0x7f07009e
int drawable session_ok 0x7f07009f int drawable session_supervised 0x7f07009f
int drawable session_spontaneous 0x7f0700a0 int drawable show_categories_grid 0x7f0700a0
int drawable session_supervised 0x7f0700a1 int drawable try_border 0x7f0700a1
int drawable session_talk 0x7f0700a2 int drawable unlock 0x7f0700a2
int drawable show_categories_grid 0x7f0700a3 int drawable yottacode_logo 0x7f0700a3
int drawable try_border 0x7f0700a4
int drawable unlock 0x7f0700a5
int drawable yottacode_logo 0x7f0700a6
int id aceptar 0x7f080000 int id aceptar 0x7f080000
int id action0 0x7f080001 int id action0 0x7f080001
int id action_bar 0x7f080002 int id action_bar 0x7f080002
...@@ -1004,58 +999,59 @@ int string fa_question_circle 0x7f0e005d ...@@ -1004,58 +999,59 @@ int string fa_question_circle 0x7f0e005d
int string fa_user_plus 0x7f0e005e int string fa_user_plus 0x7f0e005e
int string firstlogin 0x7f0e005f int string firstlogin 0x7f0e005f
int string getLicenseStudent 0x7f0e0060 int string getLicenseStudent 0x7f0e0060
int string google_play_student_apk 0x7f0e0061 int string google_play_apk 0x7f0e0061
int string google_play_supervisor_apk 0x7f0e0062 int string google_play_student_apk 0x7f0e0062
int string ilegal_user 0x7f0e0063 int string google_play_supervisor_apk 0x7f0e0063
int string imguserLoadingErrMsg 0x7f0e0064 int string ilegal_user 0x7f0e0064
int string imguserLoadingMsg 0x7f0e0065 int string imguserLoadingErrMsg 0x7f0e0065
int string loadingGrammar 0x7f0e0066 int string imguserLoadingMsg 0x7f0e0066
int string loginErrorMsg 0x7f0e0067 int string loadingGrammar 0x7f0e0067
int string loginErrorTxt 0x7f0e0068 int string loginErrorMsg 0x7f0e0068
int string loginExpiredLicenseMsg 0x7f0e0069 int string loginErrorTxt 0x7f0e0069
int string loginNoLicenseMsg 0x7f0e006a int string loginExpiredLicenseMsg 0x7f0e006a
int string loginTitle 0x7f0e006b int string loginNoLicenseMsg 0x7f0e006b
int string login_ilegaluser 0x7f0e006c int string loginTitle 0x7f0e006c
int string login_web 0x7f0e006d int string login_ilegaluser 0x7f0e006d
int string logout 0x7f0e006e int string login_web 0x7f0e006e
int string mirror_mode_off 0x7f0e006f int string logout 0x7f0e006f
int string mirror_mode_on 0x7f0e0070 int string mirror_mode_off 0x7f0e0070
int string newEscapeCode 0x7f0e0071 int string mirror_mode_on 0x7f0e0071
int string new_version_detail 0x7f0e0072 int string newEscapeCode 0x7f0e0072
int string new_version_title 0x7f0e0073 int string new_version_detail 0x7f0e0073
int string noInternetConnection 0x7f0e0074 int string new_version_title 0x7f0e0074
int string noStudentsError 0x7f0e0075 int string noInternetConnection 0x7f0e0075
int string ok 0x7f0e0076 int string noStudentsError 0x7f0e0076
int string picto_delete_fail 0x7f0e0077 int string ok 0x7f0e0077
int string picto_delete_ok 0x7f0e0078 int string picto_delete_fail 0x7f0e0078
int string pictogram_offline 0x7f0e0079 int string picto_delete_ok 0x7f0e0079
int string pictogram_online 0x7f0e007a int string pictogram_offline 0x7f0e007a
int string prompt_serial_mail 0x7f0e007b int string pictogram_online 0x7f0e007b
int string prompt_serial_pass 0x7f0e007c int string prompt_serial_mail 0x7f0e007c
int string reEnterNewEscapeCode 0x7f0e007d int string prompt_serial_pass 0x7f0e007d
int string search_menu_title 0x7f0e007e int string reEnterNewEscapeCode 0x7f0e007e
int string server 0x7f0e007f int string search_menu_title 0x7f0e007f
int string serverError 0x7f0e0080 int string server 0x7f0e0080
int string status_bar_notification_info_overflow 0x7f0e0081 int string serverError 0x7f0e0081
int string store_picture_message 0x7f0e0082 int string status_bar_notification_info_overflow 0x7f0e0082
int string store_picture_title 0x7f0e0083 int string store_picture_message 0x7f0e0083
int string supervisorapp_name 0x7f0e0084 int string store_picture_title 0x7f0e0084
int string systemMessage 0x7f0e0085 int string supervisorapp_name 0x7f0e0085
int string title_activity_login 0x7f0e0086 int string systemMessage 0x7f0e0086
int string title_activity_login_activity_fragment 0x7f0e0087 int string title_activity_login 0x7f0e0087
int string title_activity_login_activity_fragments 0x7f0e0088 int string title_activity_login_activity_fragment 0x7f0e0088
int string title_activity_pictogram 0x7f0e0089 int string title_activity_login_activity_fragments 0x7f0e0089
int string title_activity_serial 0x7f0e008a int string title_activity_pictogram 0x7f0e008a
int string title_activity_splash_screen 0x7f0e008b int string title_activity_serial 0x7f0e008b
int string toStudentList 0x7f0e008c int string title_activity_splash_screen 0x7f0e008c
int string upload_duplicated 0x7f0e008d int string toStudentList 0x7f0e008d
int string upload_error 0x7f0e008e int string upload_duplicated 0x7f0e008e
int string upload_ok 0x7f0e008f int string upload_error 0x7f0e008f
int string userInetErrorMsg 0x7f0e0090 int string upload_ok 0x7f0e0090
int string userLoadingMsg 0x7f0e0091 int string userInetErrorMsg 0x7f0e0091
int string userLoadingTxt 0x7f0e0092 int string userLoadingMsg 0x7f0e0092
int string version_label 0x7f0e0093 int string userLoadingTxt 0x7f0e0093
int string wrongCode 0x7f0e0094 int string version_label 0x7f0e0094
int string wrongCode 0x7f0e0095
int style AlertDialog_AppCompat 0x7f0f0000 int style AlertDialog_AppCompat 0x7f0f0000
int style AlertDialog_AppCompat_Light 0x7f0f0001 int style AlertDialog_AppCompat_Light 0x7f0f0001
int style Animation_AppCompat_Dialog 0x7f0f0002 int style Animation_AppCompat_Dialog 0x7f0f0002
......
android/Pictogram/supervisor/supervisor.iml
...@@ -127,35 +127,24 @@ ...@@ -127,35 +127,24 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" /> <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content> </content>
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" /> <orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictoItemViewGenerator.java
...@@ -2,6 +2,7 @@ package com.yottacode.pictogram.tabletlibrary.gui.communicator; ...@@ -2,6 +2,7 @@ package com.yottacode.pictogram.tabletlibrary.gui.communicator;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Color; import android.graphics.Color;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -87,7 +88,7 @@ public class PictoItemViewGenerator { ...@@ -87,7 +88,7 @@ public class PictoItemViewGenerator {
ImageView redCrossImage; ImageView redCrossImage;
TextView legend; TextView legend;
TextView legend_full; TextView legend_full;
if (picto.get_translation().equals("sí") || picto.get_translation().equals("no")) Log.e(LOG_TAG,"************************"+picto);
// View init // View init
if (convertView == null) if (convertView == null)
convertView = LayoutInflater.from(parent.getContext()).inflate(PCBcontext.getPcbdb().getCurrentUser().is_picto_size_big() ? LAYOUT_BIG : LAYOUT, parent, false); convertView = LayoutInflater.from(parent.getContext()).inflate(PCBcontext.getPcbdb().getCurrentUser().is_picto_size_big() ? LAYOUT_BIG : LAYOUT, parent, false);
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/VOCA.java
...@@ -555,30 +555,14 @@ Log.e(LOG_TAG,"**********************************************************PICTO L ...@@ -555,30 +555,14 @@ Log.e(LOG_TAG,"**********************************************************PICTO L
// This is to show the pictos ordered in the 2D Array that represents the panel // This is to show the pictos ordered in the 2D Array that represents the panel
Picto[][] mp = new Picto[maxRows][maxColumns]; Picto[][] mp = new Picto[maxRows][maxColumns];
Iterator<Picto> pictos = list.iterator(); for (Picto p: list) {
while (pictos.hasNext()) { if (p.get_column() != -1 && p.get_row() != -1
Picto p = pictos.next(); && p.get_column() < maxRows && p.get_row() < maxColumns)
/*if (/*PCBcontext.getPcbdb().getCurrentUser().has_categories()--PCBcontext.getVocabulary().has_categories()) {*/ mp[p.get_column()][p.get_row()] = p;
if (p.get_column() != -1 && p.get_row() != -1 if (p.get_column()==0 && p.get_row()==0)
&& p.get_column() < maxRows && p.get_row() < maxColumns) { Log.e(LOG_TAG,"VOCA SORT PPPPP "+p);
mp[p.get_column()][p.get_row()] = p;
}
/*} else {
if (p.getFreeColumn() != -1 && p.getFreeRow() != -1
&& p.getFreeColumn() < maxRows && p.getFreeRow() < maxColumns) {
mp[p.getFreeColumn()][p.getFreeRow()] = p;
}
}*/
} }
try { try {
/*
Picto blankPicto = new Picto(0,
"/symbolstx/color/png/arts_crafts/eraser.png", // TODO Definir imagen para picto en blanco
"Blank picto",
"{\"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++) for (int j = 0; j < maxColumns; j++)
ll.add(mp[i][j]); ll.add(mp[i][j]);
...@@ -586,7 +570,7 @@ Log.e(LOG_TAG,"**********************************************************PICTO L ...@@ -586,7 +570,7 @@ Log.e(LOG_TAG,"**********************************************************PICTO L
e.printStackTrace(); e.printStackTrace();
} }
Log.e(LOG_TAG,"************VOCA SORT:"+mp[0][0]);
return ll; return ll;
} }
......
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