fixed several things for the Android distribution to work

xavierlacot · Apr 6, 2011 · 7e83651 · 7e83651
1 parent 469ffbd
commit 7e83651
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 18 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "Resources/js/lib/vendor/joli.js"]
-	path = Resources/js/lib/vendor/joli.js
+[submodule "Resources/js/lib/vendor/joli"]
+	path = Resources/js/lib/vendor/joli
 	url = git@github.com:xavierlacot/joli.js.git
diff --git a/Resources/app.js b/Resources/app.js
@@ -1,4 +1,4 @@
-Ti.include('js/lib/vendor/joli.js/joli.js');
+Ti.include('js/lib/vendor/joli/joli.js');
 Ti.include('js/lib/model/models.js');
 Ti.include('js/lib/initialize.js');
 Ti.include('js/lib/install.js');

diff --git a/Resources/js/lib/model/models.js b/Resources/js/lib/model/models.js
@@ -1,3 +1,5 @@
+Ti.include('../vendor/joli/joli.js');
+
 // open database
 joli.connection = new joli.Connection('xavcc');
 

diff --git a/Resources/js/lib/vendor/joli.js → Resources/js/lib/vendor/joli b/Resources/js/lib/vendor/joli.js → Resources/js/lib/vendor/joli
diff --git a/Resources/js/views/decode.js b/Resources/js/views/decode.js
@@ -1,4 +1,4 @@
-Ti.include('../lib/vendor/joli.js/joli.js');
+Ti.include('../lib/vendor/joli/joli.js');
 Ti.include('../lib/model/models.js');
 Ti.include('../lib/xavcc.js');
 

diff --git a/Resources/js/views/encode.js b/Resources/js/views/encode.js
@@ -1,4 +1,4 @@
-Ti.include('../lib/vendor/joli.js/joli.js');
+Ti.include('../lib/vendor/joli/joli.js');
 Ti.include('../lib/model/models.js');
 Ti.include('../lib/xavcc.js');
 

diff --git a/Resources/js/views/history.details.js b/Resources/js/views/history.details.js
@@ -1,4 +1,4 @@
-Ti.include('../lib/vendor/joli.js/joli.js');
+Ti.include('../lib/vendor/joli/joli.js');
 Ti.include('../lib/model/models.js');
 Ti.include('../lib/xavcc.js');
 

diff --git a/Resources/js/views/history.js b/Resources/js/views/history.js
@@ -1,4 +1,4 @@
-Ti.include('../lib/vendor/joli.js/joli.js');
+Ti.include('../lib/vendor/joli/joli.js');
 Ti.include('../lib/model/models.js');
 Ti.include('../lib/xavcc.js');
 

diff --git a/Resources/js/views/settings.js b/Resources/js/views/settings.js
@@ -1,4 +1,4 @@
-Ti.include('../lib/vendor/joli.js/joli.js');
+Ti.include('../lib/vendor/joli/joli.js');
 Ti.include('../lib/model/models.js');
 Ti.include('../lib/xavcc.js');
 

diff --git a/platform/android/AndroidManifest.xml b/platform/android/AndroidManifest.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" ?><manifest android:versionCode="4" android:versionName="2.2" package="com.xavierlacot.xavcc" xmlns:android="http://schemas.android.com/apk/res/android">
+<?xml version="1.0" ?><manifest android:versionCode="5" android:versionName="2.2.1" package="com.xavierlacot.xavcc" xmlns:android="http://schemas.android.com/apk/res/android">
 	<uses-sdk android:minSdkVersion="4"/>
 	<supports-screens android:anyDensity="false" android:largeScreens="true" android:normalScreens="true" android:smallScreens="false"/>
 
 	<activity android:label="xavccMobileApp" android:name=".xavccMobileActivity" android:screenOrientation="portrait"/>
 
 
-	<application android:debuggable="true" android:icon="@drawable/appicon" android:label="xavccMobileApp" android:name="XavccmobileappApplication">
+	<application android:debuggable="false" android:icon="@drawable/appicon" android:label="URL Shortener xav.cc" android:name="XavccmobileappApplication">
     	<activity android:configChanges="keyboardHidden|orientation" android:label="xavccMobileApp" android:name=".XavccmobileappActivity" android:theme="@style/Theme.Titanium">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>

diff --git a/tiapp.xml b/tiapp.xml
@@ -2,7 +2,7 @@
 <ti:app xmlns:ti="http://ti.appcelerator.org">
 <id>com.xavierlacot.xavcc</id>
 <name>xavccMobileApp</name>
-<version>2.2.0</version>
+<version>2.0.0</version>
 <publisher>xav.cc</publisher>
 <url>http://xav.cc/</url>
 <description>A mobile client for the url shortener xav.cc</description>
@@ -22,15 +22,10 @@
 		</orientations>
 		<orientations device="ipad">
 			<orientation>Ti.UI.PORTRAIT</orientation>
-			<orientation>Ti.UI.UPSIDE_PORTRAIT</orientation>
-			<orientation>Ti.UI.LANDSCAPE_LEFT</orientation>
-			<orientation>Ti.UI.LANDSCAPE_RIGHT</orientation>
 		</orientations>
 	</iphone>
 	<android xmlns:android="http://schemas.android.com/apk/res/android">
-	    <manifest>
-	        <application android:debuggable="true" />
-	        <activity android:name=".xavccMobileActivity" android:label="xavccMobileApp" android:screenOrientation="portrait" />
-	    </manifest>
 	</android>
+	<modules>
+	</modules>
 </ti:app>