alter layout to support tablet

marcopagliarulo · Nov 8, 2014 · 23b8616 · 23b8616
1 parent dad3664
commit 23b8616
Show file tree

Hide file tree

Showing 48 changed files with 251 additions and 289 deletions.
diff --git a/app/assets/android/images/res-port-hdpi/facebook.png b/app/assets/android/images/res-port-hdpi/facebook.png
diff --git a/app/assets/android/images/res-port-hdpi/github.png b/app/assets/android/images/res-port-hdpi/github.png
diff --git a/app/assets/android/images/res-port-hdpi/twitter.png b/app/assets/android/images/res-port-hdpi/twitter.png
diff --git a/app/assets/android/images/res-port-hdpi/vimeo.png b/app/assets/android/images/res-port-hdpi/vimeo.png
diff --git a/app/assets/android/images/res-port-ldpi/facebook.png b/app/assets/android/images/res-port-ldpi/facebook.png
diff --git a/app/assets/android/images/res-port-ldpi/github.png b/app/assets/android/images/res-port-ldpi/github.png
diff --git a/app/assets/android/images/res-port-ldpi/twitter.png b/app/assets/android/images/res-port-ldpi/twitter.png
diff --git a/app/assets/android/images/res-port-ldpi/vimeo.png b/app/assets/android/images/res-port-ldpi/vimeo.png
diff --git a/app/assets/android/images/res-port-mdpi/facebook.png b/app/assets/android/images/res-port-mdpi/facebook.png
diff --git a/app/assets/android/images/res-port-mdpi/github.png b/app/assets/android/images/res-port-mdpi/github.png
diff --git a/app/assets/android/images/res-port-mdpi/twitter.png b/app/assets/android/images/res-port-mdpi/twitter.png
diff --git a/app/assets/android/images/res-port-mdpi/vimeo.png b/app/assets/android/images/res-port-mdpi/vimeo.png
diff --git a/app/assets/android/images/res-port-xhdpi/facebook.png b/app/assets/android/images/res-port-xhdpi/facebook.png
diff --git a/app/assets/android/images/res-port-xhdpi/github.png b/app/assets/android/images/res-port-xhdpi/github.png
diff --git a/app/assets/android/images/res-port-xhdpi/twitter.png b/app/assets/android/images/res-port-xhdpi/twitter.png
diff --git a/app/assets/android/images/res-port-xhdpi/vimeo.png b/app/assets/android/images/res-port-xhdpi/vimeo.png
diff --git a/app/assets/android/images/res-port-xxhdpi/facebook.png b/app/assets/android/images/res-port-xxhdpi/facebook.png
diff --git a/app/assets/android/images/res-port-xxhdpi/github.png b/app/assets/android/images/res-port-xxhdpi/github.png
diff --git a/app/assets/android/images/res-port-xxhdpi/twitter.png b/app/assets/android/images/res-port-xxhdpi/twitter.png
diff --git a/app/assets/android/images/res-port-xxhdpi/vimeo.png b/app/assets/android/images/res-port-xxhdpi/vimeo.png
diff --git a/app/assets/images/facebook.png b/app/assets/images/facebook.png
diff --git a/app/assets/images/github.png b/app/assets/images/github.png
diff --git a/app/assets/images/info.png b/app/assets/images/info.png
diff --git a/app/assets/images/loadinfoBlue.png b/app/assets/images/loadinfoBlue.png
diff --git a/app/assets/images/loadinfoWhite.png b/app/assets/images/loadinfoWhite.png
diff --git a/app/assets/images/twitter.png b/app/assets/images/twitter.png
diff --git a/app/assets/images/vimeo.png b/app/assets/images/vimeo.png
diff --git a/app/controllers/favorites.js b/app/controllers/favorites.js
@@ -51,6 +51,7 @@ function createRow(talkData){
 		$.addClass(rowView,"rowView");
 		var title = Ti.UI.createLabel({touchEnabled: false, bubbeParent: true, text : talk.title});
 		$.addClass(title,"listTitle");
+		$.addClass(title,"listTitleSession");
 		var speaker = Ti.UI.createLabel({touchEnabled: false, bubbeParent: true, text : talk.name + " " + talk.surname});
 		$.addClass(speaker,"listSpeaker");
 

diff --git a/app/controllers/index.js b/app/controllers/index.js
@@ -6,6 +6,12 @@ var defaultFont = {
 	fontSize : "20sp",
 	fontFamily : Alloy.Globals.museo_slab_700
 };
+if(Alloy.Globals.isAndroidTablet){
+	defaultFont = {
+		fontSize : "30sp",
+		fontFamily : Alloy.Globals.museo_slab_700
+	};
+}
 // Create our node items
 var menuItems = [
     { id: 1, controller : "schedule" , title: "Sessioni", image: "/images/clock.png" , font: defaultFont , callback : function(e){openMenuItem(e);}},

diff --git a/app/controllers/info.js b/app/controllers/info.js
@@ -1,3 +1,13 @@
+var defaultFont = {
+	fontSize : "20sp",
+	fontFamily : Alloy.Globals.museo_slab_700
+};
+if(Alloy.Globals.isAndroidTablet){
+	defaultFont = {
+		fontSize : "30sp",
+		fontFamily : Alloy.Globals.museo_slab_700
+	};
+}
 openInfo = function(e){
 	if(typeof e.source.nid != 'undefined'){
 		var nid = e.source.nid;
@@ -30,10 +40,7 @@ createInfoItem = function(infoItem){
 			touchEnabled: false, 
 			bubbeParent: true, 
 			text : infoItem.title,
-			font : {
-				fontSize : "20sp",
-				fontFamily : Alloy.Globals.museo_slab_700
-			},
+			font : defaultFont,
 			color : Alloy.CFG.colors.third
 		});
 		item.add(label);
@@ -80,10 +87,7 @@ var label = Ti.UI.createLabel({
 	touchEnabled: false,
 	bubbeParent: true, 
 	text : "Crediti",
-	font : {
-		fontSize : "20sp",
-		fontFamily : Alloy.Globals.museo_slab_700
-	},
+	font : defaultFont,
 	color : Alloy.CFG.colors.third
 });
 item.add(label);

diff --git a/app/controllers/live.js b/app/controllers/live.js
@@ -69,6 +69,7 @@ function createRow(talkHoursList){
 			$.addClass(rowView,"rowView");
 			var title = Ti.UI.createLabel({touchEnabled: false, bubbeParent: true, text : talk.title});
 			$.addClass(title,"listTitle");
+			$.addClass(title,"listTitleSession");
 			var speaker = Ti.UI.createLabel({touchEnabled: false, bubbeParent: true, text : talk.name + " " + talk.surname});
 			$.addClass(speaker,"listSpeaker");
 

diff --git a/app/controllers/schedule_group.js b/app/controllers/schedule_group.js
@@ -69,6 +69,7 @@ function createRow(talkData){
 		$.addClass(rowView,"rowView");
 		var title = Ti.UI.createLabel({touchEnabled: false, bubbeParent: true, text : talk.title});
 		$.addClass(title,"listTitle");
+		$.addClass(title,"listTitleSession");
 
 //		var track = Ti.UI.createLabel({touchEnabled: false, bubbeParent: true, text : talk.track});
 //		$.addClass(track,"listTrack");

diff --git a/app/controllers/schedule_list.js b/app/controllers/schedule_list.js
@@ -60,6 +60,7 @@ function createRow(talkHoursList){
 			$.addClass(rowView,"rowView");
 			var title = Ti.UI.createLabel({touchEnabled: false, bubbeParent: true, text : talk.title});
 			$.addClass(title,"listTitle");
+			$.addClass(title,"listTitleSession");
 
 			var track = Ti.UI.createLabel({touchEnabled: false, bubbeParent: true, text : talk.track});
 			$.addClass(track,"listTrack");

diff --git a/app/styles/app.tss b/app/styles/app.tss
@@ -10,6 +10,12 @@
 	color : Alloy.CFG.colors.first,
 	left: "0"
 }
+".listTitle[if=Alloy.Globals.isAndroidTablet]" : {
+	font : {
+		fontSize : "37sp",
+		fontFamily : Alloy.Globals.museo_slab_700
+	},
+}
 ".listDate" : {
 	font: {
 		fontSize : "25sp",
@@ -21,10 +27,106 @@
 	top: "5dp",
 	bottom : "5dp"
 }
+".listDate[if=Alloy.Globals.isAndroidTablet]" : {
+	font : {
+		fontSize : "37sp",
+		fontFamily : Alloy.Globals.museo_slab_700
+	},
+}
 "WebView" : {
 	width : Ti.UI.SIZE
 }
 "ImageView" : {
 	width : Alloy.Globals.deviceWidth,
 	height: "auto"
 }
+
+
+/*start general session list */
+".headerSession" : {
+	backgroundColor : "#eeeeee",
+}
+".headerSeparatorTop" : {
+	width: "100%",
+	height : "1dp",
+	backgroundColor : "#dddddd",
+}
+".headerSeparatorBottom" : {
+	top: "5dp",
+	width: "100%",
+	height : "1dp",
+	backgroundColor : "#dddddd",
+}
+".rowView" : {
+	backgroundColor : Alloy.CFG.colors.third,
+}
+".rowSeparator" : {
+	width: "100%",
+	height : "1dp",
+	backgroundColor : Alloy.CFG.colors.first
+}
+".scheduleDate" : {
+	font: {
+		fontSize : "17sp",
+		fontFamily : Alloy.Globals.museo_slab_700
+	},
+	color: "#000000",
+	left: "5%",
+	top: "5dp",
+}
+".scheduleDate[if=Alloy.Globals.isAndroidTablet]" : {
+	font : {
+		fontSize : "25sp",
+		fontFamily : Alloy.Globals.museo_slab_700
+	},
+}
+".listSpeaker" : {
+	font: {
+		fontSize : "15sp",
+		fontFamily : Alloy.Globals.museo_slab_700
+	},
+	color : Alloy.CFG.colors.second,
+	left: "5%",
+	bottom : "5dp",
+},
+".listSpeaker[if=Alloy.Globals.isAndroidTablet]" : {
+	font : {
+		fontSize : "22sp",
+		fontFamily : Alloy.Globals.museo_slab_700
+	},
+}
+".listTrack" : {
+	font: {
+		fontSize : "15sp",
+		fontFamily : Alloy.Globals.museo_slab_500
+	},
+	width: Ti.UI.FILL,
+	textAlign: "center",
+	bottom : "5dp",
+	color: Alloy.CFG.colors.first
+}
+".listTrack[if=Alloy.Globals.isAndroidTablet]" : {
+	font : {
+		fontSize : "22sp",
+		fontFamily : Alloy.Globals.museo_slab_500
+	},
+}
+".favorite" : {
+	right: "5%",
+	top : "5dp",
+	width: "80%"
+}
+".listTitleSession" : {
+	left: "5%",
+	top : "10dp",
+	font: {
+		fontSize : "22sp",
+	},
+	textAlign : "left",
+}
+".listTitleSession[if=Alloy.Globals.isAndroidTablet]" : {
+	font : {
+		fontSize : "33sp",
+	},
+}
+/*end general session list */
diff --git a/app/styles/countdown.tss b/app/styles/countdown.tss
@@ -25,6 +25,12 @@
 	},
 	textAlign: "center"
 }
+"Label[if=Alloy.Globals.isAndroidTablet]" : {
+	font : {
+		fontSize : "30sp",
+		fontFamily : Alloy.Globals.museo_slab_700
+	},
+}
 "#countdown" : {
 	width: "100%",
 	height: Ti.UI.SIZE,
@@ -64,6 +70,12 @@
 	textAlign: "center",
 	color : Alloy.CFG.colors.second,
 }
+".hashtag[if=Alloy.Globals.isAndroidTablet]" : {
+	font : {
+		fontSize : "30sp",
+		fontFamily : Alloy.Globals.museo_slab_700
+	},
+}
 ".socialLink" : {
 	width : "15%",
 	left : "14%"

diff --git a/app/styles/credits.tss b/app/styles/credits.tss
@@ -16,11 +16,23 @@
 	color : Alloy.CFG.colors.first,
 	textAlign : "center"
 }
+"Label[if=Alloy.Globals.isAndroidTablet]" : {
+	font : {
+		fontSize : "37sp",
+		fontFamily : Alloy.Globals.museo_slab_700
+	},
+}
 ".fontCredits" : {
 	font: {
 		fontSize : "15sp",
 		fontFamily : Alloy.Globals.museo_slab_700
 	},
 	color : Alloy.CFG.colors.first,
 	textAlign : "center"
-}
+}
+".fontCredits[if=Alloy.Globals.isAndroidTablet]" : {
+	font : {
+		fontSize : "22sp",
+		fontFamily : Alloy.Globals.museo_slab_700
+	},
+}
diff --git a/app/styles/favorites.tss b/app/styles/favorites.tss
@@ -1,66 +1,3 @@
-".headerSession" : {
-	backgroundColor : "#eeeeee",
-},
-".headerSeparatorTop" : {
-	width: "100%",
-	height : "1dp",
-	backgroundColor : "#dddddd",
-},
-".headerSeparatorBottom" : {
-	top: "5dp",
-	width: "100%",
-	height : "1dp",
-	backgroundColor : "#dddddd",
-},
-".rowView" : {
-	backgroundColor : Alloy.CFG.colors.third,
-},
-".rowSeparator" : {
-	width: "100%",
-	height : "1dp",
-	backgroundColor : Alloy.CFG.colors.first
-}
-".scheduleDate" : {
-	font: {
-		fontSize : "15sp",
-		fontFamily : Alloy.Globals.museo_slab_700
-	},
-	color: "#000000",
-	left: "5%",
-	top: "5dp",
-},
-".listSpeaker" : {
-	font: {
-		fontSize : "15sp",
-		fontFamily : Alloy.Globals.museo_slab_700
-	},
-	color : Alloy.CFG.colors.second,
-	left: "5%",
-	bottom : "5dp",
-},
-".listTrack" : {
-	font: {
-		fontSize : "15sp",
-		fontFamily : Alloy.Globals.museo_slab_500
-	},
-	width: Ti.UI.FILL,
-	textAlign: "center",
-	bottom : "5dp",
-	color: Alloy.CFG.colors.first
-}
-".listTitle" : {
-	left: "5%",
-	top : "10dp",
-	font: {
-		fontSize : "22sp",
-	},
-},
-
-".favorite" : {
-	right: "5%",
-	top : "5dp",
-	width: "80%"
-},
 ".emptyFavotires" : {
 	font: {
 		fontSize : "25sp",
@@ -69,6 +6,12 @@
 	color : Alloy.CFG.colors.first,
 	textAlign : "center"
 },
+".emptyFavorites[if=Alloy.Globals.isAndroidTablet]" : {
+	font : {
+		fontSize : "37sp",
+		fontFamily : Alloy.Globals.museo_slab_700
+	},
+}
 ".emptyFavoritesDetail" : {
 	font: {
 		fontSize : "15sp",
@@ -77,6 +20,12 @@
 	color : Alloy.CFG.colors.first,
 	textAlign : "center"
 }
+".emptyFavoritesDetail[if=Alloy.Globals.isAndroidTablet]" : {
+	font : {
+		fontSize : "22sp",
+		fontFamily : Alloy.Globals.museo_slab_700
+	},
+}
 "#nofavorites" : {
 	height: Ti.UI.SIZE
 }
diff --git a/app/styles/index.tss b/app/styles/index.tss
@@ -79,6 +79,12 @@
 	},
     top: "30dp"
 }
+"#loadingText[if=Alloy.Globals.isAndroidTablet]" : {
+	font : {
+		fontSize : "37sp",
+		fontFamily : Alloy.Globals.museo_slab_700
+	},
+}
 "#container" : {
 	height:Ti.UI.FILL,
 }
@@ -112,3 +118,9 @@
 		fontFamily : Alloy.Globals.museo_slab_700
 	}
 }
+"#headerTitle[if=Alloy.Globals.isAndroidTablet]" : {
+	font : {
+		fontSize : "37sp",
+		fontFamily : Alloy.Globals.museo_slab_700
+	},
+}
diff --git a/app/styles/infoDetail.tss b/app/styles/infoDetail.tss
@@ -1,9 +1,3 @@
 ".listTitle" : {
-	font: {
-		fontSize : "25sp",
-		fontFamily : Alloy.Globals.museo_slab_700
-	},
 	backgroundColor : "transparent",
-	color : Alloy.CFG.colors.first,
-	left: "0"
-}
+}