Skip to content

yotta / pictogram

Go to a project
Commit 78f2452c by Fernando Martínez Santiago
Options

Pictogram 1.7. supervisor.PictoGridAdapter refactorizado. Bug "pictos… 

Pictogram 1.7. supervisor.PictoGridAdapter refactorizado. Bug "pictos desaparecen" solucionado. Bug "offline en mitad de sincronización desaparecen pictos" solucionado. Botón pwd visible/invisble añadido.
parent e350dd89
Expand all
Inline Side-by-side
Showing with 272 additions and 256 deletions
android/Pictogram/commonlibrary/build.gradle
...@@ -7,8 +7,8 @@ android { ...@@ -7,8 +7,8 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 21 targetSdkVersion 21
versionCode 3 versionCode 4
versionName "1.6" versionName "1.7"
resValue "string", "db_name", "PCB.db" resValue "string", "db_name", "PCB.db"
resValue "integer", "db_version", "11" resValue "integer", "db_version", "11"
//resValue "string", "app_version", "1.1" //resValue "string", "app_version", "1.1"
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/NetService.java
...@@ -285,7 +285,13 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin { ...@@ -285,7 +285,13 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
} }
public void setOffline(Exception e) { public void setOffline(Exception e) {
this.updated=false; if (this.updated)
try {
PCBcontext.getPcbdb().getStudentVocabulary(PCBcontext.getVocabulary());
} catch (JSONException e1) {
Log.e(LOG_TAG,"Local vocabulary when offline not loading:"+e1.getMessage());
}
this.updated=false;
//PCBcontext.getRoom().exit(); //PCBcontext.getRoom().exit();
Log.e(LOG_TAG, "PCB offline because exception happens: " + e.getMessage()); Log.e(LOG_TAG, "PCB offline because exception happens: " + e.getMessage());
notifyStatus(); notifyStatus();
......
android/Pictogram/communicator/build/generated/source/buildConfig/DevFlavor/debug/com/yottacode/pictogram/communicator/BuildConfig.java
...@@ -8,6 +8,6 @@ public final class BuildConfig { ...@@ -8,6 +8,6 @@ public final class BuildConfig {
public static final String APPLICATION_ID = "com.yottacode.pictogram.yotta_tablet"; public static final String APPLICATION_ID = "com.yottacode.pictogram.yotta_tablet";
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 = 7;
public static final String VERSION_NAME = "1.6"; public static final String VERSION_NAME = "1.7";
} }
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 = 0x7f070091;
} }
public static final class id { public static final class id {
public static final int action0 = 0x7f080001; public static final int action0 = 0x7f080001;
...@@ -549,54 +549,54 @@ public final class R { ...@@ -549,54 +549,54 @@ public final class R {
public static final int line3 = 0x7f080058; public static final int line3 = 0x7f080058;
public static final int listMode = 0x7f08005a; public static final int listMode = 0x7f08005a;
public static final int list_item = 0x7f08005b; public static final int list_item = 0x7f08005b;
public static final int media_actions = 0x7f080060; public static final int media_actions = 0x7f08005f;
public static final int middle = 0x7f080062; public static final int middle = 0x7f080061;
public static final int multiply = 0x7f080063; public static final int multiply = 0x7f080062;
public static final int never = 0x7f080064; public static final int never = 0x7f080063;
public static final int none = 0x7f080065; public static final int none = 0x7f080064;
public static final int normal = 0x7f080066; public static final int normal = 0x7f080065;
public static final int parentPanel = 0x7f08006a; public static final int parentPanel = 0x7f080069;
public static final int progress_circular = 0x7f080077; public static final int progress_circular = 0x7f080076;
public static final int progress_horizontal = 0x7f080078; public static final int progress_horizontal = 0x7f080077;
public static final int radio = 0x7f080079; public static final int radio = 0x7f080078;
public static final int screen = 0x7f08007a; public static final int screen = 0x7f080079;
public static final int scrollIndicatorDown = 0x7f08007b; public static final int scrollIndicatorDown = 0x7f08007a;
public static final int scrollIndicatorUp = 0x7f08007c; public static final int scrollIndicatorUp = 0x7f08007b;
public static final int scrollView = 0x7f08007d; public static final int scrollView = 0x7f08007c;
public static final int search_badge = 0x7f08007e; public static final int search_badge = 0x7f08007d;
public static final int search_bar = 0x7f08007f; public static final int search_bar = 0x7f08007e;
public static final int search_button = 0x7f080080; public static final int search_button = 0x7f08007f;
public static final int search_close_btn = 0x7f080081; public static final int search_close_btn = 0x7f080080;
public static final int search_edit_frame = 0x7f080082; public static final int search_edit_frame = 0x7f080081;
public static final int search_go_btn = 0x7f080083; public static final int search_go_btn = 0x7f080082;
public static final int search_mag_icon = 0x7f080084; public static final int search_mag_icon = 0x7f080083;
public static final int search_plate = 0x7f080085; public static final int search_plate = 0x7f080084;
public static final int search_src_text = 0x7f080086; public static final int search_src_text = 0x7f080085;
public static final int search_voice_btn = 0x7f080087; public static final int search_voice_btn = 0x7f080086;
public static final int select_dialog_listview = 0x7f080088; public static final int select_dialog_listview = 0x7f080087;
public static final int shortcut = 0x7f08008b; public static final int shortcut = 0x7f08008a;
public static final int showCustom = 0x7f08008c; public static final int showCustom = 0x7f08008b;
public static final int showHome = 0x7f08008d; public static final int showHome = 0x7f08008c;
public static final int showTitle = 0x7f08008f; public static final int showTitle = 0x7f08008e;
public static final int spacer = 0x7f080090; public static final int spacer = 0x7f08008f;
public static final int split_action_bar = 0x7f080091; public static final int split_action_bar = 0x7f080090;
public static final int src_atop = 0x7f080092; public static final int src_atop = 0x7f080091;
public static final int src_in = 0x7f080093; public static final int src_in = 0x7f080092;
public static final int src_over = 0x7f080094; public static final int src_over = 0x7f080093;
public static final int status_bar_latest_event_content = 0x7f080096; public static final int status_bar_latest_event_content = 0x7f080095;
public static final int submenuarrow = 0x7f080097; public static final int submenuarrow = 0x7f080096;
public static final int submit_area = 0x7f080098; public static final int submit_area = 0x7f080097;
public static final int tabMode = 0x7f08009a; public static final int tabMode = 0x7f080099;
public static final int text = 0x7f08009c; public static final int text = 0x7f08009b;
public static final int text2 = 0x7f08009d; public static final int text2 = 0x7f08009c;
public static final int textSpacerNoButtons = 0x7f08009e; public static final int textSpacerNoButtons = 0x7f08009d;
public static final int time = 0x7f0800a2; public static final int time = 0x7f0800a1;
public static final int title = 0x7f0800a3; public static final int title = 0x7f0800a2;
public static final int title_template = 0x7f0800a4; public static final int title_template = 0x7f0800a3;
public static final int top = 0x7f0800a5; public static final int top = 0x7f0800a4;
public static final int topPanel = 0x7f0800a6; public static final int topPanel = 0x7f0800a5;
public static final int up = 0x7f0800a8; public static final int up = 0x7f0800a7;
public static final int useLogo = 0x7f0800a9; public static final int useLogo = 0x7f0800a8;
public static final int withText = 0x7f0800ac; public static final int withText = 0x7f0800ac;
public static final int wrap_content = 0x7f0800ad; public static final int wrap_content = 0x7f0800ad;
} }
......
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/com/google/android/gms/R.java
...@@ -92,12 +92,12 @@ public final class R { ...@@ -92,12 +92,12 @@ public final class R {
public static final int dark = 0x7f080029; public static final int dark = 0x7f080029;
public static final int icon_only = 0x7f080041; public static final int icon_only = 0x7f080041;
public static final int light = 0x7f080056; public static final int light = 0x7f080056;
public static final int none = 0x7f080065; public static final int none = 0x7f080064;
public static final int normal = 0x7f080066; public static final int normal = 0x7f080065;
public static final int radio = 0x7f080079; public static final int radio = 0x7f080078;
public static final int standard = 0x7f080095; public static final int standard = 0x7f080094;
public static final int text = 0x7f08009c; public static final int text = 0x7f08009b;
public static final int text2 = 0x7f08009d; public static final int text2 = 0x7f08009c;
public static final int wide = 0x7f0800ab; public static final int wide = 0x7f0800ab;
public static final int wrap_content = 0x7f0800ad; public static final int wrap_content = 0x7f0800ad;
} }
......
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 = 0x7f070091;
} }
public static final class id { public static final class id {
public static final int action0 = 0x7f080001; public static final int action0 = 0x7f080001;
...@@ -661,55 +661,55 @@ public final class R { ...@@ -661,55 +661,55 @@ public final class R {
public static final int line3 = 0x7f080058; public static final int line3 = 0x7f080058;
public static final int listMode = 0x7f08005a; public static final int listMode = 0x7f08005a;
public static final int list_item = 0x7f08005b; public static final int list_item = 0x7f08005b;
public static final int media_actions = 0x7f080060; public static final int media_actions = 0x7f08005f;
public static final int middle = 0x7f080062; public static final int middle = 0x7f080061;
public static final int multiply = 0x7f080063; public static final int multiply = 0x7f080062;
public static final int never = 0x7f080064; public static final int never = 0x7f080063;
public static final int none = 0x7f080065; public static final int none = 0x7f080064;
public static final int normal = 0x7f080066; public static final int normal = 0x7f080065;
public static final int parentPanel = 0x7f08006a; public static final int parentPanel = 0x7f080069;
public static final int progress_circular = 0x7f080077; public static final int progress_circular = 0x7f080076;
public static final int progress_horizontal = 0x7f080078; public static final int progress_horizontal = 0x7f080077;
public static final int radio = 0x7f080079; public static final int radio = 0x7f080078;
public static final int screen = 0x7f08007a; public static final int screen = 0x7f080079;
public static final int scrollIndicatorDown = 0x7f08007b; public static final int scrollIndicatorDown = 0x7f08007a;
public static final int scrollIndicatorUp = 0x7f08007c; public static final int scrollIndicatorUp = 0x7f08007b;
public static final int scrollView = 0x7f08007d; public static final int scrollView = 0x7f08007c;
public static final int search_badge = 0x7f08007e; public static final int search_badge = 0x7f08007d;
public static final int search_bar = 0x7f08007f; public static final int search_bar = 0x7f08007e;
public static final int search_button = 0x7f080080; public static final int search_button = 0x7f08007f;
public static final int search_close_btn = 0x7f080081; public static final int search_close_btn = 0x7f080080;
public static final int search_edit_frame = 0x7f080082; public static final int search_edit_frame = 0x7f080081;
public static final int search_go_btn = 0x7f080083; public static final int search_go_btn = 0x7f080082;
public static final int search_mag_icon = 0x7f080084; public static final int search_mag_icon = 0x7f080083;
public static final int search_plate = 0x7f080085; public static final int search_plate = 0x7f080084;
public static final int search_src_text = 0x7f080086; public static final int search_src_text = 0x7f080085;
public static final int search_voice_btn = 0x7f080087; public static final int search_voice_btn = 0x7f080086;
public static final int select_dialog_listview = 0x7f080088; public static final int select_dialog_listview = 0x7f080087;
public static final int shortcut = 0x7f08008b; public static final int shortcut = 0x7f08008a;
public static final int showCustom = 0x7f08008c; public static final int showCustom = 0x7f08008b;
public static final int showHome = 0x7f08008d; public static final int showHome = 0x7f08008c;
public static final int showTitle = 0x7f08008f; public static final int showTitle = 0x7f08008e;
public static final int spacer = 0x7f080090; public static final int spacer = 0x7f08008f;
public static final int split_action_bar = 0x7f080091; public static final int split_action_bar = 0x7f080090;
public static final int src_atop = 0x7f080092; public static final int src_atop = 0x7f080091;
public static final int src_in = 0x7f080093; public static final int src_in = 0x7f080092;
public static final int src_over = 0x7f080094; public static final int src_over = 0x7f080093;
public static final int standard = 0x7f080095; public static final int standard = 0x7f080094;
public static final int status_bar_latest_event_content = 0x7f080096; public static final int status_bar_latest_event_content = 0x7f080095;
public static final int submenuarrow = 0x7f080097; public static final int submenuarrow = 0x7f080096;
public static final int submit_area = 0x7f080098; public static final int submit_area = 0x7f080097;
public static final int tabMode = 0x7f08009a; public static final int tabMode = 0x7f080099;
public static final int text = 0x7f08009c; public static final int text = 0x7f08009b;
public static final int text2 = 0x7f08009d; public static final int text2 = 0x7f08009c;
public static final int textSpacerNoButtons = 0x7f08009e; public static final int textSpacerNoButtons = 0x7f08009d;
public static final int time = 0x7f0800a2; public static final int time = 0x7f0800a1;
public static final int title = 0x7f0800a3; public static final int title = 0x7f0800a2;
public static final int title_template = 0x7f0800a4; public static final int title_template = 0x7f0800a3;
public static final int top = 0x7f0800a5; public static final int top = 0x7f0800a4;
public static final int topPanel = 0x7f0800a6; public static final int topPanel = 0x7f0800a5;
public static final int up = 0x7f0800a8; public static final int up = 0x7f0800a7;
public static final int useLogo = 0x7f0800a9; public static final int useLogo = 0x7f0800a8;
public static final int wide = 0x7f0800ab; public static final int wide = 0x7f0800ab;
public static final int withText = 0x7f0800ac; public static final int withText = 0x7f0800ac;
public static final int wrap_content = 0x7f0800ad; public static final int wrap_content = 0x7f0800ad;
......
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.yotta_tablet"
android:versionCode="6" android:versionCode="7"
android:versionName="1.6" > android:versionName="1.7" >
<uses-sdk <uses-sdk
android:minSdkVersion="21" android:minSdkVersion="21"
......
android/Pictogram/communicator/build/intermediates/symbols/DevFlavor/debug/R.txt
...@@ -634,32 +634,33 @@ int drawable eye_blocked 0x7f070089 ...@@ -634,32 +634,33 @@ int drawable eye_blocked 0x7f070089
int drawable flash 0x7f07008a int drawable flash 0x7f07008a
int drawable gallery 0x7f07008b int drawable gallery 0x7f07008b
int drawable ic_launcher 0x7f07008c int drawable ic_launcher 0x7f07008c
int drawable login_image 0x7f07008d int drawable ic_remove_red_eye_black_24dp 0x7f07008d
int drawable micro 0x7f07008e int drawable login_image 0x7f07008e
int drawable micro_negro 0x7f07008f int drawable micro 0x7f07008f
int drawable notification_template_icon_bg 0x7f070090 int drawable micro_negro 0x7f070090
int drawable photo_camera 0x7f070091 int drawable notification_template_icon_bg 0x7f070091
int drawable photo_gallery 0x7f070092 int drawable photo_camera 0x7f070092
int drawable picto_grid_item_border 0x7f070093 int drawable photo_gallery 0x7f070093
int drawable pictogram_logo 0x7f070094 int drawable picto_grid_item_border 0x7f070094
int drawable record_animation 0x7f070095 int drawable pictogram_logo 0x7f070095
int drawable remove_picto_from_tape 0x7f070096 int drawable record_animation 0x7f070096
int drawable round_design_photo_green 0x7f070097 int drawable remove_picto_from_tape 0x7f070097
int drawable round_design_photo_white 0x7f070098 int drawable round_design_photo_green 0x7f070098
int drawable send_tape 0x7f070099 int drawable round_design_photo_white 0x7f070099
int drawable session_category 0x7f07009a int drawable send_tape 0x7f07009a
int drawable session_discarded 0x7f07009b int drawable session_category 0x7f07009b
int drawable session_fail 0x7f07009c int drawable session_discarded 0x7f07009c
int drawable session_model 0x7f07009d int drawable session_fail 0x7f07009d
int drawable session_notevaluated 0x7f07009e int drawable session_model 0x7f07009e
int drawable session_ok 0x7f07009f int drawable session_notevaluated 0x7f07009f
int drawable session_spontaneous 0x7f0700a0 int drawable session_ok 0x7f0700a0
int drawable session_supervised 0x7f0700a1 int drawable session_spontaneous 0x7f0700a1
int drawable session_talk 0x7f0700a2 int drawable session_supervised 0x7f0700a2
int drawable show_categories_grid 0x7f0700a3 int drawable session_talk 0x7f0700a3
int drawable try_border 0x7f0700a4 int drawable show_categories_grid 0x7f0700a4
int drawable unlock 0x7f0700a5 int drawable try_border 0x7f0700a5
int drawable yottacode_logo 0x7f0700a6 int drawable unlock 0x7f0700a6
int drawable yottacode_logo 0x7f0700a7
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
...@@ -753,84 +754,84 @@ int id list 0x7f080059 ...@@ -753,84 +754,84 @@ int id list 0x7f080059
int id listMode 0x7f08005a int id listMode 0x7f08005a
int id list_item 0x7f08005b int id list_item 0x7f08005b
int id list_item_picto 0x7f08005c int id list_item_picto 0x7f08005c
int id login 0x7f08005d int id loginlayout 0x7f08005d
int id loginlayout 0x7f08005e int id logo 0x7f08005e
int id logo 0x7f08005f int id media_actions 0x7f08005f
int id media_actions 0x7f080060 int id micro_icon 0x7f080060
int id micro_icon 0x7f080061 int id middle 0x7f080061
int id middle 0x7f080062 int id multiply 0x7f080062
int id multiply 0x7f080063 int id never 0x7f080063
int id never 0x7f080064 int id none 0x7f080064
int id none 0x7f080065 int id normal 0x7f080065
int id normal 0x7f080066 int id off 0x7f080066
int id off 0x7f080067 int id on 0x7f080067
int id on 0x7f080068 int id onTouch 0x7f080068
int id onTouch 0x7f080069 int id parentPanel 0x7f080069
int id parentPanel 0x7f08006a int id photo 0x7f08006a
int id photo 0x7f08006b int id picto_category_grid_view 0x7f08006b
int id picto_category_grid_view 0x7f08006c int id picto_grid_item_image 0x7f08006c
int id picto_grid_item_image 0x7f08006d int id picto_grid_item_image_big 0x7f08006d
int id picto_grid_item_image_big 0x7f08006e int id picto_grid_item_layout 0x7f08006e
int id picto_grid_item_layout 0x7f08006f int id picto_grid_item_layout_big 0x7f08006f
int id picto_grid_item_layout_big 0x7f080070 int id picto_grid_item_layout_wrapper 0x7f080070
int id picto_grid_item_layout_wrapper 0x7f080071 int id picto_grid_item_layout_wrapper_big 0x7f080071
int id picto_grid_item_layout_wrapper_big 0x7f080072 int id picto_grid_item_redcross 0x7f080072
int id picto_grid_item_redcross 0x7f080073 int id picto_grid_item_redcross_big 0x7f080073
int id picto_grid_item_redcross_big 0x7f080074 int id picto_main_grid_view 0x7f080074
int id picto_main_grid_view 0x7f080075 int id pictogramLayout 0x7f080075
int id pictogramLayout 0x7f080076 int id progress_circular 0x7f080076
int id progress_circular 0x7f080077 int id progress_horizontal 0x7f080077
int id progress_horizontal 0x7f080078 int id radio 0x7f080078
int id radio 0x7f080079 int id screen 0x7f080079
int id screen 0x7f08007a int id scrollIndicatorDown 0x7f08007a
int id scrollIndicatorDown 0x7f08007b int id scrollIndicatorUp 0x7f08007b
int id scrollIndicatorUp 0x7f08007c int id scrollView 0x7f08007c
int id scrollView 0x7f08007d int id search_badge 0x7f08007d
int id search_badge 0x7f08007e int id search_bar 0x7f08007e
int id search_bar 0x7f08007f int id search_button 0x7f08007f
int id search_button 0x7f080080 int id search_close_btn 0x7f080080
int id search_close_btn 0x7f080081 int id search_edit_frame 0x7f080081
int id search_edit_frame 0x7f080082 int id search_go_btn 0x7f080082
int id search_go_btn 0x7f080083 int id search_mag_icon 0x7f080083
int id search_mag_icon 0x7f080084 int id search_plate 0x7f080084
int id search_plate 0x7f080085 int id search_src_text 0x7f080085
int id search_src_text 0x7f080086 int id search_voice_btn 0x7f080086
int id search_voice_btn 0x7f080087 int id select_dialog_listview 0x7f080087
int id select_dialog_listview 0x7f080088 int id serialmail 0x7f080088
int id serialmail 0x7f080089 int id serialpass 0x7f080089
int id serialpass 0x7f08008a int id shortcut 0x7f08008a
int id shortcut 0x7f08008b int id showCustom 0x7f08008b
int id showCustom 0x7f08008c int id showHome 0x7f08008c
int id showHome 0x7f08008d int id showPictoCategoriesViewButton 0x7f08008d
int id showPictoCategoriesViewButton 0x7f08008e int id showTitle 0x7f08008e
int id showTitle 0x7f08008f int id spacer 0x7f08008f
int id spacer 0x7f080090 int id split_action_bar 0x7f080090
int id split_action_bar 0x7f080091 int id src_atop 0x7f080091
int id src_atop 0x7f080092 int id src_in 0x7f080092
int id src_in 0x7f080093 int id src_over 0x7f080093
int id src_over 0x7f080094 int id standard 0x7f080094
int id standard 0x7f080095 int id status_bar_latest_event_content 0x7f080095
int id status_bar_latest_event_content 0x7f080096 int id submenuarrow 0x7f080096
int id submenuarrow 0x7f080097 int id submit_area 0x7f080097
int id submit_area 0x7f080098 int id supstulist 0x7f080098
int id supstulist 0x7f080099 int id tabMode 0x7f080099
int id tabMode 0x7f08009a int id tape_grid_view 0x7f08009a
int id tape_grid_view 0x7f08009b int id text 0x7f08009b
int id text 0x7f08009c int id text2 0x7f08009c
int id text2 0x7f08009d int id textSpacerNoButtons 0x7f08009d
int id textSpacerNoButtons 0x7f08009e int id textView 0x7f08009e
int id textView 0x7f08009f int id textView1 0x7f08009f
int id textView1 0x7f0800a0 int id textView2 0x7f0800a0
int id textView2 0x7f0800a1 int id time 0x7f0800a1
int id time 0x7f0800a2 int id title 0x7f0800a2
int id title 0x7f0800a3 int id title_template 0x7f0800a3
int id title_template 0x7f0800a4 int id top 0x7f0800a4
int id top 0x7f0800a5 int id topPanel 0x7f0800a5
int id topPanel 0x7f0800a6 int id txt_firstlogin 0x7f0800a6
int id txt_firstlogin 0x7f0800a7 int id up 0x7f0800a7
int id up 0x7f0800a8 int id useLogo 0x7f0800a8
int id useLogo 0x7f0800a9 int id userList 0x7f0800a9
int id userList 0x7f0800aa int id viewPwdButton 0x7f0800aa
int id wide 0x7f0800ab int id wide 0x7f0800ab
int id withText 0x7f0800ac int id withText 0x7f0800ac
int id wrap_content 0x7f0800ad int id wrap_content 0x7f0800ad
......
android/Pictogram/supervisor/build.gradle
...@@ -12,8 +12,8 @@ android { ...@@ -12,8 +12,8 @@ android {
applicationId "com.yottacode.pictogram.supervisor" applicationId "com.yottacode.pictogram.supervisor"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 22 targetSdkVersion 22
versionCode 6 versionCode 7
versionName "1.6" versionName "1.7"
resValue "bool","NotifyAllwaysVisible","false" resValue "bool","NotifyAllwaysVisible","false"
resValue "string", "VersionManagerClass", "com.yottacode.pictogram.supervisor.net.VersionManager" resValue "string", "VersionManagerClass", "com.yottacode.pictogram.supervisor.net.VersionManager"
resValue "string","apk","pictograms.apk" resValue "string","apk","pictograms.apk"
......
android/Pictogram/supervisor/src/main/java/com/yottacode/pictogram/supervisor/gui/PictoGridAdapter.java
...@@ -8,19 +8,15 @@ import com.yottacode.pictogram.dao.Picto; ...@@ -8,19 +8,15 @@ import com.yottacode.pictogram.dao.Picto;
import com.yottacode.pictogram.tools.PCBcontext; import com.yottacode.pictogram.tools.PCBcontext;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Vector;
public class PictoGridAdapter extends ArrayAdapter { public class PictoGridAdapter extends ArrayAdapter {
private LinkedList<Picto> pictoLinkedList; private LinkedList<Picto> pictoLinkedList;
private final String LOG_TAG = this.getClass().getSimpleName(); private final String LOG_TAG = this.getClass().getSimpleName();
private Vector<Picto> pictoLinkedList_inTape;
private Vector<Picto> pictoLinkedList_inGrid;
public PictoGridAdapter(LinkedList<Picto> pictoLinkedList){ public PictoGridAdapter(LinkedList<Picto> pictoLinkedList){
super(PCBcontext.getContext(), PictoItemViewGenerator.LAYOUT, pictoLinkedList); super(PCBcontext.getContext(), PictoItemViewGenerator.LAYOUT, pictoLinkedList);
this.pictoLinkedList = pictoLinkedList; this.pictoLinkedList = pictoLinkedList;
pictoLinkedList_inTape=new Vector<>(5);
pictoLinkedList_inGrid=new Vector<>(5);
} }
@Override @Override
...@@ -42,13 +38,6 @@ public class PictoGridAdapter extends ArrayAdapter { ...@@ -42,13 +38,6 @@ public class PictoGridAdapter extends ArrayAdapter {
@Override @Override
public View getView(int position, View convertView, ViewGroup parent) { public View getView(int position, View convertView, ViewGroup parent) {
Picto picto=this.pictoLinkedList.get(position); Picto picto=this.pictoLinkedList.get(position);
int igrid=this.pictoLinkedList_inGrid.indexOf(picto);
int itape = this.pictoLinkedList_inTape.indexOf(picto);
if (itape >= 0)
picto.set_visible(false);
if (igrid>=0)
picto.set_visible(true);
View view = PictoItemViewGenerator.getPictoView( View view = PictoItemViewGenerator.getPictoView(
...@@ -60,13 +49,5 @@ public class PictoGridAdapter extends ArrayAdapter { ...@@ -60,13 +49,5 @@ public class PictoGridAdapter extends ArrayAdapter {
return view; return view;
} }
public void allPictosInGrid() {
for (Picto picto: pictoLinkedList_inTape) {
pictoLinkedList_inGrid.add(picto);
}
notifyDataSetChanged();
}
} }
android/Pictogram/supervisor/src/main/java/com/yottacode/pictogram/supervisor/gui/VocabularyManager.java
...@@ -277,12 +277,7 @@ public class VocabularyManager extends Activity implements VocabularyTalk.iVocab ...@@ -277,12 +277,7 @@ public class VocabularyManager extends Activity implements VocabularyTalk.iVocab
} }
@Override
protected void onPause() {
super.onPause();
this.pictoCategoryGridAdapter.allPictosInGrid();
this.pictoMainGridAdapter.allPictosInGrid();
}
@Override @Override
protected void onStop() { protected void onStop() {
......
android/Pictogram/supervisor/supervisor.iml
...@@ -143,6 +143,7 @@ ...@@ -143,6 +143,7 @@
<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/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/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/split-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictoGridAdapter.java
...@@ -39,16 +39,22 @@ public class PictoGridAdapter extends ArrayAdapter { ...@@ -39,16 +39,22 @@ public class PictoGridAdapter extends ArrayAdapter {
return 0; return 0;
} }
private void set_visible(Picto picto, boolean visible) {
if (PCBcontext.getVocabulary().get_picto(picto.get_grid(),picto.get_ImgId())!=null)
PCBcontext.getVocabulary().get_picto(picto.get_grid(),picto.get_ImgId()).set_visible(visible);
}
@Override @Override
public View getView(int position, View convertView, ViewGroup parent) { public View getView(int position, View convertView, ViewGroup parent) {
Picto picto=this.pictoLinkedList.get(position); Picto picto= this.pictoLinkedList.get(position)==null ? null
int igrid=this.pictoLinkedList_inGrid.indexOf(picto); : PCBcontext.getVocabulary().get_picto(this.pictoLinkedList.get(position).get_grid(),this.pictoLinkedList.get(position).get_ImgId());
int itape = this.pictoLinkedList_inTape.indexOf(picto); int igrid=this.pictoLinkedList_inGrid.indexOf(picto);
int itape = this.pictoLinkedList_inTape.indexOf(picto);
if (itape >= 0) if (itape >= 0)
picto.set_visible(false); set_visible(picto,false);
if (igrid>=0) if (igrid>=0)
picto.set_visible(true); set_visible(picto,true);
View view = PictoItemViewGenerator.getPictoView( View view = PictoItemViewGenerator.getPictoView(
...@@ -72,7 +78,7 @@ public class PictoGridAdapter extends ArrayAdapter { ...@@ -72,7 +78,7 @@ public class PictoGridAdapter extends ArrayAdapter {
public void pictoInGrid(Picto p) { public void pictoInGrid(Picto p) {
p.set_visible(true); set_visible(p,true);
pictoLinkedList_inGrid.add(p); pictoLinkedList_inGrid.add(p);
notifyDataSetChanged(); notifyDataSetChanged();
} }
...@@ -84,7 +90,7 @@ public class PictoGridAdapter extends ArrayAdapter { ...@@ -84,7 +90,7 @@ public class PictoGridAdapter extends ArrayAdapter {
public void allPictosInGrid() { public void allPictosInGrid() {
for (Picto picto: pictoLinkedList_inTape) for (Picto picto: pictoLinkedList_inTape)
picto.set_visible(true); set_visible(picto,true);
pictoLinkedList_inTape.clear(); pictoLinkedList_inTape.clear();
pictoLinkedList_inGrid.clear(); pictoLinkedList_inGrid.clear();
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/SerialActivity.java
...@@ -5,6 +5,8 @@ import android.content.Context; ...@@ -5,6 +5,8 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.text.method.HideReturnsTransformationMethod;
import android.text.method.PasswordTransformationMethod;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
...@@ -14,6 +16,7 @@ import android.view.inputmethod.InputMethodManager; ...@@ -14,6 +16,7 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
...@@ -145,7 +148,17 @@ public class SerialActivity extends Activity { ...@@ -145,7 +148,17 @@ public class SerialActivity extends Activity {
} }
}); });
}
((ImageButton)findViewById(R.id.viewPwdButton)).setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
mSerialViewPass.setTransformationMethod(mSerialViewPass.getTransformationMethod().equals(PasswordTransformationMethod.getInstance())
? HideReturnsTransformationMethod.getInstance()
:PasswordTransformationMethod.getInstance());
}});
}
private void clearWindow() { private void clearWindow() {
InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE); InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
......
android/Pictogram/tabletlibrary/src/main/res/layout/activity_serial.xml
...@@ -54,17 +54,19 @@ ...@@ -54,17 +54,19 @@
android:background="@drawable/edit_text_login_style" android:background="@drawable/edit_text_login_style"
android:fontFamily="monospace" android:fontFamily="monospace"
android:hint="@string/prompt_serial_mail" android:hint="@string/prompt_serial_mail"
android:imeActionId="@+id/login"
android:imeOptions="actionUnspecified" android:imeOptions="actionUnspecified"
android:inputType="text" android:inputType="text"
android:maxLines="1" android:maxLines="1"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:selectAllOnFocus="false" android:selectAllOnFocus="false"
android:textColorLink="@color/blue" /> android:textColorLink="@color/blue" />
<LinearLayout
android:layout_width="350dp"
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/serialpass" android:id="@+id/serialpass"
android:layout_width="350dp" android:layout_width="325dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/serialmail" android:layout_below="@+id/serialmail"
android:layout_marginTop="25dp" android:layout_marginTop="25dp"
...@@ -72,7 +74,6 @@ ...@@ -72,7 +74,6 @@
android:background="@drawable/edit_text_login_style" android:background="@drawable/edit_text_login_style"
android:fontFamily="monospace" android:fontFamily="monospace"
android:hint="@string/prompt_serial_pass" android:hint="@string/prompt_serial_pass"
android:imeActionId="@+id/login"
android:imeActionLabel="@string/action_entrar" android:imeActionLabel="@string/action_entrar"
android:imeOptions="actionUnspecified" android:imeOptions="actionUnspecified"
android:inputType="textPassword" android:inputType="textPassword"
...@@ -82,6 +83,17 @@ ...@@ -82,6 +83,17 @@
android:singleLine="false" android:singleLine="false"
android:textColorLink="@color/blue" /> android:textColorLink="@color/blue" />
<ImageButton
android:id="@+id/viewPwdButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@android:color/transparent"
android:baselineAlignBottom="false"
android:elevation="0dp"
android:clickable="true"
android:src="@drawable/ic_remove_red_eye_black_24dp" />
</LinearLayout>
<Button <Button
android:id="@+id/entrar_button" android:id="@+id/entrar_button"
style="?android:textAppearanceSmall" style="?android:textAppearanceSmall"
...@@ -97,6 +109,7 @@ ...@@ -97,6 +109,7 @@
android:text="@string/action_entrar" android:text="@string/action_entrar"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<ImageView <ImageView
......
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