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.
airhorns · Nov 13, 2010 · 77e2d0f · 77e2d0f
1 parent 952925d
commit 77e2d0f
Show file tree

Hide file tree

Showing 174 changed files with 322 additions and 119 deletions.
diff --git a/Resources/app.js b/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');

diff --git a/Resources/app/controllers/main.coffee b/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')

diff --git a/Resources/app/controllers/main.js b/Resources/app/controllers/main.js
diff --git a/Resources/app/controllers/splash_controller.coffee b/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)

diff --git a/Resources/app/controllers/splash_controller.js b/Resources/app/controllers/splash_controller.js
diff --git a/Resources/app/helpers/icons_helper.coffee b/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
+}
diff --git a/Resources/app/helpers/icons_helper.js b/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);
diff --git a/Resources/app/models/actions/action.coffee b/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) ->

diff --git a/Resources/app/models/actions/action.js b/Resources/app/models/actions/action.js
diff --git a/Resources/app/models/actions/foursquare/foursquare_action.coffee b/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()

diff --git a/Resources/app/models/actions/foursquare/foursquare_action.js b/Resources/app/models/actions/foursquare/foursquare_action.js
diff --git a/Resources/app/models/actions/platform/call_action.coffee b/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)

diff --git a/Resources/app/models/actions/platform/call_action.js b/Resources/app/models/actions/platform/call_action.js
diff --git a/Resources/app/models/actions/platform/platform_action.coffee b/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
 

diff --git a/Resources/app/models/actions/platform/platform_action.js b/Resources/app/models/actions/platform/platform_action.js
diff --git a/Resources/app/models/actions/platform/visit_link_action.coffee b/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)

diff --git a/Resources/app/models/actions/platform/visit_link_action.js b/Resources/app/models/actions/platform/visit_link_action.js
diff --git a/Resources/app/models/actions/twitter/twitter_action.coffee b/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()

diff --git a/Resources/app/models/actions/twitter/twitter_action.js b/Resources/app/models/actions/twitter/twitter_action.js
diff --git a/Resources/app/views/accounts/account_table_view_row.coffee b/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

diff --git a/Resources/app/views/accounts/account_table_view_row.js b/Resources/app/views/accounts/account_table_view_row.js
diff --git a/Resources/app/views/accounts/new_account_select_window.coffee b/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", "")
 			}

diff --git a/Resources/app/views/accounts/new_account_select_window.js b/Resources/app/views/accounts/new_account_select_window.js
diff --git a/Resources/app/views/splash/actions/account_action_table_view_row.coffee b/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
diff --git a/Resources/app/views/splash/actions/account_action_table_view_row.js b/Resources/app/views/splash/actions/account_action_table_view_row.js
diff --git a/Resources/app/views/splash/actions/action_table_view_row.coffee b/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
+				width: this.buttonWidth()
-				height: 20
+				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
+			top: 5
-			left: 4
+			left: 5
-			height: 32
+			height: 30
-			width: 32
+			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

diff --git a/Resources/app/views/splash/actions/action_table_view_row.js b/Resources/app/views/splash/actions/action_table_view_row.js
diff --git a/Resources/app/views/splash/actions/facebook_action_table_view_row.coffee b/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

diff --git a/Resources/app/views/splash/actions/facebook_action_table_view_row.js b/Resources/app/views/splash/actions/facebook_action_table_view_row.js