Skip to content

yotta / pictogram

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

merged from master

parents f7a63b48 1685bd73
Expand all
Inline Side-by-side
Showing with 4 additions and 123 deletions

Too many changes to show.
Plain diff Email patch

To preserve performance only 1000 of 1000+ files are displayed.

android/Pictogram/.gitignore
...@@ -52,9 +52,10 @@ src/main/assets/core_vocabulary/57236.png ...@@ -52,9 +52,10 @@ src/main/assets/core_vocabulary/57236.png
src/main/assets/core_vocabulary/57384.png src/main/assets/core_vocabulary/57384.png
src/main/createdoc.bat src/main/createdoc.bat
src/main/resources/ src/main/resources/
/tablet/tablet.iml tablet/tablet.iml
/commonlibrary/commonlibrary.iml commonlibrary/commonlibrary.iml
/watch/watch.iml watch/watch.iml
app
gen/ gen/
......
android/Pictogram/Pictogram.iml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="Pictogram" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
android/Pictogram/app/build/generated/res/resValues/LocalFlavor/debug/values/generated.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Automatically generated file. DO NOT MODIFY -->
<!-- Values from build type: debug -->
<bool name="force_db_create">false</bool>
<bool name="force_img_download">false</bool>
<integer name="netservice_timing">20</integer>
<bool name="ssl_connect">false</bool>
<!-- Values from product flavor: LocalFlavor -->
<string name="server" translatable="false">https://192.168.1.37:1337</string>
<!-- Values from default config. -->
<integer name="columns">10</integer>
<string name="core_vocabulary" translatable="false">core_vocabulary</string>
<string name="db_name" translatable="false">PCB.db</string>
<integer name="rows">5</integer>
</resources>
android/Pictogram/app/build/generated/res/resValues/androidTest/LocalFlavor/debug/values/generated.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Automatically generated file. DO NOT MODIFY -->
<!-- Values from build type: debug -->
<bool name="force_db_create">false</bool>
<bool name="force_img_download">false</bool>
<integer name="netservice_timing">20</integer>
<bool name="ssl_connect">false</bool>
<!-- Values from product flavor: LocalFlavor -->
<string name="server" translatable="false">https://192.168.1.37:1337</string>
<!-- Values from default config. -->
<integer name="columns">10</integer>
<string name="core_vocabulary" translatable="false">core_vocabulary</string>
<string name="db_name" translatable="false">PCB.db</string>
<integer name="rows">5</integer>
</resources>
android/Pictogram/app/build/generated/source/buildConfig/LocalFlavor/debug/com/yottacode/pictogram/BuildConfig.java deleted 100644 → 0
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.yottacode.pictogram;
public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String APPLICATION_ID = "com.yottacode.pictogram";
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "LocalFlavor";
public static final int VERSION_CODE = 1;
public static final String VERSION_NAME = "1.0";
}
android/Pictogram/app/build/generated/source/buildConfig/androidTest/LocalFlavor/debug/com/yottacode/pictogram/test/BuildConfig.java deleted 100644 → 0
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.yottacode.pictogram.test;
public final class BuildConfig {
public static final boolean DEBUG = Boolean.parseBoolean("true");
public static final String APPLICATION_ID = "com.yottacode.pictogram.test";
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "LocalFlavor";
public static final int VERSION_CODE = 1;
public static final String VERSION_NAME = "1.0";
}
android/Pictogram/app/build/generated/source/r/androidTest/LocalFlavor/debug/com/yottacode/pictogram/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.test;
public final class R {
public static final class attr {
}
public static final class bool {
public static final int force_db_create=0x7f020000;
public static final int force_img_download=0x7f020001;
public static final int ssl_connect=0x7f020002;
}
public static final class integer {
public static final int columns=0x7f030000;
public static final int netservice_timing=0x7f030001;
public static final int rows=0x7f030002;
}
public static final class string {
public static final int core_vocabulary=0x7f040000;
public static final int db_name=0x7f040001;
public static final int server=0x7f040002;
}
}
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