Permalink
Browse files

Added some new account icons, a helper for their names, updated the a…

…ccount table view rows to use these, moved the splash info to a header view instead of a row, and made it all look a bit nicer.
  • Loading branch information...
1 parent 952925d commit 77e2d0fdf91536d1b7eebc766f3ea1142d5c3a3e Harry Brundage committed Nov 13, 2010
Showing with 322 additions and 119 deletions.
  1. +2 −0 Resources/app.js
  2. +3 −0 Resources/app/controllers/main.coffee
  3. +1 −0 Resources/app/controllers/main.js
  4. +5 −4 Resources/app/controllers/splash_controller.coffee
  5. +6 −3 Resources/app/controllers/splash_controller.js
  6. +7 −0 Resources/app/helpers/icons_helper.coffee
  7. +11 −0 Resources/app/helpers/icons_helper.js
  8. +1 −1 Resources/app/models/actions/action.coffee
  9. +1 −1 Resources/app/models/actions/action.js
  10. +1 −1 Resources/app/models/actions/foursquare/foursquare_action.coffee
  11. +1 −1 Resources/app/models/actions/foursquare/foursquare_action.js
  12. +1 −0 Resources/app/models/actions/platform/call_action.coffee
  13. +1 −0 Resources/app/models/actions/platform/call_action.js
  14. +2 −2 Resources/app/models/actions/platform/platform_action.coffee
  15. +1 −1 Resources/app/models/actions/platform/platform_action.js
  16. +1 −0 Resources/app/models/actions/platform/visit_link_action.coffee
  17. +1 −0 Resources/app/models/actions/platform/visit_link_action.js
  18. +1 −1 Resources/app/models/actions/twitter/twitter_action.coffee
  19. +1 −1 Resources/app/models/actions/twitter/twitter_action.js
  20. +1 −1 Resources/app/views/accounts/account_table_view_row.coffee
  21. +1 −1 Resources/app/views/accounts/account_table_view_row.js
  22. +1 −1 Resources/app/views/accounts/new_account_select_window.coffee
  23. +1 −1 Resources/app/views/accounts/new_account_select_window.js
  24. +6 −0 Resources/app/views/splash/actions/account_action_table_view_row.coffee
  25. +20 −0 Resources/app/views/splash/actions/account_action_table_view_row.js
  26. +14 −9 Resources/app/views/splash/actions/action_table_view_row.coffee
  27. +15 −10 Resources/app/views/splash/actions/action_table_view_row.js
  28. +0 −2 Resources/app/views/splash/actions/facebook_action_table_view_row.coffee
  29. +0 −3 Resources/app/views/splash/actions/facebook_action_table_view_row.js
  30. +20 −0 Resources/app/views/splash/actions/foursquare_action_table_view_row.js
  31. +2 −1 Resources/app/views/splash/actions/paypal_action_table_view_row.coffee
  32. +3 −0 Resources/app/views/splash/actions/paypal_action_table_view_row.js
  33. +6 −0 Resources/app/views/splash/actions/platform_action_table_view_row.coffee
  34. +20 −0 Resources/app/views/splash/actions/platform_action_table_view_row.js
  35. +0 −8 Resources/app/views/splash/actions/twitter_action_table_view_row.coffee
  36. +0 −3 Resources/app/views/splash/actions/twitter_action_table_view_row.js
  37. +16 −14 Resources/app/views/splash/{splash_info_table_view_row.coffee → splash_info_header_view.coffee}
  38. +64 −0 Resources/app/views/splash/splash_info_header_view.js
  39. +39 −26 Resources/app/views/splash/splash_window.coffee
  40. +45 −23 Resources/app/views/splash/splash_window.js
  41. BIN Resources/images/account_icons/audioboo.png
  42. BIN Resources/images/account_icons/bebo.png
  43. BIN Resources/images/account_icons/behance.png
  44. BIN Resources/images/account_icons/blogger.png
  45. BIN Resources/images/account_icons/buzz.png
  46. BIN Resources/images/account_icons/creativecommons.png
  47. BIN Resources/images/account_icons/dailybooth.png
  48. BIN Resources/images/account_icons/delicious.png
  49. BIN Resources/images/account_icons/designfloat.png
  50. BIN Resources/images/account_icons/deviantart.png
  51. BIN Resources/images/account_icons/digg.png
  52. BIN Resources/images/account_icons/dopplr.png
  53. BIN Resources/images/account_icons/dribbble.png
  54. BIN Resources/images/account_icons/email.png
  55. BIN Resources/images/account_icons/ember.png
  56. BIN Resources/images/account_icons/facebook.png
  57. BIN Resources/images/account_icons/flickr.png
  58. BIN Resources/images/account_icons/forrst.png
  59. BIN Resources/images/account_icons/foursquare.png
  60. BIN Resources/images/account_icons/friendfeed.png
  61. BIN Resources/images/account_icons/google.png
  62. BIN Resources/images/account_icons/gowalla copy.png
  63. BIN Resources/images/account_icons/grooveshark.png
  64. BIN Resources/images/account_icons/hyves.png
  65. BIN Resources/images/account_icons/lastfm.png
  66. BIN Resources/images/account_icons/linkedin.png
  67. BIN Resources/images/account_icons/livejournal.png
  68. BIN Resources/images/account_icons/lockerz.png
  69. BIN Resources/images/account_icons/megavideo.png
  70. BIN Resources/images/account_icons/myspace.png
  71. BIN Resources/images/account_icons/piano.png
  72. BIN Resources/images/account_icons/playfire.png
  73. BIN Resources/images/account_icons/playstation.png
  74. BIN Resources/images/account_icons/reddit.png
  75. BIN Resources/images/account_icons/rss.png
  76. BIN Resources/images/account_icons/skype.png
  77. BIN Resources/images/account_icons/socialvibe.png
  78. BIN Resources/images/account_icons/soundcloud.png
  79. BIN Resources/images/account_icons/spotify.png
  80. BIN Resources/images/account_icons/steam.png
  81. BIN Resources/images/account_icons/stumbleupon.png
  82. BIN Resources/images/account_icons/technorati.png
  83. BIN Resources/images/account_icons/tumblr.png
  84. BIN Resources/images/account_icons/twitpic.png
  85. BIN Resources/images/account_icons/twitter.png
  86. BIN Resources/images/account_icons/typepad.png
  87. BIN Resources/images/account_icons/vimeo.png
  88. BIN Resources/images/account_icons/wakoopa.png
  89. BIN Resources/images/account_icons/wordpress.png
  90. BIN Resources/images/account_icons/xing.png
  91. BIN Resources/images/account_icons/yahoo.png
  92. BIN Resources/images/account_icons/youtube.png
  93. 0 Resources/images/{account_icons → account_icons_old}/BlinklistAccount_128.png
  94. 0 Resources/images/{account_icons → account_icons_old}/BlinklistAccount_16.png
  95. 0 Resources/images/{account_icons → account_icons_old}/BlinklistAccount_32.png
  96. 0 Resources/images/{account_icons → account_icons_old}/BlinklistAccount_64.png
  97. 0 Resources/images/{account_icons → account_icons_old}/FacebookAccount_128.png
  98. 0 Resources/images/{account_icons → account_icons_old}/FacebookAccount_16.png
  99. 0 Resources/images/{account_icons → account_icons_old}/FacebookAccount_32.png
  100. 0 Resources/images/{account_icons → account_icons_old}/FacebookAccount_64.png
  101. 0 Resources/images/{account_icons → account_icons_old}/FeedburnerAccount_128.png
  102. 0 Resources/images/{account_icons → account_icons_old}/FeedburnerAccount_16.png
  103. 0 Resources/images/{account_icons → account_icons_old}/FeedburnerAccount_32.png
  104. 0 Resources/images/{account_icons → account_icons_old}/FeedburnerAccount_64.png
  105. 0 Resources/images/{account_icons → account_icons_old}/FlickrAccount_128.png
  106. 0 Resources/images/{account_icons → account_icons_old}/FlickrAccount_16.png
  107. 0 Resources/images/{account_icons → account_icons_old}/FlickrAccount_32.png
  108. 0 Resources/images/{account_icons → account_icons_old}/FlickrAccount_64.png
  109. 0 Resources/images/{account_icons → account_icons_old}/FriendfeedAccount_128.png
  110. 0 Resources/images/{account_icons → account_icons_old}/FriendfeedAccount_16.png
  111. 0 Resources/images/{account_icons → account_icons_old}/FriendfeedAccount_32.png
  112. 0 Resources/images/{account_icons → account_icons_old}/FriendfeedAccount_64.png
  113. 0 Resources/images/{account_icons → account_icons_old}/FurlAccount_128.png
  114. 0 Resources/images/{account_icons → account_icons_old}/FurlAccount_16.png
  115. 0 Resources/images/{account_icons → account_icons_old}/FurlAccount_32.png
  116. 0 Resources/images/{account_icons → account_icons_old}/FurlAccount_64.png
  117. 0 Resources/images/{account_icons → account_icons_old}/GenericAccount_16.png
  118. 0 Resources/images/{account_icons → account_icons_old}/GmailAccount_128.png
  119. 0 Resources/images/{account_icons → account_icons_old}/GmailAccount_16.png
  120. 0 Resources/images/{account_icons → account_icons_old}/GmailAccount_32.png
  121. 0 Resources/images/{account_icons → account_icons_old}/GmailAccount_64.png
  122. 0 Resources/images/{account_icons → account_icons_old}/GoogleAccount_128.png
  123. 0 Resources/images/{account_icons → account_icons_old}/GoogleAccount_16.png
  124. 0 Resources/images/{account_icons → account_icons_old}/GoogleAccount_32.png
  125. 0 Resources/images/{account_icons → account_icons_old}/GoogleAccount_64.png
  126. 0 Resources/images/{account_icons → account_icons_old}/HeartAccount_128.png
  127. 0 Resources/images/{account_icons → account_icons_old}/HeartAccount_16.png
  128. 0 Resources/images/{account_icons → account_icons_old}/HeartAccount_32.png
  129. 0 Resources/images/{account_icons → account_icons_old}/HeartAccount_64.png
  130. 0 Resources/images/{account_icons → account_icons_old}/LastfmAccount_128.png
  131. 0 Resources/images/{account_icons → account_icons_old}/LastfmAccount_16.png
  132. 0 Resources/images/{account_icons → account_icons_old}/LastfmAccount_32.png
  133. 0 Resources/images/{account_icons → account_icons_old}/LastfmAccount_64.png
  134. 0 Resources/images/{account_icons → account_icons_old}/LinkedinAccount_128.png
  135. 0 Resources/images/{account_icons → account_icons_old}/LinkedinAccount_16.png
  136. 0 Resources/images/{account_icons → account_icons_old}/LinkedinAccount_32.png
  137. 0 Resources/images/{account_icons → account_icons_old}/LinkedinAccount_64.png
  138. 0 Resources/images/{account_icons → account_icons_old}/MagnoliaAccount_128.png
  139. 0 Resources/images/{account_icons → account_icons_old}/MagnoliaAccount_16.png
  140. 0 Resources/images/{account_icons → account_icons_old}/MagnoliaAccount_32.png
  141. 0 Resources/images/{account_icons → account_icons_old}/MagnoliaAccount_64.png
  142. 0 Resources/images/{account_icons → account_icons_old}/NewsvineAccount_128.png
  143. 0 Resources/images/{account_icons → account_icons_old}/NewsvineAccount_16.png
  144. 0 Resources/images/{account_icons → account_icons_old}/NewsvineAccount_32.png
  145. 0 Resources/images/{account_icons → account_icons_old}/NewsvineAccount_64.png
  146. 0 Resources/images/{account_icons → account_icons_old}/PaypalAccount_128.png
  147. 0 Resources/images/{account_icons → account_icons_old}/PaypalAccount_16.png
  148. 0 Resources/images/{account_icons → account_icons_old}/PaypalAccount_32.png
  149. 0 Resources/images/{account_icons → account_icons_old}/PaypalAccount_64.png
  150. 0 Resources/images/{account_icons → account_icons_old}/SkypeAccount_128.png
  151. 0 Resources/images/{account_icons → account_icons_old}/SkypeAccount_16.png
  152. 0 Resources/images/{account_icons → account_icons_old}/SkypeAccount_32.png
  153. 0 Resources/images/{account_icons → account_icons_old}/SkypeAccount_64.png
  154. 0 Resources/images/{account_icons → account_icons_old}/SphinnAccount_128.png
  155. 0 Resources/images/{account_icons → account_icons_old}/SphinnAccount_16.png
  156. 0 Resources/images/{account_icons → account_icons_old}/SphinnAccount_32.png
  157. 0 Resources/images/{account_icons → account_icons_old}/SphinnAccount_64.png
  158. 0 Resources/images/{account_icons → account_icons_old}/TwitterAccount_128.png
  159. 0 Resources/images/{account_icons → account_icons_old}/TwitterAccount_16.png
  160. 0 Resources/images/{account_icons → account_icons_old}/TwitterAccount_32.png
  161. 0 Resources/images/{account_icons → account_icons_old}/TwitterAccount_64.png
  162. 0 Resources/images/{account_icons → account_icons_old}/VimeoAccount_128.png
  163. 0 Resources/images/{account_icons → account_icons_old}/VimeoAccount_16.png
  164. 0 Resources/images/{account_icons → account_icons_old}/VimeoAccount_32.png
  165. 0 Resources/images/{account_icons → account_icons_old}/VimeoAccount_64.png
  166. 0 Resources/images/{account_icons → account_icons_old}/YahooAccount_128.png
  167. 0 Resources/images/{account_icons → account_icons_old}/YahooAccount_16.png
  168. 0 Resources/images/{account_icons → account_icons_old}/YahooAccount_32.png
  169. 0 Resources/images/{account_icons → account_icons_old}/YahooAccount_64.png
  170. 0 Resources/images/{account_icons → account_icons_old}/YoutubeAccount_128.png
  171. 0 Resources/images/{account_icons → account_icons_old}/YoutubeAccount_16.png
  172. 0 Resources/images/{account_icons → account_icons_old}/YoutubeAccount_32.png
  173. 0 Resources/images/{account_icons → account_icons_old}/YoutubeAccount_64.png
  174. BIN gowalla.png
View
2 Resources/app.js
@@ -74,6 +74,8 @@ Ti.include('/vendor/spazcore/platforms/Titanium/helpers/sys.js');
// SpazCore setup
jQuery = Titanium.Network;
sc.dumplevel = 999;
+// Helpers
+Ti.include('app/helpers/icons_helper.js');
// Citrus Specific Abstractions
Ti.include('app/models/object.js');
View
3 Resources/app/controllers/main.coffee
@@ -1,3 +1,6 @@
+# Helpers
+Ti.include('app/helpers/icons_helper.js')
+
# Main controllers
Ti.include('app/controllers/accounts_controller.js')
Ti.include('app/controllers/code_reader_controller.js')
View
1 Resources/app/controllers/main.js
@@ -1,5 +1,6 @@
(function() {
var _i, _len, _ref, accountsTab, codeReaderTab, codesTab, tab;
+ Ti.include('app/helpers/icons_helper.js');
Ti.include('app/controllers/accounts_controller.js');
Ti.include('app/controllers/code_reader_controller.js');
Ti.include('app/views/codes/codes_window.js');
View
9 Resources/app/controllers/splash_controller.coffee
@@ -5,13 +5,14 @@ class SplashController extends Citrus.Controller
@store = accountStore
@codeData = codeData
@window = new Citrus.SplashWindow(this)
- root.tabGroup.activeTab.open @window.win, {animated:true}
- this.tryToShow()
+ root.tabGroup.activeTab.open @window.win, {animated:true}
+ this.tryToShow(false)
- tryToShow: () ->
+ tryToShow: (showLoading) ->
d("Trying to show "+@codeData)
- @window.showLoading()
+ showLoading ?= true
+ @window.showLoading() if showLoading
Citrus.Splash.newFromDecodedData(@codeData, (splash) =>
d("Found a splash in the decoded data, with shortcode "+splash.shortcode)
View
9 Resources/app/controllers/splash_controller.js
@@ -21,13 +21,16 @@
root.tabGroup.activeTab.open(this.window.win, {
animated: true
});
- this.tryToShow();
+ this.tryToShow(false);
return this;
};
__extends(SplashController, Citrus.Controller);
- SplashController.prototype.tryToShow = function() {
+ SplashController.prototype.tryToShow = function(showLoading) {
d("Trying to show " + this.codeData);
- this.window.showLoading();
+ showLoading = (typeof showLoading !== "undefined" && showLoading !== null) ? showLoading : true;
+ if (showLoading) {
+ this.window.showLoading();
+ }
return Citrus.Splash.newFromDecodedData(this.codeData, __bind(function(splash) {
d("Found a splash in the decoded data, with shortcode " + splash.shortcode);
this.splash = splash;
View
7 Resources/app/helpers/icons_helper.coffee
@@ -0,0 +1,7 @@
+_.extend Citrus, {
+ getIconPath: (name) ->
+ name = (name || "Generic").toLowerCase().replace("account", "").replace("action", "")
+ path = "images/account_icons/"+name+".png"
+ d(path)
+ return path
+}
View
11 Resources/app/helpers/icons_helper.js
@@ -0,0 +1,11 @@
+(function() {
+ _.extend(Citrus, {
+ getIconPath: function(name) {
+ var path;
+ name = (name || "Generic").toLowerCase().replace("account", "").replace("action", "");
+ path = "images/account_icons/" + name + ".png";
+ d(path);
+ return path;
+ }
+ });
+}).call(this);
View
2 Resources/app/models/actions/action.coffee
@@ -12,7 +12,7 @@ class Action extends Citrus.Object
@declares: []
@alwaysDeclared: ["actionText"]
valid: false
- icon: "images/account_icons/GenericAccount_16.png"
+ icon: Citrus.getIconPath("generic")
actionText: ""
constructor: (attributes) ->
View
2 Resources/app/models/actions/action.js
@@ -41,7 +41,7 @@
Action.declares = [];
Action.alwaysDeclared = ["actionText"];
Action.prototype.valid = false;
- Action.prototype.icon = "images/account_icons/GenericAccount_16.png";
+ Action.prototype.icon = Citrus.getIconPath("generic");
Action.prototype.actionText = "";
Action.prototype.readyToRun = function() {
return true;
View
2 Resources/app/models/actions/foursquare/foursquare_action.coffee
@@ -3,7 +3,7 @@ class FoursquareAction extends Citrus.AccountBasedAction
type: "FoursquareAction"
buttonText: "Check In"
accountType: "FoursquareAccount"
- tableViewRow: "FoursquareActionTableViewRow"
+ tableViewRow: "AccountActionTableViewRow"
readyToRun: (account) ->
unless account.isAuthorized()
View
2 Resources/app/models/actions/foursquare/foursquare_action.js
@@ -16,7 +16,7 @@
FoursquareAction.prototype.type = "FoursquareAction";
FoursquareAction.prototype.buttonText = "Check In";
FoursquareAction.prototype.accountType = "FoursquareAccount";
- FoursquareAction.prototype.tableViewRow = "FoursquareActionTableViewRow";
+ FoursquareAction.prototype.tableViewRow = "AccountActionTableViewRow";
FoursquareAction.prototype.readyToRun = function(account) {
if (!(account.isAuthorized())) {
Ti.API.debug("Trying to run action on non authorized account!");
View
1 Resources/app/models/actions/platform/call_action.coffee
@@ -3,6 +3,7 @@ class CallAction extends Citrus.PlatformAction
type: "PlatformCallAction"
buttonText: "Call"
+ iconName: "phone"
action: (success, failure) ->
Titanium.Platform.openURL("tel:"+@phoneNumber)
View
1 Resources/app/models/actions/platform/call_action.js
@@ -15,6 +15,7 @@
CallAction.declares = ["phoneNumber"];
CallAction.prototype.type = "PlatformCallAction";
CallAction.prototype.buttonText = "Call";
+ CallAction.prototype.iconName = "phone";
CallAction.prototype.action = function(success, failure) {
return Titanium.Platform.openURL("tel:" + this.phoneNumber);
};
View
4 Resources/app/models/actions/platform/platform_action.coffee
@@ -2,8 +2,8 @@ class PlatformAction extends Citrus.AccountlessAction
@declares: []
type: "PlatformAction"
buttonText: "PlatformAction"
- tableViewRow: "ActionTableViewRow"
-
+ tableViewRow: "PlatformActionTableViewRow"
+
readyToRun: () ->
return true
View
2 Resources/app/models/actions/platform/platform_action.js
@@ -15,7 +15,7 @@
PlatformAction.declares = [];
PlatformAction.prototype.type = "PlatformAction";
PlatformAction.prototype.buttonText = "PlatformAction";
- PlatformAction.prototype.tableViewRow = "ActionTableViewRow";
+ PlatformAction.prototype.tableViewRow = "PlatformActionTableViewRow";
PlatformAction.prototype.readyToRun = function() {
return true;
};
View
1 Resources/app/models/actions/platform/visit_link_action.coffee
@@ -3,6 +3,7 @@ class VisitLinkAction extends Citrus.PlatformAction
type: "PlatformVisitLinkAction"
buttonText: "Safari"
+ iconName: "safari"
action: (success, failure) ->
Titanium.Platform.openURL(@url)
View
1 Resources/app/models/actions/platform/visit_link_action.js
@@ -15,6 +15,7 @@
VisitLinkAction.declares = ["url"];
VisitLinkAction.prototype.type = "PlatformVisitLinkAction";
VisitLinkAction.prototype.buttonText = "Safari";
+ VisitLinkAction.prototype.iconName = "safari";
VisitLinkAction.prototype.action = function(success, failure) {
return Titanium.Platform.openURL(this.url);
};
View
2 Resources/app/models/actions/twitter/twitter_action.coffee
@@ -3,7 +3,7 @@ class TwitterAction extends Citrus.AccountBasedAction
type: "TwitterAction"
buttonText: "TwitterAction"
accountType: "TwitterAccount"
- tableViewRow: "TwitterActionTableViewRow"
+ tableViewRow: "AccountActionTableViewRow"
readyToRun: (account) ->
unless account.isAuthorized()
View
2 Resources/app/models/actions/twitter/twitter_action.js
@@ -16,7 +16,7 @@
TwitterAction.prototype.type = "TwitterAction";
TwitterAction.prototype.buttonText = "TwitterAction";
TwitterAction.prototype.accountType = "TwitterAccount";
- TwitterAction.prototype.tableViewRow = "TwitterActionTableViewRow";
+ TwitterAction.prototype.tableViewRow = "AccountActionTableViewRow";
TwitterAction.prototype.readyToRun = function(account) {
if (!(account.isAuthorized())) {
Ti.API.debug("Trying to run action on non authorized account!");
View
2 Resources/app/views/accounts/account_table_view_row.coffee
@@ -10,7 +10,7 @@ class AccountTableViewRow extends Citrus.Object
row.wrapper = this
# Add image
photo = Ti.UI.createView {
- backgroundImage: 'images/account_icons/'+@account.type+'_64.png'
+ backgroundImage: Citrus.getIconPath(@account.type)
top:10
left:15
height: 40
View
2 Resources/app/views/accounts/account_table_view_row.js
@@ -21,7 +21,7 @@
row.height = 60;
row.wrapper = this;
photo = Ti.UI.createView({
- backgroundImage: 'images/account_icons/' + this.account.type + '_64.png',
+ backgroundImage: Citrus.getIconPath(this.account.type),
top: 10,
left: 15,
height: 40,
View
2 Resources/app/views/accounts/new_account_select_window.coffee
@@ -11,7 +11,7 @@ class NewAccountSelectWindow extends Citrus.GenericWindow
data = for klass in Citrus.AccountTypes
name = klass.prototype.type
item = Titanium.UI.createDashboardItem {
- image: "images/account_icons/"+name+'_64.png'
+ image: Citrus.getIconPath(name)
type: name
label: name.replace("Account", "")
}
View
2 Resources/app/views/accounts/new_account_select_window.js
@@ -25,7 +25,7 @@
_result.push((function() {
name = klass.prototype.type;
item = Titanium.UI.createDashboardItem({
- image: "images/account_icons/" + name + '_64.png',
+ image: Citrus.getIconPath(name),
type: name,
label: name.replace("Account", "")
});
View
6 Resources/app/views/splash/actions/account_action_table_view_row.coffee
@@ -0,0 +1,6 @@
+class AccountActionTableViewRow extends Citrus.ActionRows.ActionTableViewRow
+ type: "AccountActionTableViewRow"
+ buttonText: ->
+ @action.buttonText
+
+Citrus.registerActionViewRow AccountActionTableViewRow
View
20 Resources/app/views/splash/actions/account_action_table_view_row.js
@@ -0,0 +1,20 @@
+(function() {
+ var AccountActionTableViewRow;
+ var __extends = function(child, parent) {
+ var ctor = function(){};
+ ctor.prototype = parent.prototype;
+ child.prototype = new ctor();
+ child.prototype.constructor = child;
+ if (typeof parent.extended === "function") parent.extended(child);
+ child.__super__ = parent.prototype;
+ };
+ AccountActionTableViewRow = function() {
+ return Citrus.ActionRows.ActionTableViewRow.apply(this, arguments);
+ };
+ __extends(AccountActionTableViewRow, Citrus.ActionRows.ActionTableViewRow);
+ AccountActionTableViewRow.prototype.type = "AccountActionTableViewRow";
+ AccountActionTableViewRow.prototype.buttonText = function() {
+ return this.action.buttonText;
+ };
+ Citrus.registerActionViewRow(AccountActionTableViewRow);
+}).call(this);
View
23 Resources/app/views/splash/actions/action_table_view_row.coffee
@@ -38,10 +38,10 @@ class ActionTableViewRow extends Citrus.Object
# the style is the spinner type (which is proxied by a different object in titanium which
# barfs when it gets these option)
opts = {
- right:10
+ right:5
color: "#000"
- width: 80
- height: 20
+ width: this.buttonWidth()
+ height: 25
}
unless shittyTI
opts.style = style if style?
@@ -77,16 +77,18 @@ class ActionTableViewRow extends Citrus.Object
color:'#000'
text: this.text()
font:{fontSize:16, fontWeight:'bold'}
+ minimumFontSize: 12
+ width: (320 - 30 - this.textOffset() - this.buttonWidth())
}
@row.add(text)
displayPhoto: ->
photo = Ti.UI.createView {
backgroundImage: this.icon()
- top: 4
- left: 4
- height: 32
- width: 32
+ top: 5
+ left: 5
+ height: 30
+ width: 30
}
@row.add(photo)
@@ -115,7 +117,7 @@ class ActionTableViewRow extends Citrus.Object
d("Error displayed")
icon: ->
- return "images/account_icons/GenericAccount_32.png"
+ return Citrus.getIconPath(@action.accountType)
buttonText: ->
return "Run"
@@ -124,7 +126,10 @@ class ActionTableViewRow extends Citrus.Object
return @action.actionText
textOffset: ->
- return 40
+ return 42
+ buttonWidth: ->
+ return 80
+
Citrus.ActionRows = {}
Citrus.registerActionViewRow = (klass) ->
Citrus.ActionRows[klass::type] = klass
View
25 Resources/app/views/splash/actions/action_table_view_row.js
@@ -49,10 +49,10 @@
shittyTI = style === Titanium.UI.iPhone.SystemButton.SPINNER;
if (!(typeof (_ref = this.buttons[key]) !== "undefined" && _ref !== null)) {
opts = {
- right: 10,
+ right: 5,
color: "#000",
- width: 80,
- height: 20
+ width: this.buttonWidth(),
+ height: 25
};
if (!(shittyTI)) {
if (typeof style !== "undefined" && style !== null) {
@@ -94,18 +94,20 @@
font: {
fontSize: 16,
fontWeight: 'bold'
- }
+ },
+ minimumFontSize: 12,
+ width: (320 - 30 - this.textOffset() - this.buttonWidth())
});
return this.row.add(text);
};
ActionTableViewRow.prototype.displayPhoto = function() {
var photo;
photo = Ti.UI.createView({
backgroundImage: this.icon(),
- top: 4,
- left: 4,
- height: 32,
- width: 32
+ top: 5,
+ left: 5,
+ height: 30,
+ width: 30
});
return this.row.add(photo);
};
@@ -131,7 +133,7 @@
return d("Error displayed");
};
ActionTableViewRow.prototype.icon = function() {
- return "images/account_icons/GenericAccount_32.png";
+ return Citrus.getIconPath(this.action.accountType);
};
ActionTableViewRow.prototype.buttonText = function() {
return "Run";
@@ -140,7 +142,10 @@
return this.action.actionText;
};
ActionTableViewRow.prototype.textOffset = function() {
- return 40;
+ return 42;
+ };
+ ActionTableViewRow.prototype.buttonWidth = function() {
+ return 80;
};
Citrus.ActionRows = {};
Citrus.registerActionViewRow = function(klass) {
View
2 Resources/app/views/splash/actions/facebook_action_table_view_row.coffee
@@ -1,7 +1,5 @@
class FacebookActionTableViewRow extends Citrus.ActionRows.ActionTableViewRow
type: "FacebookActionTableViewRow"
- icon: ->
- "images/account_icons/FacebookAccount_32.png"
buttonText: ->
@action.buttonText
View
3 Resources/app/views/splash/actions/facebook_action_table_view_row.js
@@ -13,9 +13,6 @@
};
__extends(FacebookActionTableViewRow, Citrus.ActionRows.ActionTableViewRow);
FacebookActionTableViewRow.prototype.type = "FacebookActionTableViewRow";
- FacebookActionTableViewRow.prototype.icon = function() {
- return "images/account_icons/FacebookAccount_32.png";
- };
FacebookActionTableViewRow.prototype.buttonText = function() {
return this.action.buttonText;
};
View
20 Resources/app/views/splash/actions/foursquare_action_table_view_row.js
@@ -0,0 +1,20 @@
+(function() {
+ var TwitterActionTableViewRow;
+ var __extends = function(child, parent) {
+ var ctor = function(){};
+ ctor.prototype = parent.prototype;
+ child.prototype = new ctor();
+ child.prototype.constructor = child;
+ if (typeof parent.extended === "function") parent.extended(child);
+ child.__super__ = parent.prototype;
+ };
+ TwitterActionTableViewRow = function() {
+ return Citrus.ActionRows.ActionTableViewRow.apply(this, arguments);
+ };
+ __extends(TwitterActionTableViewRow, Citrus.ActionRows.ActionTableViewRow);
+ TwitterActionTableViewRow.prototype.type = "TwitterActionTableViewRow";
+ TwitterActionTableViewRow.prototype.buttonText = function() {
+ return this.action.buttonText;
+ };
+ Citrus.registerActionViewRow(TwitterActionTableViewRow);
+}).call(this);
View
3 Resources/app/views/splash/actions/paypal_action_table_view_row.coffee
@@ -7,7 +7,8 @@ class PaypalActionTableViewRow extends Citrus.ActionRows.ActionTableViewRow
textOffset: () ->
return 5
-
+ buttonWidth: () ->
+ return 152
displayPhoto: ->
return true
View
3 Resources/app/views/splash/actions/paypal_action_table_view_row.js
@@ -18,6 +18,9 @@
PaypalActionTableViewRow.prototype.textOffset = function() {
return 5;
};
+ PaypalActionTableViewRow.prototype.buttonWidth = function() {
+ return 152;
+ };
PaypalActionTableViewRow.prototype.displayPhoto = function() {
return true;
};
View
6 Resources/app/views/splash/actions/platform_action_table_view_row.coffee
@@ -0,0 +1,6 @@
+class PlatformActionTableViewRow extends Citrus.ActionRows.ActionTableViewRow
+ type: "PlatformActionTableViewRow"
+ icon: () ->
+ Citrus.getIconPath(@action.iconName)
+
+Citrus.registerActionViewRow PlatformActionTableViewRow
View
20 Resources/app/views/splash/actions/platform_action_table_view_row.js
@@ -0,0 +1,20 @@
+(function() {
+ var PlatformActionTableViewRow;
+ var __extends = function(child, parent) {
+ var ctor = function(){};
+ ctor.prototype = parent.prototype;
+ child.prototype = new ctor();
+ child.prototype.constructor = child;
+ if (typeof parent.extended === "function") parent.extended(child);
+ child.__super__ = parent.prototype;
+ };
+ PlatformActionTableViewRow = function() {
+ return Citrus.ActionRows.ActionTableViewRow.apply(this, arguments);
+ };
+ __extends(PlatformActionTableViewRow, Citrus.ActionRows.ActionTableViewRow);
+ PlatformActionTableViewRow.prototype.type = "PlatformActionTableViewRow";
+ PlatformActionTableViewRow.prototype.icon = function() {
+ return Citrus.getIconPath(this.action.iconName);
+ };
+ Citrus.registerActionViewRow(PlatformActionTableViewRow);
+}).call(this);
View
8 Resources/app/views/splash/actions/twitter_action_table_view_row.coffee
@@ -1,8 +0,0 @@
-class TwitterActionTableViewRow extends Citrus.ActionRows.ActionTableViewRow
- type: "TwitterActionTableViewRow"
- icon: ->
- "images/account_icons/TwitterAccount_32.png"
- buttonText: ->
- @action.buttonText
-
-Citrus.registerActionViewRow TwitterActionTableViewRow
View
3 Resources/app/views/splash/actions/twitter_action_table_view_row.js
@@ -13,9 +13,6 @@
};
__extends(TwitterActionTableViewRow, Citrus.ActionRows.ActionTableViewRow);
TwitterActionTableViewRow.prototype.type = "TwitterActionTableViewRow";
- TwitterActionTableViewRow.prototype.icon = function() {
- return "images/account_icons/TwitterAccount_32.png";
- };
TwitterActionTableViewRow.prototype.buttonText = function() {
return this.action.buttonText;
};
View
30 .../splash/splash_info_table_view_row.coffee → ...ews/splash/splash_info_header_view.coffee
@@ -1,12 +1,12 @@
-class SplashInfoTableViewRow extends Citrus.Object
+class SplashInfoHeaderView extends Citrus.Object
constructor: (splash) ->
- @row = Titanium.UI.createTableViewRow {
- className: "codeInfoRow"
- height: "auto"
+ @view = Titanium.UI.createView {
+ height: 65
+ top: 0
}
@splash = splash
- @row.object = this
+ @view.object = this
if splash.photo?
text_offset = 74
@@ -17,33 +17,35 @@ class SplashInfoTableViewRow extends Citrus.Object
top: 4
left: 7
}
- @row.add(photo)
+ @view.add(photo)
else
text_offset = 5
title = Ti.UI.createLabel {
color:'#000'
text: splash.name
font:{fontSize:30, fontWeight:'bold'}
+ minimumFontSize: 16
top:4
left:text_offset
- height:'auto'
- width:'auto'
+ height: 32
+ width: (320 - text_offset - 4)
}
- @row.add(title)
+ @view.add(title)
description = Ti.UI.createLabel {
color:'#000'
text: splash.text
font:{fontSize:20, fontWeight:'bold'}
+ minimumFontSize: 12
top:40
left: text_offset
- height:'auto'
- width:'auto'
+ height: 22
+ width: (320 - text_offset - 4)
}
- @row.add(description)
+ @view.add(description)
# if @account.name?
# realName = Ti.UI.createLabel {
@@ -55,7 +57,7 @@ class SplashInfoTableViewRow extends Citrus.Object
# height:'auto'
# width:'auto'
# }
- # @row.add(realName)
+ # @view.add(realName)
-Citrus.SplashInfoTableViewRow = SplashInfoTableViewRow
+Citrus.SplashInfoHeaderView = SplashInfoHeaderView
View
64 Resources/app/views/splash/splash_info_header_view.js
@@ -0,0 +1,64 @@
+(function() {
+ var SplashInfoHeaderView;
+ var __extends = function(child, parent) {
+ var ctor = function(){};
+ ctor.prototype = parent.prototype;
+ child.prototype = new ctor();
+ child.prototype.constructor = child;
+ if (typeof parent.extended === "function") parent.extended(child);
+ child.__super__ = parent.prototype;
+ };
+ SplashInfoHeaderView = function(splash) {
+ var _ref, description, photo, text_offset, title;
+ this.view = Titanium.UI.createView({
+ height: 65,
+ top: 0
+ });
+ this.splash = splash;
+ this.view.object = this;
+ if (typeof (_ref = splash.photo) !== "undefined" && _ref !== null) {
+ text_offset = 74;
+ photo = Ti.UI.createImageView({
+ image: splash.photo,
+ height: 60,
+ width: 60,
+ top: 4,
+ left: 7
+ });
+ this.view.add(photo);
+ } else {
+ text_offset = 5;
+ }
+ title = Ti.UI.createLabel({
+ color: '#000',
+ text: splash.name,
+ font: {
+ fontSize: 30,
+ fontWeight: 'bold'
+ },
+ minimumFontSize: 16,
+ top: 4,
+ left: text_offset,
+ height: 32,
+ width: (320 - text_offset - 4)
+ });
+ this.view.add(title);
+ description = Ti.UI.createLabel({
+ color: '#000',
+ text: splash.text,
+ font: {
+ fontSize: 20,
+ fontWeight: 'bold'
+ },
+ minimumFontSize: 12,
+ top: 40,
+ left: text_offset,
+ height: 22,
+ width: (320 - text_offset - 4)
+ });
+ this.view.add(description);
+ return this;
+ };
+ __extends(SplashInfoHeaderView, Citrus.Object);
+ Citrus.SplashInfoHeaderView = SplashInfoHeaderView;
+}).call(this);
View
65 Resources/app/views/splash/splash_window.coffee
@@ -1,27 +1,41 @@
-Ti.include("/app/views/splash/splash_info_table_view_row.js")
+Ti.include("/app/views/splash/splash_info_header_view.js")
Ti.include("/app/views/splash/actions/action_table_view_row.js")
Ti.include("/app/views/splash/actions/twitter_action_table_view_row.js")
Ti.include("/app/views/splash/actions/paypal_action_table_view_row.js")
Ti.include("/app/views/splash/actions/facebook_action_table_view_row.js")
+Ti.include("/app/views/splash/actions/platform_action_table_view_row.js")
class SplashWindow extends Citrus.GenericWindow
# Sets up the loading indicator
constructor: (controller) ->
super
@win = Ti.UI.createWindow({title: "Scan Results",backgroundColor:'#fff'})
-
- @loadingIndicator = Titanium.UI.createActivityIndicator {
- # style: Titanium.UI.iPhone.ActivityIndicatorStyle.PLAIN
- font: {
- fontFamily: 'Helvetica Neue'
- fontSize: 20
- fontWeight: 'bold' }
- color: '#000'
- message: 'Loading Scan Results ...'
- top: 100
+
+ @loadingWindow = Ti.UI.createWindow {
+ modal: true
+ opacity: 0.75
+ backgroundColor: 'black'
}
- @win.add(@loadingIndicator)
+ @loadingIndicator = Ti.UI.createView {
+ backgroundColor: 'black'
+ opacity: 0.75
+ height: 70
+ width: 70
+ left: 125
+ top: 280
+ }
+
+ loadIndicator = Ti.UI.createActivityIndicator {
+ style: Ti.UI.iPhone.ActivityIndicatorStyle.BIG
+ message: 'loading data...'
+ font : 'Arial'
+ color: '#FFF'
+ }
+
+ @loadingIndicator.add(loadIndicator)
+ @loadingWindow.add(@loadingIndicator)
+ @loadingShown = false
# Once a splash has been successfully displayed, this displays it
displaySplash: (splash) ->
Ti.API.debug("Displaying splash \""+splash.name+"\", tid:"+splash.tid)
@@ -30,17 +44,17 @@ class SplashWindow extends Citrus.GenericWindow
@splash = splash
@win.remove(@table) if @table?
rows = this.getActionRows()
- rows.unshift this.getInfoRow()
- d(rows)
-
+
@table = Titanium.UI.createTableView({
data: rows
editable: false
allowsSelection: false
+ style: Titanium.UI.iPhone.TableViewStyle.GROUPED
+ headerView: this.getHeaderView()
})
-
- this.hideLoading()
+
@win.add(@table)
+ this.hideLoading()
d("Table added")
# If a splash couldn't be fetched, this displays the notification and an optional retry button
@@ -55,7 +69,7 @@ class SplashWindow extends Citrus.GenericWindow
width:300
}
@win.add @errorLabel
-
+
@errorLabel.text = msg
@errorLabel.show()
if retry
@@ -78,7 +92,6 @@ class SplashWindow extends Citrus.GenericWindow
@retryButton.show()
# Displays non Citrus decoded data as a simple qr code scanner.
displayDecodedData: (data) ->
- this.hideLoading()
unless @noticeLabel?
@noticeLabel = Ti.UI.createLabel {
color:'#000'
@@ -99,10 +112,10 @@ class SplashWindow extends Citrus.GenericWindow
html: sc.helpers.makeClickable(data, {autolink: true, screenname: true})
}
@win.add(@dataView)
-
+
@noticeLabel.show()
@dataView.show()
-
+ this.hideLoading()
# Hides the error label and retry button.
hideError: () ->
@@ -113,9 +126,9 @@ class SplashWindow extends Citrus.GenericWindow
@win.remove @retryButton if @retryButton?
- getInfoRow: () ->
- row = new Citrus.SplashInfoTableViewRow(@splash)
- return row.row
+ getHeaderView: () ->
+ view = new Citrus.SplashInfoHeaderView(@splash)
+ return view.view
# Gets all the TableViewRow objects corresponding to the splash's actions.
getActionRows: () ->
@@ -134,10 +147,10 @@ class SplashWindow extends Citrus.GenericWindow
showLoading: () ->
d("Showing loading indicator")
- @loadingIndicator.show()
+ @loadingWindow.open({animated: false}) unless @loadingShown
hideLoading: () ->
d("Hiding loading indicator")
- # @loadingIndicator.hide()
+ @loadingWindow.close({animated: false}) if @loadingShown
Citrus.SplashWindow = SplashWindow
View
68 Resources/app/views/splash/splash_window.js
@@ -8,28 +8,41 @@
if (typeof parent.extended === "function") parent.extended(child);
child.__super__ = parent.prototype;
};
- Ti.include("/app/views/splash/splash_info_table_view_row.js");
+ Ti.include("/app/views/splash/splash_info_header_view.js");
Ti.include("/app/views/splash/actions/action_table_view_row.js");
Ti.include("/app/views/splash/actions/twitter_action_table_view_row.js");
Ti.include("/app/views/splash/actions/paypal_action_table_view_row.js");
Ti.include("/app/views/splash/actions/facebook_action_table_view_row.js");
+ Ti.include("/app/views/splash/actions/platform_action_table_view_row.js");
SplashWindow = function(controller) {
+ var loadIndicator;
SplashWindow.__super__.constructor.apply(this, arguments);
this.win = Ti.UI.createWindow({
title: "Scan Results",
backgroundColor: '#fff'
});
- this.loadingIndicator = Titanium.UI.createActivityIndicator({
- font: {
- fontFamily: 'Helvetica Neue',
- fontSize: 20,
- fontWeight: 'bold'
- },
- color: '#000',
- message: 'Loading Scan Results ...',
- top: 100
+ this.loadingWindow = Ti.UI.createWindow({
+ modal: true,
+ opacity: 0.75,
+ backgroundColor: 'black'
});
- this.win.add(this.loadingIndicator);
+ this.loadingIndicator = Ti.UI.createView({
+ backgroundColor: 'black',
+ opacity: 0.75,
+ height: 70,
+ width: 70,
+ left: 125,
+ top: 280
+ });
+ loadIndicator = Ti.UI.createActivityIndicator({
+ style: Ti.UI.iPhone.ActivityIndicatorStyle.BIG,
+ message: 'loading data...',
+ font: 'Arial',
+ color: '#FFF'
+ });
+ this.loadingIndicator.add(loadIndicator);
+ this.loadingWindow.add(this.loadingIndicator);
+ this.loadingShown = false;
return this;
};
__extends(SplashWindow, Citrus.GenericWindow);
@@ -42,15 +55,15 @@
this.win.remove(this.table);
}
rows = this.getActionRows();
- rows.unshift(this.getInfoRow());
- d(rows);
this.table = Titanium.UI.createTableView({
data: rows,
editable: false,
- allowsSelection: false
+ allowsSelection: false,
+ style: Titanium.UI.iPhone.TableViewStyle.GROUPED,
+ headerView: this.getHeaderView()
});
- this.hideLoading();
this.win.add(this.table);
+ this.hideLoading();
return d("Table added");
};
SplashWindow.prototype.displayError = function(msg, retry, callback) {
@@ -98,7 +111,6 @@
};
SplashWindow.prototype.displayDecodedData = function(data) {
var _ref;
- this.hideLoading();
if (!(typeof (_ref = this.noticeLabel) !== "undefined" && _ref !== null)) {
this.noticeLabel = Ti.UI.createLabel({
color: '#000',
@@ -127,7 +139,8 @@
this.win.add(this.dataView);
}
this.noticeLabel.show();
- return this.dataView.show();
+ this.dataView.show();
+ return this.hideLoading();
};
SplashWindow.prototype.hideError = function() {
var _ref;
@@ -147,10 +160,10 @@
return this.win.remove(this.retryButton);
}
};
- SplashWindow.prototype.getInfoRow = function() {
- var row;
- row = new Citrus.SplashInfoTableViewRow(this.splash);
- return row.row;
+ SplashWindow.prototype.getHeaderView = function() {
+ var view;
+ view = new Citrus.SplashInfoHeaderView(this.splash);
+ return view.view;
};
SplashWindow.prototype.getActionRows = function() {
var _i, _len, _ref, _result, action, callback, klass, row, rows, takeable;
@@ -177,10 +190,19 @@
};
SplashWindow.prototype.showLoading = function() {
d("Showing loading indicator");
- return this.loadingIndicator.show();
+ if (!(this.loadingShown)) {
+ return this.loadingWindow.open({
+ animated: false
+ });
+ }
};
SplashWindow.prototype.hideLoading = function() {
- return d("Hiding loading indicator");
+ d("Hiding loading indicator");
+ if (this.loadingShown) {
+ return this.loadingWindow.close({
+ animated: false
+ });
+ }
};
Citrus.SplashWindow = SplashWindow;
}).call(this);
View
BIN Resources/images/account_icons/audioboo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/bebo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/behance.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/blogger.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/buzz.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/creativecommons.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/dailybooth.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/delicious.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/designfloat.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/deviantart.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/digg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/dopplr.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/dribbble.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/email.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/ember.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/facebook.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/flickr.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/forrst.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/foursquare.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/friendfeed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/google.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/gowalla copy.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/grooveshark.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/hyves.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/lastfm.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN Resources/images/account_icons/linkedin.png
Diff not rendered.
View
BIN Resources/images/account_icons/livejournal.png
Diff not rendered.
View
BIN Resources/images/account_icons/lockerz.png
Diff not rendered.
View
BIN Resources/images/account_icons/megavideo.png
Diff not rendered.
View
BIN Resources/images/account_icons/myspace.png
Diff not rendered.
View
BIN Resources/images/account_icons/piano.png
Diff not rendered.
View
BIN Resources/images/account_icons/playfire.png
Diff not rendered.
View
BIN Resources/images/account_icons/playstation.png
Diff not rendered.
View
BIN Resources/images/account_icons/reddit.png
Diff not rendered.
View
BIN Resources/images/account_icons/rss.png
Diff not rendered.
View
BIN Resources/images/account_icons/skype.png
Diff not rendered.
View
BIN Resources/images/account_icons/socialvibe.png
Diff not rendered.
View
BIN Resources/images/account_icons/soundcloud.png
Diff not rendered.
View
BIN Resources/images/account_icons/spotify.png
Diff not rendered.
View
BIN Resources/images/account_icons/steam.png
Diff not rendered.
View
BIN Resources/images/account_icons/stumbleupon.png
Diff not rendered.
View
BIN Resources/images/account_icons/technorati.png
Diff not rendered.
View
BIN Resources/images/account_icons/tumblr.png
Diff not rendered.
View
BIN Resources/images/account_icons/twitpic.png
Diff not rendered.
View
BIN Resources/images/account_icons/twitter.png
Diff not rendered.
View
BIN Resources/images/account_icons/typepad.png
Diff not rendered.
View
BIN Resources/images/account_icons/vimeo.png
Diff not rendered.
View
BIN Resources/images/account_icons/wakoopa.png
Diff not rendered.
View
BIN Resources/images/account_icons/wordpress.png
Diff not rendered.
View
BIN Resources/images/account_icons/xing.png
Diff not rendered.
View
BIN Resources/images/account_icons/yahoo.png
Diff not rendered.
View
BIN Resources/images/account_icons/youtube.png
Diff not rendered.
View
0 ...es/account_icons/BlinklistAccount_128.png → ...ccount_icons_old/BlinklistAccount_128.png
Diff not rendered.
View
0 ...ges/account_icons/BlinklistAccount_16.png → ...account_icons_old/BlinklistAccount_16.png
Diff not rendered.
View
0 ...ges/account_icons/BlinklistAccount_32.png → ...account_icons_old/BlinklistAccount_32.png
Diff not rendered.
View
0 ...ges/account_icons/BlinklistAccount_64.png → ...account_icons_old/BlinklistAccount_64.png
Diff not rendered.
View
0 ...ges/account_icons/FacebookAccount_128.png → ...account_icons_old/FacebookAccount_128.png
Diff not rendered.
View
0 ...ages/account_icons/FacebookAccount_16.png → .../account_icons_old/FacebookAccount_16.png
Diff not rendered.
View
0 ...ages/account_icons/FacebookAccount_32.png → .../account_icons_old/FacebookAccount_32.png
Diff not rendered.
View
0 ...ages/account_icons/FacebookAccount_64.png → .../account_icons_old/FacebookAccount_64.png
Diff not rendered.
View
0 ...s/account_icons/FeedburnerAccount_128.png → ...count_icons_old/FeedburnerAccount_128.png
Diff not rendered.
View
0 ...es/account_icons/FeedburnerAccount_16.png → ...ccount_icons_old/FeedburnerAccount_16.png
Diff not rendered.
View
0 ...es/account_icons/FeedburnerAccount_32.png → ...ccount_icons_old/FeedburnerAccount_32.png
Diff not rendered.
View
0 ...es/account_icons/FeedburnerAccount_64.png → ...ccount_icons_old/FeedburnerAccount_64.png
Diff not rendered.
View
0 ...mages/account_icons/FlickrAccount_128.png → ...s/account_icons_old/FlickrAccount_128.png
Diff not rendered.
View
0 ...images/account_icons/FlickrAccount_16.png → ...es/account_icons_old/FlickrAccount_16.png
Diff not rendered.
View
0 ...images/account_icons/FlickrAccount_32.png → ...es/account_icons_old/FlickrAccount_32.png
Diff not rendered.
View
0 ...images/account_icons/FlickrAccount_64.png → ...es/account_icons_old/FlickrAccount_64.png
Diff not rendered.
View
0 ...s/account_icons/FriendfeedAccount_128.png → ...count_icons_old/FriendfeedAccount_128.png
Diff not rendered.
View
0 ...es/account_icons/FriendfeedAccount_16.png → ...ccount_icons_old/FriendfeedAccount_16.png
Diff not rendered.
View
0 ...es/account_icons/FriendfeedAccount_32.png → ...ccount_icons_old/FriendfeedAccount_32.png
Diff not rendered.
View
0 ...es/account_icons/FriendfeedAccount_64.png → ...ccount_icons_old/FriendfeedAccount_64.png
Diff not rendered.
View
0 .../images/account_icons/FurlAccount_128.png → ...ges/account_icons_old/FurlAccount_128.png
Diff not rendered.
View
0 ...s/images/account_icons/FurlAccount_16.png → ...ages/account_icons_old/FurlAccount_16.png
Diff not rendered.
View
0 ...s/images/account_icons/FurlAccount_32.png → ...ages/account_icons_old/FurlAccount_32.png
Diff not rendered.
View
0 ...s/images/account_icons/FurlAccount_64.png → ...ages/account_icons_old/FurlAccount_64.png
Diff not rendered.
View
0 ...mages/account_icons/GenericAccount_16.png → ...s/account_icons_old/GenericAccount_16.png
Diff not rendered.
View
0 ...images/account_icons/GmailAccount_128.png → ...es/account_icons_old/GmailAccount_128.png
Diff not rendered.
View
0 .../images/account_icons/GmailAccount_16.png → ...ges/account_icons_old/GmailAccount_16.png
Diff not rendered.
View
0 .../images/account_icons/GmailAccount_32.png → ...ges/account_icons_old/GmailAccount_32.png
Diff not rendered.
View
0 .../images/account_icons/GmailAccount_64.png → ...ges/account_icons_old/GmailAccount_64.png
Diff not rendered.
View
0 ...mages/account_icons/GoogleAccount_128.png → ...s/account_icons_old/GoogleAccount_128.png
Diff not rendered.
View
0 ...images/account_icons/GoogleAccount_16.png → ...es/account_icons_old/GoogleAccount_16.png
Diff not rendered.
View
0 ...images/account_icons/GoogleAccount_32.png → ...es/account_icons_old/GoogleAccount_32.png
Diff not rendered.
View
0 ...images/account_icons/GoogleAccount_64.png → ...es/account_icons_old/GoogleAccount_64.png
Diff not rendered.
View
0 ...images/account_icons/HeartAccount_128.png → ...es/account_icons_old/HeartAccount_128.png
Diff not rendered.
View
0 .../images/account_icons/HeartAccount_16.png → ...ges/account_icons_old/HeartAccount_16.png
Diff not rendered.
View
0 .../images/account_icons/HeartAccount_32.png → ...ges/account_icons_old/HeartAccount_32.png
Diff not rendered.
View
0 .../images/account_icons/HeartAccount_64.png → ...ges/account_icons_old/HeartAccount_64.png
Diff not rendered.
View
0 ...mages/account_icons/LastfmAccount_128.png → ...s/account_icons_old/LastfmAccount_128.png
Diff not rendered.
View
0 ...images/account_icons/LastfmAccount_16.png → ...es/account_icons_old/LastfmAccount_16.png
Diff not rendered.
View
0 ...images/account_icons/LastfmAccount_32.png → ...es/account_icons_old/LastfmAccount_32.png
Diff not rendered.
View
0 ...images/account_icons/LastfmAccount_64.png → ...es/account_icons_old/LastfmAccount_64.png
Diff not rendered.
View
0 ...ges/account_icons/LinkedinAccount_128.png → ...account_icons_old/LinkedinAccount_128.png
Diff not rendered.
View
0 ...ages/account_icons/LinkedinAccount_16.png → .../account_icons_old/LinkedinAccount_16.png
Diff not rendered.
View
0 ...ages/account_icons/LinkedinAccount_32.png → .../account_icons_old/LinkedinAccount_32.png
Diff not rendered.
View
0 ...ages/account_icons/LinkedinAccount_64.png → .../account_icons_old/LinkedinAccount_64.png
Diff not rendered.
View
0 ...ges/account_icons/MagnoliaAccount_128.png → ...account_icons_old/MagnoliaAccount_128.png
Diff not rendered.
View
0 ...ages/account_icons/MagnoliaAccount_16.png → .../account_icons_old/MagnoliaAccount_16.png
Diff not rendered.
View
0 ...ages/account_icons/MagnoliaAccount_32.png → .../account_icons_old/MagnoliaAccount_32.png
Diff not rendered.
View
0 ...ages/account_icons/MagnoliaAccount_64.png → .../account_icons_old/MagnoliaAccount_64.png
Diff not rendered.
View
0 ...ges/account_icons/NewsvineAccount_128.png → ...account_icons_old/NewsvineAccount_128.png
Diff not rendered.
View
0 ...ages/account_icons/NewsvineAccount_16.png → .../account_icons_old/NewsvineAccount_16.png
Diff not rendered.
View
0 ...ages/account_icons/NewsvineAccount_32.png → .../account_icons_old/NewsvineAccount_32.png
Diff not rendered.
View
0 ...ages/account_icons/NewsvineAccount_64.png → .../account_icons_old/NewsvineAccount_64.png
Diff not rendered.
View
0 ...mages/account_icons/PaypalAccount_128.png → ...s/account_icons_old/PaypalAccount_128.png
Diff not rendered.
View
0 ...images/account_icons/PaypalAccount_16.png → ...es/account_icons_old/PaypalAccount_16.png
Diff not rendered.
View
0 ...images/account_icons/PaypalAccount_32.png → ...es/account_icons_old/PaypalAccount_32.png
Diff not rendered.
View
0 ...images/account_icons/PaypalAccount_64.png → ...es/account_icons_old/PaypalAccount_64.png
Diff not rendered.
View
0 ...images/account_icons/SkypeAccount_128.png → ...es/account_icons_old/SkypeAccount_128.png
Diff not rendered.
View
0 .../images/account_icons/SkypeAccount_16.png → ...ges/account_icons_old/SkypeAccount_16.png
Diff not rendered.
View
0 .../images/account_icons/SkypeAccount_32.png → ...ges/account_icons_old/SkypeAccount_32.png
Diff not rendered.
View
0 .../images/account_icons/SkypeAccount_64.png → ...ges/account_icons_old/SkypeAccount_64.png
Diff not rendered.
View
0 ...mages/account_icons/SphinnAccount_128.png → ...s/account_icons_old/SphinnAccount_128.png
Diff not rendered.
View
0 ...images/account_icons/SphinnAccount_16.png → ...es/account_icons_old/SphinnAccount_16.png
Diff not rendered.
View
0 ...images/account_icons/SphinnAccount_32.png → ...es/account_icons_old/SphinnAccount_32.png
Diff not rendered.
View
0 ...images/account_icons/SphinnAccount_64.png → ...es/account_icons_old/SphinnAccount_64.png
Diff not rendered.
View
0 ...ages/account_icons/TwitterAccount_128.png → .../account_icons_old/TwitterAccount_128.png
Diff not rendered.
View
0 ...mages/account_icons/TwitterAccount_16.png → ...s/account_icons_old/TwitterAccount_16.png
Diff not rendered.
View
0 ...mages/account_icons/TwitterAccount_32.png → ...s/account_icons_old/TwitterAccount_32.png
Diff not rendered.
View
0 ...mages/account_icons/TwitterAccount_64.png → ...s/account_icons_old/TwitterAccount_64.png
Diff not rendered.
View
0 ...images/account_icons/VimeoAccount_128.png → ...es/account_icons_old/VimeoAccount_128.png
Diff not rendered.
View
0 .../images/account_icons/VimeoAccount_16.png → ...ges/account_icons_old/VimeoAccount_16.png
Diff not rendered.
View
0 .../images/account_icons/VimeoAccount_32.png → ...ges/account_icons_old/VimeoAccount_32.png
Diff not rendered.
View
0 .../images/account_icons/VimeoAccount_64.png → ...ges/account_icons_old/VimeoAccount_64.png
Diff not rendered.
View
0 ...images/account_icons/YahooAccount_128.png → ...es/account_icons_old/YahooAccount_128.png
Diff not rendered.
View
0 .../images/account_icons/YahooAccount_16.png → ...ges/account_icons_old/YahooAccount_16.png
Diff not rendered.
View
0 .../images/account_icons/YahooAccount_32.png → ...ges/account_icons_old/YahooAccount_32.png
Diff not rendered.
View
0 .../images/account_icons/YahooAccount_64.png → ...ges/account_icons_old/YahooAccount_64.png
Diff not rendered.
View
0 ...ages/account_icons/YoutubeAccount_128.png → .../account_icons_old/YoutubeAccount_128.png
Diff not rendered.
View
0 ...mages/account_icons/YoutubeAccount_16.png → ...s/account_icons_old/YoutubeAccount_16.png
Diff not rendered.
View
0 ...mages/account_icons/YoutubeAccount_32.png → ...s/account_icons_old/YoutubeAccount_32.png
Diff not rendered.
View
0 ...mages/account_icons/YoutubeAccount_64.png → ...s/account_icons_old/YoutubeAccount_64.png
Diff not rendered.
View
BIN gowalla.png
Diff not rendered.

0 comments on commit 77e2d0f

Please sign in to comment.