Added back filters

Author: thedillonb

CodeHub.Core/ViewModels/Repositories/RepositoriesViewModel.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Input;
 using Cirrious.MvvmCross.ViewModels;
 using CodeFramework.Core.Utils;
@@ -35,9 +34,9 @@ public ICommand GoToRepositoryCommand
         protected RepositoriesViewModel(string filterKey = "RepositoryController")
         {
             _repositories = new FilterableCollectionViewModel<RepositoryModel, RepositoriesFilterModel>(filterKey);
-            //_repositories.FilteringFunction = x => _repositories.Filter.Ascending ? x.OrderBy(y => y.Name) : x.OrderByDescending(y => y.Name);
-            //_repositories.GroupingFunction = CreateGroupedItems;
-            _repositories.Bind(x => x.Filter, () => Repositories.Refresh());
+			_repositories.FilteringFunction = x => Repositories.Filter.Ascending ? x.OrderBy(y => y.Name) : x.OrderByDescending(y => y.Name);
+            _repositories.GroupingFunction = CreateGroupedItems;
+			_repositories.Bind(x => x.Filter, Repositories.Refresh);
         }
 
         private IEnumerable<IGrouping<string, RepositoryModel>> CreateGroupedItems(IEnumerable<RepositoryModel> model)

CodeHub.Core/ViewModels/Source/SourceTreeViewModel.cs

@@ -65,7 +65,8 @@ private void GoToSubmodule(ContentModel x)
         public SourceTreeViewModel()
         {
             _content = new FilterableCollectionViewModel<ContentModel, SourceFilterModel>("SourceViewModel");
-            _content.FilteringFunction = FilterModel;
+            _content.FilteringFunction = FilterModel;
+			_content.Bind(x => x.Filter, _content.Refresh);
         }
 
         public void Init(NavObject navObject)
@@ -87,9 +88,9 @@ private IEnumerable<ContentModel> FilterModel(IEnumerable<ContentModel> model)
             return _content.Filter.Ascending ? ret : ret.Reverse();
         }
 
-        protected override Task Load(bool forceDataRefresh)
+        protected override Task Load(bool forceCacheInvalidation)
         {
-			return Content.SimpleCollectionLoad(this.GetApplication().Client.Users[Username].Repositories[Repository].GetContent(Path, Branch), forceDataRefresh);
+			return Content.SimpleCollectionLoad(this.GetApplication().Client.Users[Username].Repositories[Repository].GetContent(Path, Branch), forceCacheInvalidation);
         }
 
         public class NavObject

CodeHub.iOS/CodeHub.iOS.csproj

@@ -157,6 +157,11 @@
     <Compile Include="Views\Accounts\LoginView.cs" />
     <Compile Include="Views\Source\CommitsView.cs" />
     <Compile Include="Views\PullRequests\PullRequestCommitsView.cs" />
+    <Compile Include="Views\Filters\IssueMilestonesFilterViewController.cs" />
+    <Compile Include="Views\Filters\IssuesFilterViewController.cs" />
+    <Compile Include="Views\Filters\MyIssuesFilterViewController.cs" />
+    <Compile Include="Views\Filters\RepositoriesFilterViewController.cs" />
+    <Compile Include="Views\Filters\SourceFilterViewController.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CodeHub.Core\CodeHub.Core.iOS.csproj">
@@ -222,8 +227,6 @@
     <Content Include="Images\branch.png" />
     <Content Include="Images\Buttons\black_button%402x.png" />
     <Content Include="Images\Buttons\black_button.png" />
-    <Content Include="Images\Buttons\filter%402x.png" />
-    <Content Include="Images\Buttons\filter.png" />
     <Content Include="Images\Buttons\fork%402x.png" />
     <Content Include="Images\Buttons\fork.png" />
     <Content Include="Images\Buttons\grey_button%402x.png" />
@@ -238,7 +241,6 @@
     <Content Include="Images\comments.png" />
     <Content Include="Images\commit%402x.png" />
     <Content Include="Images\commit.png" />
-    <Content Include="Images\Controls\warning.png" />
     <Content Include="Images\create%402x.png" />
     <Content Include="Images\create.png" />
     <Content Include="Images\events%402x.png" />
@@ -343,14 +345,14 @@
     <Content Include="WebCell\comments.html" />
     <BundleResource Include="Images\Buttons\back%402x.png" />
     <BundleResource Include="Images\Buttons\back.png" />
-    <BundleResource Include="Images\Buttons\edit.png" />
-    <BundleResource Include="Images\Buttons\edit%402x.png" />
     <BundleResource Include="Images\Buttons\cancel.png" />
     <BundleResource Include="Images\Buttons\cancel%402x.png" />
     <BundleResource Include="Images\Buttons\three_lines.png" />
     <BundleResource Include="Images\Buttons\three_lines%402x.png" />
     <BundleResource Include="Images\Buttons\check.png" />
     <BundleResource Include="Images\Buttons\check%402x.png" />
+    <BundleResource Include="Images\Buttons\sort.png" />
+    <BundleResource Include="Images\Buttons\sort%402x.png" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
   <ItemGroup>
@@ -359,5 +361,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="WebCell\" />
+    <Folder Include="Views\Filters\" />
   </ItemGroup>
 </Project>