Fixed the Readme. Commonalized the Share functionaility. Group by repo in MyIssuesView

thedillonb · thedillonb · commit 2c7ce005a592 · 2014-01-01T15:54:22.000-05:00
diff --git a/CodeHub.Core/ViewModels/Gists/GistViewModel.cs b/CodeHub.Core/ViewModels/Gists/GistViewModel.cs
@@ -5,6 +5,7 @@
 using CodeHub.Core.ViewModels.User;
 using GitHubSharp.Models;
 using CodeFramework.Core.ViewModels;
+using CodeFramework.Core.Services;
 
 namespace CodeHub.Core.ViewModels.Gists
 {
@@ -86,6 +87,14 @@ public ICommand ToggleStarCommand
             }
         }
 
+		public ICommand ShareCommand
+		{
+			get
+			{
+				return new MvxCommand(() => GetService<IShareService>().ShareUrl(Gist.HtmlUrl), () => Gist != null);
+			}
+		}
+
         public void Init(NavObject navObject)
         {
             Id = navObject.Id;
diff --git a/CodeHub.Core/ViewModels/Gists/GistViewableFileViewModel.cs b/CodeHub.Core/ViewModels/Gists/GistViewableFileViewModel.cs
@@ -34,25 +34,22 @@ public void Init(NavObject navObject)
             GistFile = navObject.GistFile;
         }
 
-        protected override Task Load(bool forceCacheInvalidation)
+		protected override async Task Load(bool forceCacheInvalidation)
         {
-            return Task.Run(() =>
+            string data;
+            using (var ms = new System.IO.MemoryStream())
             {
-                string data;
-                using (var ms = new System.IO.MemoryStream())
-                {
-					this.GetApplication().Client.DownloadRawResource(GistFile.RawUrl, ms);
-                    ms.Position = 0;
-                    var sr = new System.IO.StreamReader(ms);
-                    data = sr.ReadToEnd();
-                }
-                if (GistFile.Language.Equals("Markdown"))
-					data = this.GetApplication().Client.Markdown.GetMarkdown(data);
-
-                var path = System.IO.Path.Combine(System.IO.Path.GetTempPath(), System.IO.Path.GetTempFileName() + ".html");
-                System.IO.File.WriteAllText(path, data, Encoding.UTF8);
-                FilePath = path;
-            });
+				await this.GetApplication().Client.DownloadRawResource(GistFile.RawUrl, ms);
+                ms.Position = 0;
+                var sr = new System.IO.StreamReader(ms);
+                data = sr.ReadToEnd();
+            }
+            if (GistFile.Language.Equals("Markdown"))
+				data = await this.GetApplication().Client.Markdown.GetMarkdown(data);
+
+            var path = System.IO.Path.Combine(System.IO.Path.GetTempPath(), System.IO.Path.GetTempFileName() + ".html");
+            System.IO.File.WriteAllText(path, data, Encoding.UTF8);
+            FilePath = path;
         }
 
         public class NavObject
diff --git a/CodeHub.Core/ViewModels/Issues/BaseIssuesViewModel.cs b/CodeHub.Core/ViewModels/Issues/BaseIssuesViewModel.cs
@@ -60,7 +60,15 @@ protected List<IGrouping<string, IssueModel>> Group(IEnumerable<IssueModel> mode
 				return FilterGroup.CreateNumberedGroup(g, "Days Ago", "Created");
 			}
 
-			return null;
+			try
+			{
+				var regex = new System.Text.RegularExpressions.Regex("repos/(.+)/issues/");
+				return model.GroupBy(x => regex.Match(x.Url).Groups[1].Value).ToList();
+			}
+			catch (Exception e)
+			{
+				return null;
+			}
 		}
     }
 
diff --git a/CodeHub.Core/ViewModels/Repositories/ReadmeViewModel.cs b/CodeHub.Core/ViewModels/Repositories/ReadmeViewModel.cs
@@ -4,6 +4,7 @@
 using Cirrious.MvvmCross.ViewModels;
 using System.Windows.Input;
 using CodeFramework.Core.ViewModels;
+using CodeFramework.Core.Services;
 
 namespace CodeHub.Core.ViewModels.Repositories
 {
@@ -39,12 +40,20 @@ public ICommand GoToLinkCommand
 			get { return GoToUrlCommand; }
 		}
 
+		public ICommand ShareCommand
+		{
+			get
+			{
+				return new MvxCommand(() => GetService<IShareService>().ShareUrl(_contentModel.HtmlUrl), () => _contentModel != null);
+			}
+		}
+
 		protected override async Task Load(bool forceCacheInvalidation)
 		{
 			var wiki = await this.GetApplication().Client.ExecuteAsync(this.GetApplication().Client.Users[Username].Repositories[Repository].GetReadme());
 			_contentModel = wiki.Data;
 			var d = Encoding.UTF8.GetString(Convert.FromBase64String(wiki.Data.Content));
-			Data = await Task.Run(() => this.GetApplication().Client.Markdown.GetMarkdown(d));
+			Data = await this.GetApplication().Client.Markdown.GetMarkdown(d);
 			Path = CreateHtmlFile(Data);
 		}
 		
diff --git a/CodeHub.iOS/Views/Gists/GistView.cs b/CodeHub.iOS/Views/Gists/GistView.cs
@@ -120,12 +120,8 @@ private void ShareButtonPress()
 				try
 				{
 	                if (e.ButtonIndex == shareButton)
-	                {
-						var item = new NSUrl(ViewModel.Gist.HtmlUrl);
-	                    var activityItems = new NSObject[] { item };
-	                    UIActivity[] applicationActivities = null;
-	                    var activityController = new UIActivityViewController (activityItems, applicationActivities);
-	                    PresentViewController (activityController, true, null);
+	                {
+						ViewModel.ShareCommand.Execute(null);
 	                }
 	                else if (e.ButtonIndex == showButton)
 					{
diff --git a/CodeHub.iOS/Views/Repositories/ReadmeView.cs b/CodeHub.iOS/Views/Repositories/ReadmeView.cs
@@ -27,7 +27,7 @@ public override void ViewDidLoad()
 
 		protected override bool ShouldStartLoad(MonoTouch.Foundation.NSUrlRequest request, MonoTouch.UIKit.UIWebViewNavigationType navigationType)
 		{
-			if (!request.Url.AbsoluteString.StartsWith("file://"))
+			if (!request.Url.AbsoluteString.StartsWith("file://", System.StringComparison.Ordinal))
 			{
 				ViewModel.GoToLinkCommand.Execute(request.Url.AbsoluteString);
 				return false;
@@ -39,13 +39,16 @@ protected override bool ShouldStartLoad(MonoTouch.Foundation.NSUrlRequest reques
 		private void ShareButtonPress()
 		{
 			var sheet = MonoTouch.Utilities.GetSheet("Readme");
+			var shareButton = sheet.AddButton("Share".t());
 			var showButton = sheet.AddButton("Show in GitHub".t());
 			var cancelButton = sheet.AddButton("Cancel".t());
 			sheet.CancelButtonIndex = cancelButton;
 			sheet.DismissWithClickedButtonIndex(cancelButton, true);
 			sheet.Clicked += (s, e) => {
 				if (e.ButtonIndex == showButton)
 					ViewModel.GoToGitHubCommand.Execute(null);
+				else if (e.ButtonIndex == shareButton)
+					ViewModel.ShareCommand.Execute(null);
 			};
 
 			sheet.ShowFrom(NavigationItem.RightBarButtonItem, true);
diff --git a/CodeHub.iOS/Views/Source/FileSourceView.cs b/CodeHub.iOS/Views/Source/FileSourceView.cs
@@ -64,11 +64,7 @@ private void ShowExtraMenu()
 					}
 					else if (e.ButtonIndex == shareButton)
 					{
-						var item = new NSUrl(ViewModel.HtmlUrl);
-						var activityItems = new NSObject[] { item };
-						UIActivity[] applicationActivities = null;
-						var activityController = new UIActivityViewController (activityItems, applicationActivities);
-						PresentViewController (activityController, true, null);
+						ViewModel.ShareCommand.Execute(null);
 					}
 					else if (e.ButtonIndex == showButton)
 					{
diff --git a/lib/CodeFramework b/lib/CodeFramework
@@ -1 +1 @@
-Subproject commit d42cdc2229670673ad3722798569dc4de83c575d
+Subproject commit 5a5f5254cf22e2293b5b7f4cf166014a33fcd641
diff --git a/lib/GitHubSharp b/lib/GitHubSharp
@@ -1 +1 @@
-Subproject commit 71ab269f5a6398501674bb0b03cef4409ea26f4b
+Subproject commit 8831ade4007ee6e468cc208e730e39a4d315c1ce

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using CodeHub.Core.ViewModels.User;`
`6`	`6`	`using GitHubSharp.Models;`
`7`	`7`	`using CodeFramework.Core.ViewModels;`
	`8`	`+using CodeFramework.Core.Services;`
`8`	`9`
`9`	`10`	`namespace CodeHub.Core.ViewModels.Gists`
`10`	`11`	`{`
`@@ -86,6 +87,14 @@ public ICommand ToggleStarCommand`
`86`	`87`	`}`
`87`	`88`	`}`
`88`	`89`
	`90`	`+ public ICommand ShareCommand`
	`91`	`+ {`
	`92`	`+ get`
	`93`	`+ {`
	`94`	`+ return new MvxCommand(() => GetService<IShareService>().ShareUrl(Gist.HtmlUrl), () => Gist != null);`
	`95`	`+ }`
	`96`	`+ }`
	`97`	`+`
`89`	`98`	`public void Init(NavObject navObject)`
`90`	`99`	`{`
`91`	`100`	`Id = navObject.Id;`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,15 @@ protected List<IGrouping<string, IssueModel>> Group(IEnumerable<IssueModel> mode`
`60`	`60`	`return FilterGroup.CreateNumberedGroup(g, "Days Ago", "Created");`
`61`	`61`	`}`
`62`	`62`
`63`		`- return null;`
	`63`	`+ try`
	`64`	`+ {`
	`65`	`+ var regex = new System.Text.RegularExpressions.Regex("repos/(.+)/issues/");`
	`66`	`+ return model.GroupBy(x => regex.Match(x.Url).Groups[1].Value).ToList();`
	`67`	`+ }`
	`68`	`+ catch (Exception e)`
	`69`	`+ {`
	`70`	`+ return null;`
	`71`	`+ }`
`64`	`72`	`}`
`65`	`73`	`}`
`66`	`74`
Original file line number	Diff line number	Diff line change
`@@ -120,12 +120,8 @@ private void ShareButtonPress()`
`120`	`120`	`try`
`121`	`121`	`{`
`122`	`122`	`if (e.ButtonIndex == shareButton)`
`123`		`- {`
`124`		`- var item = new NSUrl(ViewModel.Gist.HtmlUrl);`
`125`		`- var activityItems = new NSObject[] { item };`
`126`		`- UIActivity[] applicationActivities = null;`
`127`		`- var activityController = new UIActivityViewController (activityItems, applicationActivities);`
`128`		`- PresentViewController (activityController, true, null);`
	`123`	`+ {`
	`124`	`+ ViewModel.ShareCommand.Execute(null);`
`129`	`125`	`}`
`130`	`126`	`else if (e.ButtonIndex == showButton)`
`131`	`127`	`{`
Original file line number	Diff line number	Diff line change
`@@ -64,11 +64,7 @@ private void ShowExtraMenu()`
`64`	`64`	`}`
`65`	`65`	`else if (e.ButtonIndex == shareButton)`
`66`	`66`	`{`
`67`		`- var item = new NSUrl(ViewModel.HtmlUrl);`
`68`		`- var activityItems = new NSObject[] { item };`
`69`		`- UIActivity[] applicationActivities = null;`
`70`		`- var activityController = new UIActivityViewController (activityItems, applicationActivities);`
`71`		`- PresentViewController (activityController, true, null);`
	`67`	`+ ViewModel.ShareCommand.Execute(null);`
`72`	`68`	`}`
`73`	`69`	`else if (e.ButtonIndex == showButton)`
`74`	`70`	`{`