Merge branch 'master' of github.com:teddywing/LikeFeed

Conflicts:
	tiapp.xml

20 files changed, 64 insertions, 10 deletions

diff --git a/.settings/com.appcelerator.titanium.core.prefs b/.settings/com.appcelerator.titanium.core.prefs
new file mode 100644
index 0000000..bf8352a
--- /dev/null
+++ b/.settings/com.appcelerator.titanium.core.prefs
@@ -0,0 +1,13 @@
+eclipse.preferences.version=1
+provisioning_profiles/development/102921B8-D171-474F-A74E-69BF1EC80A2E/appid=*
+provisioning_profiles/development/102921B8-D171-474F-A74E-69BF1EC80A2E/filepath=/Users/mimic/Library/MobileDevice/Provisioning Profiles/102921B8-D171-474F-A74E-69BF1EC80A2E.mobileprovision
+provisioning_profiles/development/102921B8-D171-474F-A74E-69BF1EC80A2E/name=iOS Team Provisioning Profile\: *
+provisioning_profiles/development/102921B8-D171-474F-A74E-69BF1EC80A2E/uuid=102921B8-D171-474F-A74E-69BF1EC80A2E
+provisioning_profiles/development/88FDBC82-D5DA-4B15-935F-0DF154ED0248/appid=*
+provisioning_profiles/development/88FDBC82-D5DA-4B15-935F-0DF154ED0248/filepath=/Users/mimic/Library/MobileDevice/Provisioning Profiles/88FDBC82-D5DA-4B15-935F-0DF154ED0248.mobileprovision
+provisioning_profiles/development/88FDBC82-D5DA-4B15-935F-0DF154ED0248/name=Sphnx_on_Anqi_s_iPhone_4S
+provisioning_profiles/development/88FDBC82-D5DA-4B15-935F-0DF154ED0248/uuid=88FDBC82-D5DA-4B15-935F-0DF154ED0248
+provisioning_profiles/development/B5FB1F66-50E9-4DF3-B419-EF7FF1D341DF/appid=*
+provisioning_profiles/development/B5FB1F66-50E9-4DF3-B419-EF7FF1D341DF/filepath=/Users/mimic/Library/MobileDevice/Provisioning Profiles/B5FB1F66-50E9-4DF3-B419-EF7FF1D341DF.mobileprovision
+provisioning_profiles/development/B5FB1F66-50E9-4DF3-B419-EF7FF1D341DF/name=Sphnx_on_Zach_s_iPhone
+provisioning_profiles/development/B5FB1F66-50E9-4DF3-B419-EF7FF1D341DF/uuid=B5FB1F66-50E9-4DF3-B419-EF7FF1D341DF
diff --git a/Resources/iphone/Default-Landscape.psd b/Image Resources/Default-Landscape.psd
index e79ed3b..e79ed3b 100644
--- a/Resources/iphone/Default-Landscape.psd
+++ b/Image Resources/Default-Landscape.psd
diff --git a/Resources/iphone/Default-Portrait.psd b/Image Resources/Default-Portrait.psd
index 181d3f0..181d3f0 100644
--- a/Resources/iphone/Default-Portrait.psd
+++ b/Image Resources/Default-Portrait.psd
diff --git a/Resources/iphone/Default@2x.psd b/Image Resources/Default@2x.psd
index b2a082c..b2a082c 100644
--- a/Resources/iphone/Default@2x.psd
+++ b/Image Resources/Default@2x.psd
diff --git a/Resources/android/appicon.png b/Resources/android/appicon.png
new file mode 100644
index 0000000..3300a00
--- /dev/null
+++ b/Resources/android/appicon.png
diff --git a/Resources/android/default.png b/Resources/android/default.png
new file mode 100644
index 0000000..718fb3c
--- /dev/null
+++ b/Resources/android/default.png
diff --git a/Resources/android/images/res-long-land-hdpi/default.png b/Resources/android/images/res-long-land-hdpi/default.png
new file mode 100644
index 0000000..7751959
--- /dev/null
+++ b/Resources/android/images/res-long-land-hdpi/default.png
diff --git a/Resources/android/images/res-long-land-ldpi/default.png b/Resources/android/images/res-long-land-ldpi/default.png
new file mode 100644
index 0000000..86e7930
--- /dev/null
+++ b/Resources/android/images/res-long-land-ldpi/default.png
diff --git a/Resources/android/images/res-long-port-hdpi/default.png b/Resources/android/images/res-long-port-hdpi/default.png
new file mode 100644
index 0000000..3a83cc7
--- /dev/null
+++ b/Resources/android/images/res-long-port-hdpi/default.png
diff --git a/Resources/android/images/res-long-port-ldpi/default.png b/Resources/android/images/res-long-port-ldpi/default.png
new file mode 100644
index 0000000..2ab10df
--- /dev/null
+++ b/Resources/android/images/res-long-port-ldpi/default.png
diff --git a/Resources/android/images/res-notlong-land-hdpi/default.png b/Resources/android/images/res-notlong-land-hdpi/default.png
new file mode 100644
index 0000000..7751959
--- /dev/null
+++ b/Resources/android/images/res-notlong-land-hdpi/default.png
diff --git a/Resources/android/images/res-notlong-land-ldpi/default.png b/Resources/android/images/res-notlong-land-ldpi/default.png
new file mode 100644
index 0000000..7db10fa
--- /dev/null
+++ b/Resources/android/images/res-notlong-land-ldpi/default.png
diff --git a/Resources/android/images/res-notlong-land-mdpi/default.png b/Resources/android/images/res-notlong-land-mdpi/default.png
new file mode 100644
index 0000000..f1268ba
--- /dev/null
+++ b/Resources/android/images/res-notlong-land-mdpi/default.png
diff --git a/Resources/android/images/res-notlong-port-hdpi/default.png b/Resources/android/images/res-notlong-port-hdpi/default.png
new file mode 100644
index 0000000..3a83cc7
--- /dev/null
+++ b/Resources/android/images/res-notlong-port-hdpi/default.png
diff --git a/Resources/android/images/res-notlong-port-ldpi/default.png b/Resources/android/images/res-notlong-port-ldpi/default.png
new file mode 100644
index 0000000..2c2bebe
--- /dev/null
+++ b/Resources/android/images/res-notlong-port-ldpi/default.png
diff --git a/Resources/android/images/res-notlong-port-mdpi/default.png b/Resources/android/images/res-notlong-port-mdpi/default.png
new file mode 100644
index 0000000..606024d
--- /dev/null
+++ b/Resources/android/images/res-notlong-port-mdpi/default.png
diff --git a/build.log b/build.log
new file mode 100644
index 0000000..7ec6809
--- /dev/null
+++ b/build.log
@@ -0,0 +1,24 @@
+Logfile initialized
+[INFO] logfile = /Users/me/Desktop/LikeFeed/build.log
+[DEBUG] /Users/me/Library/Application Support/Titanium/mobilesdk/osx/2.0.2.GA/android/builder.py simulator LikeFeed /Users/me/Downloads/android-sdk-macosx /Users/me/Desktop/LikeFeed com.likefeed.LikeFeed 4 HVGA 
+[INFO] Building LikeFeed for Android ... one moment
+[DEBUG] signal caught: 3
+[DEBUG] calling emulator kill on 55988
+[ERROR] Exception occured while building Android project:
+[ERROR] Traceback (most recent call last):
+[ERROR]   File "/Users/me/Library/Application Support/Titanium/mobilesdk/osx/2.0.2.GA/android/builder.py", line 2112, in <module>
+[ERROR]     s.run_emulator(avd_id, avd_skin, avd_name, add_args)
+[ERROR]   File "/Users/me/Library/Application Support/Titanium/mobilesdk/osx/2.0.2.GA/android/builder.py", line 484, in run_emulator
+[ERROR]     handler(3,None)
+[ERROR]   File "/Users/me/Library/Application Support/Titanium/mobilesdk/osx/2.0.2.GA/android/builder.py", line 469, in handler
+[ERROR]     os.kill(p.pid, signal.SIGTERM)
+[ERROR] OSError: [Errno 3] No such process
+[INFO] Titanium SDK version: 2.0.2 (05/30/12 10:21 2ff31a3)
+[DEBUG] Waiting for device to be ready ...
+[TRACE] adb devices returned 0 devices/emulators
+[TRACE] adb devices returned 0 devices/emulators
+[TRACE] adb devices returned 0 devices/emulators
+[TRACE] adb devices returned 0 devices/emulators
+[TRACE] adb devices returned 0 devices/emulators
+[TRACE] adb devices returned 0 devices/emulators
+[ERROR] Timed out waiting for emulator to be ready, you may need to close the emulator and try again
diff --git a/manifest b/manifest
index 9fecf3c..de3e23b 100644
--- a/manifest
+++ b/manifest
@@ -4,5 +4,5 @@
 #image:appicon.png
 #appid:com.likefeed.LikeFeed
 #desc:not specified
-#type:mobile
+#type:ipad
 #guid:ccd110bb-8710-4380-ad4a-94d93e18d62a
diff --git a/sphnx.com/Presentation.pptx b/sphnx.com/Presentation.pptx
new file mode 100644
index 0000000..305fbf3
--- /dev/null
+++ b/sphnx.com/Presentation.pptx
diff --git a/tiapp.xml b/tiapp.xml
index c53767d..a455030 100644
--- a/tiapp.xml
+++ b/tiapp.xml
@@ -1,23 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ti:app xmlns:ti="http://ti.appcelerator.org">
+    <property name="acs-oauth-secret-production" type="string">8H6Tg8EVGSw8jhQqAI0YRyybF93hXqKM</property>
+    <property name="acs-oauth-key-production" type="string">cxUzPq23YVDCRyl1DZvXZya9BfiVeIr0</property>
+    <property name="acs-api-key-production" type="string">MJTTR0hSGOFif1GGDfrW5Zi5ySNNQIha</property>
+    <property name="acs-oauth-secret-development" type="string">FsWT4cYUAsNNZb2B2VzPpk7uyLNDE5On</property>
+    <property name="acs-oauth-key-development" type="string">GeOoGtXcFds17TLcC195J0akS57AnPlm</property>
+    <property name="acs-api-key-development" type="string">Qsx8MiLqKzuNJLNBXGYJ7NGzIcuNJ0el</property>
     <deployment-targets>
         <target device="mobileweb">true</target>
-        <target device="iphone">false</target>
-        <target device="ipad">false</target>
-        <target device="android">false</target>
+        <target device="iphone">true</target>
+        <target device="ipad">true</target>
+        <target device="android">true</target>
         <target device="blackberry">false</target>
     </deployment-targets>
     <sdk-version>1.6.2</sdk-version>
-    <id>com.likefeed.LikeFeed</id>
-    <name>LikeFeed</name>
+    <id>com.sphnx.Sphnx</id>
+    <name>Sphnx</name>
     <version>1.0</version>
-    <publisher>TW</publisher>
+    <publisher>ZANT</publisher>
     <url>http://</url>
     <description>not specified</description>
-    <copyright>2012 by TW</copyright>
+    <copyright>2012 by ZANT</copyright>
     <icon>appicon.png</icon>
     <persistent-wifi>false</persistent-wifi>
-    <prerendered-icon>false</prerendered-icon>
+    <prerendered-icon>true</prerendered-icon>
     <statusbar-style>default</statusbar-style>
     <statusbar-hidden>false</statusbar-hidden>
     <fullscreen>false</fullscreen>
@@ -25,6 +31,7 @@
     <analytics>true</analytics>
     <property name="ti.facebook.appid">258369447595838</property>
     <guid>ccd110bb-8710-4380-ad4a-94d93e18d62a</guid>
+    <property name="ti.ui.defaultunit">system</property>
     <iphone>
         <orientations device="iphone">
             <orientation>Ti.UI.PORTRAIT</orientation>
@@ -37,5 +44,15 @@
         </orientations>
     </iphone>
     <android xmlns:android="http://schemas.android.com/apk/res/android"/>
-    <modules/>
+    <mobileweb>
+        <precache/>
+        <splash>
+            <enabled>true</enabled>
+            <inline-css-images>true</inline-css-images>
+        </splash>
+        <theme>default</theme>
+    </mobileweb>
+    <modules>
+        <module platform="commonjs" version="2.0.5">ti.cloud</module>
+    </modules>
 </ti:app>