diff options
| author | Jin Yoon <jinny.yoon@samsung.com> | 2015-08-08 10:13:53 +0900 |
|---|---|---|
| committer | Jin Yoon <jinny.yoon@samsung.com> | 2015-08-08 10:13:53 +0900 |
| commit | 289102cd98728d9adc9470c368f2bcc671e789d0 (patch) | |
| tree | ae2704633b6a3083490d733c6e95c6495e80c82a | |
| parent | 65f2076a41acfdfabae73ed4ae81414f3b3416b3 (diff) | |
| download | adventure-289102cd98728d9adc9470c368f2bcc671e789d0.tar.gz adventure-289102cd98728d9adc9470c368f2bcc671e789d0.tar.bz2 adventure-289102cd98728d9adc9470c368f2bcc671e789d0.zip | |
Build : initial version
33 files changed, 270 insertions, 1344 deletions
@@ -21,7 +21,7 @@ <targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.640377684" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/> <builder autoBuildTarget="all" buildPath="${workspace_loc:/adventure}/Debug" enableAutoBuild="true" id="org.tizen.nativecore.target.sbi.gnu.builder.990647930" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Tizen Application Builder" superClass="org.tizen.nativecore.target.sbi.gnu.builder"/> <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.1980216938" name="Archiver" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver"/> - <tool command="clang++.exe" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.352107375" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler"> + <tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.352107375" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler"> <option id="gnu.cpp.compiler.option.optimization.level.764615478" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/> <option id="sbi.gnu.cpp.compiler.option.debugging.level.core.287247668" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/> <option id="sbi.gnu.cpp.compiler.option.1762641182" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs"> @@ -29,7 +29,7 @@ </option> <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1550287729" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> - <listOptionValue builtIn="false" value=""${SDK_INSTALL_PATH}/library""/> + <listOptionValue builtIn="false" value=""${SDK_PATH}/library""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/AL""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> @@ -73,10 +73,6 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vconf""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/web""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eio-1""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/email-service""/> @@ -90,15 +86,15 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ewebkit2-0""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/location""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/sensor""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/efl-extension/""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/efl-extension""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/wifi-direct""/> </option> <option id="sbi.gnu.cpp.compiler.option.frameworks_cflags.core.1560778731" name="Tizen-Frameworks-Other-Cflags" superClass="sbi.gnu.cpp.compiler.option.frameworks_cflags.core" valueType="stringList"> - <listOptionValue builtIn="false" value="$(TC_COMPILER_MISC)"/> - <listOptionValue builtIn="false" value="$(RS_COMPILER_MISC)"/> + <listOptionValue builtIn="false" value="${TC_COMPILER_MISC}"/> + <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/> <listOptionValue builtIn="false" value=" -fPIE"/> <listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/> <listOptionValue builtIn="false" value="-mthumb"/> - <listOptionValue builtIn="false" value="-fvisibility=hidden"/> </option> <option id="gnu.cpp.compiler.option.include.paths.2009528832" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath"> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/> @@ -110,9 +106,9 @@ <listOptionValue builtIn="false" value="_DEBUG"/> </option> <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1617127847" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/> - <inputType id="sbi.gnu.cpp.compiler.tizen.inputType.1976789424" superClass="sbi.gnu.cpp.compiler.tizen.inputType"/> + <inputType id="sbi.gnu.cpp.compiler.tizen.inputType.1976789424"/> </tool> - <tool command="clang.exe" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.2072256000" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler"> + <tool command="clang" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.2072256000" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler"> <option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.928507427" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/> <option id="sbi.gnu.c.compiler.option.debugging.level.core.975928777" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" value="gnu.c.debugging.level.max" valueType="enumerated"/> <option id="sbi.gnu.c.compiler.option.1294129822" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs"> @@ -120,7 +116,7 @@ </option> <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1153181887" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> - <listOptionValue builtIn="false" value=""${SDK_INSTALL_PATH}/library""/> + <listOptionValue builtIn="false" value=""${SDK_PATH}/library""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/AL""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> @@ -164,10 +160,6 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vconf""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/web""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eio-1""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/email-service""/> @@ -181,15 +173,15 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ewebkit2-0""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/location""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/sensor""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/efl-extension/""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/efl-extension""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/wifi-direct""/> </option> <option id="sbi.gnu.c.compiler.option.frameworks_cflags.core.1444148063" name="Tizen-Frameworks-Other-Cflags" superClass="sbi.gnu.c.compiler.option.frameworks_cflags.core" valueType="stringList"> - <listOptionValue builtIn="false" value="$(TC_COMPILER_MISC)"/> - <listOptionValue builtIn="false" value="$(RS_COMPILER_MISC)"/> + <listOptionValue builtIn="false" value="${TC_COMPILER_MISC}"/> + <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/> <listOptionValue builtIn="false" value=" -fPIE"/> <listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/> <listOptionValue builtIn="false" value="-mthumb"/> - <listOptionValue builtIn="false" value="-fvisibility=hidden"/> </option> <option id="gnu.c.compiler.option.include.paths.1308825906" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/> @@ -201,16 +193,17 @@ <listOptionValue builtIn="false" value="_DEBUG"/> </option> <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.2146603089" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> - <inputType id="sbi.gnu.c.compiler.tizen.inputType.1816736872" superClass="sbi.gnu.c.compiler.tizen.inputType"/> + <inputType id="sbi.gnu.c.compiler.tizen.inputType.1816736872"/> </tool> <tool id="org.tizen.nativeide.tool.sbi.gnu.c.linker.base.1598889351" name="C Linker" superClass="org.tizen.nativeide.tool.sbi.gnu.c.linker.base"/> - <tool command="clang++.exe" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.476976860" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker"> + <tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.476976860" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker"> <option id="sbi.gnu.cpp.linker.option.frameworks_lflags.core.1508122298" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.core" valueType="stringList"> - <listOptionValue builtIn="false" value="$(TC_LINKER_MISC)"/> - <listOptionValue builtIn="false" value="$(RS_LINKER_MISC)"/> + <listOptionValue builtIn="false" value="${TC_LINKER_MISC}"/> + <listOptionValue builtIn="false" value="${RS_LINKER_MISC}"/> <listOptionValue builtIn="false" value="-pie -lpthread "/> <listOptionValue builtIn="false" value="-Xlinker -rpath="/home/developer/sdk_tools/lib""/> <listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/> + <listOptionValue builtIn="false" value="-Xlinker --version-script=${PROJ_PATH}/.exportMap"/> <listOptionValue builtIn="false" value="-L"${SBI_SYSROOT}/usr/lib""/> <listOptionValue builtIn="false" value="$(RS_LIBRARIES)"/> </option> @@ -222,7 +215,7 @@ <additionalInput kind="additionalinput" paths="$(LIBS)"/> </inputType> </tool> - <tool command="arm-linux-gnueabi-as.exe" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1778607987" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base"> + <tool command="arm-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1778607987" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base"> <inputType id="cdt.managedbuild.tool.gnu.assembler.input.195154528" superClass="cdt.managedbuild.tool.gnu.assembler.input"/> </tool> <tool id="org.tizen.nativecore.tool.fnmapgen.523856279" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/> @@ -233,27 +226,11 @@ <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler"/> </toolChain> </folderInfo> - <fileInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1621246236.2139066374" name="initial.edc" rcbsApplicability="disable" resourcePath="res/edje/initial.edc" toolsToInvoke="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.853757925"> - <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.853757925" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924"> - <option id="sbi.gnu.edc.compiler.option.misc.id.1187406907" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/edje/images""/> - <listOptionValue builtIn="false" value="/home/storycompiler/contest/adventure/res/edje/images"/> - </option> - </tool> - </fileInfo> - <fileInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1621246236.2089306010" name="loading.edc" rcbsApplicability="disable" resourcePath="res/edje/loading.edc" toolsToInvoke="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.75913520"> - <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.75913520" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924"> - <option id="sbi.gnu.edc.compiler.option.misc.id.1439751542" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/edje/images""/> - <listOptionValue builtIn="false" value="/home/storycompiler/contest/adventure/res/edje/images"/> - </option> - </tool> - </fileInfo> - <fileInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1621246236.386483865" name="lecture.edc" rcbsApplicability="disable" resourcePath="res/edje/lecture.edc" toolsToInvoke="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.964297813"> - <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.964297813" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924"> - <option id="sbi.gnu.edc.compiler.option.misc.id.1447184442" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList"> + <fileInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1621246236.358789494" name="map.edc" rcbsApplicability="disable" resourcePath="res/edje/map.edc" toolsToInvoke="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1099652705"> + <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1099652705" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924"> + <option id="sbi.gnu.edc.compiler.option.misc.id.1560519824" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList"> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/edje/images""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/edje""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}/res/edje/images""/> </option> </tool> </fileInfo> @@ -286,7 +263,7 @@ <targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.1675966596" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/> <builder buildPath="${workspace_loc:/adventure}/Release" id="org.tizen.nativecore.target.sbi.gnu.builder.1193736427" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Tizen Application Builder" superClass="org.tizen.nativecore.target.sbi.gnu.builder"/> <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.1811524496" name="Archiver" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver"/> - <tool command="clang++.exe" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.2095296535" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler"> + <tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.2095296535" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler"> <option id="gnu.cpp.compiler.option.optimization.level.137659573" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/> <option id="sbi.gnu.cpp.compiler.option.debugging.level.core.1735501451" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core"/> <option id="sbi.gnu.cpp.compiler.option.518787281" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs"> @@ -294,7 +271,7 @@ </option> <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.406527400" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> - <listOptionValue builtIn="false" value=""${SDK_INSTALL_PATH}/library""/> + <listOptionValue builtIn="false" value=""${SDK_PATH}/library""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/AL""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> @@ -338,17 +315,10 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vconf""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/web""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eio-1""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/email-service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/embryo-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/emotion-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/messaging""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/msg-service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ug-1""/> @@ -359,13 +329,13 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/location""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/sensor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/efl-extension""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/wifi-direct""/> </option> <option id="sbi.gnu.cpp.compiler.option.frameworks_cflags.core.2011208489" name="Tizen-Frameworks-Other-Cflags" superClass="sbi.gnu.cpp.compiler.option.frameworks_cflags.core" valueType="stringList"> - <listOptionValue builtIn="false" value="$(TC_COMPILER_MISC)"/> - <listOptionValue builtIn="false" value="$(RS_COMPILER_MISC)"/> + <listOptionValue builtIn="false" value="${TC_COMPILER_MISC}"/> + <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/> <listOptionValue builtIn="false" value=" -fPIE"/> <listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/> - <listOptionValue builtIn="false" value="-fvisibility=hidden"/> </option> <option id="gnu.cpp.compiler.option.include.paths.561319280" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath"> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/> @@ -374,9 +344,9 @@ <listOptionValue builtIn="false" value="Native_API"/> </option> <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1291196129" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/> - <inputType id="sbi.gnu.cpp.compiler.tizen.inputType.1148305892" superClass="sbi.gnu.cpp.compiler.tizen.inputType"/> + <inputType id="sbi.gnu.cpp.compiler.tizen.inputType.1148305892"/> </tool> - <tool command="clang.exe" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.1480967097" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler"> + <tool command="clang" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.1480967097" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler"> <option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.option.optimization.level.1976335889" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/> <option id="sbi.gnu.c.compiler.option.debugging.level.core.1387962702" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core"/> <option id="sbi.gnu.c.compiler.option.245862639" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs"> @@ -384,7 +354,7 @@ </option> <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1881114364" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> - <listOptionValue builtIn="false" value=""${SDK_INSTALL_PATH}/library""/> + <listOptionValue builtIn="false" value=""${SDK_PATH}/library""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/AL""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/appcore-agent""/> @@ -428,17 +398,10 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ui""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/vconf""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/web""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/EGL""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/badge""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/eio-1""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/email-service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/embryo-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/emotion-1""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GL""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES2""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/GLES3""/> - <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/KHR""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/messaging""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/msg-service""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/ug-1""/> @@ -449,13 +412,13 @@ <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/location""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/sensor""/> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/efl-extension""/> + <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/wifi-direct""/> </option> <option id="sbi.gnu.c.compiler.option.frameworks_cflags.core.1822162768" name="Tizen-Frameworks-Other-Cflags" superClass="sbi.gnu.c.compiler.option.frameworks_cflags.core" valueType="stringList"> - <listOptionValue builtIn="false" value="$(TC_COMPILER_MISC)"/> - <listOptionValue builtIn="false" value="$(RS_COMPILER_MISC)"/> + <listOptionValue builtIn="false" value="${TC_COMPILER_MISC}"/> + <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/> <listOptionValue builtIn="false" value=" -fPIE"/> <listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/> - <listOptionValue builtIn="false" value="-fvisibility=hidden"/> </option> <option id="gnu.c.compiler.option.include.paths.1552230224" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/> @@ -464,16 +427,17 @@ <listOptionValue builtIn="false" value="Native_API"/> </option> <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1605098491" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> - <inputType id="sbi.gnu.c.compiler.tizen.inputType.226094692" superClass="sbi.gnu.c.compiler.tizen.inputType"/> + <inputType id="sbi.gnu.c.compiler.tizen.inputType.226094692"/> </tool> <tool id="org.tizen.nativeide.tool.sbi.gnu.c.linker.base.1119865794" name="C Linker" superClass="org.tizen.nativeide.tool.sbi.gnu.c.linker.base"/> - <tool command="clang++.exe" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1329061829" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker"> + <tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1329061829" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker"> <option id="sbi.gnu.cpp.linker.option.frameworks_lflags.core.426393147" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.core" valueType="stringList"> - <listOptionValue builtIn="false" value="$(TC_LINKER_MISC)"/> - <listOptionValue builtIn="false" value="$(RS_LINKER_MISC)"/> + <listOptionValue builtIn="false" value="${TC_LINKER_MISC}"/> + <listOptionValue builtIn="false" value="${RS_LINKER_MISC}"/> <listOptionValue builtIn="false" value="-pie -lpthread "/> <listOptionValue builtIn="false" value="-Xlinker -rpath="/home/developer/sdk_tools/lib""/> <listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/> + <listOptionValue builtIn="false" value="-Xlinker --version-script=${PROJ_PATH}/.exportMap"/> <listOptionValue builtIn="false" value="-L"${SBI_SYSROOT}/usr/lib""/> <listOptionValue builtIn="false" value="$(RS_LIBRARIES)"/> </option> @@ -485,7 +449,7 @@ <additionalInput kind="additionalinput" paths="$(LIBS)"/> </inputType> </tool> - <tool command="i386-linux-gnueabi-as.exe" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.332133103" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base"> + <tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.332133103" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base"> <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1505972775" superClass="cdt.managedbuild.tool.gnu.assembler.input"/> </tool> <tool id="org.tizen.nativecore.tool.fnmapgen.25665089" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/> diff --git a/inc/adventure.h b/inc/adventure.h deleted file mode 100644 index 06797bd..0000000 --- a/inc/adventure.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Samsung API - * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/license/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef __ADVENTURE_H__ -#define __ADVENTURE_H__ - -#include <app.h> -#include <Elementary.h> -#include <system_settings.h> -#include <efl_extension.h> -#include <dlog.h> - -#ifdef LOG_TAG -#undef LOG_TAG -#endif -#define LOG_TAG "adventure" - -#if !defined(PACKAGE) -#define PACKAGE "org.tizen.adventure" -#endif - -#define EDJ_FILE "edje/adventure.edj" -#define GRP_MAIN "main" - -struct _adventure_info_s { - Evas_Object *win; - Evas_Object *conform; - Evas_Object *adventure; - Evas_Object *initial; - Evas_Object *loading; - Evas_Object *ui_manager; - - Ecore_Timer *initial_timer; - - Eina_List *view; - - int width; - int height; -}; -typedef struct _adventure_info_s adventure_info_s; - -struct _path_info_s { - int path_id; - int created_time; - int duration; - int rate; - - char *title; - char *title_image; - char *content; - char *author; -}; -typedef struct _path_info_s path_info_s; - -struct _point_info_s { - int point_id; - int path_id; - - char *title; - char *nation; - char *district; - char *title_image; - char *content; - char *map_image; - char *duration; -}; -typedef struct _point_info_s point_info_s; - -struct _user_info_s { - char *user_id; - char *password; -}; -typedef struct _user_info_s user_info_s; - -#endif /* __ADVENTURE_H__ */ diff --git a/inc/group_info.h b/inc/group_info.h new file mode 100644 index 0000000..69b7c40 --- /dev/null +++ b/inc/group_info.h @@ -0,0 +1,18 @@ +#ifndef __MOMENTIC_GROUP_INFO_H__ +#define __MOMENTIC_GROUP_INFO_H__ + +struct _group_info_s { + char *title; + int time; + int city1; + int city2; + int city3; + int city4; + int city5; +}; +typedef struct _group_info_s group_info_s; + +extern group_info_s *group_info_create(int time, const char *title, int city1, int city2, int city3, int city4, int city5); +extern void group_info_destroy(group_info_s *group_info); + +#endif /* __MOMENTIC_GROUP_INFO_H__ */ diff --git a/inc/loading.h b/inc/loading.h deleted file mode 100644 index b5c8dd4..0000000 --- a/inc/loading.h +++ /dev/null @@ -1,4 +0,0 @@ -#include <Elementary.h> - -extern Evas_Object *loading_create(Evas_Object *parent, int width, int height); -extern void loading_destroy(Evas_Object *loading); @@ -4,7 +4,7 @@ #include <dlog.h> #undef LOG_TAG -#define LOG_TAG "ADVENTURE" +#define LOG_TAG "MOMENTIC" #define COLOR_RED "\033[0;40;31m" #define COLOR_LIGHTBLUE "\033[1;40;34m" @@ -33,7 +33,6 @@ #define PACKAGE "org.tizen.moment" #endif -#define PATH_LEN 1024 #define DATA_KEY_INFO "__info__" struct _moment_info_s { diff --git a/inc/main_view.h b/inc/main_view.h index 378b4cc..6df48e0 100644 --- a/inc/main_view.h +++ b/inc/main_view.h @@ -17,6 +17,6 @@ struct _main_view_s { typedef struct _main_view_s main_view_s; extern Evas_Object *main_view_create(Evas_Object *parent, moment_info_s *moment_info); -extern void *main_view_destroy(Evas_Object *main_view); +extern void main_view_destroy(Evas_Object *main_view); #endif /* __MAIN_VIEW_H__ */ @@ -63,6 +63,6 @@ struct _city_info_s { typedef struct _city_info_s city_info_s; extern Evas_Object *map_create(Evas_Object *parent); -extern void *map_destroy(Evas_Object *map); +extern void map_destroy(Evas_Object *map); #endif /* __MAP_H__ */ diff --git a/inc/result_view.h b/inc/result_view.h deleted file mode 100644 index a33f5e3..0000000 --- a/inc/result_view.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef __RESULT_VIEW_H__ -#define __RESULT_VIEW_H__ - -#include <Elementary.h> -#include "main.h" - -extern Evas_Object *result_view_create(Evas_Object *parent, moment_info_s *moment_info); -extern void *result_view_destroy(Evas_Object *result_view); - -#endif /* __RESULT_VIEW_H__ */ diff --git a/inc/ui_manager.h b/inc/ui_manager.h index a314fb6..02efb90 100644 --- a/inc/ui_manager.h +++ b/inc/ui_manager.h @@ -4,7 +4,7 @@ #include <Elementary.h> #include "main.h" -extern Evas_Object *ui_manager_create(Evas_Object *parent, moment_info_s *moment_info); +extern Evas_Object *ui_manager_create(Evas_Object *parent, moment_info_s *moment_info, int width, int height); extern void ui_manager_destroy(Evas_Object *ui_manager); #endif /* __UI_MANAGER_H__ */ @@ -1,28 +1,3 @@ -/* - - - - - - - - - * Samsung API - * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/license/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - #ifndef __ADVENTURE_INTERNAL_H__ #define __ADVENTURE_INTERNAL_H__ diff --git a/res/edje/adventure.edc b/res/edje/adventure.edc deleted file mode 100755 index b11d677..0000000 --- a/res/edje/adventure.edc +++ /dev/null @@ -1,39 +0,0 @@ -collections { - group { name: "main"; - parts { - part { name: "bg"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - align: 0.0 0.0; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } - color: 255 255 255 255; - } - part { - name: "loading"; - type: SWALLOW; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.5 0.5; to: "bg"; } - rel2 { relative: 0.5 0.5; to: "bg"; } - align: 0.5 0.5; - visible: 1; - } - } - part { - name: "initial"; - type: SWALLOW; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.5 0.5; to: "bg"; } - rel2 { relative: 0.5 0.5; to: "bg"; } - align: 0.5 0.5; - visible: 1; - } - } - } - } -} diff --git a/res/images/world map.png b/res/edje/images/world_map.png Binary files differindex 3f50872..3f50872 100755..100644 --- a/res/images/world map.png +++ b/res/edje/images/world_map.png diff --git a/res/edje/initial.edc b/res/edje/initial.edc deleted file mode 100755 index 56e8b59..0000000 --- a/res/edje/initial.edc +++ /dev/null @@ -1,79 +0,0 @@ -images { - image: "Aventure01.1.png" COMP; - image: "Location.gif" COMP; -} - - -collections { - group { name: "main"; - parts { - part { name: "bg"; - type: SWALLOW; - description { state: "default" 0.0; - align: 0.0 0.0; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } - visible: 0; - } - } - part { name: "bg_img"; - type: IMAGE; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - rel1 { relative: 0.0 0.0; to: "bg"; } - rel2 { relative: 1.0 1.0; to: "bg"; } - image { - normal: "Aventure01.1.png"; - } - visible: 1; - } - } - part { name: "point_bg"; - type: SPACER; - description { state: "default" 0.0; - align: 0.5 0.5; - rel1 { relative: 0.35 0.5; } - rel2 { relative: 0.35 0.5; } - } - description { state: "down" 0.0; - inherit: "default" 0.0; - rel1 { relative: 0.35 0.535; } - rel2 { relative: 0.35 0.535; } - } - } - part { name: "point"; - type: IMAGE; - mouse_events: 0; - description { state: "default" 0.0; - rel1 { relative: 0.5 0.5; to: "point_bg"; } - rel2 { relative: 0.5 0.5; to: "point_bg"; } - image { - normal: "Location.gif"; - } - min: 82 113; - visible: 1; - } - } - } - programs { - program { - name: "go_down"; - signal: "load"; - action: STATE_SET "down" 0.0; - target: "point_bg"; - transition: ACCELERATE 1.0; - after: "go_up"; - } - program { - name: "go_up"; - signal: "load"; - action: STATE_SET "default" 0.0; - target: "point_bg"; - transition: DECELERATE 1.0; - after: "go_down"; - } - - } - } -} diff --git a/res/edje/lecture.edc b/res/edje/lecture.edc deleted file mode 100755 index eda3cfe..0000000 --- a/res/edje/lecture.edc +++ /dev/null @@ -1,62 +0,0 @@ -collections { - group { - name: "main"; - parts { - part { - name: "bg"; - type: RECT; - description { - state: "default" 0.0; - color: 255 255 255 255; - visible: 1; - } - } - - part { - name: "lighten"; - type: RECT; - description { - state: "default" 0.0; - perspective { - zplane: 100; - } - color: 0 0 255 255; - //color2: 0 0 255 255; - visible: 0; - } - } -/* - part { - name: "pers"; - type: RECT; - description { - state: "default" 0.0; - perspective { - zplane: -100; - } - visible: 0; - } - }*/ - - part { - name: "rect_1"; - type: RECT; - description { - state: "default" 0.0; - rel1 { relative: 0.4 0.4; to: "bg"; } - rel2 { relative: 0.6 0.6; to: "bg"; } - color: 255 0 0 255; - visible: 1; - - map { - //perspective: "pers"; - light: "lighten"; - on: 1; - } - } - } - - - } - } -}
\ No newline at end of file diff --git a/res/edje/loading.edc b/res/edje/loading.edc deleted file mode 100755 index 33c9503..0000000 --- a/res/edje/loading.edc +++ /dev/null @@ -1,104 +0,0 @@ -images { - image: "1.png" COMP; - image: "2.png" COMP; - image: "3.png" COMP; - image: "4.png" COMP; - image: "5.png" COMP; - image: "6.png" COMP; - image: "7.png" COMP; - image: "8.png" COMP; - image: "9.png" COMP; - image: "10.png" COMP; - image: "11.png" COMP; - image: "12.png" COMP; - image: "13.png" COMP; - image: "14.png" COMP; - image: "15.png" COMP; - image: "16.png" COMP; - image: "17.png" COMP; - image: "18.png" COMP; - image: "19.png" COMP; - image: "20.png" COMP; - image: "21.png" COMP; - image: "22.png" COMP; - image: "23.png" COMP; - image: "24.png" COMP; - image: "25.png" COMP; - image: "26.png" COMP; - image: "27.png" COMP; -} - -collections { - group { - name: "loading"; - - parts { - part { - name: "bg"; - type: SPACER; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } - } - } - part { - name: "loading"; - type: IMAGE; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.5 0.5; } - rel2 { relative: 0.5 0.5; } - align: 0.5 0.5; - min: 80 80; - visible: 1; - image { - normal: "27.png"; - tween: "1.png"; - tween: "2.png"; - tween: "3.png"; - tween: "4.png"; - tween: "5.png"; - tween: "6.png"; - tween: "7.png"; - tween: "8.png"; - tween: "9.png"; - tween: "10.png"; - tween: "11.png"; - tween: "12.png"; - tween: "13.png"; - tween: "14.png"; - tween: "15.png"; - tween: "16.png"; - tween: "17.png"; - tween: "18.png"; - tween: "19.png"; - tween: "20.png"; - tween: "21.png"; - tween: "22.png"; - tween: "23.png"; - tween: "24.png"; - tween: "25.png"; - tween: "26.png"; - tween: "27.png"; - } - } - } - } - - programs { - program { - name: "on"; - signal: "load"; - action: STATE_SET "default" 0.0; - target: "loading"; - transition: ACCELERATE 1.0; - in: 1.0 0.0; - after: "on"; - } - } - } -} diff --git a/res/edje/main_view.edc b/res/edje/main_view.edc index 853395d..b93fc16 100755 --- a/res/edje/main_view.edc +++ b/res/edje/main_view.edc @@ -16,12 +16,14 @@ collections { parts { part { name: "bg"; - type: SPACER; + type: RECT; description { state: "default" 0.0; align: 0.0 0.0; rel1 { relative: 0.0 0.0; } rel2 { relative: 1.0 1.0; } + color: 246 243 243 255; + visible: 1; } } part { @@ -61,7 +63,7 @@ collections { type: SWALLOW; description { state: "default" 0.0; - rel1 { relative: 0 .5 1.0; to: "map"; } + rel1 { relative: 0.5 1.0; to: "map"; } rel2 { relative: 0.5 1.0; to: "map"; } align: 0.5 0.0; visible: 1; @@ -212,19 +214,6 @@ collections { action: STATE_SET "default" 0.0; target: "selected_scroller"; } - - program { - signal: "hide"; - source: "button"; - action: STATE_SET "hide" 0.0; - target: "button"; - } - program { - signal: "show"; - source: "button"; - action: STATE_SET "default" 0.0; - target: "button"; - } } } } diff --git a/res/edje/map.edc b/res/edje/map.edc index 696a00b..8a0c426 100755 --- a/res/edje/map.edc +++ b/res/edje/map.edc @@ -1,38 +1,38 @@ -images {
- image: "" COMP;
-}
-
-collections {
- group {
- name: "main";
- parts {
- part {
- name: "bg";
- type: SPACER;
- description {
- state: "default" 0.0;
- align: 0.0 0.0;
- rel1 { relative: 0.0 0.0; }
- rel2 { relative: 1.0 1.0; }
- }
- }
- part {
- name: "map_img";
- type: IMAGE;
- scale: 1;
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1 { relative: 0.5 0.5; to: "bg"; }
- rel2 { relative: 0.5 0.5; to: "bg"; }
- align: 0.5 0.5;
- visible: 1;
- image {
- normal: "";
- }
- }
- }
- }
- programs {
- }
- }
-}
+images { + image: "world_map.png" COMP; +} + +collections { + group { + name: "main"; + parts { + part { + name: "bg"; + type: SPACER; + description { + state: "default" 0.0; + align: 0.0 0.0; + rel1 { relative: 0.0 0.0; } + rel2 { relative: 1.0 1.0; } + } + } + part { + name: "map_img"; + type: IMAGE; + scale: 1; + mouse_events: 0; + description { + state: "default" 0.0; + rel1 { relative: 0.5 0.5; to: "bg"; } + rel2 { relative: 0.5 0.5; to: "bg"; } + align: 0.5 0.5; + image { + normal: "world_map.png"; + } + min: 443 259; + visible: 1; + } + } + } + } +} diff --git a/res/edje/result_view.edc b/res/edje/result_view.edc deleted file mode 100755 index 62c6a4f..0000000 --- a/res/edje/result_view.edc +++ /dev/null @@ -1,206 +0,0 @@ -collections { - group { - name: "main"; - - styles { - style { - name: "description_style"; - base: "font=Tizen:style=Bold font_size=26 color=#ffffff align=center text_class=tizen"; - tag: "br" "\n"; - tag: "hilight" "+ font_weight=Bold"; - tag: "b" "+ font_weight=Bold"; - tag: "tab" "\t"; - } - } - - parts { - part { - name: "bg"; - type: SPACER; - description { - state: "default" 0.0; - align: 0.0 0.0; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } - } - } - part { - name: "title"; - type: TEXT; - scale: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 1.0; to: "map"; } - rel2 { relative: 1.0 1.0; to: "map"; } - color: 0 0 0 255; - align: 0.5 0.0; - min: 0 50; - visible: 1; - text { - text: ""; - font: "Tizen:style=Bold"; - text_class: "tizen"; - min: 0 0; - size: 32; - align: 0.5 0.5; - } - } - } - part { - name: "time_current"; - type: TEXT; - scale: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 1.0; to: "map"; } - rel2 { relative: 1.0 1.0; to: "map"; } - color: 0 0 0 255; - align: 0.5 0.0; - min: 0 50; - visible: 1; - text { - text: ""; - font: "Tizen:style=Bold"; - text_class: "tizen"; - min: 0 0; - size: 24; - align: 0.5 0.5; - } - } - } - part { - name: "time_best_name"; - type: TEXT; - scale: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 1.0; to: "map"; } - rel2 { relative: 1.0 1.0; to: "map"; } - color: 0 0 0 255; - align: 0.5 0.0; - min: 0 50; - visible: 1; - text { - text: ""; - font: "Tizen:style=Bold"; - text_class: "tizen"; - min: 0 0; - size: 24; - align: 0.5 0.5; - } - } - } - part { - name: "time_recomment_name"; - type: TEXT; - scale: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 1.0; to: "map"; } - rel2 { relative: 1.0 1.0; to: "map"; } - color: 0 0 0 255; - align: 0.5 0.0; - min: 0 50; - visible: 1; - text { - text: ""; - font: "Tizen:style=Bold"; - text_class: "tizen"; - min: 0 0; - size: 24; - align: 0.5 0.5; - } - } - } - part { - name: "time_best_value"; - type: TEXT; - scale: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 1.0; to: "map"; } - rel2 { relative: 1.0 1.0; to: "map"; } - color: 0 0 0 255; - align: 0.5 0.0; - min: 0 50; - visible: 1; - text { - text: ""; - font: "Tizen:style=Bold"; - text_class: "tizen"; - min: 0 0; - size: 24; - align: 0.5 0.5; - } - } - } - part { - name: "time_recomment_value"; - type: TEXT; - scale: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 1.0; to: "map"; } - rel2 { relative: 1.0 1.0; to: "map"; } - color: 0 0 0 255; - align: 0.5 0.0; - min: 0 50; - visible: 1; - text { - text: ""; - font: "Tizen:style=Bold"; - text_class: "tizen"; - min: 0 0; - size: 24; - align: 0.5 0.5; - } - } - } - part { - name: "result_circle"; - type: SWALLOW; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.5 0.0; to: "bg"; } - rel2 { relative: 0.5 0.0; to: "bg"; } - align: 0.5 0.0; - visible: 1; - } - description { - state: "hide" 0.0; - inherit: "default" 0.0; - rel1 { relative: 0.5 -0.1; to: "bg"; } - rel2 { relative: 0.5 -0.1; to: "bg"; } - } - } - part { - name: "button_save"; - type: SWALLOW; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.5 1.0; to: "search"; } - rel2 { relative: 0.5 1.0; to: "search"; } - align: 0.5 0.0; - visible: 1; - } - } - part { - name: "button_alarm"; - type: SWALLOW; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.5 1.0; to: "search"; } - rel2 { relative: 0.5 1.0; to: "search"; } - align: 0.5 0.0; - visible: 1; - } - } - } - } -} diff --git a/res/edje/search.edc b/res/edje/search.edc deleted file mode 100755 index 6f50efe..0000000 --- a/res/edje/search.edc +++ /dev/null @@ -1,78 +0,0 @@ -collections { - group { - name: "main"; - - parts { - part { - name: "bg"; - type: SPACER; - description { - state: "default" 0.0; - align: 0.0 0.0; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } - } - } - part { - name: "entry"; - type: SWALLOW; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; to: "bg"; } - rel2 { relative: 0.8 1.0; to: "bg"; } - align: 0.5 0.0; - visible: 1; - } - } - part { - name: "button"; - type: SWALLOW; - description { - state: "default" 0.0; - rel1 { relative: 1.0 0.0; to: "entry"; } - rel2 { relative: 0.0 1.0; to: "button_search"; } - align: 0.5 1.0; - visible: 1; - } - description { - state: "hide" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { - name: "button_result"; - type: SWALLOW; - description { - state: "default" 0.0; - rel1 { relative: 0.9 1.0; to: "bg"; } - rel2 { relative: 1.0 1.0; to: "bg"; } - align: 0.5 1.0; - visible: 1; - } - description { - state: "hide" 0.0; - inherit: "default" 0.0; - rel1 { relative: 1.0 1.0; to: "bg"; } - rel2 { relative: 1.1 1.0; to: "bg"; } - } - } - } - programs { - program { - signal: "hide"; - source: "button_result"; - action: STATE_SET "hide" 0.0; - target: "button_result"; - } - program { - signal: "show"; - source: "button_result"; - action: STATE_SET "default" 0.0; - target: "button_result"; - } - } - } -} diff --git a/res/edje/search_result.edc b/res/edje/search_result.edc deleted file mode 100755 index 5dbf4e0..0000000 --- a/res/edje/search_result.edc +++ /dev/null @@ -1,32 +0,0 @@ -collections { - group { - name: "main"; - - parts { - part { - name: "bg"; - type: RECT; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 1.0; } - color: 0 0 0 0; - visible: 1; - } - } - part { - name: "content"; - type: SWALLOW; - scale: 1; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; to: "bg"; } - rel2 { relative: 1.0 1.0; to: "bg"; } - align: 0.5 0.0; - visible: 1; - } - } - } - } -} diff --git a/res/edje/ui_manager.edc b/res/edje/ui_manager.edc index 3c9d525..16b2d1a 100755 --- a/res/edje/ui_manager.edc +++ b/res/edje/ui_manager.edc @@ -1,7 +1,3 @@ -images { - image: "Aventure01_background.png" COMP; -} - collections { group { name: "main"; @@ -18,20 +14,6 @@ collections { } } part { - name: "bg_img"; - type: IMAGE; - scale: 1; - mouse_events: 0; - description { state: "default" 0.0; - rel1 { relative: 0.0 0.0; to: "bg"; } - rel2 { relative: 1.0 1.0; to: "bg"; } - image { - normal: "Aventure01_background.png"; - } - visible: 1; - } - } - part { name: "content"; type: SWALLOW; description { diff --git a/res/images/world_map.png b/res/images/world_map.png Binary files differnew file mode 100755 index 0000000..3f50872 --- /dev/null +++ b/res/images/world_map.png diff --git a/src/adventure.c b/src/adventure.c deleted file mode 100644 index fecc567..0000000 --- a/src/adventure.c +++ /dev/null @@ -1,229 +0,0 @@ -/* - * Samsung API - * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/license/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include <tizen.h> -#include <Elementary.h> -#include "adventure.h" -#include "log.h" -#include "initial.h" -#include "loading.h" -#include "util.h" - -static void -win_delete_request_cb(void *data, Evas_Object *obj, void *event_info) -{ - ui_app_exit(); -} - -static Evas_Object *_create_adventure(Evas_Object *parent) -{ - Evas_Object *adventure = NULL; - char *path = NULL; - char full_path[PATH_LEN] = {0, }; - - adventure = elm_layout_add(parent); - retv_if(!adventure, NULL); - - path = app_get_resource_path(); - retv_if(!path, NULL); - - snprintf(full_path, sizeof(full_path), "%s/edje/adventure.edj", path); - - elm_layout_file_set(adventure, full_path, "main"); - evas_object_size_hint_weight_set(adventure, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(adventure, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_show(adventure); - - return adventure; -} - -static void _destroy_adventure(Evas_Object *adventure) -{ - ret_if(!adventure); - evas_object_del(adventure); -} - -Eina_Bool _destroy_initial_cb(void *data) -{ - adventure_info_s *adventure_info = data; - - retv_if(!adventure_info, ECORE_CALLBACK_CANCEL); - - elm_object_part_content_unset(adventure_info->adventure, "initial"); - initial_destroy(adventure_info->initial); - adventure_info->initial_timer = NULL; - - adventure_info->ui_manager = ui_manager_create(adventure_info->conformant, adventure_info); - retv_if(!adventure_info->ui_manager, ECORE_CALLBACK_CANCEL); - -#if 0 - adventure_info->loading = loading_create(adventure_info->adventure, adventure_info->width, adventure_info->height); - retv_if(!adventure_info->loading, ECORE_CALLBACK_CANCEL); - elm_object_part_content_set(adventure_info->adventure, "loading", adventure_info->loading); -#endif - - return ECORE_CALLBACK_CANCEL; -} - -static bool -app_create(void *data) -{ - adventure_info_s *adventure_info = data; - adventure_info->win = elm_win_util_standard_add(PACKAGE, PACKAGE); - elm_win_conformant_set(adventure_info->win, EINA_TRUE); - elm_win_autodel_set(adventure_info->win, EINA_TRUE); - if (elm_win_wm_rotation_supported_get(adventure_info->win)) { - int rots[1] = {0}; - elm_win_wm_rotation_available_rotations_set(adventure_info->win, (const int *)(&rots), 1); - } - evas_object_smart_callback_add(adventure_info->win, "delete,request", win_delete_request_cb, NULL); - elm_win_screen_size_get(adventure_info->win, NULL, NULL, &adventure_info->width, &adventure_info->height); - evas_object_show(adventure_info->win); - - adventure_info->conform = elm_conformant_add(adventure_info->win); - elm_win_indicator_mode_set(adventure_info->win, ELM_WIN_INDICATOR_HIDE); - evas_object_size_hint_weight_set(adventure_info->conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(adventure_info->win, adventure_info->conform); - evas_object_show(adventure_info->conform); - - _D("Window size (%d:%d)", adventure_info->width, adventure_info->height); - - adventure_info->adventure = _create_adventure(adventure_info->conform); - if (adventure_info->adventure) - elm_object_content_set(adventure_info->conform, adventure_info->adventure); - else - _E("cannot create the adventure ui"); - - adventure_info->initial = initial_create(adventure_info->conform, adventure_info->width, adventure_info->height); - if (adventure_info->initial) - elm_object_part_content_set(adventure_info->adventure, "initial", adventure_info->initial); - else - _E("cannot create the initial ui"); - - adventure_info->initial_timer = ecore_timer_add(3.0f, _destroy_initial_cb, adventure_info); - retv_if(!adventure_info->initial_timer, false); - - return true; -} - -static void -app_control(app_control_h app_control, void *data) -{ - adventure_info_s *adventure_info = data; - ret_if(!adventure_info); -} - -static void -app_pause(void *data) -{ - /* Take necessary actions when application becomes invisible. */ -} - -static void -app_resume(void *data) -{ - /* Take necessary actions when application becomes visible. */ -} - -static void -app_terminate(void *data) -{ - adventure_info_s *adventure_info = data; - - if (adventure_info->ui_manager) - ui_manager_destroy(adventure_info->ui_manager); - - if (adventure_info->adventure) - _destroy_adventure(adventure_info->adventure); - - if (adventure_info->initial_timer) { - ecore_timer_del(adventure_info->initial_timer); - initial_destroy(adventure_info->initial); - } - - if (adventure_info->conform) - evas_object_del(adventure_info->conform); - - if (adventure_info->win) - evas_object_del(adventure_info->win); -} - -static void -ui_app_lang_changed(app_event_info_h event_info, void *user_data) -{ - /*APP_EVENT_LANGUAGE_CHANGED*/ - char *locale = NULL; - system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, &locale); - elm_language_set(locale); - free(locale); - return; -} - -static void -ui_app_orient_changed(app_event_info_h event_info, void *user_data) -{ - /*APP_EVENT_DEVICE_ORIENTATION_CHANGED*/ - return; -} - -static void -ui_app_region_changed(app_event_info_h event_info, void *user_data) -{ - /*APP_EVENT_REGION_FORMAT_CHANGED*/ -} - -static void -ui_app_low_battery(app_event_info_h event_info, void *user_data) -{ - /*APP_EVENT_LOW_BATTERY*/ -} - -static void -ui_app_low_memory(app_event_info_h event_info, void *user_data) -{ - /*APP_EVENT_LOW_MEMORY*/ -} - -int -main(int argc, char *argv[]) -{ - adventure_info_s adventure_info = {0,}; - int ret = 0; - - ui_app_lifecycle_callback_s event_callback = {0,}; - app_event_handler_h handlers[5] = {NULL, }; - - event_callback.create = app_create; - event_callback.terminate = app_terminate; - event_callback.pause = app_pause; - event_callback.resume = app_resume; - event_callback.app_control = app_control; - - ui_app_add_event_handler(&handlers[APP_EVENT_LOW_BATTERY], APP_EVENT_LOW_BATTERY, ui_app_low_battery, &adventure_info); - ui_app_add_event_handler(&handlers[APP_EVENT_LOW_MEMORY], APP_EVENT_LOW_MEMORY, ui_app_low_memory, &adventure_info); - ui_app_add_event_handler(&handlers[APP_EVENT_DEVICE_ORIENTATION_CHANGED], APP_EVENT_DEVICE_ORIENTATION_CHANGED, ui_app_orient_changed, &adventure_info); - ui_app_add_event_handler(&handlers[APP_EVENT_LANGUAGE_CHANGED], APP_EVENT_LANGUAGE_CHANGED, ui_app_lang_changed, &adventure_info); - ui_app_add_event_handler(&handlers[APP_EVENT_REGION_FORMAT_CHANGED], APP_EVENT_REGION_FORMAT_CHANGED, ui_app_region_changed, &adventure_info); - ui_app_remove_event_handler(handlers[APP_EVENT_LOW_MEMORY]); - - ret = ui_app_main(argc, argv, &event_callback, &adventure_info); - if (ret != APP_ERROR_NONE) { - dlog_print(DLOG_ERROR, LOG_TAG, "ui_app_main() is failed. err = %d", ret); - } - - return ret; -} @@ -26,6 +26,7 @@ #include "db.h" #include "log.h" #include "util.h" +#include "group_info.h" #define APP_DB_FILE ".app.db" @@ -319,21 +320,21 @@ HAPI int db_insert_version(sqlite3 *db, int version) const char *const QUERY_SYNTAX = "INSERT INTO db_checksum (version) VALUES (?);"; sqlite3_stmt *st = NULL; - st = _db_prepare(db, QUERY_SYNTAX); + st = db_prepare(db, QUERY_SYNTAX); retv_if(!st, APPL_ERROR_DB_FAILED); - goto_if(_db_bind_int(db, st, 1, version) != APPL_ERROR_NONE, error); - goto_if(_db_next(db, st) == -1, error); + goto_if(db_bind_int(db, st, 1, version) != APPL_ERROR_NONE, error); + goto_if(db_next(db, st) == -1, error); - _db_reset(db, st); - _db_finalize(db, st); + db_reset(db, st); + db_finalize(db, st); /* keep this DB opened */ return APPL_ERROR_NONE; error: - _db_finalize(db, st); + db_finalize(db, st); return APPL_ERROR_DB_FAILED; } @@ -344,21 +345,21 @@ HAPI int db_remove_version(sqlite3 *db, int version) const char *const QUERY_SYNTAX = "DELETE FROM db_checksum WHERE version = ?;"; sqlite3_stmt *st = NULL; - st = _db_prepare(db, QUERY_SYNTAX); + st = db_prepare(db, QUERY_SYNTAX); retv_if(!st, APPL_ERROR_DB_FAILED); - goto_if(_db_bind_int(db, st, 1, version) != APPL_ERROR_NONE, error); - goto_if(_db_next(db, st) == -1, error); + goto_if(db_bind_int(db, st, 1, version) != APPL_ERROR_NONE, error); + goto_if(db_next(db, st) == -1, error); - _db_reset(db, st); - _db_finalize(db, st); + db_reset(db, st); + db_finalize(db, st); /* keep this DB opened */ return APPL_ERROR_NONE; error: - _db_finalize(db, st); + db_finalize(db, st); return APPL_ERROR_DB_FAILED; } @@ -369,21 +370,21 @@ HAPI int db_update_version(sqlite3 *db, int version) const char *const QUERY_SYNTAX = "UPDATE db_checksum SET version = ?;"; sqlite3_stmt *st = NULL; - st = _db_prepare(db, QUERY_SYNTAX); + st = db_prepare(db, QUERY_SYNTAX); retv_if(!st, APPL_ERROR_DB_FAILED); - goto_if(_db_bind_int(db, st, 1, version) != APPL_ERROR_NONE, error); - goto_if(_db_next(db, st) == -1, error); + goto_if(db_bind_int(db, st, 1, version) != APPL_ERROR_NONE, error); + goto_if(db_next(db, st) == -1, error); - _db_reset(db, st); - _db_finalize(db, st); + db_reset(db, st); + db_finalize(db, st); /* keep this DB opened */ return APPL_ERROR_NONE; error: - _db_finalize(db, st); + db_finalize(db, st); return APPL_ERROR_DB_FAILED; } @@ -395,18 +396,18 @@ HAPI int db_count_version(sqlite3 *db) sqlite3_stmt *st = NULL; int count = 0; - st = _db_prepare(db, QUERY_SYNTAX); + st = db_prepare(db, QUERY_SYNTAX); retv_if(!st, APPL_ERROR_DB_FAILED); - if (_db_next(db, st) == -1) { - _E("_db_next error"); - _db_finalize(db, st); + if (db_next(db, st) == -1) { + _E("db_next error"); + db_finalize(db, st); return -1; } - count = _db_get_int(st, 0); - _db_reset(db, st); - _db_finalize(db, st); + count = db_get_int(st, 0); + db_reset(db, st); + db_finalize(db, st); /* keep this DB opened */ @@ -415,116 +416,113 @@ HAPI int db_count_version(sqlite3 *db) -HAPI int _db_count_group(sqlite3 *db, int *count) +HAPI int db_count_group(sqlite3 *db, int *count) { const char *const QUERY_SYNTAX = "SELECT COUNT(*) FROM group;"; sqlite3_stmt *st = NULL; - st = _db_prepare(db, QUERY_SYNTAX); + st = db_prepare(db, QUERY_SYNTAX); retv_if(!st, APPL_ERROR_FAIL); - goto_if(_db_next(db, st) == -1, error); + goto_if(db_next(db, st) == -1, error); - *count = _db_get_int(st, 0); + *count = db_get_int(st, 0); - _db_reset(db, st); - _db_finalize(db, st); + db_reset(db, st); + db_finalize(db, st); /* keep this DB opened */ return APPL_ERROR_NONE; error: - _db_finalize(db, st); + db_finalize(db, st); return APPL_ERROR_FAIL; } -HAPI int _db_insert_group(sqlite3 *db, const char *title, int city1, int city2, int city3, int city4, int city5) +HAPI int db_insert_group(sqlite3 *db, const char *title, int city1, int city2, int city3, int city4, int city5) { const char *const QUERY_INSERT = "INSERT INTO group (time, title, city1, city2, city3, city4, city5) VALUES (DATETIME('now'), ?, ?, ?, ?, ?, ?);"; sqlite3_stmt *st = NULL; - int ret = APPL_ERROR_NONE; - st = _db_prepare(db, QUERY_INSERT); + st = db_prepare(db, QUERY_INSERT); retv_if(!st, APPL_ERROR_FAIL); - goto_if(_db_bind_str(db, st, 1, title) != APPL_ERROR_NONE, error); - goto_if(_db_bind_int(db, st, 2, city1) != APPL_ERROR_NONE, error); - goto_if(_db_bind_int(db, st, 3, city2) != APPL_ERROR_NONE, error); - goto_if(_db_bind_int(db, st, 4, city3) != APPL_ERROR_NONE, error); - goto_if(_db_bind_int(db, st, 5, city4) != APPL_ERROR_NONE, error); - goto_if(_db_bind_int(db, st, 6, city5) != APPL_ERROR_NONE, error); - goto_if(_db_next(db, st) == -1, error); + goto_if(db_bind_str(db, st, 1, title) != APPL_ERROR_NONE, error); + goto_if(db_bind_int(db, st, 2, city1) != APPL_ERROR_NONE, error); + goto_if(db_bind_int(db, st, 3, city2) != APPL_ERROR_NONE, error); + goto_if(db_bind_int(db, st, 4, city3) != APPL_ERROR_NONE, error); + goto_if(db_bind_int(db, st, 5, city4) != APPL_ERROR_NONE, error); + goto_if(db_bind_int(db, st, 6, city5) != APPL_ERROR_NONE, error); + goto_if(db_next(db, st) == -1, error); - _db_reset(db, st); - _db_finalize(db, st); + db_reset(db, st); + db_finalize(db, st); /* keep the sticker panel DB opened */ return APPL_ERROR_NONE; error: - _db_finalize(db, st); + db_finalize(db, st); return APPL_ERROR_FAIL; } -HAPI int _db_update_group(sqlite3 *db, int time, const char *title, int city1, int city2, int city3, int city4, int city5) +HAPI int db_update_group(sqlite3 *db, int time, const char *title, int city1, int city2, int city3, int city4, int city5) { const char *const QUERY_UPDATE = "UPDATE group SET title = ?, city1 = ?, city2 = ?, city3 = ?, city4 = ?, city5 = ? WHERE time = ?;"; sqlite3_stmt *st = NULL; - int count = 0; - int ret = APPL_ERROR_NONE; - st = _db_prepare(db, QUERY_UPDATE); + st = db_prepare(db, QUERY_UPDATE); retv_if(!st, APPL_ERROR_FAIL); - goto_if(_db_bind_str(db, st, 1, title) != APPL_ERROR_NONE, error); - goto_if(_db_bind_int(db, st, 2, city1) != APPL_ERROR_NONE, error); - goto_if(_db_bind_int(db, st, 3, city2) != APPL_ERROR_NONE, error); - goto_if(_db_bind_int(db, st, 4, city3) != APPL_ERROR_NONE, error); - goto_if(_db_bind_int(db, st, 5, city4) != APPL_ERROR_NONE, error); - goto_if(_db_bind_int(db, st, 6, city5) != APPL_ERROR_NONE, error); - goto_if(_db_bind_int(db, st, 7, time) != APPL_ERROR_NONE, error); - goto_if(_db_next(db, st) == -1, error); + goto_if(db_bind_str(db, st, 1, title) != APPL_ERROR_NONE, error); + goto_if(db_bind_int(db, st, 2, city1) != APPL_ERROR_NONE, error); + goto_if(db_bind_int(db, st, 3, city2) != APPL_ERROR_NONE, error); + goto_if(db_bind_int(db, st, 4, city3) != APPL_ERROR_NONE, error); + goto_if(db_bind_int(db, st, 5, city4) != APPL_ERROR_NONE, error); + goto_if(db_bind_int(db, st, 6, city5) != APPL_ERROR_NONE, error); + goto_if(db_bind_int(db, st, 7, time) != APPL_ERROR_NONE, error); + goto_if(db_next(db, st) == -1, error); - _db_reset(db, st); - _db_finalize(db, st); + db_reset(db, st); + db_finalize(db, st); /* keep the sticker panel DB opened */ return APPL_ERROR_NONE; error: - _db_finalize(db, st); + db_finalize(db, st); return APPL_ERROR_FAIL; } -HAPI int _db_delete_group(sqlite3 *db, int time) +HAPI int db_delete_group(sqlite3 *db, int time) { const char *const QUERY_SYNTAX = "DELETE FROM group WHERE time = ?;"; sqlite3_stmt *st = NULL; - st = _db_prepare(db, QUERY_SYNTAX); + st = db_prepare(db, QUERY_SYNTAX); retv_if(!st, APPL_ERROR_FAIL); - goto_if(_db_bind_int(db, st, 1, time) != APPL_ERROR_NONE, error); - goto_if(_db_next(db, st) == -1, error); + goto_if(db_bind_int(db, st, 1, time) != APPL_ERROR_NONE, error); + goto_if(db_next(db, st) == -1, error); - _db_reset(db, st); - _db_finalize(db, st); + db_reset(db, st); + db_finalize(db, st); /* keep the sticker panel DB opened */ return APPL_ERROR_NONE; error: - _db_finalize(db, st); + db_finalize(db, st); return APPL_ERROR_FAIL; } @@ -543,35 +541,36 @@ typedef struct _group_s group_s; -HAPI int _db_list_group(sqlite3 *db, Eina_List **group_list, int limit) +HAPI int db_list_group(sqlite3 *db, Eina_List **group_list, int limit) { const char *const QUERY_LIST = "SELECT time, title, city1, city2, city3, city4, city5 FROM group ORDER BY time ASC"; - const char *id = NULL; sqlite3_stmt *st = NULL; - group_s *group_info = NULL; + group_info_s *group_info = NULL; - int type = 0; int ret = -1; - st = _db_prepare(db, QUERY_LIST); + st = db_prepare(db, QUERY_LIST); retv_if(!st, APPL_ERROR_FAIL); do { - ret = _db_next(db, st); + int time = 0; + const char *title = NULL; + int city1 = 0, city2 = 0, city3 = 0, city4 = 0, city5 = 0; + ret = db_next(db, st); if (SQLITE_DONE == ret) { break; } else if (-1 == ret) { - _E("_db_next() error"); + _E("db_next() error"); goto error; } - time = _db_get_int(st, 0); - title = _db_get_str(st, 1); - city1 = _db_get_int(st, 2); - city2 = _db_get_int(st, 3); - city3 = _db_get_int(st, 4); - city4 = _db_get_int(st, 5); - city5 = _db_get_int(st, 6); + time = db_get_int(st, 0); + title = db_get_str(st, 1); + city1 = db_get_int(st, 2); + city2 = db_get_int(st, 3); + city3 = db_get_int(st, 4); + city4 = db_get_int(st, 5); + city5 = db_get_int(st, 6); group_info = group_info_create(time, title, city1, city2, city3, city4, city5); continue_if(!group_info); @@ -579,8 +578,8 @@ HAPI int _db_list_group(sqlite3 *db, Eina_List **group_list, int limit) *group_list = eina_list_append(*group_list, group_info); } while (SQLITE_ROW == ret); - _db_reset(db, st); - _db_finalize(db, st); + db_reset(db, st); + db_finalize(db, st); /* keep the sticker panel DB opened */ @@ -591,7 +590,7 @@ error: group_info_destroy(group_info); } - _db_finalize(db, st); + db_finalize(db, st); return APPL_ERROR_FAIL; } diff --git a/src/group_info.c b/src/group_info.c new file mode 100644 index 0000000..9159c04 --- /dev/null +++ b/src/group_info.c @@ -0,0 +1,42 @@ +#include <stdlib.h> + +#include "log.h" + +struct _group_info_s { + char *title; + int time; + int city1; + int city2; + int city3; + int city4; + int city5; +}; +typedef struct _group_info_s group_info_s; + +group_info_s *group_info_create(int time, const char *title, int city1, int city2, int city3, int city4, int city5) +{ + group_info_s *group_info = NULL; + + group_info = calloc(1, sizeof(group_info_s)); + retv_if(!group_info, NULL); + + group_info->time = time; + + if (title) + group_info->title = strdup(title); + + group_info->city1 = city1; + group_info->city2 = city2; + group_info->city3 = city3; + group_info->city4 = city4; + group_info->city5 = city5; + + return group_info; +} + +void group_info_destroy(group_info_s *group_info) +{ + ret_if(!group_info); + + free(group_info); +} @@ -1,5 +1,11 @@ +#include <Elementary.h> #include <system_settings.h> #include <time.h> +#include <stdio.h> +#include <stdlib.h> + +#include "log.h" +#include "util.h" void item_set_local_timezone(Evas_Object *item) { diff --git a/src/loading.c b/src/loading.c deleted file mode 100644 index bbfc711..0000000 --- a/src/loading.c +++ /dev/null @@ -1,44 +0,0 @@ -#include <Elementary.h> -#include <app.h> -#include "log.h" -#include "adventure.h" -#include "util.h" - - - -Evas_Object *loading_create(Evas_Object *parent, int width, int height) -{ - Evas_Object *loading = NULL; - char *path = NULL; - char full_path[PATH_LEN] = {0, }; - - retv_if(!parent, NULL); - - path = app_get_resource_path(); - retv_if(!path, NULL); - - snprintf(full_path, sizeof(full_path), "%s/edje/loading.edj", path); - free(path); - - loading = elm_layout_add(parent); - goto_if(!loading, error); - - elm_layout_file_set(loading, full_path, "loading"); - evas_object_size_hint_weight_set(loading, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(loading, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_min_set(loading, width, height); - evas_object_show(loading); - - return loading; - -error: - return NULL; -} - - - -void loading_destroy(Evas_Object *loading) -{ - ret_if(!loading); - evas_object_del(loading); -} @@ -17,6 +17,7 @@ #include <tizen.h>
#include <Elementary.h>
+
#include "log.h"
#include "util.h"
#include "main.h"
@@ -62,9 +63,9 @@ app_control(app_control_h app_control, void *data) {
moment_info_s *moment_info = data;
ret_if(!moment_info);
- ret_if(!mement_info->conformant);
+ ret_if(!moment_info->conform);
- moment_info->ui_manager = ui_manager_create(moment_info->conformant, moment_info);
+ moment_info->ui_manager = ui_manager_create(moment_info->conform, moment_info, moment_info->width, moment_info->height);
ret_if(!moment_info->ui_manager);
}
diff --git a/src/main_view.c b/src/main_view.c index 2633222..f775959 100644 --- a/src/main_view.c +++ b/src/main_view.c @@ -1,21 +1,26 @@ #include <Elementary.h> + #include "main.h" +#include "main_view.h" #include "log.h" #include "scroller.h" #include "city.h" +#include "util.h" const char *const MAIN_VIEW_EDJE = "main_view.edj"; const char *const PREDICT_ITEM_EDJE = "predict_item.edj"; +static void _update_predict_scroller(Evas_Object *predict_scroller, const char *str); + static void _change_entry_cb(void *data, Evas_Object *obj, void *event_info) { main_view_s *main_view_info = data; Evas_Object *entry = obj; const char *str = NULL; - ret_if(!moment_info); + ret_if(!main_view_info); - str = elm_entry_entry_get(obj); + str = elm_entry_entry_get(entry); if (!str) return; @@ -30,7 +35,7 @@ static void _unfocus_entry_cb(void *data, Evas_Object *obj, void *event_info) { } -static Evas_Object *_create_search_entry(Evas_Object *parent, moment_info_s *moment_info) +static Evas_Object *_create_search_entry(Evas_Object *parent, main_view_s *main_view_info) { Evas_Object *entry = NULL; @@ -89,29 +94,28 @@ static void _destroy_map(Evas_Object *map) evas_object_del(map); } -static _click_result_button_cb(void *data, Evas_Object *obj, void *event_info) +static void _click_result_button_cb(void *data, Evas_Object *obj, void *event_info) { - moment_info_s *moment_info = data; - - _D("Add button is clicked"); + main_view_s *main_view_info = data; - ret_if(!moment_info); + _D("result button is clicked"); - moment_info->result_view = result_view_create(moment_info->ui_manager); - ret_if(!moment_info->result_view); + ret_if(!main_view_info); } static Evas_Object *_create_result_button(Evas_Object *parent, main_view_s *main_view_info) { Evas_Object *result_button = NULL; + retv_if(!parent, NULL); + result_button = elm_button_add(parent); retv_if(!result_button, NULL); - elm_object_part_text_set(result_button, "Result"); - evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_smart_callback_add(button, "clicked", _click_result_button_cb, moment_info); + elm_object_text_set(result_button, "Result"); + evas_object_size_hint_weight_set(result_button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(result_button, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_smart_callback_add(result_button, "clicked", _click_result_button_cb, main_view_info); return result_button; } @@ -141,7 +145,7 @@ static void _destroy_selected_scroller(Evas_Object *selected_scroller) evas_object_del(selected_scroller); } -static _click_plus_button_cb(void *data, Evas_Object *obj, void *event_info) +static void _click_plus_button_cb(void *data, Evas_Object *obj, void *event_info) { moment_info_s *moment_info = data; @@ -161,7 +165,7 @@ static Evas_Object *_create_plus_button(Evas_Object *parent, main_view_s *main_v plus_button = elm_button_add(parent); retv_if(!plus_button, NULL); - elm_object_part_text_set(plus_button, "+Add"); + elm_object_text_set(plus_button, "+Add"); evas_object_size_hint_weight_set(plus_button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(plus_button, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_smart_callback_add(plus_button, "clicked", _click_plus_button_cb, main_view_info); @@ -265,7 +269,6 @@ static void _append_item_to_predict_scroller(Evas_Object *predict_scroller, Evas static void _remove_item_in_predict_scroller(Evas_Object *predict_scroller, Evas_Object *item) { Evas_Object *box = NULL; - Evas_Object *item = NULL; ret_if(!predict_scroller); ret_if(!item); @@ -291,23 +294,22 @@ static void _update_predict_scroller(Evas_Object *predict_scroller, const char * for (; i < CITY_MAX; i++) { int matched = 0; - if (city_info[i]->name && strstr(city_info[i]->name, str)) + if (city_info[i].name && strstr(city_info[i].name, str)) matched = 1; - else if (city_info[i]->nation && strstr(city_info[i]->nation, str)) + else if (city_info[i].nation && strstr(city_info[i].nation, str)) matched = 1; if (matched) { Evas_Object *predict_item = NULL; - predict_item = _create_predict_item(predict_scroller, city_info[i]->name, city_info[i]->nation); + predict_item = _create_predict_item(predict_scroller, city_info[i].name, city_info[i].nation); if (predict_item) - _append_item_to_predict_scroller(predict_scroller); + _append_item_to_predict_scroller(predict_scroller, predict_item); } } } Evas_Object *main_view_create(Evas_Object *parent, moment_info_s *moment_info) { - Evas_Object *button = NULL; main_view_s *main_view_info = NULL; char *path = NULL; char full_path[] = {0, }; @@ -332,13 +334,13 @@ Evas_Object *main_view_create(Evas_Object *parent, moment_info_s *moment_info) elm_layout_file_set(main_view_info->main_view, full_path, "main"); evas_object_size_hint_weight_set(main_view_info->main_view, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(main_view_info->main_view, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_show(main_view); + evas_object_show(main_view_info->main_view); evas_object_data_set(main_view_info->main_view, DATA_KEY_INFO, main_view_info); elm_object_part_text_set(main_view_info->main_view, "title", "No cities"); elm_object_part_text_set(main_view_info->main_view, "description", "After you add cities, they will be shown here."); - main_view_info->entry = _create_search_entry(main_view_info->main_view, moment_info); + main_view_info->entry = _create_search_entry(main_view_info->main_view, main_view_info); if (main_view_info->entry) elm_object_part_content_set(main_view_info->main_view, "entry", main_view_info->entry); @@ -362,7 +364,7 @@ Evas_Object *main_view_create(Evas_Object *parent, moment_info_s *moment_info) if (main_view_info->predict_scroller) elm_object_part_content_set(main_view_info->main_view, "predict_scroller", main_view_info->predict_scroller); - return main_view; + return main_view_info->main_view; } void main_view_destroy(Evas_Object *main_view) @@ -8,7 +8,6 @@ const char *const MAP_EDJE = "map.edj"; Evas_Object *map_create(Evas_Object *parent) { Evas_Object *map = NULL; - Evas_Object *button = NULL; char *path = NULL; char full_path[] = {0, }; @@ -30,8 +29,6 @@ Evas_Object *map_create(Evas_Object *parent) void map_destroy(Evas_Object *map) { - Evas_Object *button = NULL; - ret_if(!map); evas_object_del(map); diff --git a/src/result_view.c b/src/result_view.c deleted file mode 100644 index 5cbea82..0000000 --- a/src/result_view.c +++ /dev/null @@ -1,69 +0,0 @@ -#include <Elementary.h> -#include "main.h" -#include "log.h" -#include "scroller.h" - -const char *const MAIN_VIEW_EDJE = "result_view.edj"; - -static _clicked_cb(void *data, Evas_Object *obj, void *event_info) -{ - moment_info_s *moment_info = data; - - _D("Add button is clicked"); - - ret_if(!moment_info); - - moment_info->scroller = scroller_create(moment_info->ui_manager); - ret_if(!moment_info->scroller); -} - -Evas_Object *result_view_create(Evas_Object *parent, moment_info_s *moment_info) -{ - Evas_Object *result_view = NULL; - Evas_Object *button = NULL; - char *path = NULL; - char full_path[] = {0, }; - - retv_if(!parent, NULL); - - path = app_get_resource_path(); - retv_if(!path, NULL); - - snprintf(full_path, sizeof(full_path), "%s/edje/%s", path, MAIN_VIEW_EDJE); - free(path); - - result_view = elm_layout_add(parent); - retv_if(!result_view, NULL); - elm_layout_file_set(result_view, full_path, "main"); - evas_object_size_hint_weight_set(result_view, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(result_view, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_show(result_view); - - elm_object_part_text_set(result_view, "title", "No cities"); - elm_object_part_text_set(result_view, "description", "After you add cities, they will be shown here."); - - button = elm_button_add(parent); - if (button) { - elm_object_part_text_set(button, "+ Add"); - elm_object_part_content_set(result_view, "button", button); - evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_smart_callback_add(button, "clicked", _clicked_cb, moment_info); - } - - return result_view; -} - -void result_view_destroy(Evas_Object *result_view) -{ - Evas_Object *button = NULL; - - ret_if(!result_view); - - button = elm_object_part_content_unset(result_view, "button"); - if (button) { - evas_object_del(button); - } - - evas_object_del(result_view); -} diff --git a/src/ui_manager.c b/src/ui_manager.c index ccf295d..e54568c 100644 --- a/src/ui_manager.c +++ b/src/ui_manager.c @@ -1,10 +1,11 @@ #include <Elementary.h> #include "main.h" #include "log.h" +#include "main_view.h" const char *const UI_MANAGER_EDJE = "ui_manager.edj"; -Evas_Object *ui_manager_create(Evas_Object *parent, moment_info_s *moment_info) +Evas_Object *ui_manager_create(Evas_Object *parent, moment_info_s *moment_info, int width, int height) { Evas_Object *ui_manager = NULL; Evas_Object *rect = NULL; @@ -17,7 +18,7 @@ Evas_Object *ui_manager_create(Evas_Object *parent, moment_info_s *moment_info) path = app_get_resource_path(); retv_if(!path, NULL); - snprintf(full_path, sizeof(full_path), "%s/edje/%s", path, MAIN_VIEW_EDJE); + snprintf(full_path, sizeof(full_path), "%s/edje/%s", path, UI_MANAGER_EDJE); free(path); ui_manager = elm_layout_add(parent); @@ -52,7 +53,6 @@ extern void ui_manager_destroy(Evas_Object *ui_manager) { Evas_Object *rect = NULL; Evas_Object *content = NULL; - void (*destroy_function)(void *data); ret_if(!ui_manager); @@ -61,11 +61,8 @@ extern void ui_manager_destroy(Evas_Object *ui_manager) evas_object_del(rect); content = elm_object_part_content_unset(ui_manager, "content"); - if (content) { - destroy_function = evas_object_data_del(ui_manager, DATA_KEY_DESTROY_FUNCTION); - if (destroy_function) - destroy_function(content); - } + if (content) + evas_object_del(content); evas_object_del(ui_manager); } |
