More cleaning

thedillonb · thedillonb · commit 6415bfaf0c77 · 2013-12-28T14:20:43.000-05:00
diff --git a/CodeHub.Core/App.cs b/CodeHub.Core/App.cs
@@ -1,5 +1,4 @@
 ﻿using Cirrious.MvvmCross.ViewModels;
-using CodeHub.Core.ViewModels;
 using CodeHub.Core.ViewModels.App;
 
 namespace CodeHub.Core
diff --git a/CodeHub.Core/CodeHub.Core.iOS.csproj b/CodeHub.Core/CodeHub.Core.iOS.csproj
@@ -118,7 +118,6 @@
     <Compile Include="ViewModels\Issues\IssueModifyViewModel.cs" />
     <Compile Include="Messages\IssueEditMessage.cs" />
     <Compile Include="Services\IMarkdownService.cs" />
-    <Compile Include="Services\MarkdownService.cs" />
     <Compile Include="ViewModels\App\DefaultStartupViewModel.cs" />
     <Compile Include="ViewModels\Accounts\LoginViewModel.cs" />
     <Compile Include="ViewModels\CommitsViewModel.cs" />
@@ -130,7 +129,6 @@
     <Reference Include="System.Windows" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
-    <Reference Include="monotouch" />
     <Reference Include="Cirrious.CrossCore">
       <HintPath>..\lib\CodeFramework\lib\iOS\Cirrious.CrossCore.dll</HintPath>
     </Reference>
@@ -155,9 +153,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
-  <ItemGroup>
-    <Folder Include="Messages\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <Content Include="Markdown\marked.js" />
     <Content Include="Markdown\markdown.html" />
diff --git a/CodeHub.Core/Filters/BaseIssuesFilterModel.cs b/CodeHub.Core/Filters/BaseIssuesFilterModel.cs
@@ -6,15 +6,15 @@ public abstract class BaseIssuesFilterModel<T> : FilterModel<T>
     {
 		public bool Ascending { get; set; }
 
-		public Sort SortType { get; set; }
-
-        public BaseIssuesFilterModel()
+		public Sort SortType { get; set; }
+
+	    protected BaseIssuesFilterModel()
         {
 			SortType = Sort.None;
 			Ascending = false;
         }
 
-		public enum Sort : int
+		public enum Sort
 		{
 			None,
 			Created,
diff --git a/CodeHub.Core/Filters/MyIssuesFilterModel.cs b/CodeHub.Core/Filters/MyIssuesFilterModel.cs
@@ -47,7 +47,7 @@ public override bool Equals(object obj)
                 return true;
             if (obj.GetType() != typeof(MyIssuesFilterModel))
                 return false;
-            MyIssuesFilterModel other = (MyIssuesFilterModel)obj;
+            var other = (MyIssuesFilterModel)obj;
             return Ascending == other.Ascending && Labels == other.Labels && FilterType == other.FilterType && Open == other.Open && Since == other.Since && SortType == other.SortType;
         }
 
@@ -59,7 +59,7 @@ public override int GetHashCode()
             }
         }
         
-		public enum Filter : int
+		public enum Filter
 		{
             [EnumDescription("Assigned To You")]
 			Assigned,
diff --git a/CodeHub.Core/Filters/NotificationsFilterModel.cs b/CodeHub.Core/Filters/NotificationsFilterModel.cs
@@ -22,7 +22,7 @@ public override bool Equals(object obj)
                 return true;
             if (obj.GetType() != typeof(NotificationsFilterModel))
                 return false;
-            NotificationsFilterModel other = (NotificationsFilterModel)obj;
+            var other = (NotificationsFilterModel)obj;
             return All == other.All && Participating == other.Participating;
         }
         
diff --git a/CodeHub.Core/Filters/RepositoriesFilterModel.cs b/CodeHub.Core/Filters/RepositoriesFilterModel.cs
@@ -19,7 +19,7 @@ public override RepositoriesFilterModel Clone()
             return (RepositoriesFilterModel)this.MemberwiseClone();
         }
 
-        public enum Order : int
+        public enum Order
         { 
             Name, 
             Owner,
diff --git a/CodeHub.Core/Filters/SourceFilterModel.cs b/CodeHub.Core/Filters/SourceFilterModel.cs
@@ -19,7 +19,7 @@ public override SourceFilterModel Clone()
 			return (SourceFilterModel)this.MemberwiseClone();
         }
 
-        public enum Order : int
+        public enum Order
         { 
             Alphabetical, 
             [EnumDescription("Folders Then Files")]
diff --git a/CodeHub.Core/Messages/IssueAddMessage.cs b/CodeHub.Core/Messages/IssueAddMessage.cs
@@ -1,4 +1,3 @@
-using System;
 using Cirrious.MvvmCross.Plugins.Messenger;
 using GitHubSharp.Models;
 
diff --git a/CodeHub.Core/Messages/IssueEditMessage.cs b/CodeHub.Core/Messages/IssueEditMessage.cs
@@ -1,4 +1,3 @@
-using System;
 using Cirrious.MvvmCross.Plugins.Messenger;
 using GitHubSharp.Models;
 
diff --git a/CodeHub.Core/Messages/NotificationCountMessage.cs b/CodeHub.Core/Messages/NotificationCountMessage.cs
@@ -1,4 +1,3 @@
-using System;
 using Cirrious.MvvmCross.Plugins.Messenger;
 
 namespace CodeHub.Core.Messages
diff --git a/CodeHub.Core/Messages/SelectIssueLabelsMessage.cs b/CodeHub.Core/Messages/SelectIssueLabelsMessage.cs
@@ -1,4 +1,3 @@
-using System;
 using Cirrious.MvvmCross.Plugins.Messenger;
 
 namespace CodeHub.Core.Messages
diff --git a/CodeHub.Core/Messages/SelectedAssignedToMessage.cs b/CodeHub.Core/Messages/SelectedAssignedToMessage.cs
@@ -1,4 +1,3 @@
-using System;
 using Cirrious.MvvmCross.Plugins.Messenger;
 using GitHubSharp.Models;
 
diff --git a/CodeHub.Core/Messages/SelectedMilestoneMessage.cs b/CodeHub.Core/Messages/SelectedMilestoneMessage.cs
@@ -1,4 +1,3 @@
-using System;
 using Cirrious.MvvmCross.Plugins.Messenger;
 using GitHubSharp.Models;
 
diff --git a/CodeHub.Core/Services/ApplicationService.cs b/CodeHub.Core/Services/ApplicationService.cs
@@ -1,10 +1,8 @@
-﻿using Cirrious.CrossCore;
-using Cirrious.MvvmCross.ViewModels;
+﻿using Cirrious.MvvmCross.ViewModels;
 using Cirrious.MvvmCross.Views;
-using CodeFramework.Core;
+using CodeFramework.Core.Data;
 using CodeFramework.Core.Services;
 using CodeHub.Core.Data;
-using CodeHub.Core.ViewModels;
 using CodeHub.Core.ViewModels.App;
 using GitHubSharp;
 using System.Linq;
@@ -42,10 +40,10 @@ public void ActivateUser(GitHubAccount account, Client client)
             _viewDispatcher.ShowViewModel(new MvxViewModelRequest {ViewModelType = typeof (MenuViewModel)});
         }
 
-		private static void CheckCacheSize(CodeFramework.Core.Data.AccountCache cache)
+		private static void CheckCacheSize(AccountCache cache)
 		{
 			var totalCacheSize = cache.Sum(x => System.IO.File.Exists(x.Path) ? new System.IO.FileInfo(x.Path).Length : 0);
-			var totalCacheSizeMB = ((float)totalCacheSize / 1024f / 1024f);
+			var totalCacheSizeMB = (totalCacheSize / 1024f / 1024f);
 
 			if (totalCacheSizeMB > 64)
 			{
@@ -56,8 +54,8 @@ private static void CheckCacheSize(CodeFramework.Core.Data.AccountCache cache)
 
 		private class GitHubCache : ICache
 		{
-			private readonly CodeFramework.Core.Data.AccountCache _account;
-			public GitHubCache(GitHubAccount account)
+			private readonly AccountCache _account;
+			public GitHubCache(Account account)
 			{
 				_account = account.Cache;
 			}
diff --git a/CodeHub.Core/Services/IApplicationService.cs b/CodeHub.Core/Services/IApplicationService.cs
@@ -1,5 +1,4 @@
-﻿using CodeFramework.Core.Data;
-using CodeFramework.Core.Services;
+﻿using CodeFramework.Core.Services;
 using CodeHub.Core.Data;
 
 namespace CodeHub.Core.Services
diff --git a/CodeHub.Core/Services/IMarkdownService.cs b/CodeHub.Core/Services/IMarkdownService.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace CodeHub.Core.Services
 {
     public interface IMarkdownService
diff --git a/CodeHub.Core/Services/JsonSerializationService.cs b/CodeHub.Core/Services/JsonSerializationService.cs
@@ -1,4 +1,3 @@
-using System;
 using CodeFramework.Core.Services;
 
 namespace CodeHub.Core.Services
diff --git a/CodeHub.Core/Services/LoginService.cs b/CodeHub.Core/Services/LoginService.cs
@@ -115,6 +115,7 @@ public LoginData Authenticate(string domain, string user, string pass, string tw
         /// <summary>
         /// Goofy exception so we can catch and do two factor auth
         /// </summary>
+        [Serializable]
         public class TwoFactorRequiredException : Exception
         {
             public TwoFactorRequiredException()
diff --git a/CodeHub.Core/ViewModels/Repositories/ReadmeViewModel.cs b/CodeHub.Core/ViewModels/Repositories/ReadmeViewModel.cs
@@ -44,7 +44,7 @@ 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<string>(() => this.GetApplication().Client.Markdown.GetMarkdown(d));
+			Data = await Task.Run(() => this.GetApplication().Client.Markdown.GetMarkdown(d));
 			Path = CreateHtmlFile(Data);
 		}
 		
@@ -54,15 +54,15 @@ private string CreateHtmlFile(string data)
 			var markup = System.IO.File.ReadAllText("Markdown/markdown.html", Encoding.UTF8);
 
             var tmp = System.IO.Path.Combine(System.IO.Path.GetTempPath(), System.IO.Path.GetTempFileName() + ".html");
-			using (var fs = new System.IO.StreamWriter(new System.IO.FileStream(tmp, System.IO.FileMode.Create)))
-			{
-				var dataIndex = markup.IndexOf("{{DATA}}", StringComparison.Ordinal);
-				fs.Write(markup.Substring(0, dataIndex));
-				fs.Write(data);
-				fs.Write(markup.Substring(dataIndex + 8));
-				fs.Flush();
-				fs.Close();
-			}
+            using (var tmpStream = new System.IO.FileStream(tmp, System.IO.FileMode.Create))
+            {
+                var fs = new System.IO.StreamWriter(tmpStream);
+                var dataIndex = markup.IndexOf("{{DATA}}", StringComparison.Ordinal);
+                fs.Write(markup.Substring(0, dataIndex));
+                fs.Write(data);
+                fs.Write(markup.Substring(dataIndex + 8));
+                fs.Flush();
+            }
             return tmp;
         }
 
diff --git a/CodeHub.iOS/CodeHub.iOS.csproj b/CodeHub.iOS/CodeHub.iOS.csproj
@@ -95,6 +95,7 @@
     <Compile Include="Images\Images.cs" />
     <Compile Include="LinkerPleaseInclude.cs" />
     <Compile Include="AppDelegate.cs" />
+    <Compile Include="Services\MarkdownService.cs" />
     <Compile Include="Setup.cs" />
     <Compile Include="Theme.cs" />
     <Compile Include="Views\Accounts\NewAccountView.cs" />
@@ -382,8 +383,5 @@
     <ITunesArtwork Include="iTunesArtwork" />
     <ITunesArtwork Include="iTunesArtwork%402x" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="WebCell\" />
-    <Folder Include="Views\Filters\" />
-  </ItemGroup>
+  <ItemGroup />
 </Project>
diff --git a/CodeHub.iOS/CodeHub.iOS.sln b/CodeHub.iOS/CodeHub.iOS.sln
diff --git a/CodeHub.iOS/Services/MarkdownService.cs b/CodeHub.iOS/Services/MarkdownService.cs
diff --git a/CodeHub.iOS/Setup.cs b/CodeHub.iOS/Setup.cs
diff --git a/lib/CodeFramework b/lib/CodeFramework

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using Cirrious.MvvmCross.ViewModels;`
`2`		`-using CodeHub.Core.ViewModels;`
`3`	`2`	`using CodeHub.Core.ViewModels.App;`
`4`	`3`
`5`	`4`	`namespace CodeHub.Core`
Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,15 @@ public abstract class BaseIssuesFilterModel<T> : FilterModel<T>`
`6`	`6`	`{`
`7`	`7`	`public bool Ascending { get; set; }`
`8`	`8`
`9`		`- public Sort SortType { get; set; }`
`10`		`-`
`11`		`- public BaseIssuesFilterModel()`
	`9`	`+ public Sort SortType { get; set; }`
	`10`	`+`
	`11`	`+ protected BaseIssuesFilterModel()`
`12`	`12`	`{`
`13`	`13`	`SortType = Sort.None;`
`14`	`14`	`Ascending = false;`
`15`	`15`	`}`
`16`	`16`
`17`		`- public enum Sort : int`
	`17`	`+ public enum Sort`
`18`	`18`	`{`
`19`	`19`	`None,`
`20`	`20`	`Created,`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public override bool Equals(object obj)`
`47`	`47`	`return true;`
`48`	`48`	`if (obj.GetType() != typeof(MyIssuesFilterModel))`
`49`	`49`	`return false;`
`50`		`- MyIssuesFilterModel other = (MyIssuesFilterModel)obj;`
	`50`	`+ var other = (MyIssuesFilterModel)obj;`
`51`	`51`	`return Ascending == other.Ascending && Labels == other.Labels && FilterType == other.FilterType && Open == other.Open && Since == other.Since && SortType == other.SortType;`
`52`	`52`	`}`
`53`	`53`
`@@ -59,7 +59,7 @@ public override int GetHashCode()`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`- public enum Filter : int`
	`62`	`+ public enum Filter`
`63`	`63`	`{`
`64`	`64`	`[EnumDescription("Assigned To You")]`
`65`	`65`	`Assigned,`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public override bool Equals(object obj)`
`22`	`22`	`return true;`
`23`	`23`	`if (obj.GetType() != typeof(NotificationsFilterModel))`
`24`	`24`	`return false;`
`25`		`- NotificationsFilterModel other = (NotificationsFilterModel)obj;`
	`25`	`+ var other = (NotificationsFilterModel)obj;`
`26`	`26`	`return All == other.All && Participating == other.Participating;`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public override RepositoriesFilterModel Clone()`
`19`	`19`	`return (RepositoriesFilterModel)this.MemberwiseClone();`
`20`	`20`	`}`
`21`	`21`
`22`		`- public enum Order : int`
	`22`	`+ public enum Order`
`23`	`23`	`{`
`24`	`24`	`Name,`
`25`	`25`	`Owner,`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public override SourceFilterModel Clone()`
`19`	`19`	`return (SourceFilterModel)this.MemberwiseClone();`
`20`	`20`	`}`
`21`	`21`
`22`		`- public enum Order : int`
	`22`	`+ public enum Order`
`23`	`23`	`{`
`24`	`24`	`Alphabetical,`
`25`	`25`	`[EnumDescription("Folders Then Files")]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System;`
`2`	`1`	`using Cirrious.MvvmCross.Plugins.Messenger;`
`3`	`2`	`using GitHubSharp.Models;`
`4`	`3`