diff --git a/app/assets/android/images/res-port-hdpi/facebook.png b/app/assets/android/images/res-port-hdpi/facebook.png index 9d7a46b..e6d9bd9 100644 Binary files a/app/assets/android/images/res-port-hdpi/facebook.png and b/app/assets/android/images/res-port-hdpi/facebook.png differ diff --git a/app/assets/android/images/res-port-hdpi/github.png b/app/assets/android/images/res-port-hdpi/github.png index f5ac817..6da532c 100644 Binary files a/app/assets/android/images/res-port-hdpi/github.png and b/app/assets/android/images/res-port-hdpi/github.png differ diff --git a/app/assets/android/images/res-port-hdpi/twitter.png b/app/assets/android/images/res-port-hdpi/twitter.png index 0560520..b9c6ad4 100644 Binary files a/app/assets/android/images/res-port-hdpi/twitter.png and b/app/assets/android/images/res-port-hdpi/twitter.png differ diff --git a/app/assets/android/images/res-port-hdpi/vimeo.png b/app/assets/android/images/res-port-hdpi/vimeo.png index 6b1d252..90f7b04 100644 Binary files a/app/assets/android/images/res-port-hdpi/vimeo.png and b/app/assets/android/images/res-port-hdpi/vimeo.png differ diff --git a/app/assets/android/images/res-port-ldpi/facebook.png b/app/assets/android/images/res-port-ldpi/facebook.png index a6caed2..23d2e0b 100644 Binary files a/app/assets/android/images/res-port-ldpi/facebook.png and b/app/assets/android/images/res-port-ldpi/facebook.png differ diff --git a/app/assets/android/images/res-port-ldpi/github.png b/app/assets/android/images/res-port-ldpi/github.png index 3780b02..26bb647 100644 Binary files a/app/assets/android/images/res-port-ldpi/github.png and b/app/assets/android/images/res-port-ldpi/github.png differ diff --git a/app/assets/android/images/res-port-ldpi/twitter.png b/app/assets/android/images/res-port-ldpi/twitter.png index fc69519..1c08a3a 100644 Binary files a/app/assets/android/images/res-port-ldpi/twitter.png and b/app/assets/android/images/res-port-ldpi/twitter.png differ diff --git a/app/assets/android/images/res-port-ldpi/vimeo.png b/app/assets/android/images/res-port-ldpi/vimeo.png index 088ab97..2ac96ee 100644 Binary files a/app/assets/android/images/res-port-ldpi/vimeo.png and b/app/assets/android/images/res-port-ldpi/vimeo.png differ diff --git a/app/assets/android/images/res-port-mdpi/facebook.png b/app/assets/android/images/res-port-mdpi/facebook.png index 7fa493d..925abc9 100644 Binary files a/app/assets/android/images/res-port-mdpi/facebook.png and b/app/assets/android/images/res-port-mdpi/facebook.png differ diff --git a/app/assets/android/images/res-port-mdpi/github.png b/app/assets/android/images/res-port-mdpi/github.png index d0361bc..3dbbd44 100644 Binary files a/app/assets/android/images/res-port-mdpi/github.png and b/app/assets/android/images/res-port-mdpi/github.png differ diff --git a/app/assets/android/images/res-port-mdpi/twitter.png b/app/assets/android/images/res-port-mdpi/twitter.png index a87b377..48ca26c 100644 Binary files a/app/assets/android/images/res-port-mdpi/twitter.png and b/app/assets/android/images/res-port-mdpi/twitter.png differ diff --git a/app/assets/android/images/res-port-mdpi/vimeo.png b/app/assets/android/images/res-port-mdpi/vimeo.png index bf1e226..8f8301a 100644 Binary files a/app/assets/android/images/res-port-mdpi/vimeo.png and b/app/assets/android/images/res-port-mdpi/vimeo.png differ diff --git a/app/assets/android/images/res-port-xhdpi/facebook.png b/app/assets/android/images/res-port-xhdpi/facebook.png index fb2d7d6..849013e 100644 Binary files a/app/assets/android/images/res-port-xhdpi/facebook.png and b/app/assets/android/images/res-port-xhdpi/facebook.png differ diff --git a/app/assets/android/images/res-port-xhdpi/github.png b/app/assets/android/images/res-port-xhdpi/github.png index db8b1b5..9814f96 100644 Binary files a/app/assets/android/images/res-port-xhdpi/github.png and b/app/assets/android/images/res-port-xhdpi/github.png differ diff --git a/app/assets/android/images/res-port-xhdpi/twitter.png b/app/assets/android/images/res-port-xhdpi/twitter.png index 3c7d08b..7b48fcf 100644 Binary files a/app/assets/android/images/res-port-xhdpi/twitter.png and b/app/assets/android/images/res-port-xhdpi/twitter.png differ diff --git a/app/assets/android/images/res-port-xhdpi/vimeo.png b/app/assets/android/images/res-port-xhdpi/vimeo.png index df8d7f8..2685905 100644 Binary files a/app/assets/android/images/res-port-xhdpi/vimeo.png and b/app/assets/android/images/res-port-xhdpi/vimeo.png differ diff --git a/app/assets/android/images/res-port-xxhdpi/facebook.png b/app/assets/android/images/res-port-xxhdpi/facebook.png index 5db99be..265123f 100644 Binary files a/app/assets/android/images/res-port-xxhdpi/facebook.png and b/app/assets/android/images/res-port-xxhdpi/facebook.png differ diff --git a/app/assets/android/images/res-port-xxhdpi/github.png b/app/assets/android/images/res-port-xxhdpi/github.png index 88d684f..0074516 100644 Binary files a/app/assets/android/images/res-port-xxhdpi/github.png and b/app/assets/android/images/res-port-xxhdpi/github.png differ diff --git a/app/assets/android/images/res-port-xxhdpi/twitter.png b/app/assets/android/images/res-port-xxhdpi/twitter.png index 54f4a61..28b2f60 100644 Binary files a/app/assets/android/images/res-port-xxhdpi/twitter.png and b/app/assets/android/images/res-port-xxhdpi/twitter.png differ diff --git a/app/assets/android/images/res-port-xxhdpi/vimeo.png b/app/assets/android/images/res-port-xxhdpi/vimeo.png index ae30d32..180c072 100644 Binary files a/app/assets/android/images/res-port-xxhdpi/vimeo.png and b/app/assets/android/images/res-port-xxhdpi/vimeo.png differ diff --git a/app/assets/images/facebook.png b/app/assets/images/facebook.png index ddf0aef..995ed99 100644 Binary files a/app/assets/images/facebook.png and b/app/assets/images/facebook.png differ diff --git a/app/assets/images/github.png b/app/assets/images/github.png index 56ed922..5887b50 100644 Binary files a/app/assets/images/github.png and b/app/assets/images/github.png differ diff --git a/app/assets/images/info.png b/app/assets/images/info.png index 7c9c3a5..e6cbd07 100644 Binary files a/app/assets/images/info.png and b/app/assets/images/info.png differ diff --git a/app/assets/images/loadinfoBlue.png b/app/assets/images/loadinfoBlue.png deleted file mode 100644 index 88b2fec..0000000 Binary files a/app/assets/images/loadinfoBlue.png and /dev/null differ diff --git a/app/assets/images/loadinfoWhite.png b/app/assets/images/loadinfoWhite.png deleted file mode 100644 index e40f42d..0000000 Binary files a/app/assets/images/loadinfoWhite.png and /dev/null differ diff --git a/app/assets/images/twitter.png b/app/assets/images/twitter.png index 9a088a2..5f407cc 100644 Binary files a/app/assets/images/twitter.png and b/app/assets/images/twitter.png differ diff --git a/app/assets/images/vimeo.png b/app/assets/images/vimeo.png index 377ea7f..4a4cf1f 100644 Binary files a/app/assets/images/vimeo.png and b/app/assets/images/vimeo.png differ diff --git a/app/controllers/favorites.js b/app/controllers/favorites.js index 3c7f430..f7cf3ee 100644 --- 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 index 140de50..e56c90e 100644 --- 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 index bb61a98..3213390 100644 --- 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 index 132be73..e6aa4a2 100644 --- 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 index 913a02d..1316ecf 100644 --- 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 index c8cb428..0f7288c 100644 --- 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 index e9d5e27..23d111b 100644 --- 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,6 +27,12 @@ top: "5dp", bottom : "5dp" } +".listDate[if=Alloy.Globals.isAndroidTablet]" : { + font : { + fontSize : "37sp", + fontFamily : Alloy.Globals.museo_slab_700 + }, +} "WebView" : { width : Ti.UI.SIZE } @@ -28,3 +40,93 @@ 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 index a8d7343..5db283e 100644 --- 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 index 6da0a1c..9cadea6 100644 --- a/app/styles/credits.tss +++ b/app/styles/credits.tss @@ -16,6 +16,12 @@ 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", @@ -23,4 +29,10 @@ }, color : Alloy.CFG.colors.first, textAlign : "center" -} \ No newline at end of file +} +".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 index 979fd55..4853acc 100644 --- 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 index 7bd8c1b..6738a6f 100644 --- 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 index 4103c58..8064661 100644 --- 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" -} +} \ No newline at end of file diff --git a/app/styles/live.tss b/app/styles/live.tss index eb08e3b..75060d8 100644 --- a/app/styles/live.tss +++ b/app/styles/live.tss @@ -1,67 +1,6 @@ -".headerSession" : { - backgroundColor : "#eeeeee", -}, -".headerSeparatorTop" : { - width: "100%", - height : "1dp", - backgroundColor : "#dddddd", -}, -".headerSeparatorBottom" : { - top: "3dp", - 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", -}, -".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", - }, +".listTitleSession" : { textAlign : "left", }, - -".favorite" : { - right: "5%", - top : "5dp", - width: "80%" -}, "Label" : { font: { fontSize : "20sp", @@ -70,6 +9,12 @@ textAlign : "center", color: Alloy.CFG.colors.first } +"Label[if=Alloy.Globals.isAndroidTablet]" : { + font : { + fontSize : "30sp", + fontFamily : Alloy.Globals.museo_slab_700 + }, +} ".link" : { color : Alloy.CFG.colors.second, } diff --git a/app/styles/location.tss b/app/styles/location.tss index 2aa8471..e7506ff 100644 --- a/app/styles/location.tss +++ b/app/styles/location.tss @@ -14,6 +14,12 @@ backgroundColor: Alloy.CFG.colors.first, backgroundSelectedColor: Alloy.CFG.colors.second, } +".button[if=Alloy.Globals.isAndroidTablet]" : { + font : { + fontSize : "30sp", + fontFamily : Alloy.Globals.museo_slab_700 + }, +} ".error" : { textAlign : 'center', font : { @@ -22,3 +28,9 @@ }, color : Alloy.CFG.colors.second, } +".error[if=Alloy.Globals.isAndroidTablet]" : { + font : { + fontSize : "37sp", + fontFamily : Alloy.Globals.museo_slab_700 + }, +} diff --git a/app/styles/schedule.tss b/app/styles/schedule.tss index e058d2e..217d827 100644 --- a/app/styles/schedule.tss +++ b/app/styles/schedule.tss @@ -7,4 +7,10 @@ }, width : Ti.UI.FILL, textAlign: "center", -} \ No newline at end of file +} +"#schedule_switch[if=Alloy.Globals.isAndroidTablet]" : { + font : { + fontSize : "30sp", + fontFamily : Alloy.Globals.museo_slab_700 + }, +} diff --git a/app/styles/schedule_group.tss b/app/styles/schedule_group.tss index d7a544d..9d724f7 100644 --- a/app/styles/schedule_group.tss +++ b/app/styles/schedule_group.tss @@ -1,77 +1,24 @@ -".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, -}, -".tab" : { - borderWidth: "1dp", - borderColor: "#fff", - backgroundColor: Alloy.CFG.colors.first, - width: "33%" +".labelTab" : { + color : Alloy.CFG.colors.third, + font: { + fontSize : "25sp", + fontFamily : Alloy.Globals.museo_slab_300 + }, + borderWidth: "1dp", + borderColor: "#fff", + backgroundColor: Alloy.CFG.colors.first, + width: "33%" }, ".labelTab" : { - color : Alloy.CFG.colors.third, - font: { - fontSize : "25sp", - fontFamily : Alloy.Globals.museo_slab_300 - }, + color : Alloy.CFG.colors.third, + font: { + fontSize : "25sp", + fontFamily : Alloy.Globals.museo_slab_300 + }, }, ".tabActive" : { - backgroundColor: Alloy.CFG.colors.second, - borderWidth: "1dp", - borderColor: "#fff", - width: "33%" -}, -".scheduleDate" : { - font: { - fontSize : "17sp", - 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%" + backgroundColor: Alloy.CFG.colors.second, + borderWidth: "1dp", + borderColor: "#fff", + width: "33%" }, diff --git a/app/styles/schedule_list.tss b/app/styles/schedule_list.tss deleted file mode 100644 index 962d0c8..0000000 --- a/app/styles/schedule_list.tss +++ /dev/null @@ -1,63 +0,0 @@ -".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", -}, -".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%" -}, diff --git a/app/styles/speaker.tss b/app/styles/speaker.tss index ea78bef..c033999 100644 --- a/app/styles/speaker.tss +++ b/app/styles/speaker.tss @@ -8,9 +8,4 @@ } "TableView" : { separatorColor : Alloy.CFG.colors.first -} -".rowSeparator" : { - width: "100%", - height : "1dp", - backgroundColor : Alloy.CFG.colors.first -} +} \ No newline at end of file diff --git a/app/styles/speakerDetail.tss b/app/styles/speakerDetail.tss index bca0e83..4cde53c 100644 --- a/app/styles/speakerDetail.tss +++ b/app/styles/speakerDetail.tss @@ -20,3 +20,9 @@ }, color : Alloy.CFG.colors.first, }, +".body[if=Alloy.Globals.isAndroidTablet]" : { + font : { + fontSize : "30sp", + fontFamily : Alloy.Globals.museo_slab_700 + }, +} diff --git a/app/styles/sponsor.tss b/app/styles/sponsor.tss index c108c57..7cd075a 100644 --- a/app/styles/sponsor.tss +++ b/app/styles/sponsor.tss @@ -6,6 +6,12 @@ color : Alloy.CFG.colors.third, textAlign : "center" }, +".sponsorType[if=Alloy.Globals.isAndroidTablet]" : { + font : { + fontSize : "37sp", + fontFamily : Alloy.Globals.museo_slab_700 + }, +} ".headerViewElement" : { backgroundColor : Alloy.CFG.colors.second, height: Ti.UI.SIZE diff --git a/app/styles/talkDetail.tss b/app/styles/talkDetail.tss index 2ae6670..e37047d 100644 --- a/app/styles/talkDetail.tss +++ b/app/styles/talkDetail.tss @@ -7,12 +7,7 @@ }, ".listSpeaker" : { - font: { - fontSize : "15sp", - fontFamily : Alloy.Globals.museo_slab_700 - }, - color : Alloy.CFG.colors.second, - left: "5%", + bottom: 0, }, ".listTitle" : { left: "5%", @@ -30,6 +25,12 @@ }, color : Alloy.CFG.colors.first, }, +".body[if=Alloy.Globals.isAndroidTablet]" : { + font : { + fontSize : "30sp", + fontFamily : Alloy.Globals.museo_slab_300 + }, +} ".category" : { font: { fontSize : "20sp", @@ -39,6 +40,12 @@ left: "5%", width : "55%" }, +".category[if=Alloy.Globals.isAndroidTablet]" : { + font : { + fontSize : "30sp", + fontFamily : Alloy.Globals.museo_slab_700 + }, +} ".viewLevel" : { width: "40%", }, @@ -51,3 +58,9 @@ textAlign: "center", color: Alloy.CFG.colors.first } +".levelLabel[if=Alloy.Globals.isAndroidTablet]" : { + font : { + fontSize : "22sp", + fontFamily : Alloy.Globals.museo_slab_500 + }, +}