Skip to content

yotta / pictogram

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

working on PCB v1.5

parent 1505c9e2
Expand all
Inline Side-by-side
Showing with 10 additions and 10 deletions
android/Pictogram/commonlibrary/build.gradle
...@@ -7,10 +7,10 @@ android { ...@@ -7,10 +7,10 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 21 targetSdkVersion 21
versionCode 1 versionCode 3
versionName "1.4" versionName "1.5"
resValue "string", "db_name", "PCB.db" resValue "string", "db_name", "PCB.db"
resValue "integer", "db_version", "10" resValue "integer", "db_version", "11"
//resValue "string", "app_version", "1.1" //resValue "string", "app_version", "1.1"
resValue "string", "core_vocabulary", "core_vocabulary" resValue "string", "core_vocabulary", "core_vocabulary"
resValue "string", "apk", "to_be_set_in_subproject" resValue "string", "apk", "to_be_set_in_subproject"
......
android/Pictogram/commonlibrary/src/main/res/raw/pcbdb_create.sql
...@@ -34,8 +34,8 @@ name TEXT(40) NOT NULL, ...@@ -34,8 +34,8 @@ name TEXT(40) NOT NULL,
surname TEXT(60) NOT NULL, surname TEXT(60) NOT NULL,
id_scene INTEGER NOT NULL REFERENCES scene, id_scene INTEGER NOT NULL REFERENCES scene,
url_img VARCHAR(250) NOT NULL, url_img VARCHAR(250) NOT NULL,
gender TEXT(1) NOT NULL CHECK (gender IN ('M','F')), gender TEXT(1) DEFAULT 'M',
lang TEXT(5) NOT NULL CHECK (lang in ('en-gb','en-us','es-es')), lang TEXT(5) CHECK (lang in ('en-gb','en-us','es-es')) DEFAULT 'es-es',
attributes TEXT(1024) NULL attributes TEXT(1024) NULL
) )
;-- ;--
...@@ -49,8 +49,8 @@ pwd TEXT(40) NOT NULL, ...@@ -49,8 +49,8 @@ pwd TEXT(40) NOT NULL,
name TEXT(40) NOT NULL, name TEXT(40) NOT NULL,
surname TEXT(60) NOT NULL, surname TEXT(60) NOT NULL,
url_img VARCHAR(250) NOT NULL, url_img VARCHAR(250) NOT NULL,
gender TEXT(1) NULL CHECK (gender IN (NULL, 'M','F')), gender TEXT(1) NULL CHECK (gender IN (NULL, 'M','F')) DEFAULT 'M',
lang TEXT(5) NOT NULL CHECK (lang in ('en-gb','en-us','es-es')), lang TEXT(5) NOT NULL CHECK (lang in ('en-gb','en-us','es-es')) DEFAULT 'es-es',
tts_engine TEXT(100) NULL, tts_engine TEXT(100) NULL,
office TEXT(140) NULL office TEXT(140) NULL
) )
......
android/Pictogram/settings.gradle
include ':supervisor_tablet', ':yotta_tablet', ':commonlibrary', ':watch', ':tabletlibrary' include ':supervisor', ':yotta_tablet', ':commonlibrary', ':watch', ':tabletlibrary'
android/Pictogram/supervisor_tablet/build.gradle → android/Pictogram/supervisor/build.gradle
...@@ -16,8 +16,8 @@ android { ...@@ -16,8 +16,8 @@ android {
applicationId "com.yottacode.supervisor_tablet" applicationId "com.yottacode.supervisor_tablet"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 22 targetSdkVersion 22
versionCode 1 versionCode 3
versionName "1.0" versionName "1.5"
resValue "bool","NotifyAllwaysVisible","false" resValue "bool","NotifyAllwaysVisible","false"
resValue "string", "VersionManagerClass", "com.yottacode.pictogram.supervisor_tablet.net.VersionManager" resValue "string", "VersionManagerClass", "com.yottacode.pictogram.supervisor_tablet.net.VersionManager"
resValue "string","apk","pictograms.apk" resValue "string","apk","pictograms.apk"
......
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