bug fix and display improvement

yorzi · Sep 2, 2010 · 890c6cc · 890c6cc
1 parent fd3fc43
commit 890c6cc
Show file tree

Hide file tree

Showing 26 changed files with 14 additions and 24 deletions.
diff --git a/Resources/31formulas.db b/Resources/31formulas.db
diff --git a/Resources/content/formulas_list.js b/Resources/content/formulas_list.js
@@ -98,9 +98,9 @@ for (var c=0;c<rows.rowCount;c++)
 
 	var formula = Ti.UI.createLabel({
 		color:'#222981',
-		font:{fontSize:25,fontWeight:'bold', fontFamily:'Helvetica'},
+		font:{fontSize:27,fontWeight:'bold', fontFamily:'Helvetica'},
 		left:15,
-		top:24,
+		top:30,
 		height:30,
 		width:50,
 		innerShadowColor:'#000',

diff --git a/Resources/css/formula.css b/Resources/css/formula.css
@@ -9,7 +9,7 @@ body {
 	margin: 0;
 	padding: 10px;
 	line-height: 20px;
-	background: url(../images/formula_bg.png) no-repeat left top;
+	background: url(../images/formula_bg.png) no-repeat center top;
 }
 
 h3 {

diff --git a/Resources/css/tips.css b/Resources/css/tips.css
@@ -20,7 +20,8 @@ h3 {
 	margin: 10px auto 0px;
 /* 	font-family: "American Typewriter"; */
 	font-family: "Marker Felt";
-	background: url(../images/tips_h3_bg.png) no-repeat left top;
+	background: url(../images/tips_h3_bg.png) no-repeat center center;
+	background-size: cover;
 	width: 260px;
 	height: 125px;
 	padding: 20px;

diff --git a/Resources/css/tips_dont.css b/Resources/css/tips_dont.css
@@ -20,7 +20,8 @@ h3 {
 	margin: 10px auto 0px;
 /* 	font-family: "American Typewriter"; */
 	font-family: "Marker Felt";
-	background: url(../images/tips_h3_bg.png) no-repeat left top;
+	background: url(../images/tips_h3_bg.png) no-repeat center center;
+	background-size: cover;
 	width: 260px;
 	height: 125px;
 	padding: 20px;

diff --git a/Resources/images/en_f_part1_intro.png b/Resources/images/en_f_part1_intro.png
diff --git a/Resources/images/en_splash.png b/Resources/images/en_splash.png
diff --git a/Resources/images/en_tips_intro.png b/Resources/images/en_tips_intro.png
diff --git a/Resources/images/es_f_part1_intro.png b/Resources/images/es_f_part1_intro.png
diff --git a/Resources/images/es_splash.png b/Resources/images/es_splash.png
diff --git a/Resources/images/es_tips_intro.png b/Resources/images/es_tips_intro.png
diff --git a/Resources/images/nav_icon_setting.png b/Resources/images/nav_icon_setting.png
diff --git a/Resources/images/nav_icon_tips.png b/Resources/images/nav_icon_tips.png
diff --git a/Resources/images/nav_icon_weibo.png b/Resources/images/nav_icon_weibo.png
diff --git a/Resources/images/row_bg.png b/Resources/images/row_bg.png
diff --git a/Resources/images/row_bg_selected.png b/Resources/images/row_bg_selected.png
diff --git a/Resources/images/row_formula.png b/Resources/images/row_formula.png
diff --git a/Resources/images/tips_bg.png b/Resources/images/tips_bg.png
diff --git a/Resources/images/tips_h3_bg.png b/Resources/images/tips_h3_bg.png
diff --git a/Resources/images/zh_splash.png b/Resources/images/zh_splash.png
diff --git a/Resources/introduction.js b/Resources/introduction.js
@@ -5,15 +5,10 @@
 (function()
 {	
 	// window container
-	var welcomeWindow = Titanium.UI.createWindow();
-    welcomeWindow.fullscreen = true;
-
-	var f = Ti.Filesystem.getFile(Titanium.Filesystem.resourcesDirectory,('images/' + _('img_fix') + '_splash.png'));
-
-	var imageView = Titanium.UI.createImageView({
-		image:f
+	var welcomeWindow = Titanium.UI.createWindow({
+		fullcreen:true,
+		backgroundImage:'images/' + _('img_fix') + '_splash.png'
 	});
-	welcomeWindow.add(imageView);
 
 	var actInd = Titanium.UI.createActivityIndicator({
 		bottom:100, 

diff --git a/Resources/iphone/Default.png b/Resources/iphone/Default.png
diff --git a/Resources/iphone/appicon.png b/Resources/iphone/appicon.png
diff --git a/Resources/synchronize.js b/Resources/synchronize.js
@@ -1,13 +1,6 @@
 (function(){
 	//var db = Titanium.Database.open('eq31formulas');
 
-	var currentTime = new Date();
-	var month = currentTime.getMonth() + 1;
-	var day = currentTime.getDate();
-	var year = currentTime.getFullYear();
-
-	Ti.API.info('JS TIME:' + currentTime);
-
 	if (Titanium.Network.online == true)
 	{
 		Titanium.API.info('Online--update lessons!');

diff --git a/manifest b/manifest
@@ -1,4 +1,4 @@
-#appname: IELTSFormulas
+#appname: 31 Formulas
 #publisher: Idapted Ltd.
 #url: http://www.idapted.com
 #image: appicon.png

diff --git a/tiapp.xml b/tiapp.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ti:app xmlns:ti="http://ti.appcelerator.org">
 <id>com.idapted.eq31formulas</id>
-<name>IELTSFormulas</name>
-<version>1.0.0</version>
+<name>31 Formulas</name>
+<version>1.0.1</version>
 <publisher>Idapted Ltd.</publisher>
 <url>http://www.idapted.com</url>
 <description>Based on the best selling book and years of scientific analysis, these 31 Formulas tell you everything you need to know to answer ANY IELTS Speaking question!</description>
 <copyright>2010 by Idapted Ltd.</copyright>
-<icon>default_app_logo.png</icon>
+<icon>appicon.png</icon>
     <persistent-wifi>false</persistent-wifi>
     <prerendered-icon>false</prerendered-icon>
     <statusbar-style>default</statusbar-style>