From 921e84c08bd8d1e4d2e6955558aeb76d2a9ac68a Mon Sep 17 00:00:00 2001
From: Justin Mazzocchi <2831158+jzzocc@users.noreply.github.com>
Date: Thu, 10 Sep 2020 18:59:43 -0700
Subject: [PATCH] UI refinements

---
 Localizations/Localizable.strings             |  4 +--
 .../ViewModels/AddIdentityViewModel.swift     |  2 +-
 Views/AddIdentityView.swift                   | 31 ++++++++++---------
 Views/IdentitiesView.swift                    |  2 +-
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Localizations/Localizable.strings b/Localizations/Localizable.strings
index 5e02fa3..1efd8f5 100644
--- a/Localizations/Localizable.strings
+++ b/Localizations/Localizable.strings
@@ -4,13 +4,13 @@
 "apns-default-message" = "New notification";
 "add-identity.instance-url" = "Instance URL";
 "add-identity.log-in" = "Log in";
-"add-identity.browse-anonymously" = "Browse anonymously";
+"add-identity.browse" = "Browse";
 "add-identity.unable-to-connect-to-instance" = "Unable to connect to instance";
 "secondary-navigation.manage-accounts" = "Manage Accounts";
 "secondary-navigation.lists" = "Lists";
 "secondary-navigation.preferences" = "Preferences";
 "identities.accounts" = "Accounts";
-"identities.browsing-anonymously" = "Browsing Anonymously";
+"identities.browsing" = "Browsing";
 "lists.new-list-title" = "New List Title";
 "preferences" = "Preferences";
 "preferences.posting-reading" = "Posting and Reading";
diff --git a/ViewModels/Sources/ViewModels/AddIdentityViewModel.swift b/ViewModels/Sources/ViewModels/AddIdentityViewModel.swift
index ad4ef71..bf4da8a 100644
--- a/ViewModels/Sources/ViewModels/AddIdentityViewModel.swift
+++ b/ViewModels/Sources/ViewModels/AddIdentityViewModel.swift
@@ -55,7 +55,7 @@ public extension AddIdentityViewModel {
         addIdentity(authenticated: true)
     }
 
-    func browseAnonymouslyTapped() {
+    func browseTapped() {
         addIdentity(authenticated: false)
     }
 
diff --git a/Views/AddIdentityView.swift b/Views/AddIdentityView.swift
index 513ebc3..9b85274 100644
--- a/Views/AddIdentityView.swift
+++ b/Views/AddIdentityView.swift
@@ -15,21 +15,7 @@ struct AddIdentityView: View {
                     .autocapitalization(.none)
                     .disableAutocorrection(true)
                     .keyboardType(.URL)
-                Group {
-                    if viewModel.loading {
-                        ProgressView()
-                    } else {
-                        Button("add-identity.log-in",
-                               action: viewModel.logInTapped)
-                        if viewModel.isPublicTimelineAvailable {
-                            Button("add-identity.browse-anonymously", action: viewModel.browseAnonymouslyTapped)
-                        }
-                    }
-                }
-                .frame(maxWidth: .infinity, alignment: .center)
-            }
-            if let instance = viewModel.instance {
-                Section {
+                if let instance = viewModel.instance {
                     VStack(alignment: .center) {
                         KFImage(instance.thumbnail)
                             .placeholder {
@@ -37,15 +23,30 @@ struct AddIdentityView: View {
                             }
                             .resizable()
                             .aspectRatio(16 / 9, contentMode: .fill)
+                            .background(Color.blue)
+                        Spacer()
                         Text(instance.title)
                             .font(.headline)
                         Text(instance.uri)
                             .font(.subheadline)
                             .foregroundColor(.secondary)
+                        Spacer()
                     }
                     .frame(maxWidth: .infinity, alignment: .center)
                     .listRowInsets(EdgeInsets())
                 }
+                Group {
+                    if viewModel.loading {
+                        ProgressView()
+                    } else {
+                        Button("add-identity.log-in",
+                               action: viewModel.logInTapped)
+                        if viewModel.isPublicTimelineAvailable {
+                            Button("add-identity.browse", action: viewModel.browseTapped)
+                        }
+                    }
+                }
+                .frame(maxWidth: .infinity, alignment: .center)
             }
         }
         .animation(.default)
diff --git a/Views/IdentitiesView.swift b/Views/IdentitiesView.swift
index 0dbb26e..710100c 100644
--- a/Views/IdentitiesView.swift
+++ b/Views/IdentitiesView.swift
@@ -20,7 +20,7 @@ struct IdentitiesView: View {
                     })
             }
             section(title: "identities.accounts", identities: viewModel.authenticated)
-            section(title: "identities.browsing-anonymously", identities: viewModel.unauthenticated)
+            section(title: "identities.browsing", identities: viewModel.unauthenticated)
         }
         .toolbar {
             ToolbarItem(placement: ToolbarItemPlacement.navigationBarTrailing) {