Skip to content

yotta / pictogram

Go to a project
Commit 217c5709 by Arturo Montejo Ráez
Options

Merge branch 'master' of http://gitlab.ujaen.es/yotta/pictogram

parents e7e48710 cf342414
Expand all
Inline Side-by-side
Showing with 164 additions and 340 deletions
android/Pictogram/build.gradle
...@@ -7,9 +7,10 @@ buildscript { ...@@ -7,9 +7,10 @@ buildscript {
url 'https://maven.google.com/' url 'https://maven.google.com/'
name 'Google' name 'Google'
} }
google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.android.tools.build:gradle:3.3.1'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
......
android/Pictogram/commonlibrary/build.gradle
...@@ -2,13 +2,18 @@ apply plugin: 'com.android.library' ...@@ -2,13 +2,18 @@ apply plugin: 'com.android.library'
android { android {
compileSdkVersion 24 compileSdkVersion 24
buildToolsVersion '26.0.2' buildToolsVersion '28.0.3'
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 21 targetSdkVersion 21
<<<<<<< HEAD
versionCode 3 versionCode 3
versionName "1.6" versionName "1.8"
=======
versionCode 4
versionName "1.7"
>>>>>>> develop
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"
...@@ -42,14 +47,27 @@ android { ...@@ -42,14 +47,27 @@ android {
} }
dependencies { dependencies {
<<<<<<< HEAD
implementation fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
implementation 'com.android.support:support-v4:24.2.1'
implementation 'com.android.support:appcompat-v7:24.2.1'
api 'com.github.nkzawa:socket.io-client:0.5.0'
api 'com.koushikdutta.async:androidasync:2.2.1'
api 'com.koushikdutta.ion:ion:2.2.1'
implementation 'com.google.android.gms:play-services-ads:9.2.1'
implementation 'com.google.android.gms:play-services-auth:9.2.1'
implementation 'com.google.android.gms:play-services-gcm:9.2.1'
=======
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
compile 'com.android.support:support-v4:24.2.1' compile 'com.android.support:support-v4:24.2.1'
compile 'com.android.support:appcompat-v7:24.2.1' compile 'com.android.support:appcompat-v7:24.2.1'
compile 'com.github.nkzawa:socket.io-client:0.5.0' compile 'com.github.nkzawa:socket.io-client:0.5.1'
compile 'com.koushikdutta.async:androidasync:2.+' compile 'com.koushikdutta.async:androidasync:2.+'
compile 'com.koushikdutta.ion:ion:2.+' compile 'com.koushikdutta.ion:ion:2.+'
compile 'com.google.android.gms:play-services-ads:9.2.1' compile 'com.google.android.gms:play-services-ads:9.2.1'
compile 'com.google.android.gms:play-services-auth:9.2.1' compile 'com.google.android.gms:play-services-auth:9.2.1'
compile 'com.google.android.gms:play-services-gcm:9.2.1' compile 'com.google.android.gms:play-services-gcm:9.2.1'
>>>>>>> develop
} }
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/NetService.java
...@@ -285,6 +285,12 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin { ...@@ -285,6 +285,12 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
} }
public void setOffline(Exception e) { public void setOffline(Exception e) {
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; 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());
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/websockets/Room.java
...@@ -42,7 +42,7 @@ public class Room { ...@@ -42,7 +42,7 @@ public class Room {
@Override @Override
public void call(Object... args) { public void call(Object... args) {
Log.e(LOG_TAG,"Websockect disconnect"); Log.e(LOG_TAG,"Websockect disconnect");
PCBcontext.getNetService().setOffline(new SocketIOException("Websocket connection is lost")); //PCBcontext.getNetService().setOffline(new SocketIOException("Websocket connection is lost"));
} }
}); });
connect(); connect();
......
android/Pictogram/commonlibrary/src/main/res/values/dimens.xml 0 → 100644
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">8dp</dimen>
<dimen name="activity_vertical_margin">8dp</dimen>
<dimen name="small_padding">4dp</dimen>
<!-- Horizontal and vertical spacing between pictos -->
<dimen name="picto_grid_spacing">1dp</dimen>
<!-- Picto border -->
<dimen name="picto_border_width">2dp</dimen>
<!-- Picto padding ¿? -->
<dimen name="picto_padding">1dp</dimen>
<!-- Picto normal size -->
<dimen name="picto_normal_side">58dp</dimen>
<!-- Picto big size -->
<dimen name="picto_big_side">65dp</dimen>
<!-- Tape -->
<dimen name="tape_normal_height">68dp</dimen>
<dimen name="tape_big_height">75dp</dimen>
<!-- Menu size -->
<dimen name="menu_top_height">64dp</dimen>
<!-- Picto session -->
<dimen name="picto_session_height">75dp</dimen>
<dimen name="picto_session_width">75dp</dimen>
</resources>
\ No newline at end of file
android/Pictogram/communicator/PreFlavor/release/output.json 0 → 100644
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":8,"versionName":"1.8","enabled":true,"outputFile":"communicator-PreFlavor-release.apk","fullName":"PreFlavorRelease","baseName":"PreFlavor-release"},"path":"communicator-PreFlavor-release.apk","properties":{}}]
\ No newline at end of file
android/Pictogram/communicator/build/generated/res/resValues/DevFlavor/debug/values/generated.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Automatically generated file. DO NOT MODIFY -->
<!-- Values from product flavor: DevFlavor -->
<string name="apk" translatable="false">pictogram_dev.apk</string>
<string name="server" translatable="false">https://dev.pictogramweb.com</string>
<bool name="ssl_connect">false</bool>
<!-- Values from default config. -->
<bool name="NotifyAllwaysVisible">true</bool>
<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
...@@ -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/compat/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package android.support.compat;
public final class R {
}
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/android/support/coreui/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package android.support.coreui;
public final class R {
}
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/android/support/coreutils/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package android.support.coreutils;
public final class R {
}
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/android/support/fragment/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package android.support.fragment;
public final class R {
}
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/android/support/graphics/drawable/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package android.support.graphics.drawable;
public final class R {
}
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/android/support/graphics/drawable/animated/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package android.support.graphics.drawable.animated;
public final class R {
}
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/android/support/mediacompat/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package android.support.mediacompat;
public final class R {
}
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/android/support/v4/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package android.support.v4;
public final class R {
}
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/google/android/gms/ads/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package com.google.android.gms.ads;
public final class R {
}
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/com/google/android/gms/ads/impl/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package com.google.android.gms.ads.impl;
public final class R {
}
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/com/google/android/gms/auth/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package com.google.android.gms.auth;
public final class R {
}
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/com/google/android/gms/auth/api/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package com.google.android.gms.auth.api;
public final class R {
}
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/com/google/android/gms/base/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package com.google.android.gms.base;
public final class R {
}
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/com/google/android/gms/clearcut/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package com.google.android.gms.clearcut;
public final class R {
}
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/com/google/android/gms/gcm/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package com.google.android.gms.gcm;
public final class R {
}
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/com/google/android/gms/iid/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package com.google.android.gms.iid;
public final class R {
}
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/com/google/android/gms/tasks/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package com.google.android.gms.tasks;
public final class R {
}
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/com/koushikdutta/async/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package com.koushikdutta.async;
public final class R {
}
android/Pictogram/communicator/build/generated/source/r/DevFlavor/debug/com/koushikdutta/ion/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package com.koushikdutta.ion;
public final class R {
}
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/generated/source/r/DevFlavor/debug/pl/droidsonroids/gif/R.java deleted 100644 → 0
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/
package pl.droidsonroids.gif;
public final class R {
public static final class attr {
public static final int freezesAnimation = 0x7f030070;
public static final int gifSource = 0x7f030072;
public static final int isOpaque = 0x7f030081;
}
public static final class styleable {
public static final int[] GifTextureView = { 0x7f030072, 0x7f030081 };
public static final int GifTextureView_gifSource = 0;
public static final int GifTextureView_isOpaque = 1;
public static final int[] GifView = { 0x7f030070 };
public static final int GifView_freezesAnimation = 0;
}
}
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