Added Hege's new artwork, added support for session ID's, adjusted so…

…me other UI bits
alexyork · May 25, 2010 · 3685e06 · 3685e06
1 parent 687db7d
commit 3685e06
Show file tree

Hide file tree

Showing 10 changed files with 149 additions and 6 deletions.
diff --git a/NDC2010.Logic/SessionConverter.cs b/NDC2010.Logic/SessionConverter.cs
@@ -11,6 +11,7 @@ public static Session FromXml(XElement xml)
    		{
 			return new Session
 				    {
+						ID = (Guid) xml.Element("id"),
 						Title = (string) xml.Element("title"),
 						Speakers = (from speaker in xml.Element("speakers").Elements("speaker")
 				            			select new Speaker

diff --git a/NDC2010.Model/Session.cs b/NDC2010.Model/Session.cs
@@ -4,6 +4,7 @@ namespace NDC2010.Model
 {
 	public class Session
 	{
+		public Guid ID  { get; set; }
 		public string Title { get; set; }
 		public Speaker[] Speakers { get; set; }
 		public int Day { get; set; }

diff --git a/NDC2010.Tests/Converting_session_XML_elements.cs b/NDC2010.Tests/Converting_session_XML_elements.cs
@@ -16,6 +16,7 @@ public void Should_convert_XElement_to_Session()
 			Console.WriteLine("1");
 			var xml = XElement.Parse(
 			            @"<session>
+						    <id>11111111-1111-1111-1111-111111111111</id>
 						    <title>Test session title</title>
 						    <speakers>
 						      <speaker>
@@ -32,6 +33,7 @@ public void Should_convert_XElement_to_Session()
 
 			var session = SessionConverter.FromXml(xml);
 
+			session.ID.ShouldBe(new Guid("11111111-1111-1111-1111-111111111111"));
 			session.Title.ShouldBe("Test session title");
 			session.Speakers.Count().ShouldBe(1);
 			session.Speakers[0].Name.ShouldBe("Alex York");
@@ -48,6 +50,7 @@ public void Should_convert_XElement_to_Session_with_multiple_speakers()
 			Console.WriteLine("1");
 			var xml = XElement.Parse(
 			            @"<session>
+						    <id>11111111-1111-1111-1111-111111111111</id>
 						    <title>Test session title</title>
 						    <speakers>
 						      <speaker>

diff --git a/NDC2010/App_Data/sessions.xml b/NDC2010/App_Data/sessions.xml
diff --git a/NDC2010/Default-old.png b/NDC2010/Default-old.png
diff --git a/NDC2010/Default.png b/NDC2010/Default.png
diff --git a/NDC2010/Icon.png b/NDC2010/Icon.png
diff --git a/NDC2010/NDC2010.csproj b/NDC2010/NDC2010.csproj
@@ -122,11 +122,10 @@
     <Content Include="Sessions\TabIcon.png" />
     <Content Include="Speakers\TabIcon.png" />
     <Content Include="Twitter\TabIcon.png" />
-    <Content Include="App_Data\sessions.xml" />
-    <Content Include="Default.png" />
     <Content Include="Images\background.png" />
     <Content Include="Icon.png" />
-    <Content Include="Default-old.png" />
+    <Content Include="App_Data\sessions.xml" />
+    <Content Include="Default.png" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="Twitter\TweetCellController.xib" />

diff --git a/NDC2010/Twitter/TweetCellController.xib b/NDC2010/Twitter/TweetCellController.xib
@@ -128,8 +128,8 @@
 									<int key="NSfFlags">16</int>
 								</object>
 								<object class="NSColor" key="IBUITextColor">
-									<int key="NSColorSpace">1</int>
-									<bytes key="NSRGB">MC4yIDAuNCAwLjYAA</bytes>
+									<int key="NSColorSpace">2</int>
+									<bytes key="NSRGB">MC41MDk4MDM5NTA4IDAuMDA3ODQzMTM3NzE5IDAuMDA3ODQzMTM3NzE5AA</bytes>
 								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">1</int>

diff --git a/NDC2010/Twitter/TwitterTableViewController.cs b/NDC2010/Twitter/TwitterTableViewController.cs
@@ -215,7 +215,7 @@ private void FetchAndBindTweets()
 			{
 				using (var threadAutoRelease = new NSAutoreleasePool())
 				{
-					var twitterXml = XDocument.Load("http://search.twitter.com/search.atom?q=NDC2010");
+					var twitterXml = XDocument.Load("http://search.twitter.com/search.atom?q=%23NDC2010");
 					BindTweetsToTable(twitterXml);
 				}
 			}