From 9eeb9fba76a3e154668006843de5d513e1e9663e Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Fri, 29 Jun 2012 12:31:44 -0400 Subject: Took out iPhone-only constants on Android. --- Resources/friendship/ui/ActivityIndicator.js | 2 +- Resources/friendship/ui/FriendSelector.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/friendship/ui/ActivityIndicator.js b/Resources/friendship/ui/ActivityIndicator.js index d74a563..1430b6f 100644 --- a/Resources/friendship/ui/ActivityIndicator.js +++ b/Resources/friendship/ui/ActivityIndicator.js @@ -12,7 +12,7 @@ borderRadius: 10 }); var loader = Ti.UI.createActivityIndicator({ - style: Titanium.UI.iPhone.ActivityIndicatorStyle.BIG + style: (fs.app.isAndroid) ? null : Titanium.UI.iPhone.ActivityIndicatorStyle.BIG }); loading_view.add(background); diff --git a/Resources/friendship/ui/FriendSelector.js b/Resources/friendship/ui/FriendSelector.js index 7160cd8..62ba42d 100644 --- a/Resources/friendship/ui/FriendSelector.js +++ b/Resources/friendship/ui/FriendSelector.js @@ -14,7 +14,7 @@ fs.ui.createFriendSelector = function() { var done_button = Ti.UI.createButton({ title: 'Done', - style: Titanium.UI.iPhone.SystemButtonStyle.DONE + style: (fs.app.isAndroid) ? null : Titanium.UI.iPhone.SystemButtonStyle.DONE }); var win = Ti.UI.createWindow({ @@ -95,7 +95,7 @@ width: 240 }); var flexSpace = Titanium.UI.createButton({ - systemButton:Titanium.UI.iPhone.SystemButton.FLEXIBLE_SPACE + systemButton: (fs.app.isAndroid) ? null : Titanium.UI.iPhone.SystemButton.FLEXIBLE_SPACE }); var toolbar = Ti.UI.createToolbar({ barColor: fs.ui.styles.navBarColour, -- cgit v1.2.3