Skip to content

yotta / pictogram

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

Pictogram 1.6: soporte a tableros Beta 1

parent 8e9f6a2a
Expand all
Inline Side-by-side
Showing with 398 additions and 133 deletions
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/action/Action.java
......@@ -40,7 +40,7 @@ public abstract class Action {
public JSONObject get_json() {
final String param_id_stu="id_stu";
final String param_id_sup="id_sup";
final String param_id_scene="id_scene";
final String param_id_grid="id_grid";
final String param_timestamp="timestamp";
final Date currentTime = new Date();
SimpleDateFormat datetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSZ");
......@@ -48,10 +48,9 @@ public abstract class Action {
JSONObject jsonObject = new JSONObject()
.put(param_id_stu, PCBcontext.getPcbdb().getCurrentUser().get_id_stu())
.put(param_timestamp, datetime.format(currentTime));
Log.d("TIMESTAMP-----------> ", datetime.format(currentTime));
if (PCBcontext.getPcbdb().getCurrentUser().has_supervisor()) {
jsonObject.put(param_id_sup, PCBcontext.getPcbdb().getCurrentUser().get_id_sup());
jsonObject.put(param_id_scene, PCBcontext.getPcbdb().getCurrentUser().get_active_grid());
jsonObject.put(param_id_grid, PCBcontext.getPcbdb().getCurrentUser().get_active_grid());
}
//TODO Decidir qué almacenar con DEVICE
//if (PCBcontext.getDevice().getDeviceID()!=null)
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/PCBDBHelper.java
......@@ -178,23 +178,7 @@ public class PCBDBHelper extends SQLiteOpenHelper {
return this.active_grid;
}
/**
* Return if a given scene has categories
* @param id_scene
* @return
*/
private boolean getHasCategories(int id_scene){
SQLiteDatabase db = this.getReadableDatabase();
Cursor cursor = db.query("scene",new String[]{"categories"},"id=?",new String[]{String.valueOf(id_scene)},null,null,null,null);
boolean has_categories;
cursor.moveToFirst();
if(cursor.getCount() > 0){
has_categories=cursor.getString(0).equals("true");
}
else has_categories=false;
return has_categories;
}
/**
* the collection (set of pictos) of the current student
......@@ -260,7 +244,7 @@ public class PCBDBHelper extends SQLiteOpenHelper {
getWritableDatabase().execSQL(sql_grid);
if (grid.getBoolean("active")) {
setActiveGrid(grid.getInt("id"));
Log.e(LOG_TAG,"ACTIVE GRID->"+getActiveGrid());
}
} catch (JSONException e) {
e.printStackTrace();
......@@ -360,18 +344,20 @@ public class PCBDBHelper extends SQLiteOpenHelper {
*
* @param picto_id to be modified from the configuration of the Student
* @param attrs new picto attributes
* @param id_child_grid
* @see com.yottacode.pictogram.dao.Picto
*/
public void modifyPicto(int picto_id, String attrs) {
public void modifyPicto(int picto_id, String attrs, int id_child_grid) {
int id_stu = this.getCurrentUser().get_id_stu();
int id_grid = this.getCurrentUser().get_active_grid();
SQLiteDatabase db = this.getWritableDatabase();
ContentValues values = new ContentValues(1);
values.put("attributes",attrs);
int updates=db.update("collection",values, "id_stu=? AND id_picto=? AND id_grid=?", new String[] {Integer.toString(id_stu),
int updates=db.update("collection",values, "id_stu=? AND id_picto=? AND id_grid=? AND id_child_grid=?", new String[] {Integer.toString(id_stu),
Integer.toString(picto_id),
Integer.toString(id_grid)});
Log.i(this.getClass().getCanonicalName(),"Modify "+updates+" Picto, id. "+picto_id+" grid id:"+id_grid+" Attributes="+attrs);//+ "::"+ Arrays.toString(Thread.currentThread().getStackTrace()));
Integer.toString(id_grid),
Integer.toString(id_child_grid)});
Log.i(this.getClass().getCanonicalName(),"Modify "+updates+" Picto, id. "+picto_id+" grid id:"+id_grid+" child grid:"+id_child_grid+" Attributes="+attrs);//+ "::"+ Arrays.toString(Thread.currentThread().getStackTrace()));
//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
......@@ -50,6 +50,8 @@ public class Picto extends Img {
return id_stupicto;
}
public final static class JSON_ATTTRS {
public static String STUPICTO_ID = "id";
public static String COLUMN = "coord_x";
......@@ -248,6 +250,10 @@ public class Picto extends Img {
return this.id_child_grid;
}
public void set_child_grid(int id_child_grid) {
this.id_child_grid=id_child_grid;
}
/**
*
* @return the magnifiy property of a picto
......@@ -491,7 +497,7 @@ public class Picto extends Img {
if (local)
try {
this.attributes.put(JSON_ATTTRS.PCB_STATUS_MODIFICATION, true);
PCBcontext.getPcbdb().modifyPicto(this.get_ImgId(), this.get_json_attrs());
PCBcontext.getPcbdb().modifyPicto(this.get_ImgId(), this.get_json_attrs(), this.get_child_grid());
} catch (JSONException e) {
e.printStackTrace();
Log.e(LOG_TAG, e.getMessage());
......@@ -499,7 +505,7 @@ public class Picto extends Img {
}
else {
this.attributes.remove(JSON_ATTTRS.PCB_STATUS_MODIFICATION);
PCBcontext.getPcbdb().modifyPicto(this.get_ImgId(), this.get_json_attrs());
PCBcontext.getPcbdb().modifyPicto(this.get_ImgId(), this.get_json_attrs(), id_child_grid);
}
}
......@@ -508,10 +514,11 @@ public class Picto extends Img {
* picto is locally modified
*/
public void set_local_update(boolean update) {
int id_child_grid=this.get_child_grid();
if (update)
try {
this.attributes.put(JSON_ATTTRS.PCB_UPDATE, true);
PCBcontext.getPcbdb().modifyPicto(this.get_ImgId(), this.get_json_attrs());
PCBcontext.getPcbdb().modifyPicto(this.get_ImgId(), this.get_json_attrs(), id_child_grid);
} catch (JSONException e) {
e.printStackTrace();
Log.e(LOG_TAG, e.getMessage());
......@@ -519,7 +526,7 @@ public class Picto extends Img {
}
else {
this.attributes.remove(JSON_ATTTRS.PCB_UPDATE);
PCBcontext.getPcbdb().modifyPicto(this.get_ImgId(), this.get_json_attrs());
PCBcontext.getPcbdb().modifyPicto(this.get_ImgId(), this.get_json_attrs(), id_child_grid);
}
}
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/grammar/Vocabulary.java
......@@ -67,7 +67,7 @@ public class Vocabulary implements Iterable<Picto> {
public void listen(Room room, VocabularyTalk.iVocabularyListener listener, ActionTalk.iActionListener action_listener) {
VocabularyTalk.iVocabularyListener vocabulary_listeners[] = {new VocabularyTalk.iVocabularyListener() {
@Override
public void change(action action, int picto_grid, int picto_id, JSONObject args) {
public void change(action action, int picto_grid, int picto_id, int id_child_grid, JSONObject args) {
switch (action) {
case delete: {
......@@ -78,17 +78,13 @@ public class Vocabulary implements Iterable<Picto> {
case update:{
Log.i(this.getClass().getCanonicalName(), "Picto update "+args.toString());
try {
modifyAttsPicto(picto_grid, picto_id, args.getJSONObject("attributes"));
modifyAttsPicto(picto_grid, picto_id, args.getJSONObject("attributes"), id_child_grid);
} catch (JSONException e) {
e.printStackTrace();
Log.e(LOG_TAG,"Error updating picto:"+e.getMessage());
}
break;
}
case update_category:{
Log.i(this.getClass().getCanonicalName(), "Picto category update "+args.toString());
Vocabulary.this.synchronize(get_picto(picto_grid,picto_id).get_grid());
}
case add:{
try{
......@@ -429,7 +425,7 @@ public class Vocabulary implements Iterable<Picto> {
* @param attrs
*/
public void modifyAttsPicto(int pic_grid, int pic_id, JSONObject attrs) {
public void modifyAttsPicto(int pic_grid, int pic_id, JSONObject attrs, int id_child_grid) {
int index=find_picto_index(pic_grid,pic_id);
if (index>=0) { //puede ocurrir que se intente modificar un pictograma que fue borrado
Picto picto = this.pictos.get(pic_grid).get(index);
......@@ -437,7 +433,11 @@ public class Vocabulary implements Iterable<Picto> {
picto.set_json_attr(attrs);
if (!old_legend.equals(picto.get_legend())) //puede ocurrir que se cambie la leyenda de TODOS los pictos
this.synchronize();
PCBcontext.getPcbdb().modifyPicto(pic_id, attrs.toString());
PCBcontext.getPcbdb().modifyPicto(pic_id, attrs.toString(), id_child_grid);
if (picto.get_child_grid()!=id_child_grid){
picto.set_child_grid(id_child_grid);
synchronize(id_child_grid);
}
}
else
Log.i(this.getClass().getCanonicalName(),"Trying to modify an unregistered picto:"+pic_id+" grid:"+pic_grid);
......@@ -472,7 +472,6 @@ public class Vocabulary implements Iterable<Picto> {
startpictos=null;
else {
startpictos = new LinkedList<>();
Log.e(LOG_TAG,"ACTIVE GRID:"+PCBcontext.getPcbdb().getActiveGrid()+this.pictos.get(PCBcontext.getPcbdb().getActiveGrid()));
LinkedList<Picto> pictos = this.pictos.get(PCBcontext.getPcbdb().getActiveGrid());
for (Picto picto : pictos) {
startpictos.add(picto);
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/websockets/VocabularyTalk.java
......@@ -34,10 +34,9 @@ public class VocabularyTalk implements Emitter.Listener {
final String param_picto="picto";
final String param_stu_picto="stu_picto";
final String param_picto_id="id";
final String param_stupicto_scene="id_scene";
final String param_picto_cat="id_cat";
final String param_grid_id="id_grid";
final String action_update="update";
final String action_update_category="update_category";
String param_id_child_grid="id_child_grid";
final String action_add="add";
final String action_delete="delete";
......@@ -47,21 +46,20 @@ public class VocabularyTalk implements Emitter.Listener {
try {
Log.i(LOG_TAG, "raw Received message " +msg.toString());
String action = msg.getString(param_action).toLowerCase();
JSONObject stu_picto= msg.getJSONObject(param_attributes).getJSONObject(param_stu_picto);
JSONObject attributes = msg.getJSONObject(param_attributes);
JSONObject stu_picto= attributes.getJSONObject(param_stu_picto);
JSONObject attrs_stu_picto = stu_picto.optJSONObject(param_attributes);
JSONObject picto_stupicto = stu_picto.optJSONObject(param_picto);
int picto_id = picto_stupicto.getInt(param_picto_id);
int picto_cat = attrs_stu_picto!=null ? attrs_stu_picto.optInt(param_picto_cat, Picto.NO_CATEGORY) : 0;
if(PCBcontext.getPcbdb().getCurrentUser().get_active_grid() == attributes.getInt(param_stupicto_scene)) {
PCBcontext.getNetService().nextSynchro(new Date().getTime() + PCBcontext.getNetService().getSynchroTimingLength() * 2); //nos saltamos una sincronización para evitar que llegue antes que los websockets
for (iVocabularyListener listener : this.listeners)
int id_child_grid=stu_picto.optInt(param_id_child_grid, Picto.NO_CHILD_GRID);
PCBcontext.getNetService().nextSynchro(new Date().getTime() + PCBcontext.getNetService().getSynchroTimingLength() * 2); //nos saltamos una sincronización para evitar que llegue antes que los websockets
for (iVocabularyListener listener : this.listeners)
listener.change(action.equals(action_update) ? iVocabularyListener.action.update
: action.equals(action_update_category) ? iVocabularyListener.action.update_category
: action.equals(action_add) ? iVocabularyListener.action.add
: iVocabularyListener.action.delete
, picto_cat, picto_id, stu_picto);
}
, attributes.getInt(param_grid_id), picto_id, id_child_grid, stu_picto);
} catch (JSONException e) {
Log.e(LOG_TAG, e.getClass().getCanonicalName() + "--" + e);
}
......@@ -74,7 +72,7 @@ public class VocabularyTalk implements Emitter.Listener {
* @version 1.0
*/
public interface iVocabularyListener {
enum action {delete,add, update_category, update}
void change(action action, int picto_cat, int picto_id, JSONObject args);
enum action {delete,add, update}
void change(action action, int picto_cat, int picto_id, int id_child_grid, JSONObject args);
}
}
android/Pictogram/communicator/build/generated/res/resValues/DevFlavor/debug/values/generated.xml
......@@ -11,6 +11,6 @@
<!-- Values from default config. -->
<bool name="NotifyAllwaysVisible">true</bool>
<string name="VersionManagerClass" translatable="false">com.yottacode.pictogram.communicator.net.com.yottacode.pictogram.communicator.net.VersionManager</string>
<string name="VersionManagerClass" translatable="false">com.yottacode.pictogram.communicator.VersionManager</string>
</resources>
android/Pictogram/communicator/build/generated/res/resValues/androidTest/DevFlavor/debug/values/generated.xml
......@@ -11,6 +11,6 @@
<!-- Values from default config. -->
<bool name="NotifyAllwaysVisible">true</bool>
<string name="VersionManagerClass" translatable="false">com.yottacode.pictogram.communicator.net.com.yottacode.pictogram.communicator.net.VersionManager</string>
<string name="VersionManagerClass" translatable="false">com.yottacode.pictogram.communicator.VersionManager</string>
</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;
public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String APPLICATION_ID = "com.yottacode.pictogram.communicator";
public static final String APPLICATION_ID = "com.yottacode.pictogram.yotta_tablet";
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "DevFlavor";
public static final int VERSION_CODE = 1;
public static final String VERSION_NAME = "1.0";
public static final int VERSION_CODE = 4;
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 {
public static final int abc_textfield_search_default_mtrl_alpha = 0x7f020050;
public static final int abc_textfield_search_material = 0x7f020051;
public static final int abc_vector_test = 0x7f020052;
public static final int notification_template_icon_bg = 0x7f0200a3;
public static final int notification_template_icon_bg = 0x7f0200a6;
}
public static final class id {
public static final int action0 = 0x7f0e0086;
......
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/com/yottacode/pictogram/commonlibrary/R.java
......@@ -604,7 +604,7 @@ public final class R {
public static final int common_plus_signin_btn_text_light_focused = 0x7f02007e;
public static final int common_plus_signin_btn_text_light_normal = 0x7f02007f;
public static final int common_plus_signin_btn_text_light_pressed = 0x7f020080;
public static final int notification_template_icon_bg = 0x7f0200a3;
public static final int notification_template_icon_bg = 0x7f0200a6;
}
public static final class id {
public static final int action0 = 0x7f0e0086;
......
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/com/yottacode/pictogram/tabletlibrary/R.java
......@@ -23,6 +23,8 @@ public final class R {
public static final int pulse = 0x7f05000c;
public static final int rightin = 0x7f05000d;
public static final int rightout = 0x7f05000e;
public static final int slide_in = 0x7f05000f;
public static final int slide_out = 0x7f050010;
}
public static final class array {
public static final int androidcolors = 0x7f0c0000;
......@@ -642,41 +644,44 @@ public final class R {
public static final int common_plus_signin_btn_text_light_focused = 0x7f02007e;
public static final int common_plus_signin_btn_text_light_normal = 0x7f02007f;
public static final int common_plus_signin_btn_text_light_pressed = 0x7f020080;
public static final int disabled_picto = 0x7f020081;
public static final int edit = 0x7f020082;
public static final int edit_picture = 0x7f020083;
public static final int edit_text = 0x7f020084;
public static final int edit_text_login_style = 0x7f020085;
public static final int editpicto_edittext_style = 0x7f020086;
public static final int emptyvocab = 0x7f020087;
public static final int eye_blocked = 0x7f020088;
public static final int gallery = 0x7f020089;
public static final int ic_launcher = 0x7f02008a;
public static final int login_image = 0x7f02008b;
public static final int micro = 0x7f02008c;
public static final int micro_negro = 0x7f02008d;
public static final int notification_template_icon_bg = 0x7f0200a3;
public static final int photo_camera = 0x7f02008e;
public static final int photo_gallery = 0x7f02008f;
public static final int picto_grid_item_border = 0x7f020090;
public static final int pictogram_logo = 0x7f020091;
public static final int record_animation = 0x7f020092;
public static final int remove_picto_from_tape = 0x7f020093;
public static final int round_design_photo_green = 0x7f020094;
public static final int round_design_photo_white = 0x7f020095;
public static final int send_tape = 0x7f020096;
public static final int session_category = 0x7f020097;
public static final int session_discarded = 0x7f020098;
public static final int session_fail = 0x7f020099;
public static final int session_model = 0x7f02009a;
public static final int session_notevaluated = 0x7f02009b;
public static final int session_ok = 0x7f02009c;
public static final int session_spontaneous = 0x7f02009d;
public static final int session_supervised = 0x7f02009e;
public static final int show_categories_grid = 0x7f02009f;
public static final int try_border = 0x7f0200a0;
public static final int unlock = 0x7f0200a1;
public static final int yottacode_logo = 0x7f0200a2;
public static final int descarga = 0x7f020081;
public static final int disabled_picto = 0x7f020082;
public static final int edit = 0x7f020083;
public static final int edit_picture = 0x7f020084;
public static final int edit_text = 0x7f020085;
public static final int edit_text_login_style = 0x7f020086;
public static final int editpicto_edittext_style = 0x7f020087;
public static final int emptyvocab = 0x7f020088;
public static final int eye_blocked = 0x7f020089;
public static final int flash = 0x7f02008a;
public static final int gallery = 0x7f02008b;
public static final int ic_launcher = 0x7f02008c;
public static final int login_image = 0x7f02008d;
public static final int micro = 0x7f02008e;
public static final int micro_negro = 0x7f02008f;
public static final int notification_template_icon_bg = 0x7f0200a6;
public static final int photo_camera = 0x7f020090;
public static final int photo_gallery = 0x7f020091;
public static final int picto_grid_item_border = 0x7f020092;
public static final int pictogram_logo = 0x7f020093;
public static final int record_animation = 0x7f020094;
public static final int remove_picto_from_tape = 0x7f020095;
public static final int round_design_photo_green = 0x7f020096;
public static final int round_design_photo_white = 0x7f020097;
public static final int send_tape = 0x7f020098;
public static final int session_category = 0x7f020099;
public static final int session_discarded = 0x7f02009a;
public static final int session_fail = 0x7f02009b;
public static final int session_model = 0x7f02009c;
public static final int session_notevaluated = 0x7f02009d;
public static final int session_ok = 0x7f02009e;
public static final int session_spontaneous = 0x7f02009f;
public static final int session_supervised = 0x7f0200a0;
public static final int session_talk = 0x7f0200a1;
public static final int show_categories_grid = 0x7f0200a2;
public static final int try_border = 0x7f0200a3;
public static final int unlock = 0x7f0200a4;
public static final int yottacode_logo = 0x7f0200a5;
}
public static final class id {
public static final int aceptar = 0x7f0e0085;
......
android/Pictogram/communicator/build/generated/source/r/androidTest/DevFlavor/debug/com/yottacode/pictogram/communicator/test/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* aapt tool from the resource data it found. It
* should not be modified by hand.
*/
package com.yottacode.pictogram.communicator.test;
public final class R {
public static final class attr {
}
public static final class bool {
public static final int NotifyAllwaysVisible=0x7f020000;
public static final int ssl_connect=0x7f020001;
}
public static final class string {
public static final int VersionManagerClass=0x7f030000;
public static final int apk=0x7f030001;
public static final int server=0x7f030002;
}
}
android/Pictogram/communicator/build/intermediates/blame/res/DevFlavor/debug/multi/values-h720dp-v13.json
[
{
"outputFile": "/home/german/pictogram/android/Pictogram/communicator/build/intermediates/incremental/mergeDevFlavorDebugResources/merged.dir/values-h720dp-v13/values-h720dp-v13.xml",
"outputFile": "C:\\home\\german\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml",
"map": [
{
"to": {
......@@ -11,7 +11,31 @@
"endOffset": 117
},
"from": {
"file": "/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/values-h720dp-v13/values-h720dp-v13.xml",
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 66,
"endOffset": 117
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 66,
"endOffset": 117
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
"position": {
"startLine": 2,
"startColumn": 4,
......
android/Pictogram/communicator/build/intermediates/blame/res/DevFlavor/debug/multi/values-hdpi-v4.json
[
{
"outputFile": "/home/german/pictogram/android/Pictogram/communicator/build/intermediates/incremental/mergeDevFlavorDebugResources/merged.dir/values-hdpi-v4/values-hdpi-v4.xml",
"outputFile": "C:\\home\\german\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml",
"map": [
{
"to": {
......@@ -12,7 +12,33 @@
"endOffset": 327
},
"from": {
"file": "/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/values-hdpi-v4/values-hdpi-v4.xml",
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-hdpi-v4\\values-hdpi-v4.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endLine": 6,
"endColumn": 13,
"endOffset": 327
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endLine": 6,
"endColumn": 13,
"endOffset": 327
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-hdpi-v4\\values-hdpi-v4.xml",
"position": {
"startLine": 2,
"startColumn": 4,
......
android/Pictogram/communicator/build/intermediates/blame/res/DevFlavor/debug/multi/values-land.json
[
{
"outputFile": "/home/german/pictogram/android/Pictogram/communicator/build/intermediates/incremental/mergeDevFlavorDebugResources/merged.dir/values-land/values-land.xml",
"outputFile": "C:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-land\\values-land.xml",
"map": [
{
"to": {
......@@ -11,7 +11,7 @@
"endOffset": 120
},
"from": {
"file": "/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/values-land/values-land.xml",
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 2,
"startColumn": 4,
......@@ -30,7 +30,7 @@
"endOffset": 184
},
"from": {
"file": "/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/values-land/values-land.xml",
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 3,
"startColumn": 4,
......@@ -49,7 +49,7 @@
"endOffset": 255
},
"from": {
"file": "/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/values-land/values-land.xml",
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 4,
"startColumn": 4,
......@@ -68,7 +68,88 @@
"endOffset": 323
},
"from": {
"file": "/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/values-land/values-land.xml",
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 5,
"startColumn": 4,
"startOffset": 260,
"endColumn": 67,
"endOffset": 323
}
}
}
]
},
{
"outputFile": "C:\\home\\german\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-land\\values-land.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 69,
"endOffset": 120
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 69,
"endOffset": 120
}
}
},
{
"to": {
"startLine": 3,
"startColumn": 4,
"startOffset": 125,
"endColumn": 63,
"endOffset": 184
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 3,
"startColumn": 4,
"startOffset": 125,
"endColumn": 63,
"endOffset": 184
}
}
},
{
"to": {
"startLine": 4,
"startColumn": 4,
"startOffset": 189,
"endColumn": 70,
"endOffset": 255
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 4,
"startColumn": 4,
"startOffset": 189,
"endColumn": 70,
"endOffset": 255
}
}
},
{
"to": {
"startLine": 5,
"startColumn": 4,
"startOffset": 260,
"endColumn": 67,
"endOffset": 323
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 5,
"startColumn": 4,
......
android/Pictogram/communicator/build/intermediates/blame/res/DevFlavor/debug/multi/values-ldltr-v21.json
[
{
"outputFile": "/home/german/pictogram/android/Pictogram/communicator/build/intermediates/incremental/mergeDevFlavorDebugResources/merged.dir/values-ldltr-v21/values-ldltr-v21.xml",
"outputFile": "C:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml",
"map": [
{
"to": {
......@@ -11,7 +11,31 @@
"endOffset": 163
},
"from": {
"file": "/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/values-ldltr-v21/values-ldltr-v21.xml",
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 112,
"endOffset": 163
}
}
}
]
},
{
"outputFile": "C:\\home\\german\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 112,
"endOffset": 163
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
"position": {
"startLine": 2,
"startColumn": 4,
......
android/Pictogram/communicator/build/intermediates/blame/res/DevFlavor/debug/multi/values-night-v8.json
[
{
"outputFile": "/home/german/pictogram/android/Pictogram/communicator/build/intermediates/incremental/mergeDevFlavorDebugResources/merged.dir/values-night-v8/values-night-v8.xml",
"outputFile": "C:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-night-v8\\values-night-v8.xml",
"map": [
{
"to": {
......@@ -11,7 +11,7 @@
"endOffset": 120
},
"from": {
"file": "/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/values-night-v8/values-night-v8.xml",
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-night-v8\\values-night-v8.xml",
"position": {
"startLine": 2,
"startColumn": 4,
......@@ -30,7 +30,7 @@
"endOffset": 204
},
"from": {
"file": "/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/values-night-v8/values-night-v8.xml",
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-night-v8\\values-night-v8.xml",
"position": {
"startLine": 3,
"startColumn": 4,
......@@ -49,7 +49,7 @@
"endOffset": 288
},
"from": {
"file": "/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/values-night-v8/values-night-v8.xml",
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-night-v8\\values-night-v8.xml",
"position": {
"startLine": 4,
"startColumn": 4,
......@@ -68,7 +68,7 @@
"endOffset": 384
},
"from": {
"file": "/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/values-night-v8/values-night-v8.xml",
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-night-v8\\values-night-v8.xml",
"position": {
"startLine": 5,
"startColumn": 4,
......@@ -87,7 +87,7 @@
"endOffset": 486
},
"from": {
"file": "/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/values-night-v8/values-night-v8.xml",
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-night-v8\\values-night-v8.xml",
"position": {
"startLine": 6,
"startColumn": 4,
......@@ -106,7 +106,7 @@
"endOffset": 588
},
"from": {
"file": "/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/values-night-v8/values-night-v8.xml",
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-night-v8\\values-night-v8.xml",
"position": {
"startLine": 7,
"startColumn": 4,
......@@ -125,7 +125,145 @@
"endOffset": 682
},
"from": {
"file": "/home/german/.android/build-cache/116ba476ffe1c97e7a1f57d6511e4139a0deeca9/output/res/values-night-v8/values-night-v8.xml",
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-night-v8\\values-night-v8.xml",
"position": {
"startLine": 8,
"startColumn": 4,
"startOffset": 593,
"endColumn": 93,
"endOffset": 682
}
}
}
]
},
{
"outputFile": "C:\\home\\german\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-night-v8\\values-night-v8.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 69,
"endOffset": 120
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-night-v8\\values-night-v8.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 69,
"endOffset": 120
}
}
},
{
"to": {
"startLine": 3,
"startColumn": 4,
"startOffset": 125,
"endColumn": 83,
"endOffset": 204
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-night-v8\\values-night-v8.xml",
"position": {
"startLine": 3,
"startColumn": 4,
"startOffset": 125,
"endColumn": 83,
"endOffset": 204
}
}
},
{
"to": {
"startLine": 4,
"startColumn": 4,
"startOffset": 209,
"endColumn": 83,
"endOffset": 288
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-night-v8\\values-night-v8.xml",
"position": {
"startLine": 4,
"startColumn": 4,
"startOffset": 209,
"endColumn": 83,
"endOffset": 288
}
}
},
{
"to": {
"startLine": 5,
"startColumn": 4,
"startOffset": 293,
"endColumn": 95,
"endOffset": 384
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-night-v8\\values-night-v8.xml",
"position": {
"startLine": 5,
"startColumn": 4,
"startOffset": 293,
"endColumn": 95,
"endOffset": 384
}
}
},
{
"to": {
"startLine": 6,
"startColumn": 4,
"startOffset": 389,
"endColumn": 101,
"endOffset": 486
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-night-v8\\values-night-v8.xml",
"position": {
"startLine": 6,
"startColumn": 4,
"startOffset": 389,
"endColumn": 101,
"endOffset": 486
}
}
},
{
"to": {
"startLine": 7,
"startColumn": 4,
"startOffset": 491,
"endColumn": 101,
"endOffset": 588
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-night-v8\\values-night-v8.xml",
"position": {
"startLine": 7,
"startColumn": 4,
"startOffset": 491,
"endColumn": 101,
"endOffset": 588
}
}
},
{
"to": {
"startLine": 8,
"startColumn": 4,
"startOffset": 593,
"endColumn": 93,
"endOffset": 682
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-night-v8\\values-night-v8.xml",
"position": {
"startLine": 8,
"startColumn": 4,
......
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