Skip to content
This repository was archived by the owner on Jul 2, 2022. It is now read-only.

Commit a6272d1

Browse files
thedillonbthedillonb
committed
Big refactoring and better Pull request support
1 parent eb5ce3f commit a6272d1

29 files changed

+568
-64
lines changed

‎CodeHub.Core/CodeHub.Core.iOS.csproj‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@
6262
<Compile Include="ViewModels\Source\SourceViewModel.cs" />
6363
<Compile Include="ViewModels\User\BaseUserCollectionViewModel.cs" />
6464
<Compile Include="ViewModels\ViewModelExtensions.cs" />
65-
<Compile Include="ViewModels\ChangesetViewModel.cs" />
66-
<Compile Include="ViewModels\ChangesetsViewModel.cs" />
6765
<Compile Include="ViewModels\Events\BaseEventsViewModel.cs" />
6866
<Compile Include="ViewModels\Gists\GistsViewModel.cs" />
6967
<Compile Include="ViewModels\Gists\GistViewModel.cs" />
@@ -72,7 +70,6 @@
7270
<Compile Include="ViewModels\Issues\IssueViewModel.cs" />
7371
<Compile Include="ViewModels\Issues\MyIssuesViewModel.cs" />
7472
<Compile Include="ViewModels\Events\NewsViewModel.cs" />
75-
<Compile Include="ViewModels\NotificationsViewModel.cs" />
7673
<Compile Include="ViewModels\User\OrganizationMembersViewModel.cs" />
7774
<Compile Include="ViewModels\Repositories\OrganizationRepositoriesViewModel.cs" />
7875
<Compile Include="ViewModels\Organizations\OrganizationsViewModel.cs" />
@@ -86,13 +83,11 @@
8683
<Compile Include="ViewModels\Repositories\RepositoriesStarredViewModel.cs" />
8784
<Compile Include="ViewModels\Repositories\RepositoriesViewModel.cs" />
8885
<Compile Include="ViewModels\Repositories\RepositoriesWatchedViewModel.cs" />
89-
<Compile Include="ViewModels\RepositoryCollaboratorsViewModel.cs" />
9086
<Compile Include="ViewModels\Events\RepositoryEventsViewModel.cs" />
9187
<Compile Include="ViewModels\Repositories\RepositoryViewModel.cs" />
9288
<Compile Include="ViewModels\Source\SourceTreeViewModel.cs" />
9389
<Compile Include="ViewModels\Repositories\StargazersViewModel.cs" />
9490
<Compile Include="ViewModels\User\TeamMembersViewModel.cs" />
95-
<Compile Include="ViewModels\TeamsViewModel.cs" />
9691
<Compile Include="ViewModels\User\UserFollowersViewModel.cs" />
9792
<Compile Include="ViewModels\User\UserFollowingsViewModel.cs" />
9893
<Compile Include="ViewModels\Source\BranchesAndTagsViewModel.cs" />
@@ -115,7 +110,6 @@
115110
<Compile Include="Messages\IssueEditMessage.cs" />
116111
<Compile Include="ViewModels\App\DefaultStartupViewModel.cs" />
117112
<Compile Include="ViewModels\Accounts\LoginViewModel.cs" />
118-
<Compile Include="ViewModels\CommitsViewModel.cs" />
119113
<Compile Include="Messages\NotificationCountMessage.cs" />
120114
<Compile Include="Services\IPushNotificationsService.cs" />
121115
<Compile Include="ViewModels\App\AboutViewModel.cs" />
@@ -133,6 +127,14 @@
133127
<Compile Include="Factories\IFeatureFactory.cs" />
134128
<Compile Include="Factories\ILoginFactory.cs" />
135129
<Compile Include="Factories\LoginFactory.cs" />
130+
<Compile Include="ViewModels\Teams\TeamsViewModel.cs" />
131+
<Compile Include="ViewModels\Repositories\RepositoryCollaboratorsViewModel.cs" />
132+
<Compile Include="ViewModels\Changesets\ChangesetsViewModel.cs" />
133+
<Compile Include="ViewModels\Changesets\ChangesetViewModel.cs" />
134+
<Compile Include="ViewModels\Changesets\CommitsViewModel.cs" />
135+
<Compile Include="ViewModels\Notifications\NotificationsViewModel.cs" />
136+
<Compile Include="ViewModels\LoadableViewModel.cs" />
137+
<Compile Include="Messages\PullRequestEditMessage.cs" />
136138
</ItemGroup>
137139
<ItemGroup />
138140
<ItemGroup>
@@ -172,5 +174,8 @@
172174
</ItemGroup>
173175
<ItemGroup>
174176
<Folder Include="Factories\" />
177+
<Folder Include="ViewModels\Teams\" />
178+
<Folder Include="ViewModels\Changesets\" />
179+
<Folder Include="ViewModels\Notifications\" />
175180
</ItemGroup>
176181
</Project>

‎CodeHub.Core/Messages/PullRequestEditMessage.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using Cirrious.MvvmCross.Plugins.Messenger;
2+
using GitHubSharp.Models;
3+
4+
namespace CodeHub.Core.Messages
5+
{
6+
public class PullRequestEditMessage : MvxMessage
7+
{
8+
public PullRequestEditMessage(object sender) : base(sender) {}
9+
public PullRequestModel PullRequest;
10+
}
11+
}
12+

‎CodeHub.Core/ViewModels/App/MenuViewModel.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Collections.Generic;
2-
using System.Threading.Tasks;
32
using System.Windows.Input;
43
using Cirrious.MvvmCross.ViewModels;
54
using CodeHub.Core.Data;
@@ -15,7 +14,7 @@
1514
using CodeFramework.Core.ViewModels.App;
1615
using CodeHub.Core.Messages;
1716
using Cirrious.MvvmCross.Plugins.Messenger;
18-
using System;
17+
using CodeHub.Core.ViewModels.Notifications;
1918

2019
namespace CodeHub.Core.ViewModels.App
2120
{

CodeHub.Core/ViewModels/ChangesetViewModel.cs renamed to CodeHub.Core/ViewModels/Changesets/ChangesetViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Threading.Tasks;
88
using CodeHub.Core.ViewModels.Source;
99

10-
namespace CodeHub.Core.ViewModels
10+
namespace CodeHub.Core.ViewModels.Changesets
1111
{
1212
public class ChangesetViewModel : LoadableViewModel
1313
{

CodeHub.Core/ViewModels/ChangesetsViewModel.cs renamed to CodeHub.Core/ViewModels/Changesets/ChangesetsViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Collections.Generic;
33
using GitHubSharp.Models;
44

5-
namespace CodeHub.Core.ViewModels
5+
namespace CodeHub.Core.ViewModels.Changesets
66
{
77
public class ChangesetsViewModel : CommitsViewModel
88
{

CodeHub.Core/ViewModels/CommitsViewModel.cs renamed to CodeHub.Core/ViewModels/Changesets/CommitsViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Collections.Generic;
88
using Cirrious.MvvmCross.ViewModels;
99

10-
namespace CodeHub.Core.ViewModels
10+
namespace CodeHub.Core.ViewModels.Changesets
1111
{
1212
public abstract class CommitsViewModel : LoadableViewModel
1313
{

‎CodeHub.Core/ViewModels/Events/BaseEventsViewModel.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
using GitHubSharp;
1515
using GitHubSharp.Models;
1616
using CodeFramework.Core.Utils;
17+
using CodeHub.Core.ViewModels.Changesets;
1718

1819
namespace CodeHub.Core.ViewModels.Events
1920
{

‎CodeHub.Core/ViewModels/LoadableViewModel.cs‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
using GitHubSharp;
2+
using System.Threading.Tasks;
3+
using Cirrious.MvvmCross.ViewModels;
4+
5+
namespace CodeHub.Core.ViewModels
6+
{
7+
public abstract class LoadableViewModel : CodeFramework.Core.ViewModels.LoadableViewModel
8+
{
9+
protected override async Task ExecuteLoadResource(bool forceCacheInvalidation)
10+
{
11+
try
12+
{
13+
await base.ExecuteLoadResource(forceCacheInvalidation);
14+
}
15+
catch (StatusCodeException e)
16+
{
17+
DisplayAlert(e.Message);
18+
19+
if (e is NotFoundException)
20+
ChangePresentation(new MvxClosePresentationHint(this));
21+
}
22+
}
23+
}
24+
}
25+

CodeHub.Core/ViewModels/NotificationsViewModel.cs renamed to CodeHub.Core/ViewModels/Notifications/NotificationsViewModel.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
using CodeHub.Core.Messages;
1313
using System.Collections.Generic;
1414
using CodeHub.Core.ViewModels.Source;
15+
using CodeHub.Core.ViewModels.Changesets;
1516

16-
namespace CodeHub.Core.ViewModels
17+
namespace CodeHub.Core.ViewModels.Notifications
1718
{
1819
public class NotificationsViewModel : LoadableViewModel
1920
{

‎CodeHub.Core/ViewModels/Organizations/OrganizationViewModel.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using CodeHub.Core.ViewModels.User;
88
using GitHubSharp.Models;
99
using CodeFramework.Core.ViewModels;
10+
using CodeHub.Core.ViewModels.Teams;
1011

1112
namespace CodeHub.Core.ViewModels.Organizations
1213
{

0 commit comments

Comments
 (0)