Bug fixes

Author: thedillonb

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "lib/CodeFramework"]
 	path = lib/CodeFramework
-	url = https://thedillonb@github.com/thedillonb/CodeFramework.git
+	url = git@github.com:thedillonb/CodeFramework.git
 [submodule "lib/GitHubSharp"]
 	path = lib/GitHubSharp
-	url = https://thedillonb@github.com/thedillonb/GitHubSharp.git
+	url = git@github.com:thedillonb/GitHubSharp.git

CodeHub.Core/ViewModels/Gists/GistViewModel.cs

@@ -48,7 +48,7 @@ public CollectionViewModel<GistCommentModel> Comments
 
         public ICommand GoToUserCommand
         {
-            get { return new MvxCommand(() => ShowViewModel<ProfileViewModel>(new ProfileViewModel.NavObject { Username = Gist.User.Login }), () => Gist != null && Gist.User != null); }
+            get { return new MvxCommand(() => ShowViewModel<ProfileViewModel>(new ProfileViewModel.NavObject { Username = Gist.Owner.Login }), () => Gist != null && Gist.Owner != null); }
         }
 
         public ICommand GoToFileSourceCommand

CodeHub.Core/ViewModels/Issues/IssueLabelsViewModel.cs

@@ -98,7 +98,7 @@ private async Task SelectLabels(IEnumerable<LabelModel> x)
 
 		protected override Task Load(bool forceCacheInvalidation)
 		{
-			return Labels.SimpleCollectionLoad(this.GetApplication().Client.Users[Username].Repositories[Repository].GetLabels(), forceCacheInvalidation);
+            return Labels.SimpleCollectionLoad(this.GetApplication().Client.Users[Username].Repositories[Repository].Labels.GetAll(), forceCacheInvalidation);
 		}
 
 		public class NavObject

CodeHub.iOS/Views/Gists/GistView.cs

@@ -65,7 +65,7 @@ private void UpdateOwned()
         {
             //Is it owned?
 			var app = Cirrious.CrossCore.Mvx.Resolve<CodeHub.Core.Services.IApplicationService>();
-			if (string.Equals(app.Account.Username, ViewModel.Gist.User.Login, StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(app.Account.Username, ViewModel.Gist.Owner.Login, StringComparison.OrdinalIgnoreCase))
             {
 				NavigationItem.RightBarButtonItem = new UIBarButtonItem(UIBarButtonSystemItem.Compose, async (s, e) => {
 					try
@@ -157,8 +157,8 @@ public void RenderGist()
             };
 
             //Sometimes there's no user!
-            d.Name = (model.User == null) ? "Anonymous" : model.User.Login;
-            d.ImageUri = (model.User == null) ? null : new Uri(model.User.AvatarUrl);
+            d.Name = (model.Owner == null) ? "Anonymous" : model.Owner.Login;
+            d.ImageUri = (model.Owner == null) ? null : new Uri(model.Owner.AvatarUrl);
 
             sec.Add(d);
 

CodeHub.iOS/Views/Gists/GistsView.cs

@@ -25,8 +25,8 @@ public override void ViewDidLoad()
                     Image = Theme.CurrentTheme.AnonymousUserImage
                 };
 
-                sse.Name = (x.User == null) ? "Anonymous" : x.User.Login;
-                sse.ImageUri = (x.User == null) ? null : new Uri(x.User.AvatarUrl);
+                sse.Name = (x.Owner == null) ? "Anonymous" : x.Owner.Login;
+                sse.ImageUri = (x.Owner == null) ? null : new Uri(x.Owner.AvatarUrl);
                 sse.Tapped += () => vm.GoToGistCommand.Execute(x);
                 return sse;
             });

CodeHub.iOS/Views/Issues/IssueLabelsView.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using MonoTouch.UIKit;
 using CodeFramework.iOS.Utils;
+using CodeFramework.iOS.Elements;
 
 namespace CodeHub.iOS.Views.Issues
 {
@@ -26,7 +27,7 @@ public override void ViewDidLoad()
 
 			BindCollection(vm.Labels, x => 
             {
-				var e = new LabelElement(x);
+                var e = new LabelElement(x.Name, x.Color);
                 e.Tapped += () =>
                 {
                     if (e.Accessory == UITableViewCellAccessory.Checkmark)
@@ -49,7 +50,8 @@ public override void ViewDidLoad()
 				var elements = Root[0].Elements;
 				foreach (var el in elements.Cast<LabelElement>())
 				{
-					el.Accessory = vm.SelectedLabels.Contains(el.Label) ? 
+                    var element = el;
+                    el.Accessory = vm.SelectedLabels.Any(y => string.Equals(y.Name, element.Name, System.StringComparison.OrdinalIgnoreCase)) ? 
 					               UITableViewCellAccessory.Checkmark : 
 					               UITableViewCellAccessory.None;
 				}
@@ -64,44 +66,6 @@ public override void ViewDidLoad()
 				else _hud.Hide();
 			});
         }
-
-		private class LabelElement : StyledStringElement
-		{
-			public LabelModel Label { get; private set; }
-			public LabelElement(LabelModel m)
-				: base(m.Name)
-			{
-				Label = m;
-				Image = CreateImage(m.Color);
-			}
-
-			private static UIImage CreateImage(string color)
-			{
-				try
-				{
-					var red = color.Substring(0, 2);
-					var green = color.Substring(2, 2);
-					var blue = color.Substring(4, 2);
-
-					var redB = System.Convert.ToByte(red, 16);
-					var greenB = System.Convert.ToByte(green, 16);
-					var BlueB = System.Convert.ToByte(blue, 16);
-
-					var size = new System.Drawing.SizeF(24f, 24f);
-
-					UIGraphics.BeginImageContext(size);
-					UIColor.FromRGB(redB, greenB, BlueB).SetFill();
-					GraphicsUtil.FillRoundedRect(UIGraphics.GetCurrentContext(), new System.Drawing.RectangleF(0, 0, size.Width, size.Height), 6f);
-					var image = UIGraphics.GetImageFromCurrentImageContext();
-					UIGraphics.EndImageContext();
-					return image;
-				}
-				catch
-				{
-					return null;
-				}
-			}
-		}
     }
 }
 

CodeHub.iOS/Views/Issues/IssueMilestonesView.cs

@@ -1,10 +1,9 @@
 using CodeFramework.ViewControllers;
 using CodeHub.Core.ViewModels.Issues;
-using MonoTouch.Dialog;
-using GitHubSharp.Models;
 using System.Linq;
 using MonoTouch.UIKit;
 using CodeFramework.iOS.Utils;
+using CodeFramework.iOS.Elements;
 
 namespace CodeHub.iOS.Views.Issues
 {
@@ -21,9 +20,12 @@ public override void ViewDidLoad()
         {
             base.ViewDidLoad();
 
+            TableView.RowHeight = 80f;
+            TableView.SeparatorInset = new UIEdgeInsets(0, 0, 0, 0);
+
 			var vm = (IssueMilestonesViewModel)ViewModel;
 			BindCollection(vm.Milestones, x => {
-				var e = new MilestoneElement(x);
+                var e = new MilestoneElement(x.Number, x.Title, x.OpenIssues, x.ClosedIssues, x.DueOn);
 				e.Tapped += () => {
 					if (vm.SelectedMilestone != null && vm.SelectedMilestone.Number == x.Number)
 						vm.SelectedMilestone = null;
@@ -40,7 +42,7 @@ public override void ViewDidLoad()
 				if (Root.Count == 0)
 					return;
 				foreach (var m in Root[0].Elements.Cast<MilestoneElement>())
-					m.Accessory = (x != null && m.Milestone.Number == x.Number) ? UITableViewCellAccessory.Checkmark : UITableViewCellAccessory.None;
+					m.Accessory = (x != null && m.Number == x.Number) ? UITableViewCellAccessory.Checkmark : UITableViewCellAccessory.None;
 				Root.Reload(Root[0], UITableViewRowAnimation.None);
 			});
 
@@ -51,16 +53,6 @@ public override void ViewDidLoad()
 				else _hud.Hide();
 			});
         }
-
-		private class MilestoneElement : StyledStringElement
-		{
-			public MilestoneModel Milestone { get; private set; }
-			public MilestoneElement(MilestoneModel m) 
-				: base(m.Title)
-			{
-				Milestone = m;
-			}
-		}
     }
 }