Beter Startup View

CodeHubApp · Apr 16, 2014 · 120496c · 120496c
1 parent 394b6c1
commit 120496c
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 61 deletions.
diff --git a/CodeHub.Core/ViewModels/App/StartupViewModel.cs b/CodeHub.Core/ViewModels/App/StartupViewModel.cs
@@ -4,83 +4,88 @@
 using CodeHub.Core.Services;
 using System.Linq;
 using CodeHub.Core.Factories;
-using System.Threading.Tasks;
 
 namespace CodeHub.Core.ViewModels.App
 {
-	public class StartupViewModel : BaseStartupViewModel
+    public class StartupViewModel : BaseStartupViewModel
     {
         private readonly ILoginFactory _loginFactory;
-		private readonly IApplicationService _applicationService;
+        private readonly IApplicationService _applicationService;
 
         public StartupViewModel(ILoginFactory loginFactory, IApplicationService applicationService)
-		{
-			_loginFactory = loginFactory;
-			_applicationService = applicationService;
-		}
+        {
+            _loginFactory = loginFactory;
+            _applicationService = applicationService;
+        }
 
-		protected async override void Startup()
-		{
-			if (!_applicationService.Accounts.Any())
-			{
-				ShowViewModel<Accounts.AccountsViewModel>();
-				ShowViewModel<Accounts.NewAccountViewModel>();
-				return;
-			}
+        protected async override void Startup()
+        {
+            if (!_applicationService.Accounts.Any())
+            {
+                ShowViewModel<Accounts.AccountsViewModel>();
+                ShowViewModel<Accounts.NewAccountViewModel>();
+                return;
+            }
 
-			var account = GetDefaultAccount() as GitHubAccount;
-			if (account == null)
-			{
-				ShowViewModel<Accounts.AccountsViewModel>();
-				return;
-			}
+            var account = GetDefaultAccount() as GitHubAccount;
+            if (account == null)
+            {
+                ShowViewModel<Accounts.AccountsViewModel>();
+                return;
+            }
 
-			var isEnterprise = account.IsEnterprise || !string.IsNullOrEmpty(account.Password);
-			if (account.DontRemember)
-			{
-				ShowViewModel<Accounts.AccountsViewModel>();
+            var isEnterprise = account.IsEnterprise || !string.IsNullOrEmpty(account.Password);
+            if (account.DontRemember)
+            {
+                ShowViewModel<Accounts.AccountsViewModel>();
 
-				//Hack for now
-				if (isEnterprise)
-				{
-					ShowViewModel<Accounts.AddAccountViewModel>(new Accounts.AddAccountViewModel.NavObject { IsEnterprise = true, AttemptedAccountId = account.Id });
-				}
-				else
-				{
-					ShowViewModel<Accounts.LoginViewModel>(Accounts.LoginViewModel.NavObject.CreateDontRemember(account));
-				}
+                //Hack for now
+                if (isEnterprise)
+                {
+                    ShowViewModel<Accounts.AddAccountViewModel>(new Accounts.AddAccountViewModel.NavObject { IsEnterprise = true, AttemptedAccountId = account.Id });
+                }
+                else
+                {
+                    ShowViewModel<Accounts.LoginViewModel>(Accounts.LoginViewModel.NavObject.CreateDontRemember(account));
+                }
 
-				return;
-			}
+                return;
+            }
 
-			//Lets login!
-			try
-			{
-				IsLoggingIn = true;
-				var client = await _loginFactory.LoginAccount(account);
-				_applicationService.ActivateUser(account, client);
-			}
-			catch (GitHubSharp.UnauthorizedException e)
-			{
+            //Lets login!
+            try
+            {
+                IsLoggingIn = true;
+
+                Uri accountAvatarUri = null;
+                Uri.TryCreate(account.AvatarUrl, UriKind.Absolute, out accountAvatarUri);
+                ImageUrl = accountAvatarUri;
+                Status = "Logging in as " + account.Username;
+
+                var client = await _loginFactory.LoginAccount(account);
+                _applicationService.ActivateUser(account, client);
+            }
+            catch (GitHubSharp.UnauthorizedException e)
+            {
                 DisplayAlert("The credentials for the selected account are incorrect. " + e.Message);
 
-				ShowViewModel<Accounts.AccountsViewModel>();
-				if (isEnterprise)
-					ShowViewModel<Accounts.AddAccountViewModel>(new Accounts.AddAccountViewModel.NavObject { IsEnterprise = true, AttemptedAccountId = account.Id });
-				else
-					ShowViewModel<Accounts.LoginViewModel>(Accounts.LoginViewModel.NavObject.CreateDontRemember(account));
-			}
-			catch (Exception e)
-			{
+                ShowViewModel<Accounts.AccountsViewModel>();
+                if (isEnterprise)
+                    ShowViewModel<Accounts.AddAccountViewModel>(new Accounts.AddAccountViewModel.NavObject { IsEnterprise = true, AttemptedAccountId = account.Id });
+                else
+                    ShowViewModel<Accounts.LoginViewModel>(Accounts.LoginViewModel.NavObject.CreateDontRemember(account));
+            }
+            catch (Exception e)
+            {
                 DisplayAlert(e.Message);
-				ShowViewModel<Accounts.AccountsViewModel>();
-			}
-			finally
-			{
-				IsLoggingIn = false;
-			}
+                ShowViewModel<Accounts.AccountsViewModel>();
+            }
+            finally
+            {
+                IsLoggingIn = false;
+            }
 
-		}
+        }
     }
 }
 
diff --git a/CodeHub.iOS/CodeHub.iOS.csproj b/CodeHub.iOS/CodeHub.iOS.csproj
@@ -434,6 +434,8 @@
     <BundleResource Include="Images\MarkdownComposer\photo.png" />
     <BundleResource Include="Images\MarkdownComposer\picture%402x.png" />
     <BundleResource Include="Images\MarkdownComposer\picture.png" />
+    <BundleResource Include="Images\login_user_unknown%402x.png" />
+    <BundleResource Include="Images\login_user_unknown.png" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
   <ItemGroup>

diff --git a/CodeHub.iOS/Images/Images.cs b/CodeHub.iOS/Images/Images.cs
@@ -48,6 +48,9 @@ public static class Images
         public static UIImage Language { get { return UIImageHelper.FromFileAuto("Images/language"); } }
         public static UIImage Unlocked { get { return UIImageHelper.FromFileAuto("Images/unlocked"); } }
         public static UIImage Locked { get { return UIImageHelper.FromFileAuto("Images/locked"); } }
+
+        public static UIImage LoginUserUnknown { get { return UIImageHelper.FromFileAuto("Images/login_user_unknown"); } }
+
 
         public static Uri GitHubRepoUrl
         {

diff --git a/CodeHub.iOS/Images/login_user_unknown.png b/CodeHub.iOS/Images/login_user_unknown.png
diff --git a/CodeHub.iOS/Images/login_user_unknown@2x.png b/CodeHub.iOS/Images/login_user_unknown@2x.png
diff --git a/CodeHub.iOS/Theme.cs b/CodeHub.iOS/Theme.cs
@@ -164,5 +164,7 @@ public UIColor ApplicationNavigationBarTint
         }
 
         public float FontSizeRatio { get; set; }
+
+        public UIImage LoginUserUnknown { get { return Images.LoginUserUnknown; } }
     }
 }
diff --git a/lib/CodeFramework b/lib/CodeFramework
-Original file line number
+Diff line change
@@ Expand Up / @@ -164,5 +164,7 @@ public UIColor ApplicationNavigationBarTint @@
             }
             public float FontSizeRatio { get; set; }
+            public UIImage LoginUserUnknown { get { return Images.LoginUserUnknown; } }
         }
     }
+23 −0		CodeFramework.Core/ViewModels/BaseStartupViewModel.cs
+3 −1		CodeFramework.iOS/Theme.cs
+3 −1		CodeFramework.iOS/Utils/Util.cs
+89 −43		CodeFramework.iOS/Views/StartupView.cs