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

Commit d7e7bdf

Browse files
thedillonbthedillonb
committed
Fixed bugs
1 parent eb488a5 commit d7e7bdf

File tree

11 files changed

+52
-40
lines changed

11 files changed

+52
-40
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,6 @@
151151
<Reference Include="System.Net.Http" />
152152
</ItemGroup>
153153
<ItemGroup>
154-
<ProjectReference Include="..\lib\CodeFramework\CodeFramework.Core\CodeFramework.Core.iOS.csproj">
155-
<Project>{C99FE7E3-0985-48F1-9EBB-91680A795F0F}</Project>
156-
<Name>CodeFramework.Core.iOS</Name>
157-
</ProjectReference>
158154
<ProjectReference Include="..\lib\GitHubSharp\GitHubSharp.MonoTouch.csproj">
159155
<Project>{89E14828-85BB-4790-9B4E-E44DD4CE000E}</Project>
160156
<Name>GitHubSharp.MonoTouch</Name>
@@ -163,6 +159,10 @@
163159
<Project>{2698B412-26A3-4269-AA01-AC3BC79A0F14}</Project>
164160
<Name>CodeFramework.iOS</Name>
165161
</ProjectReference>
162+
<ProjectReference Include="..\lib\CodeFramework\CodeFramework.Core\CodeFramework.Core.csproj">
163+
<Project>{C99FE7E3-0985-48F1-9EBB-91680A795F0F}</Project>
164+
<Name>CodeFramework.Core</Name>
165+
</ProjectReference>
166166
</ItemGroup>
167167
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
168168
<ItemGroup />

‎CodeHub.iOS/CodeHub.iOS.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,6 @@
225225
<Compile Include="Views\App\AboutView.cs" />
226226
</ItemGroup>
227227
<ItemGroup>
228-
<ProjectReference Include="..\lib\CodeFramework\CodeFramework.Core\CodeFramework.Core.iOS.csproj">
229-
<Project>{C99FE7E3-0985-48F1-9EBB-91680A795F0F}</Project>
230-
<Name>CodeFramework.Core.iOS</Name>
231-
</ProjectReference>
232228
<ProjectReference Include="..\lib\CodeFramework\CodeFramework.iOS\CodeFramework.iOS.csproj">
233229
<Project>{2698B412-26A3-4269-AA01-AC3BC79A0F14}</Project>
234230
<Name>CodeFramework.iOS</Name>
@@ -253,6 +249,10 @@
253249
<Project>{3A0C5D98-D568-43C1-A877-B1BA00BA4A87}</Project>
254250
<Name>UserVoice</Name>
255251
</ProjectReference>
252+
<ProjectReference Include="..\lib\CodeFramework\CodeFramework.Core\CodeFramework.Core.csproj">
253+
<Project>{C99FE7E3-0985-48F1-9EBB-91680A795F0F}</Project>
254+
<Name>CodeFramework.Core</Name>
255+
</ProjectReference>
256256
</ItemGroup>
257257
<ItemGroup>
258258
<Reference Include="Cirrious.CrossCore">

‎CodeHub.iOS/CodeHub.iOS.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeHub.iOS", "CodeHub.iOS.
55
EndProject
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeFramework", "CodeFramework", "{F112095C-7262-445E-91C4-D35C1E986E69}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeFramework.Core.iOS", "..\lib\CodeFramework\CodeFramework.Core\CodeFramework.Core.iOS.csproj", "{C99FE7E3-0985-48F1-9EBB-91680A795F0F}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeFramework.Core", "..\lib\CodeFramework\CodeFramework.Core\CodeFramework.Core.csproj", "{C99FE7E3-0985-48F1-9EBB-91680A795F0F}"
99
EndProject
1010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeFramework.iOS", "..\lib\CodeFramework\CodeFramework.iOS\CodeFramework.iOS.csproj", "{2698B412-26A3-4269-AA01-AC3BC79A0F14}"
1111
EndProject

‎CodeHub.iOS/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,6 @@
6868
</dict>
6969
</array>
7070
<key>CFBundleVersion</key>
71-
<string>1</string>
71+
<string>4</string>
7272
</dict>
7373
</plist>

‎CodeHub.iOS/RELEASE-NOTES.txt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
- Bug fixes
2-
- Tweeks to performance and error reporting
3-
- Issue action button (top right) now allows for share, close/open, comment, edit, show in github within the menu.
1+
- Bug fixes

‎CodeHub.iOS/Views/Issues/IssuesView.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ public override void ViewWillAppear(bool animated)
5858

5959
void SegmentValueChanged (object sender, EventArgs e)
6060
{
61-
var application = Mvx.Resolve<IApplicationService>();
61+
var application = Mvx.Resolve<IApplicationService>();
62+
63+
// If there is searching going on. Finish it.
64+
FinishSearch();
6265

6366
if (_viewSegment.SelectedSegment == 0)
6467
{

‎CodeHub.iOS/Views/Issues/MyIssuesView.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ public override void ViewDidLoad()
2424
{
2525
ShowFilterController(new CodeHub.iOS.Views.Filters.MyIssuesFilterViewController(vm.Issues));
2626
}
27+
28+
// If there is searching going on. Finish it.
29+
FinishSearch();
2730
});
2831

2932
BindCollection(vm.Issues, CreateElement);

‎CodeHub.iOS/Views/PullRequests/PullRequestsView.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,51 +9,51 @@ namespace CodeHub.iOS.Views.PullRequests
99
{
1010
public class PullRequestsView : ViewModelCollectionDrivenDialogViewController
1111
{
12-
private readonly UISegmentedControl _viewSegment;
13-
private readonly UIBarButtonItem _segmentBarButton;
12+
private readonly UISegmentedControl _viewSegment;
13+
private readonly UIBarButtonItem _segmentBarButton;
1414

15-
public PullRequestsView()
16-
{
17-
Root.UnevenRows = true;
18-
Title = "Pull Requests".t();
19-
NoItemsText = "No Pull Requests".t();
15+
public PullRequestsView()
16+
{
17+
Root.UnevenRows = true;
18+
Title = "Pull Requests".t();
19+
NoItemsText = "No Pull Requests".t();
2020

21-
_viewSegment = new UISegmentedControl(new object[] { "Open".t(), "Closed".t() });
22-
_segmentBarButton = new UIBarButtonItem(_viewSegment);
23-
ToolbarItems = new [] { new UIBarButtonItem(UIBarButtonSystemItem.FlexibleSpace), _segmentBarButton, new UIBarButtonItem(UIBarButtonSystemItem.FlexibleSpace) };
24-
}
21+
_viewSegment = new UISegmentedControl(new object[] { "Open".t(), "Closed".t() });
22+
_segmentBarButton = new UIBarButtonItem(_viewSegment);
23+
ToolbarItems = new [] { new UIBarButtonItem(UIBarButtonSystemItem.FlexibleSpace), _segmentBarButton, new UIBarButtonItem(UIBarButtonSystemItem.FlexibleSpace) };
24+
}
2525

2626
public override void ViewDidLoad()
2727
{
2828
base.ViewDidLoad();
2929

30-
var vm = (PullRequestsViewModel)ViewModel;
30+
var vm = (PullRequestsViewModel)ViewModel;
3131
_segmentBarButton.Width = View.Frame.Width - 10f;
32-
var set = this.CreateBindingSet<PullRequestsView, PullRequestsViewModel>();
33-
set.Bind(_viewSegment).To(x => x.SelectedFilter);
34-
set.Apply();
32+
var set = this.CreateBindingSet<PullRequestsView, PullRequestsViewModel>();
33+
set.Bind(_viewSegment).To(x => x.SelectedFilter);
34+
set.Apply();
3535

36-
BindCollection(vm.PullRequests, s =>
36+
BindCollection(vm.PullRequests, s =>
3737
{
3838
var sse = new NameTimeStringElement
3939
{
40-
Name = s.Title,
41-
String = s.Body.Replace('\n', ' ').Replace("\r", ""),
40+
Name = s.Title ?? "No Title",
41+
String = (s.Body ?? string.Empty).Replace('\n', ' ').Replace("\r", ""),
4242
Lines = 3,
4343
Time = s.CreatedAt.ToDaysAgo(),
4444
Image = Theme.CurrentTheme.AnonymousUserImage,
4545
ImageUri = new Uri(s.User.AvatarUrl)
4646
};
47-
sse.Tapped += () => vm.GoToPullRequestCommand.Execute(s);
47+
sse.Tapped += () => vm.GoToPullRequestCommand.Execute(s);
4848
return sse;
4949
});
5050
}
5151

5252
public override void ViewWillAppear(bool animated)
5353
{
5454
base.ViewWillAppear(animated);
55-
if (ToolbarItems != null)
56-
NavigationController.SetToolbarHidden(false, animated);
55+
if (ToolbarItems != null)
56+
NavigationController.SetToolbarHidden(false, animated);
5757
}
5858

5959
public override void ViewWillDisappear(bool animated)

‎CodeHub.iOS/Views/Repositories/RepositoriesTrendingView.cs‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,23 @@ public override void ViewDidLoad()
3535
{
3636
var index = vm.SelectedTime == null ? 0 : vm.Times.ToList().IndexOf(vm.SelectedTime);
3737
if (index < 0) index = 0;
38-
new PickerAlert(vm.Times.Select(x => x.Name).ToArray(), index, x => vm.SelectedTime = vm.Times[x]).Show();
38+
new PickerAlert(vm.Times.Select(x => x.Name).ToArray(), index, x =>
39+
{
40+
if (x < vm.Times.Length)
41+
vm.SelectedTime = vm.Times[x];
42+
}).Show();
3943
});
4044

4145
var button2 = new UIBarButtonItem("Language", UIBarButtonItemStyle.Plain, (s, e) =>
4246
{
4347
var index = vm.SelectedLanguage == null ? 0 : vm.Languages.ToList().IndexOf(vm.SelectedLanguage);
4448
if (index < 0) index = 0;
45-
new PickerAlert(vm.Languages.Select(x => x.Name).ToArray(), index, x => vm.SelectedLanguage = vm.Languages.ElementAt(x)).Show();
46-
49+
new PickerAlert(vm.Languages.Select(x => x.Name).ToArray(), index, x =>
50+
{
51+
var selectedlanguage = vm.Languages.ElementAtOrDefault(x);
52+
if (selectedlanguage != null)
53+
vm.SelectedLanguage = selectedlanguage;
54+
}).Show();
4755
});
4856

4957
vm.Bind(x => x.SelectedTime, x => button.Title = x.Name, true);

‎lib/CodeFramework‎

0 commit comments

Comments
 (0)