More features for larger fonts

thedillonb · thedillonb · commit 5c855507c4b5 · 2014-03-22T17:41:40.000-04:00
diff --git a/CodeHub.Core/CodeHub.Core.iOS.csproj b/CodeHub.Core/CodeHub.Core.iOS.csproj
@@ -156,6 +156,10 @@
       <Project>{89E14828-85BB-4790-9B4E-E44DD4CE000E}</Project>
       <Name>GitHubSharp.MonoTouch</Name>
     </ProjectReference>
+    <ProjectReference Include="..\lib\CodeFramework\CodeFramework.iOS\CodeFramework.iOS.csproj">
+      <Project>{2698B412-26A3-4269-AA01-AC3BC79A0F14}</Project>
+      <Name>CodeFramework.iOS</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
   <ItemGroup />
diff --git a/CodeHub.Core/ViewModels/App/SettingsViewModel.cs b/CodeHub.Core/ViewModels/App/SettingsViewModel.cs
@@ -12,10 +12,12 @@ namespace CodeHub.Core.ViewModels.App
     public class SettingsViewModel : BaseViewModel
     {
         private readonly IFeaturesService _featuresService;
+        private readonly IDefaultValueService _defaultValueService;
 
-        public SettingsViewModel(IFeaturesService featuresService)
+        public SettingsViewModel(IFeaturesService featuresService, IDefaultValueService defaultValueService)
         {
             _featuresService = featuresService;
+            _defaultValueService = defaultValueService;
         }
 
 		public string DefaultStartupViewName
@@ -56,6 +58,12 @@ public bool AnalyticsEnabled
 			}
 		}
 
+        public bool LargeFonts
+        {
+            get { return _defaultValueService.Get<bool>("large_fonts"); }
+            set { _defaultValueService.Set("large_fonts", value); }
+        }
+
         public bool PushNotificationsActivated
         {
             get { return _featuresService.IsPushNotificationsActivated; }
diff --git a/CodeHub.iOS/AppDelegate.cs b/CodeHub.iOS/AppDelegate.cs
@@ -60,15 +60,13 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
 			iRate.AppStoreID = 707173885;
 
 			this.window = new UIWindow(UIScreen.MainScreen.Bounds);
-
-            // Setup theme
-            Theme.Setup();
-
             var presenter = new TouchViewPresenter(this.window);
-
             var setup = new Setup(this, presenter);
             setup.Initialize();
 
+            // Setup theme
+            Theme.Setup();
+
             Mvx.Resolve<CodeFramework.Core.Services.IAnalyticsService>().Init("YDPn28UeAWRt5dTlrd2IhIc3zW4atsiSPScqWmGI", "eDfhufHi88Az1IQkMsIR2o8j5Jmqjmc7FhyQradc");
 
             if (options != null)
diff --git a/CodeHub.iOS/Info.plist b/CodeHub.iOS/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.dillonbuchanan.codehub</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>CFBundleIconFiles</key>
 	<array>
 		<string>Icon-Small-50</string>
@@ -68,6 +68,6 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 </dict>
 </plist>
diff --git a/CodeHub.iOS/Theme.cs b/CodeHub.iOS/Theme.cs
@@ -6,16 +6,20 @@ namespace CodeHub.iOS
 {
     public class Theme : ICodeFrameworkTheme
     {
-        public static Theme CurrentTheme { get; private set; }
+        public static Theme CurrentTheme { get; private set; }
 
         public static void Setup()
         {
             var theme = new Theme();
             CurrentTheme = theme;
             CodeFramework.iOS.Theme.CurrentTheme = theme;
+
+            var defaultValues = Cirrious.CrossCore.Mvx.Resolve<CodeFramework.Core.Services.IDefaultValueService>();
+            Theme.CurrentTheme.FontSizeRatio = defaultValues.Get<bool>("large_fonts") ? 1.3f : 1.0f;
+
 			RepositoryCellView.RoundImages = false;
-			MonoTouch.Dialog.StyledStringElement.DefaultTitleFont = UIFont.SystemFontOfSize(15f);
 			MonoTouch.Dialog.NameTimeStringElement.NameColor = Theme.CurrentTheme.MainTitleColor;
+            MonoTouch.Dialog.Element.FontSizeRatio = Theme.CurrentTheme.FontSizeRatio;
 
             UIApplication.SharedApplication.StatusBarStyle = UIStatusBarStyle.LightContent;
             UINavigationBar.Appearance.TintColor = UIColor.White;
@@ -34,7 +38,7 @@ public static void Setup()
             UISegmentedControl.Appearance.TintColor = UIColor.FromRGB(110, 110, 117);
             UITableViewHeaderFooterView.Appearance.TintColor = UIColor.FromRGB(228, 228, 228);
             UILabel.AppearanceWhenContainedIn(typeof(UITableViewHeaderFooterView)).TextColor = UIColor.FromRGB(136, 136, 136);
-            UILabel.AppearanceWhenContainedIn(typeof(UITableViewHeaderFooterView)).Font = UIFont.SystemFontOfSize(13f);
+            UILabel.AppearanceWhenContainedIn(typeof(UITableViewHeaderFooterView)).Font = UIFont.SystemFontOfSize(13f * Theme.CurrentTheme.FontSizeRatio);
 
             UIToolbar.Appearance.BarTintColor = UIColor.FromRGB(245, 245, 245);
 
@@ -43,15 +47,15 @@ public static void Setup()
 //            CodeFramework.Elements.NewsFeedElement.LinkColor = theme.MainTitleColor;
 //            CodeFramework.Elements.NewsFeedElement.TextColor = theme.MainTextColor;
 //            CodeFramework.Elements.NewsFeedElement.NameColor = theme.MainTitleColor;
-        }
+        }
 
         public UITextAttributes SegmentedControlText
         {
             get
             {
                 return new UITextAttributes
                 { 
-                    Font = UIFont.SystemFontOfSize(14f), 
+                    Font = UIFont.SystemFontOfSize(14f * Theme.CurrentTheme.FontSizeRatio), 
                     TextColor = UIColor.FromRGB(87, 85, 85), 
                     TextShadowColor = UIColor.FromRGBA(255, 255, 255, 125), 
                     TextShadowOffset = new UIOffset(0, 1) 
@@ -149,5 +153,7 @@ public UIColor ApplicationNavigationBarTint
 				return UIColor.Black;
 			}
 		}
+
+        public float FontSizeRatio { get; set; }
     }
 }
diff --git a/CodeHub.iOS/UrlRouterProvider.cs b/CodeHub.iOS/UrlRouterProvider.cs
@@ -20,6 +20,8 @@ public static class UrlRouteProvider
             new Route("^[^/]*/(?<Username>[^/]*)/(?<Repository>[^/]*)/pulls/$", typeof(CodeHub.Core.ViewModels.PullRequests.PullRequestsViewModel)),
             new Route("^[^/]*/(?<Username>[^/]*)/(?<Repository>[^/]*)/pull/(?<Id>[^/]*)/$", typeof(CodeHub.Core.ViewModels.PullRequests.PullRequestViewModel)),
             new Route("^[^/]*/(?<Username>[^/]*)/(?<Repository>[^/]*)/issues/$", typeof(CodeHub.Core.ViewModels.Issues.IssuesViewModel)),
+            new Route("^[^/]*/(?<Username>[^/]*)/(?<Repository>[^/]*)/commits/$", typeof(CodeHub.Core.ViewModels.CommitsViewModel)),
+            new Route("^[^/]*/(?<Username>[^/]*)/(?<Repository>[^/]*)/commits/(?<Node>[^/]*)/$", typeof(CodeHub.Core.ViewModels.ChangesetViewModel)),
             new Route("^[^/]*/(?<Username>[^/]*)/(?<Repository>[^/]*)/issues/(?<Id>[^/]*)/$", typeof(CodeHub.Core.ViewModels.Issues.IssueViewModel)),
             new Route("^[^/]*/(?<Username>[^/]*)/(?<Repository>[^/]*)/tree/(?<Branch>[^/]*)/(?<Path>.*)$", typeof(CodeHub.Core.ViewModels.Source.SourceTreeViewModel)),
         };
diff --git a/CodeHub.iOS/Views/App/SettingsView.cs b/CodeHub.iOS/Views/App/SettingsView.cs
@@ -72,6 +72,13 @@ private void CreateTable()
 			};
 			startupView.Tapped += () => vm.GoToDefaultStartupViewCommand.Execute(null);
 
+            var largeFonts = new TrueFalseElement("Large Fonts", vm.LargeFonts, x =>
+            {
+                vm.LargeFonts = x.Value;
+                Theme.Setup();
+                CreateTable();
+            });
+
             if (vm.PushNotificationsActivated)
                 accountSection.Add(new TrueFalseElement("Push Notifications".t(), vm.PushNotificationsEnabled, e => vm.PushNotificationsEnabled = e.Value));
 
@@ -89,7 +96,7 @@ private void CreateTable()
 			//Assign the root
 			var root = new RootElement(Title);
             root.Add(accountSection);
-			root.Add(new Section("Appearance") { showOrganizationsInEvents, showOrganizations, repoDescriptions, startupView });
+            root.Add(new Section("Appearance") { showOrganizationsInEvents, showOrganizations, repoDescriptions, startupView, largeFonts });
 			root.Add(new Section ("Internal") { deleteCache, usage });
 			Root = root;
 
diff --git a/CodeHub.iOS/Views/Issues/IssueAddView.cs b/CodeHub.iOS/Views/Issues/IssueAddView.cs
@@ -45,7 +45,7 @@ public override void ViewDidLoad()
 			var content = new MultilinedElement("Description");
 			content.Tapped += () =>
 			{
-				var composer = new Composer { Title = "Issue Description", Text = content.Value, ActionButtonText = "Save" };
+				var composer = new Composer { Title = "Issue Description", Text = content.Value };
 				composer.NewComment(this, (text) => {
 					vm.Content = text;
 					composer.CloseComposer();
diff --git a/CodeHub.iOS/Views/Issues/IssueEditView.cs b/CodeHub.iOS/Views/Issues/IssueEditView.cs
@@ -45,7 +45,7 @@ public override void ViewDidLoad()
 			var content = new MultilinedElement("Description");
 			content.Tapped += () =>
 			{
-				var composer = new Composer { Title = "Issue Description", Text = content.Value, ActionButtonText = "Save" };
+				var composer = new Composer { Title = "Issue Description", Text = content.Value };
 				composer.NewComment(this, (text) => {
 					vm.Content = text;
 					composer.CloseComposer();
diff --git a/CodeHub.iOS/Views/NotificationsView.cs b/CodeHub.iOS/Views/NotificationsView.cs
@@ -82,6 +82,7 @@ public MarkReadSection(string text, NotificationsView parent, bool button)
             {
                 _parent = parent;
                 TextLabel.Text = text;
+                TextLabel.Font = TextLabel.Font.WithSize(TextLabel.Font.PointSize * Theme.CurrentTheme.FontSizeRatio);
 
                 if (button)
                 {
diff --git a/CodeHub.iOS/Views/PullRequests/PullRequestView.cs b/CodeHub.iOS/Views/PullRequests/PullRequestView.cs
@@ -101,7 +101,7 @@ public void Render()
                 if (ViewModel.PullRequest.Mergable == null)
                 {
                     var el = new StyledStringElement("Merge".t(), mergeAction, Images.Fork);
-                    root.Add(new Section(null, "The mergable state is unknown and merging may not be successful.") { el });
+                    root.Add(new Section { el });
                 }
                 else if (ViewModel.PullRequest.Mergable.Value)
                 {
diff --git a/CodeHub.iOS/Views/Repositories/RepositoryView.cs b/CodeHub.iOS/Views/Repositories/RepositoryView.cs
@@ -1,12 +1,9 @@
 using System;
-using Cirrious.MvvmCross.Binding.BindingContext;
 using CodeFramework.iOS.ViewControllers;
 using CodeFramework.iOS.Views;
 using CodeHub.Core.ViewModels.Repositories;
 using GitHubSharp.Models;
 using MonoTouch.Dialog;
-using MonoTouch.Dialog.Utilities;
-using MonoTouch.Foundation;
 using MonoTouch.UIKit;
 
 namespace CodeHub.iOS.Views.Repositories
diff --git a/CodeHub.iOS/Views/Source/ChangesetView.cs b/CodeHub.iOS/Views/Source/ChangesetView.cs
@@ -53,10 +53,10 @@ public void Render()
             root.Add(detailSection);
 
             var user = "Unknown";
-            if (commitModel.Author != null)
-                user = commitModel.Author.Login;
             if (commitModel.Commit.Author != null)
                 user = commitModel.Commit.Author.Name;
+            if (commitModel.Commit.Committer != null)
+                user = commitModel.Commit.Committer.Name;
 
             detailSection.Add(new MultilinedElement(user, commitModel.Commit.Message)
             {
diff --git a/CodeHub.iOS/Views/Source/CommitsView.cs b/CodeHub.iOS/Views/Source/CommitsView.cs
@@ -16,30 +16,32 @@ public override void ViewDidLoad()
 
 			var vm = (CommitsViewModel) ViewModel;
 			BindCollection(vm.Commits, x =>
-				{
-					var msg = x.Commit.Message ?? string.Empty;
-					var firstLine = msg.IndexOf("\n", StringComparison.Ordinal);
-					var desc = firstLine > 0 ? msg.Substring(0, firstLine) : msg;
-
-					string login;
-					var date = DateTimeOffset.MinValue;
-
-					if (x.Committer != null)
-						login = x.Committer.Login;
-					else if (x.Author != null)
-						login = x.Author.Login;
-					else if (x.Commit.Committer != null)
-						login = x.Commit.Committer.Name;
-					else
-						login = "Unknown";
-
-					if (x.Commit.Committer != null)
-						date = x.Commit.Committer.Date;
-
-					var el = new NameTimeStringElement { Name = login, Time = date.ToDaysAgo(), String = desc, Lines = 4 };
-					el.Tapped += () => vm.GoToChangesetCommand.Execute(x);
-					return el;
-				});
+			{
+				var msg = x.Commit.Message ?? string.Empty;
+				var firstLine = msg.IndexOf("\n", StringComparison.Ordinal);
+				var desc = firstLine > 0 ? msg.Substring(0, firstLine) : msg;
+
+				string login;
+				var date = DateTimeOffset.MinValue;
+           
+                if (x.Commit.Author != null && !string.IsNullOrEmpty(x.Commit.Author.Name))
+                    login = x.Commit.Author.Name;
+                else if (x.Commit.Committer != null && !string.IsNullOrEmpty(x.Commit.Committer.Name))
+                    login = x.Commit.Committer.Name;
+                else if (x.Author != null)
+                    login = x.Author.Login;
+                else if (x.Committer != null)
+					login = x.Committer.Login;
+				else
+					login = "Unknown";
+
+				if (x.Commit.Committer != null)
+					date = x.Commit.Committer.Date;
+
+				var el = new NameTimeStringElement { Name = login, Time = date.ToDaysAgo(), String = desc, Lines = 4 };
+				el.Tapped += () => vm.GoToChangesetCommand.Execute(x);
+				return el;
+			});
 		}
 	}
 }
diff --git a/lib/CodeFramework b/lib/CodeFramework
@@ -1 +1 @@
-Subproject commit ae310f04cf1ffbe5b52c25865615fdcfab046f2d
+Subproject commit a3597c6b3d0a80e033a2eaddab00cd52af659fdc

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,12 @@ namespace CodeHub.Core.ViewModels.App`
`12`	`12`	`public class SettingsViewModel : BaseViewModel`
`13`	`13`	`{`
`14`	`14`	`private readonly IFeaturesService _featuresService;`
	`15`	`+ private readonly IDefaultValueService _defaultValueService;`
`15`	`16`
`16`		`- public SettingsViewModel(IFeaturesService featuresService)`
	`17`	`+ public SettingsViewModel(IFeaturesService featuresService, IDefaultValueService defaultValueService)`
`17`	`18`	`{`
`18`	`19`	`_featuresService = featuresService;`
	`20`	`+ _defaultValueService = defaultValueService;`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`public string DefaultStartupViewName`
`@@ -56,6 +58,12 @@ public bool AnalyticsEnabled`
`56`	`58`	`}`
`57`	`59`	`}`
`58`	`60`
	`61`	`+ public bool LargeFonts`
	`62`	`+ {`
	`63`	`+ get { return _defaultValueService.Get<bool>("large_fonts"); }`
	`64`	`+ set { _defaultValueService.Set("large_fonts", value); }`
	`65`	`+ }`
	`66`	`+`
`59`	`67`	`public bool PushNotificationsActivated`
`60`	`68`	`{`
`61`	`69`	`get { return _featuresService.IsPushNotificationsActivated; }`
Original file line number	Diff line number	Diff line change
`@@ -6,16 +6,20 @@ namespace CodeHub.iOS`
`6`	`6`	`{`
`7`	`7`	`public class Theme : ICodeFrameworkTheme`
`8`	`8`	`{`
`9`		`- public static Theme CurrentTheme { get; private set; }`
	`9`	`+ public static Theme CurrentTheme { get; private set; }`
`10`	`10`
`11`	`11`	`public static void Setup()`
`12`	`12`	`{`
`13`	`13`	`var theme = new Theme();`
`14`	`14`	`CurrentTheme = theme;`
`15`	`15`	`CodeFramework.iOS.Theme.CurrentTheme = theme;`
	`16`	`+`
	`17`	`+ var defaultValues = Cirrious.CrossCore.Mvx.Resolve<CodeFramework.Core.Services.IDefaultValueService>();`
	`18`	`+ Theme.CurrentTheme.FontSizeRatio = defaultValues.Get<bool>("large_fonts") ? 1.3f : 1.0f;`
	`19`	`+`
`16`	`20`	`RepositoryCellView.RoundImages = false;`
`17`		`- MonoTouch.Dialog.StyledStringElement.DefaultTitleFont = UIFont.SystemFontOfSize(15f);`
`18`	`21`	`MonoTouch.Dialog.NameTimeStringElement.NameColor = Theme.CurrentTheme.MainTitleColor;`
	`22`	`+ MonoTouch.Dialog.Element.FontSizeRatio = Theme.CurrentTheme.FontSizeRatio;`
`19`	`23`
`20`	`24`	`UIApplication.SharedApplication.StatusBarStyle = UIStatusBarStyle.LightContent;`
`21`	`25`	`UINavigationBar.Appearance.TintColor = UIColor.White;`
`@@ -34,7 +38,7 @@ public static void Setup()`
`34`	`38`	`UISegmentedControl.Appearance.TintColor = UIColor.FromRGB(110, 110, 117);`
`35`	`39`	`UITableViewHeaderFooterView.Appearance.TintColor = UIColor.FromRGB(228, 228, 228);`
`36`	`40`	`UILabel.AppearanceWhenContainedIn(typeof(UITableViewHeaderFooterView)).TextColor = UIColor.FromRGB(136, 136, 136);`
`37`		`- UILabel.AppearanceWhenContainedIn(typeof(UITableViewHeaderFooterView)).Font = UIFont.SystemFontOfSize(13f);`
	`41`	`+ UILabel.AppearanceWhenContainedIn(typeof(UITableViewHeaderFooterView)).Font = UIFont.SystemFontOfSize(13f * Theme.CurrentTheme.FontSizeRatio);`
`38`	`42`
`39`	`43`	`UIToolbar.Appearance.BarTintColor = UIColor.FromRGB(245, 245, 245);`
`40`	`44`
`@@ -43,15 +47,15 @@ public static void Setup()`
`43`	`47`	`// CodeFramework.Elements.NewsFeedElement.LinkColor = theme.MainTitleColor;`
`44`	`48`	`// CodeFramework.Elements.NewsFeedElement.TextColor = theme.MainTextColor;`
`45`	`49`	`// CodeFramework.Elements.NewsFeedElement.NameColor = theme.MainTitleColor;`
`46`		`- }`
	`50`	`+ }`
`47`	`51`
`48`	`52`	`public UITextAttributes SegmentedControlText`
`49`	`53`	`{`
`50`	`54`	`get`
`51`	`55`	`{`
`52`	`56`	`return new UITextAttributes`
`53`	`57`	`{`
`54`		`- Font = UIFont.SystemFontOfSize(14f),`
	`58`	`+ Font = UIFont.SystemFontOfSize(14f * Theme.CurrentTheme.FontSizeRatio),`
`55`	`59`	`TextColor = UIColor.FromRGB(87, 85, 85),`
`56`	`60`	`TextShadowColor = UIColor.FromRGBA(255, 255, 255, 125),`
`57`	`61`	`TextShadowOffset = new UIOffset(0, 1)`
`@@ -149,5 +153,7 @@ public UIColor ApplicationNavigationBarTint`
`149`	`153`	`return UIColor.Black;`
`150`	`154`	`}`
`151`	`155`	`}`
	`156`	`+`
	`157`	`+ public float FontSizeRatio { get; set; }`
`152`	`158`	`}`
`153`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public override void ViewDidLoad()`
`45`	`45`	`var content = new MultilinedElement("Description");`
`46`	`46`	`content.Tapped += () =>`
`47`	`47`	`{`
`48`		`- var composer = new Composer { Title = "Issue Description", Text = content.Value, ActionButtonText = "Save" };`
	`48`	`+ var composer = new Composer { Title = "Issue Description", Text = content.Value };`
`49`	`49`	`composer.NewComment(this, (text) => {`
`50`	`50`	`vm.Content = text;`
`51`	`51`	`composer.CloseComposer();`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ public MarkReadSection(string text, NotificationsView parent, bool button)`
`82`	`82`	`{`
`83`	`83`	`_parent = parent;`
`84`	`84`	`TextLabel.Text = text;`
	`85`	`+ TextLabel.Font = TextLabel.Font.WithSize(TextLabel.Font.PointSize * Theme.CurrentTheme.FontSizeRatio);`
`85`	`86`
`86`	`87`	`if (button)`
`87`	`88`	`{`