Add time span switch.

vestige · Oct 7, 2012 · edd5caa · edd5caa
1 parent b65db40
commit edd5caa
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 18 deletions.
diff --git a/Resources/app.js b/Resources/app.js
@@ -29,7 +29,7 @@ var qa = Ti.UI.createLabel({
 });
 
 var count = Ti.UI.createLabel({
-	text: '88:88',
+	text: '00:00',
 	color: '#444',
 	top: 20,
 	font:{fontSize: '250%'},
@@ -49,16 +49,24 @@ var toolview = Ti.UI.createView({
 
 var start = Ti.UI.createButton({
 	title: 'start',
+	height: 42,
 });
 
 var stop = Ti.UI.createButton({
 	title: 'stop',
 	left: 10,
+	height: 42,
 });
 
 var clear = Ti.UI.createButton({
 	title: 'clear',
 	left: 10,
+	height: 42,
+});
+
+var spanSwitch = Ti.UI.createSwitch({
+	left: 10,
+  	value: true 
 });
 
 function date_format(counting) {
@@ -86,8 +94,8 @@ function update () {
 	if (tmp_time.getSeconds() != past_time.getSeconds()) {
 		counting -= 1;
 		if (counting < 0) {
-			qa.text = '';
+			qa.text = 'Finish!';
-			count.text = "Finish";
+			count.text = "88888888";
 			stop.fireEvent('click');
 		} else {
 			if (counting == remain) {
@@ -112,8 +120,12 @@ var pause = 0;
 function timerClear(){
 	start_time = new Date();
 	past_time = start_time;
-	counting = 10;
+	if (spanSwitch.value) {
-	remain = 5;	
+		counting = 25 * 60;
+	} else {
+		counting = 15 * 60;
+	}
+	remain = 5 * 60;	
 	count.text = date_format(counting);
 	qa.text = '';
 	contents.backgroundColor = '#000';
@@ -150,7 +162,7 @@ contents.add(count);
 toolview.add(start);
 toolview.add(stop);
 toolview.add(clear);
-
+toolview.add(spanSwitch);
 footer.add(toolview);
 
 ground.add(top);

diff --git a/build/mobileweb/app.js b/build/mobileweb/app.js
@@ -1,7 +1,3 @@
-// 10min + 5min(Q&A) 最後に拍手
-// 20min + 5min(Q&A) 最後に拍手
-//optiondialog , switch
-
 Titanium.UI.setBackgroundColor('#000');
 
 var ground = Ti.UI.createWindow({
@@ -33,7 +29,7 @@ var qa = Ti.UI.createLabel({
 });
 
 var count = Ti.UI.createLabel({
-	text: '88:88',
+	text: '00:00',
 	color: '#444',
 	top: 20,
 	font:{fontSize: '250%'},
@@ -53,16 +49,24 @@ var toolview = Ti.UI.createView({
 
 var start = Ti.UI.createButton({
 	title: 'start',
+	height: 42,
 });
 
 var stop = Ti.UI.createButton({
 	title: 'stop',
 	left: 10,
+	height: 42,
 });
 
 var clear = Ti.UI.createButton({
 	title: 'clear',
 	left: 10,
+	height: 42,
+});
+
+var spanSwitch = Ti.UI.createSwitch({
+	left: 10,
+  	value: true 
 });
 
 function date_format(counting) {
@@ -90,8 +94,8 @@ function update () {
 	if (tmp_time.getSeconds() != past_time.getSeconds()) {
 		counting -= 1;
 		if (counting < 0) {
-			qa.text = '';
+			qa.text = 'Finish!';
-			count.text = "Finish";
+			count.text = "88888888";
 			stop.fireEvent('click');
 		} else {
 			if (counting == remain) {
@@ -116,8 +120,12 @@ var pause = 0;
 function timerClear(){
 	start_time = new Date();
 	past_time = start_time;
-	counting = 10;
+	if (spanSwitch.value) {
-	remain = 5;	
+		counting = 25 * 60;
+	} else {
+		counting = 15 * 60;
+	}
+	remain = 5 * 60;	
 	count.text = date_format(counting);
 	qa.text = '';
 	contents.backgroundColor = '#000';
@@ -154,7 +162,7 @@ contents.add(count);
 toolview.add(start);
 toolview.add(stop);
 toolview.add(clear);
-
+toolview.add(spanSwitch);
 footer.add(toolview);
 
 ground.add(top);

diff --git a/build/mobileweb/titanium/filesystem.registry b/build/mobileweb/titanium/filesystem.registry
@@ -1,10 +1,10 @@
-ts	1349606178000
+ts	1349608519000
 Default-Landscape.jpg	36232
 Default-Portrait.jpg	28479
 Default.jpg	17184
 KS_nav_ui.png	1158
 KS_nav_views.png	1074
-app.js	2824
+app.js	2939
 appicon.png	19109
 apple-touch-icon-114x114-precomposed.png	15820
 apple-touch-icon-57x57-precomposed.png	6790