Permalink
Browse files

Merge branch 'develop'

Conflicts:
	Resources/app/views/splash/actions/paypal_action_table_view_row.coffee
	Resources/app/views/splash/actions/paypal_action_table_view_row.js
  • Loading branch information...
Harry Brundage
Harry Brundage committed Nov 15, 2010
2 parents f15280a + 1f81401 commit 11620a6f0af05b2c69fde4fa06acdaa435989cd6
Showing with 247 additions and 218 deletions.
  1. +0 −2 Resources/app/controllers/main.coffee
  2. +0 −1 Resources/app/controllers/main.js
  3. +1 −0 Resources/app/controllers/oauthorization_controller.coffee
  4. +1 −0 Resources/app/controllers/oauthorization_controller.js
  5. +3 −4 Resources/app/controllers/splash_controller.coffee
  6. +3 −6 Resources/app/controllers/splash_controller.js
  7. +1 −1 Resources/app/models/accounts/account.coffee
  8. +1 −0 Resources/app/models/accounts/account.js
  9. +4 −1 Resources/app/models/accounts/twitter/twitter_account.coffee
  10. +6 −1 Resources/app/models/accounts/twitter/twitter_account.js
  11. +5 −3 Resources/app/views/accounts/authorization_web_view_window.coffee
  12. +3 −1 Resources/app/views/accounts/authorization_web_view_window.js
  13. +1 −1 Resources/app/views/accounts/twitter_account_table_view_row.coffee
  14. +1 −2 Resources/app/views/accounts/twitter_account_table_view_row.js
  15. +5 −1 Resources/app/views/codes/codes_window.coffee
  16. +4 −1 Resources/app/views/codes/codes_window.js
  17. +62 −0 Resources/app/views/modal_loading_view.coffee
  18. +74 −0 Resources/app/views/modal_loading_view.js
  19. +17 −20 Resources/app/views/splash/actions/paypal_action_table_view_row.coffee
  20. +9 −12 Resources/app/views/splash/actions/paypal_action_table_view_row.js
  21. +23 −25 Resources/app/views/splash/splash_info_header_view.coffee
  22. +12 −4 Resources/app/views/splash/splash_info_header_view.js
  23. +0 −62 Resources/app/views/splash/splash_info_table_view_row.js
  24. +7 −33 Resources/app/views/splash/splash_window.coffee
  25. +4 −35 Resources/app/views/splash/splash_window.js
  26. BIN Resources/images/account_icons/aim.png
  27. BIN Resources/images/account_icons/amazon-1.png
  28. BIN Resources/images/account_icons/amazon-2.png
  29. BIN Resources/images/account_icons/android.png
  30. BIN Resources/images/account_icons/aol.png
  31. BIN Resources/images/account_icons/apple.png
  32. BIN Resources/images/account_icons/appstore.png
  33. BIN Resources/images/account_icons/audioboo.png
  34. BIN Resources/images/account_icons/bebo.png
  35. BIN Resources/images/account_icons/behance.png
  36. BIN Resources/images/account_icons/bing.png
  37. BIN Resources/images/account_icons/bleetbox.png
  38. BIN Resources/images/account_icons/blinklist.png
  39. BIN Resources/images/account_icons/blogger.png
  40. BIN Resources/images/account_icons/brightkite-1.png
  41. BIN Resources/images/account_icons/brightkite-2.png
  42. BIN Resources/images/account_icons/buzz.png
  43. BIN Resources/images/account_icons/cargocollective.png
  44. BIN Resources/images/account_icons/coroflot.png
  45. BIN Resources/images/account_icons/creativecommons.png
  46. BIN Resources/images/account_icons/dailybooth.png
  47. BIN Resources/images/account_icons/delicious.png
  48. BIN Resources/images/account_icons/designfloat.png
  49. BIN Resources/images/account_icons/designmoo.png
  50. BIN Resources/images/account_icons/deviantart.png
  51. BIN Resources/images/account_icons/digg.png
  52. BIN Resources/images/account_icons/diglog.png
  53. BIN Resources/images/account_icons/doppler.png
  54. BIN Resources/images/account_icons/dopplr.png
  55. BIN Resources/images/account_icons/dribbble.png
  56. BIN Resources/images/account_icons/dzone.png
  57. BIN Resources/images/account_icons/ebay.png
  58. BIN Resources/images/account_icons/email.png
  59. BIN Resources/images/account_icons/ember.png
  60. BIN Resources/images/account_icons/evernote.png
  61. BIN Resources/images/account_icons/facebook.png
  62. BIN Resources/images/account_icons/feedburner-1.png
  63. BIN Resources/images/account_icons/feedburner-2.png
  64. BIN Resources/images/account_icons/flickr-1.png
  65. BIN Resources/images/account_icons/flickr-2.png
  66. BIN Resources/images/account_icons/flickr.png
  67. BIN Resources/images/account_icons/forrst.png
  68. BIN Resources/images/account_icons/foursquare.png
  69. BIN Resources/images/account_icons/fresqui.png
  70. BIN Resources/images/account_icons/friendfeed.png
  71. BIN Resources/images/account_icons/friendster.png
  72. BIN Resources/images/account_icons/furl.png
  73. BIN Resources/images/account_icons/gamespot.png
  74. BIN Resources/images/account_icons/generic.png
  75. BIN Resources/images/account_icons/gmail.png
  76. BIN Resources/images/account_icons/google.png
  77. BIN Resources/images/account_icons/googlebuzz.png
  78. BIN Resources/images/account_icons/gowalla copy.png
  79. BIN Resources/images/account_icons/gowalla.png
  80. BIN Resources/images/account_icons/gravee.png
  81. BIN Resources/images/account_icons/grooveshark-1.png
  82. BIN Resources/images/account_icons/grooveshark-2.png
  83. BIN Resources/images/account_icons/grooveshark.png
  84. BIN Resources/images/account_icons/gtalk.png
  85. BIN Resources/images/account_icons/hi5-1.png
  86. BIN Resources/images/account_icons/hi5-2.png
  87. BIN Resources/images/account_icons/hyves-1.png
  88. BIN Resources/images/account_icons/hyves-2.png
  89. BIN Resources/images/account_icons/hyves.png
  90. BIN Resources/images/account_icons/identica.png
  91. BIN Resources/images/account_icons/ilike.png
  92. BIN Resources/images/account_icons/isociety.png
  93. BIN Resources/images/account_icons/lastfm.png
  94. BIN Resources/images/account_icons/linkedin.png
  95. BIN Resources/images/account_icons/livejournal.png
  96. BIN Resources/images/account_icons/lockerz.png
  97. BIN Resources/images/account_icons/magnolia.png
  98. BIN Resources/images/account_icons/megavideo.png
  99. BIN Resources/images/account_icons/metacafe.png
  100. BIN Resources/images/account_icons/misterwong.png
  101. BIN Resources/images/account_icons/mixx.png
  102. BIN Resources/images/account_icons/mobileme.png
  103. BIN Resources/images/account_icons/msn-1.png
  104. BIN Resources/images/account_icons/msn-2.png
  105. BIN Resources/images/account_icons/mynameise.png
  106. BIN Resources/images/account_icons/myspace.png
  107. BIN Resources/images/account_icons/netvibes.png
  108. BIN Resources/images/account_icons/newsvine.png
  109. BIN Resources/images/account_icons/ning.png
  110. BIN Resources/images/account_icons/openid-1.png
  111. BIN Resources/images/account_icons/openid-2.png
  112. BIN Resources/images/account_icons/orkut.png
  113. BIN Resources/images/account_icons/pandora.png
  114. BIN Resources/images/account_icons/paypal.png
  115. BIN Resources/images/account_icons/piano.png
  116. BIN Resources/images/account_icons/picasa.png
  117. BIN Resources/images/account_icons/pimpthisblog.png
  118. BIN Resources/images/account_icons/playfire.png
  119. BIN Resources/images/account_icons/playstation.png
  120. BIN Resources/images/account_icons/plurk.png
  121. BIN Resources/images/account_icons/posterous.png
  122. BIN Resources/images/account_icons/qik.png
  123. BIN Resources/images/account_icons/readernaut.png
  124. BIN Resources/images/account_icons/reddit.png
  125. BIN Resources/images/account_icons/rss.png
  126. BIN Resources/images/account_icons/sharethis.png
  127. BIN Resources/images/account_icons/skype.png
  128. BIN Resources/images/account_icons/slashdot.png
  129. BIN Resources/images/account_icons/socialvibe.png
  130. BIN Resources/images/account_icons/soundcloud.png
  131. BIN Resources/images/account_icons/sphere.png
  132. BIN Resources/images/account_icons/sphinn.png
  133. BIN Resources/images/account_icons/spotify.png
  134. BIN Resources/images/account_icons/springpad.png
  135. BIN Resources/images/account_icons/steam.png
  136. BIN Resources/images/account_icons/stumbleupon.png
  137. BIN Resources/images/account_icons/technorati.png
  138. BIN Resources/images/account_icons/tripadvisor.png
  139. BIN Resources/images/account_icons/tuenti.png
  140. BIN Resources/images/account_icons/tumblr.png
  141. BIN Resources/images/account_icons/twitpic.png
  142. BIN Resources/images/account_icons/twitter.png
  143. BIN Resources/images/account_icons/typepad.png
  144. BIN Resources/images/account_icons/viddler.png
  145. BIN Resources/images/account_icons/vimeo.png
  146. BIN Resources/images/account_icons/virb.png
  147. BIN Resources/images/account_icons/wakoopa.png
  148. BIN Resources/images/account_icons/webshots.png
  149. BIN Resources/images/account_icons/windows.png
  150. BIN Resources/images/account_icons/wordpress.png
  151. BIN Resources/images/account_icons/xing.png
  152. BIN Resources/images/account_icons/yahoo.png
  153. BIN Resources/images/account_icons/yahoobuzz.png
  154. BIN Resources/images/account_icons/yelp.png
  155. BIN Resources/images/account_icons/youtube.png
  156. BIN Resources/images/account_icons/zanatic.png
  157. BIN Resources/images/account_icons/zootool.png
  158. BIN Resources/images/account_icons_old/BlinklistAccount_128.png
  159. BIN Resources/images/account_icons_old/BlinklistAccount_16.png
  160. BIN Resources/images/account_icons_old/BlinklistAccount_32.png
  161. BIN Resources/images/account_icons_old/BlinklistAccount_64.png
  162. BIN Resources/images/account_icons_old/FacebookAccount_128.png
  163. BIN Resources/images/account_icons_old/FacebookAccount_16.png
  164. BIN Resources/images/account_icons_old/FacebookAccount_32.png
  165. BIN Resources/images/account_icons_old/FacebookAccount_64.png
  166. BIN Resources/images/account_icons_old/FeedburnerAccount_128.png
  167. BIN Resources/images/account_icons_old/FeedburnerAccount_16.png
  168. BIN Resources/images/account_icons_old/FeedburnerAccount_32.png
  169. BIN Resources/images/account_icons_old/FeedburnerAccount_64.png
  170. BIN Resources/images/account_icons_old/FlickrAccount_128.png
  171. BIN Resources/images/account_icons_old/FlickrAccount_16.png
  172. BIN Resources/images/account_icons_old/FlickrAccount_32.png
  173. BIN Resources/images/account_icons_old/FlickrAccount_64.png
  174. BIN Resources/images/account_icons_old/FriendfeedAccount_128.png
  175. BIN Resources/images/account_icons_old/FriendfeedAccount_16.png
  176. BIN Resources/images/account_icons_old/FriendfeedAccount_32.png
  177. BIN Resources/images/account_icons_old/FriendfeedAccount_64.png
  178. BIN Resources/images/account_icons_old/FurlAccount_128.png
  179. BIN Resources/images/account_icons_old/FurlAccount_16.png
  180. BIN Resources/images/account_icons_old/FurlAccount_32.png
  181. BIN Resources/images/account_icons_old/FurlAccount_64.png
  182. BIN Resources/images/account_icons_old/GenericAccount_16.png
  183. BIN Resources/images/account_icons_old/GmailAccount_128.png
  184. BIN Resources/images/account_icons_old/GmailAccount_16.png
  185. BIN Resources/images/account_icons_old/GmailAccount_32.png
  186. BIN Resources/images/account_icons_old/GmailAccount_64.png
  187. BIN Resources/images/account_icons_old/GoogleAccount_128.png
  188. BIN Resources/images/account_icons_old/GoogleAccount_16.png
  189. BIN Resources/images/account_icons_old/GoogleAccount_32.png
  190. BIN Resources/images/account_icons_old/GoogleAccount_64.png
  191. BIN Resources/images/account_icons_old/HeartAccount_128.png
  192. BIN Resources/images/account_icons_old/HeartAccount_16.png
  193. BIN Resources/images/account_icons_old/HeartAccount_32.png
  194. BIN Resources/images/account_icons_old/HeartAccount_64.png
  195. BIN Resources/images/account_icons_old/LastfmAccount_128.png
  196. BIN Resources/images/account_icons_old/LastfmAccount_16.png
  197. BIN Resources/images/account_icons_old/LastfmAccount_32.png
  198. BIN Resources/images/account_icons_old/LastfmAccount_64.png
  199. BIN Resources/images/account_icons_old/LinkedinAccount_128.png
  200. BIN Resources/images/account_icons_old/LinkedinAccount_16.png
  201. BIN Resources/images/account_icons_old/LinkedinAccount_32.png
  202. BIN Resources/images/account_icons_old/LinkedinAccount_64.png
  203. BIN Resources/images/account_icons_old/MagnoliaAccount_128.png
  204. BIN Resources/images/account_icons_old/MagnoliaAccount_16.png
  205. BIN Resources/images/account_icons_old/MagnoliaAccount_32.png
  206. BIN Resources/images/account_icons_old/MagnoliaAccount_64.png
  207. BIN Resources/images/account_icons_old/NewsvineAccount_128.png
  208. BIN Resources/images/account_icons_old/NewsvineAccount_16.png
  209. BIN Resources/images/account_icons_old/NewsvineAccount_32.png
  210. BIN Resources/images/account_icons_old/NewsvineAccount_64.png
  211. BIN Resources/images/account_icons_old/PaypalAccount_128.png
  212. BIN Resources/images/account_icons_old/PaypalAccount_16.png
  213. BIN Resources/images/account_icons_old/PaypalAccount_32.png
  214. BIN Resources/images/account_icons_old/PaypalAccount_64.png
  215. BIN Resources/images/account_icons_old/SkypeAccount_128.png
  216. BIN Resources/images/account_icons_old/SkypeAccount_16.png
  217. BIN Resources/images/account_icons_old/SkypeAccount_32.png
  218. BIN Resources/images/account_icons_old/SkypeAccount_64.png
  219. BIN Resources/images/account_icons_old/SphinnAccount_128.png
  220. BIN Resources/images/account_icons_old/SphinnAccount_16.png
  221. BIN Resources/images/account_icons_old/SphinnAccount_32.png
  222. BIN Resources/images/account_icons_old/SphinnAccount_64.png
  223. BIN Resources/images/account_icons_old/TwitterAccount_128.png
  224. BIN Resources/images/account_icons_old/TwitterAccount_16.png
  225. BIN Resources/images/account_icons_old/TwitterAccount_32.png
  226. BIN Resources/images/account_icons_old/TwitterAccount_64.png
  227. BIN Resources/images/account_icons_old/VimeoAccount_128.png
  228. BIN Resources/images/account_icons_old/VimeoAccount_16.png
  229. BIN Resources/images/account_icons_old/VimeoAccount_32.png
  230. BIN Resources/images/account_icons_old/VimeoAccount_64.png
  231. BIN Resources/images/account_icons_old/YahooAccount_128.png
  232. BIN Resources/images/account_icons_old/YahooAccount_16.png
  233. BIN Resources/images/account_icons_old/YahooAccount_32.png
  234. BIN Resources/images/account_icons_old/YahooAccount_64.png
  235. BIN Resources/images/account_icons_old/YoutubeAccount_128.png
  236. BIN Resources/images/account_icons_old/YoutubeAccount_16.png
  237. BIN Resources/images/account_icons_old/YoutubeAccount_32.png
  238. BIN Resources/images/account_icons_old/YoutubeAccount_64.png
  239. +0 −2 Resources/test.coffee
  240. BIN gowalla.png
@@ -39,5 +39,3 @@ codesTab = Titanium.UI.createTab({
root.tabGroup.addTab(tab) for tab in [codeReaderTab, accountsTab, codesTab]
root.tabGroup.setActiveTab(accountsTab)
root.tabGroup.open({transition:Titanium.UI.iPhone.AnimationStyle.FLIP_FROM_LEFT})
-
-Ti.include('test.js')

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -2,6 +2,7 @@ Ti.include("/app/views/accounts/authorization_web_view_window.js")
class OAuthorizationController extends Citrus.Controller
constructor: (onload, onerror) ->
+ d("Creating window")
@window = new Citrus.AuthorizationWebViewWindow(this)
@window.addEventListener("load", onload)
@window.addEventListener("destroy", onerror)

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -7,12 +7,11 @@ class SplashController extends Citrus.Controller
@window = new Citrus.SplashWindow(this)
root.tabGroup.activeTab.open @window.win, {animated:true}
- this.tryToShow(false)
+ this.tryToShow()
- tryToShow: (showLoading) ->
+ tryToShow: () ->
d("Trying to show "+@codeData)
- showLoading ?= true
- @window.showLoading() if showLoading
+ @window.showLoading()
Citrus.Splash.newFromDecodedData(@codeData, (splash) =>
d("Found a splash in the decoded data, with shortcode "+splash.shortcode)

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -30,5 +30,5 @@ Citrus.registerAccount = (account_klass) ->
Ti.include("/app/models/accounts/twitter/twitter_account.js")
Ti.include("/app/models/accounts/facebook/facebook_account.js")
Ti.include("/app/models/accounts/google/google_account.js")
-#Ti.include("/app/models/accounts/foursquare/foursquare_account.js")
Ti.include("/app/models/accounts/linkedin/linkedin_account.js")
+Ti.include("/app/models/accounts/foursquare/foursquare_account.js")

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -51,9 +51,11 @@ class TwitterAccount extends Citrus.Account
oAuthAuthorize: () ->
controller = {}
d("Starting OAuth Twitter Authorization")
+
this.addEventListener "authorization:error", (e) =>
- controller.destroy()
+ controller.destroy() if controller.destroy?
+ d("Setting up callbacks")
errorFindingPin = (e) =>
Ti.API.error("Error finding pin in authorize UI. Canceling process.")
this.fireEvent("authorization:error", e)
@@ -85,6 +87,7 @@ class TwitterAccount extends Citrus.Account
Ti.API.debug("Pin not found in loaded XML")
# Create controller to manage the PIN getting web view
+ d("Creating controller")
controller = new Citrus.OAuthorizationController(findPin, errorFindingPin)
tokenSuccess = (token) =>

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -33,7 +33,7 @@ class AuthorizationWebViewWindow extends Citrus.GenericWindow
right: 12
width: 20
}
-
+ d("Opening window")
@win.open()
this.authorizationWebView = Ti.UI.createWebView({
@@ -42,15 +42,17 @@ class AuthorizationWebViewWindow extends Citrus.GenericWindow
@authorizationWebView.addEventListener('load', (e) => this.fireEvent("load", e))
@authorizationView.add(@authorizationWebView)
- @win.add(@authorizationView)
@loadCallback = => this.destroyAuthorizeUI()
@closeLabel.addEventListener('click', @loadCallback)
@authorizationView.add(@closeLabel)
+ @win.add(@authorizationView)
+
animation = Ti.UI.createAnimation()
animation.transform = Ti.UI.create2DMatrix()
animation.duration = 500
+ d("Animating auth web view")
@authorizationView.animate(animation)
loadURL: (url) ->
@@ -71,4 +73,4 @@ class AuthorizationWebViewWindow extends Citrus.GenericWindow
Ti.API.debug('Cannot destroy the authorize UI. Ignoring. Error:')
Ti.API.error(ex)
-Citrus.AuthorizationWebViewWindow = AuthorizationWebViewWindow
+Citrus.AuthorizationWebViewWindow = AuthorizationWebViewWindow

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -17,7 +17,7 @@ class TwitterAccountTableViewRow extends Citrus.AccountTableViewRow
realName = Ti.UI.createLabel {
color:'#333'
text: @account.name
- font:{fontSize:15, fontWeight:'bold'}
+ font:{fontSize:15}
top:30
left:70
height:'auto'

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -1,3 +1,7 @@
class CodesWindow extends Citrus.PlaceholderWindow
+ constructor: () ->
+ super
+ @loading = new Citrus.ModalLoadingView("Loading info...", this)
+ @loading.show(@win)
-Citrus.CodesWindow = CodesWindow
+Citrus.CodesWindow = CodesWindow

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -0,0 +1,62 @@
+class ModalLoadingView extends Citrus.GenericWindow
+ constructor: (text, controller) ->
+ super(controller)
+
+ @view = Titanium.UI.createView
+ height: 480
+ width: 320
+ top: 0
+ left: 0
+
+ bg = Titanium.UI.createView
+ height: 480
+ width: 320
+ top: 0
+ left: 0
+ opacity: 0.4
+ # TODO: background gradient to get the nice blurring
+ backgroundColor: 'black'
+
+ box = Titanium.UI.createView
+ height: 150
+ width: 150
+ top: 100
+ backgroundColor: 'black'
+ opacity: 0.75
+ borderRadius: 5
+
+ indicator = Titanium.UI.createActivityIndicator
+ top: 130
+ left: 140
+ width: 40
+ height: 40
+ style: Titanium.UI.iPhone.ActivityIndicatorStyle.BIG
+
+ message = Titanium.UI.createLabel
+ top: 190
+ left: 100
+ width: 120
+ height: 'auto'
+ font:
+ fontFamily:'Helvetica Neue'
+ fontSize:15
+ fontWeight:'bold'
+ text: text
+ textAlign: "center"
+ color: 'white'
+
+ @view.add(bg)
+ @view.add(box)
+ @view.add(indicator)
+ @view.add(message)
+ indicator.show()
+
+ show: (window) ->
+ d("Showing loading indicator")
+ window.add(@view)
+
+ hide: (window) ->
+ d("Hiding loading indicator")
+ window.remove(@view)
+
+Citrus.ModalLoadingView = ModalLoadingView

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 11620a6

Please sign in to comment.