From 3e76f436370e6e536e4ea0f46fe69579f50bedcd Mon Sep 17 00:00:00 2001
From: Nathan Mattes <hallo@bullenscheisse.de>
Date: Wed, 28 Dec 2022 14:58:57 +0100
Subject: [PATCH] Add username-suggestion (#690)

---
 .../Register/MastodonRegisterView.swift       | 38 +++++++++++++------
 .../TextField/invalid.colorset/Contents.json  |  6 +--
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/Mastodon/Scene/Onboarding/Register/MastodonRegisterView.swift b/Mastodon/Scene/Onboarding/Register/MastodonRegisterView.swift
index d8810c3b9..1f5e449d0 100644
--- a/Mastodon/Scene/Onboarding/Register/MastodonRegisterView.swift
+++ b/Mastodon/Scene/Onboarding/Register/MastodonRegisterView.swift
@@ -20,7 +20,7 @@ struct MastodonRegisterView: View {
     var body: some View {
         ScrollView(.vertical) {
             let margin: CGFloat = 16
-            VStack(alignment: .leading, spacing: 11) {
+            VStack(alignment: .leading, spacing: 16) {
                 TextField(L10n.Scene.Register.Input.DisplayName.placeholder.localizedCapitalized, text: $viewModel.name)
                     .textContentType(.name)
                     .disableAutocorrection(true)
@@ -41,8 +41,23 @@ struct MastodonRegisterView: View {
                 .modifier(FormTextFieldModifier(validateState: viewModel.usernameValidateState))
                 .environment(\.layoutDirection, .leftToRight)   // force LTR
                 if let errorPrompt = viewModel.usernameErrorPrompt {
-                    Text(errorPrompt)
-                        .modifier(FormFootnoteModifier())
+                    VStack(alignment: .leading, spacing: 8) {
+                        Text(errorPrompt)
+                            .font(Font(UIFontMetrics(forTextStyle: .caption1).scaledFont(for: .systemFont(ofSize: 13, weight: .regular))))
+                        //FIXME: Better way than comparing strings
+                        if errorPrompt == L10n.Scene.Register.Error.Reason.taken(L10n.Scene.Register.Error.Item.username) {
+                            Button {
+                                viewModel.usernameErrorPrompt = nil
+                                viewModel.usernameValidateState = .empty
+                                viewModel.username = "amazing_\(viewModel.username)"
+                            } label: {
+                                Text("amazing_\(viewModel.username)")
+                                    .foregroundColor(Asset.Colors.Brand.blurple.swiftUIColor)
+                                    .font(Font(UIFontMetrics(forTextStyle: .body).scaledFont(for: .systemFont(ofSize: 17, weight: .bold))))
+
+                            }
+                        }
+                    }
                 }
                 TextField(L10n.Scene.Register.Input.Email.placeholder.localizedCapitalized, text: $viewModel.email)
                     .textContentType(.emailAddress)
@@ -109,23 +124,23 @@ struct MastodonRegisterView: View {
                 let borderColor: Color = {
                     switch validateState {
                         case .empty:    return Color(Asset.Scene.Onboarding.textFieldBackground.color)
-                        case .invalid:  return Color(Asset.Colors.TextField.invalid.color)
+                        case .invalid:  return Color(Asset.Colors.TextField.invalid.color.withAlphaComponent(0.25))
                         case .valid:    return Color(Asset.Scene.Onboarding.textFieldBackground.color)
                     }
                 }()
 
-                Color(Asset.Scene.Onboarding.textFieldBackground.color)
+                borderColor
                     .cornerRadius(10)
 
                 content
                     .padding()
-                    .background(Color(Asset.Scene.Onboarding.textFieldBackground.color))
+                    .background(borderColor)
                     .cornerRadius(10)
-                    .overlay(
-                        RoundedRectangle(cornerRadius: 10)
-                            .stroke(borderColor, lineWidth: 1)
-                            .animation(.easeInOut, value: validateState)
-                    )
+//                    .overlay(
+//                        RoundedRectangle(cornerRadius: 10)
+//                            .stroke(borderColor, lineWidth: 1)
+//                            .animation(.easeInOut, value: validateState)
+//                    )
             }
         }
     }
@@ -136,7 +151,6 @@ struct MastodonRegisterView: View {
             content
                 .font(.footnote)
                 .foregroundColor(foregroundColor)
-                .padding(.horizontal)
         }
     }
     
diff --git a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Colors/TextField/invalid.colorset/Contents.json b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Colors/TextField/invalid.colorset/Contents.json
index dabccc33e..622f9df33 100644
--- a/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Colors/TextField/invalid.colorset/Contents.json
+++ b/MastodonSDK/Sources/MastodonAsset/Assets.xcassets/Colors/TextField/invalid.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.353",
-          "green" : "0.251",
-          "red" : "0.875"
+          "blue" : "0x30",
+          "green" : "0x3B",
+          "red" : "0xFF"
         }
       },
       "idiom" : "universal"