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

Commit 9a65760

Browse files
thedillonbthedillonb
committed
Migrating to new icons
1 parent b12a31d commit 9a65760

File tree

195 files changed

+1235
-890
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

195 files changed

+1235
-890
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
using Cirrious.MvvmCross.Plugins.Messenger;
1717
using CodeHub.Core.ViewModels.Notifications;
1818
using CodeFramework.Core.ViewModels;
19+
using GitHubSharp.Models;
1920

2021
namespace CodeHub.Core.ViewModels.App
2122
{
2223
public class MenuViewModel : BaseMenuViewModel
2324
{
2425
private readonly IApplicationService _application;
2526
private int _notifications;
26-
private List<string> _organizations;
27+
private List<BasicUserModel> _organizations;
2728
private readonly MvxSubscriptionToken _notificationCountToken;
2829

2930
public int Notifications
@@ -32,7 +33,7 @@ public int Notifications
3233
set { _notifications = value; RaisePropertyChanged(() => Notifications); }
3334
}
3435

35-
public List<string> Organizations
36+
public List<BasicUserModel> Organizations
3637
{
3738
get { return _organizations; }
3839
set { _organizations = value; RaisePropertyChanged(() => Organizations); }
@@ -190,8 +191,7 @@ private void Load()
190191

191192
this.GetApplication().Client.ExecuteAsync(this.GetApplication().Client.AuthenticatedUser.GetOrganizations()).ContinueWith(t =>
192193
{
193-
Organizations = t.Result.Data.Select(y => y.Login).ToList();
194-
194+
Organizations = t.Result.Data.ToList();
195195
});
196196
}
197197
}

‎CodeHub.iOS/CodeHub.iOS.csproj‎

Lines changed: 41 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -233,18 +233,6 @@
233233
<DependentUpon>EnableEnterpriseViewController.cs</DependentUpon>
234234
</Compile>
235235
<None Include="packages.config" />
236-
<Compile Include="Cells\IssueCellView.cs" />
237-
<Compile Include="Cells\IssueCellView.designer.cs">
238-
<DependentUpon>..\..\lib\CodeFramework\CodeFramework.iOS\Cells\IssueCellView.cs</DependentUpon>
239-
</Compile>
240-
<Compile Include="Cells\NewsCellView.cs" />
241-
<Compile Include="Cells\NewsCellView.designer.cs">
242-
<DependentUpon>..\..\lib\CodeFramework\CodeFramework.iOS\Cells\NewsCellView.cs</DependentUpon>
243-
</Compile>
244-
<Compile Include="Cells\RepositoryCellView.cs" />
245-
<Compile Include="Cells\RepositoryCellView.designer.cs">
246-
<DependentUpon>..\..\lib\CodeFramework\CodeFramework.iOS\Cells\RepositoryCellView.cs</DependentUpon>
247-
</Compile>
248236
<Compile Include="Elements\ChangesetElement.cs" />
249237
<Compile Include="Elements\CommentElement.cs" />
250238
<Compile Include="Elements\IssueElement.cs" />
@@ -296,7 +284,6 @@
296284
<None Include="SourceBrowser\css\tomorrow-night-eighties.css" />
297285
<None Include="SourceBrowser\css\xcode.css" />
298286
<None Include="SourceBrowser\css\zenburn.css" />
299-
<Compile Include="TableViewCells\MilestoneTableViewCell.cs" />
300287
<Compile Include="ViewControllers\BaseDialogViewController.cs" />
301288
<Compile Include="ViewControllers\Composer.cs" />
302289
<Compile Include="ViewControllers\FilterViewController.cs" />
@@ -306,17 +293,9 @@
306293
<Compile Include="ViewControllers\ViewModelCollectionDrivenDialogViewController.cs" />
307294
<Compile Include="ViewControllers\ViewModelDrivenDialogViewController.cs" />
308295
<Compile Include="ViewControllers\ViewModelDrivenViewController.cs" />
309-
<Compile Include="Utils\Hud.cs" />
310-
<Compile Include="Utils\PickerAlert.cs" />
311-
<Compile Include="Utils\Translate.cs" />
312-
<Compile Include="Utils\UIImageExtensions.cs" />
313-
<Compile Include="Utils\Util.cs" />
314-
<Compile Include="Utils\ViewControllerExtensions.cs" />
315-
<Compile Include="Views\AccountsView.cs" />
316296
<Compile Include="Views\AddRemoveView.cs" />
317297
<Compile Include="Views\MenuSectionView.cs" />
318298
<Compile Include="Views\MilestoneView.cs" />
319-
<Compile Include="Views\ProfileButton.cs" />
320299
<Compile Include="Views\ProgressBarView.cs" />
321300
<Compile Include="Views\ScrollingToolbarView.cs" />
322301
<Compile Include="Views\StartupView.cs" />
@@ -329,7 +308,6 @@
329308
<Compile Include="XCallback\XCallbackQuery.cs" />
330309
<Compile Include="TouchViewPresenter.cs" />
331310
<Compile Include="Elements\ActivityElement.cs" />
332-
<Compile Include="Elements\ButtonElement.cs" />
333311
<Compile Include="Elements\CustomElement.cs" />
334312
<Compile Include="Elements\InputElement.cs" />
335313
<Compile Include="Elements\MultilinedElement.cs" />
@@ -346,14 +324,6 @@
346324
<Compile Include="Elements\SplitElement.cs" />
347325
<Compile Include="Elements\TrueFalseElement.cs" />
348326
<Compile Include="Elements\LoadMoreElement.cs" />
349-
<Compile Include="Utils\Controls.cs" />
350-
<Compile Include="Utils\GlassButton.cs" />
351-
<Compile Include="Utils\Graphics.cs" />
352-
<Compile Include="Utils\ImageLoader.cs" />
353-
<Compile Include="Utils\LocalizationExtensions.cs" />
354-
<Compile Include="Utils\LRUCache.cs" />
355-
<Compile Include="Utils\SegmentControl.cs" />
356-
<Compile Include="Utils\StringExtensions.cs" />
357327
<Compile Include="ViewControllers\DialogViewController.cs" />
358328
<Compile Include="Elements\Elements.cs" />
359329
<InterfaceDefinition Include="Views\Accounts\NewAccountView.xib" />
@@ -362,13 +332,44 @@
362332
<InterfaceDefinition Include="Views\App\EnablePushNotificationsViewController.xib" />
363333
<InterfaceDefinition Include="Views\App\EnableEnterpriseViewController.xib" />
364334
<InterfaceDefinition Include="Launch.storyboard" />
365-
<InterfaceDefinition Include="Cells\IssueCellView.xib" />
366-
<InterfaceDefinition Include="Cells\NewsCellView.xib" />
367-
<InterfaceDefinition Include="Cells\RepositoryCellView.xib" />
368335
<Compile Include="Bootstrap\MessengerPluginBootstrap.cs" />
369336
<Compile Include="Views\ImageAndTitleHeaderView.cs" />
370337
<Compile Include="Views\SlideupTitleVIew.cs" />
371338
<Compile Include="Views\Repositories\RepositoriesForkedView.cs" />
339+
<Compile Include="Utilities\Hud.cs" />
340+
<Compile Include="Utilities\PickerAlert.cs" />
341+
<Compile Include="Utilities\Translate.cs" />
342+
<Compile Include="Utilities\UIImageExtensions.cs" />
343+
<Compile Include="Utilities\Util.cs" />
344+
<Compile Include="Utilities\ViewControllerExtensions.cs" />
345+
<Compile Include="Utilities\Controls.cs" />
346+
<Compile Include="Utilities\Graphics.cs" />
347+
<Compile Include="Utilities\ImageLoader.cs" />
348+
<Compile Include="Utilities\LocalizationExtensions.cs" />
349+
<Compile Include="Utilities\LRUCache.cs" />
350+
<Compile Include="Utilities\SegmentControl.cs" />
351+
<Compile Include="Utilities\StringExtensions.cs" />
352+
<Compile Include="Utilities\EasyLayout.cs" />
353+
<Compile Include="Octicons.cs" />
354+
<Compile Include="OcticonExtensions.cs" />
355+
<Compile Include="Views\Accounts\AccountsView.cs" />
356+
<Compile Include="Views\ProfileButton.cs" />
357+
<Compile Include="TableViewCells\IssueCellView.cs" />
358+
<Compile Include="TableViewCells\IssueCellView.designer.cs">
359+
<DependentUpon>IssueCellView.cs</DependentUpon>
360+
</Compile>
361+
<Compile Include="TableViewCells\NewsCellView.cs" />
362+
<Compile Include="TableViewCells\NewsCellView.designer.cs">
363+
<DependentUpon>NewsCellView.cs</DependentUpon>
364+
</Compile>
365+
<Compile Include="TableViewCells\RepositoryCellView.cs" />
366+
<Compile Include="TableViewCells\RepositoryCellView.designer.cs">
367+
<DependentUpon>RepositoryCellView.cs</DependentUpon>
368+
</Compile>
369+
<InterfaceDefinition Include="TableViewCells\IssueCellView.xib" />
370+
<InterfaceDefinition Include="TableViewCells\NewsCellView.xib" />
371+
<InterfaceDefinition Include="TableViewCells\RepositoryCellView.xib" />
372+
<Compile Include="TableViewCells\MilestoneTableViewCell.cs" />
372373
</ItemGroup>
373374
<ItemGroup>
374375
<Reference Include="System" />
@@ -418,18 +419,14 @@
418419
<Reference Include="Newtonsoft.Json">
419420
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
420421
</Reference>
421-
<Reference Include="SDWebImage">
422-
<HintPath>..\packages\Xamarin.SDWebImage.3.7.3.4\lib\Xamarin.iOS\SDWebImage.dll</HintPath>
423-
</Reference>
424422
<Reference Include="GitHubSharp">
425423
<HintPath>..\packages\GitHubClient.1.0.9.0\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\GitHubSharp.dll</HintPath>
426424
</Reference>
425+
<Reference Include="SDWebImage">
426+
<HintPath>..\packages\Xamarin.SDWebImage.3.7.5\lib\Xamarin.iOS\SDWebImage.dll</HintPath>
427+
</Reference>
427428
</ItemGroup>
428429
<ItemGroup>
429-
<Content Include="Images\bin_closed%402x.png" />
430-
<Content Include="Images\bin_closed.png" />
431-
<Content Include="Images\branch%402x.png" />
432-
<Content Include="Images\branch.png" />
433430
<Content Include="Images\Buttons\black_button%402x.png" />
434431
<Content Include="Images\Buttons\black_button.png" />
435432
<Content Include="Images\Buttons\fork%402x.png" />
@@ -440,30 +437,6 @@
440437
<Content Include="Images\Buttons\save.png" />
441438
<Content Include="Images\Buttons\view%402x.png" />
442439
<Content Include="Images\Buttons\view.png" />
443-
<Content Include="Images\cog%402x.png" />
444-
<Content Include="Images\cog.png" />
445-
<Content Include="Images\comments%402x.png" />
446-
<Content Include="Images\comments.png" />
447-
<Content Include="Images\commit%402x.png" />
448-
<Content Include="Images\commit.png" />
449-
<Content Include="Images\create%402x.png" />
450-
<Content Include="Images\create.png" />
451-
<Content Include="Images\events%402x.png" />
452-
<Content Include="Images\events.png" />
453-
<Content Include="Images\explore%402x.png" />
454-
<Content Include="Images\explore.png" />
455-
<Content Include="Images\eye%402x.png" />
456-
<Content Include="Images\eye.png" />
457-
<Content Include="Images\file%402x.png" />
458-
<Content Include="Images\file.png" />
459-
<Content Include="Images\flag%402x.png" />
460-
<Content Include="Images\flag.png" />
461-
<Content Include="Images\folder%402x.png" />
462-
<Content Include="Images\folder.png" />
463-
<Content Include="Images\following%402x.png" />
464-
<Content Include="Images\following.png" />
465-
<Content Include="Images\fork%402x.png" />
466-
<Content Include="Images\fork.png" />
467440
<Content Include="Images\Gist\share%402x.png" />
468441
<Content Include="Images\Gist\share.png" />
469442
<Content Include="Images\Gist\star%402x.png" />
@@ -472,57 +445,8 @@
472445
<Content Include="Images\Gist\star_highlighted.png" />
473446
<Content Include="Images\Gist\user%402x.png" />
474447
<Content Include="Images\Gist\user.png" />
475-
<Content Include="Images\group%402x.png" />
476-
<Content Include="Images\group.png" />
477-
<Content Include="Images\hand%402x.png" />
478-
<Content Include="Images\hand.png" />
479-
<Content Include="Images\heart%402x.png" />
480-
<Content Include="Images\heart.png" />
481-
<Content Include="Images\info%402x.png" />
482-
<Content Include="Images\info.png" />
483-
<Content Include="Images\language%402x.png" />
484-
<Content Include="Images\language.png" />
485-
<Content Include="Images\locked%402x.png" />
486-
<Content Include="Images\locked.png" />
487-
<Content Include="Images\Logos\github.png" />
488-
<Content Include="Images\merge%402x.png" />
489-
<Content Include="Images\merge.png" />
490-
<Content Include="Images\milestone%402x.png" />
491-
<Content Include="Images\milestone.png" />
492-
<Content Include="Images\news%402x.png" />
493-
<Content Include="Images\news.png" />
494-
<Content Include="Images\notifications%402x.png" />
495-
<Content Include="Images\notifications.png" />
496-
<Content Include="Images\pencil%402x.png" />
497-
<Content Include="Images\pencil.png" />
498-
<Content Include="Images\person%402x.png" />
499-
<Content Include="Images\person.png" />
500-
<Content Include="Images\priority%402x.png" />
501-
<Content Include="Images\priority.png" />
502-
<Content Include="Images\public%402x.png" />
503-
<Content Include="Images\public.png" />
504-
<Content Include="Images\repo%402x.png" />
505-
<Content Include="Images\repo.png" />
506448
<Content Include="Images\repository.png" />
507449
<Content Include="Images\repository_fork.png" />
508-
<Content Include="Images\script%402x.png" />
509-
<Content Include="Images\script.png" />
510-
<Content Include="Images\size%402x.png" />
511-
<Content Include="Images\size.png" />
512-
<Content Include="Images\star%402x.png" />
513-
<Content Include="Images\star.png" />
514-
<Content Include="Images\star2%402x.png" />
515-
<Content Include="Images\star2.png" />
516-
<Content Include="Images\tag%402x.png" />
517-
<Content Include="Images\tag.png" />
518-
<Content Include="Images\team%402x.png" />
519-
<Content Include="Images\team.png" />
520-
<Content Include="Images\unlocked%402x.png" />
521-
<Content Include="Images\unlocked.png" />
522-
<Content Include="Images\user%402x.png" />
523-
<Content Include="Images\user.png" />
524-
<Content Include="Images\webpage%402x.png" />
525-
<Content Include="Images\webpage.png" />
526450
<BundleResource Include="Resources\iTunesArtwork.png" />
527451
<BundleResource Include="Resources\iTunesArtwork%402x.png" />
528452
<BundleResource Include="Images\Web\back.png" />
@@ -541,8 +465,6 @@
541465
<BundleResource Include="Images\Buttons\check%402x.png" />
542466
<BundleResource Include="Images\Buttons\sort%402x.png" />
543467
<BundleResource Include="Images\Buttons\sort.png" />
544-
<BundleResource Include="Images\chart%402x.png" />
545-
<BundleResource Include="Images\chart.png" />
546468
<BundleResource Include="Images\MarkdownComposer\link%402x.png" />
547469
<BundleResource Include="Images\MarkdownComposer\link.png" />
548470
<BundleResource Include="Images\MarkdownComposer\photo%402x.png" />
@@ -566,6 +488,9 @@
566488
<Content Include="SourceBrowser\index.html" />
567489
<BundleResource Include="Images\avatar.png" />
568490
<BundleResource Include="Images\avatar%402x.png" />
491+
<BundleResource Include="Images\Logos\dotcom-mascot.png" />
492+
<BundleResource Include="Images\Logos\enterprise-mascot.png" />
493+
<BundleResource Include="octicons.ttf" />
569494
</ItemGroup>
570495
<ItemGroup>
571496
<ITunesArtwork Include="iTunesArtwork" />
@@ -577,6 +502,7 @@
577502
<Folder Include="Images\MarkdownComposer\" />
578503
<Folder Include="Factories\" />
579504
<Folder Include="Views\Teams\" />
505+
<Folder Include="Images\Logos\" />
580506
</ItemGroup>
581507
<ItemGroup>
582508
<EmbeddedResource Include="Images\arrow.png">

‎CodeHub.iOS/Elements/ButtonElement.cs‎

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎CodeHub.iOS/Elements/ChangesetElement.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using CodeFramework.iOS.Views;
21
using MonoTouch.Dialog;
2+
using CodeHub.iOS.Views;
33

4-
namespace CodeFramework.Elements
4+
namespace CodeHub.iOS.Elements
55
{
66
public class ChangesetElement : StyledStringElement
77
{

‎CodeHub.iOS/Elements/CommentElement.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using MonoTouch.Dialog;
22
using UIKit;
33

4-
namespace CodeFramework.Elements
4+
namespace CodeHub.iOS.Elements
55
{
66
public class CommentElement : NameTimeStringElement
77
{

0 commit comments

Comments
 (0)