From bcc80b521051440e7955189fa75659c687dfece3 Mon Sep 17 00:00:00 2001
From: Nico Verbruggen <mail@nicoverbruggen.be>
Date: Fri, 5 Aug 2022 20:05:29 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8C=20More=20SwiftUI=20tuning=20(autom?=
 =?UTF-8?q?atic=20height)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SwiftUI/Onboarding/OnboardingView.swift   | 34 +++++++++----------
 phpmon/Localizable.strings                    |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/phpmon/Domain/SwiftUI/Onboarding/OnboardingView.swift b/phpmon/Domain/SwiftUI/Onboarding/OnboardingView.swift
index b81befb..cf81c48 100644
--- a/phpmon/Domain/SwiftUI/Onboarding/OnboardingView.swift
+++ b/phpmon/Domain/SwiftUI/Onboarding/OnboardingView.swift
@@ -12,6 +12,7 @@ struct OnboardingTextItem: View {
     @State var icon: String
     @State var title: String
     @State var description: String
+
     var body: some View {
         HStack(alignment: .top, spacing: 5) {
             Image(systemName: icon)
@@ -23,20 +24,19 @@ struct OnboardingTextItem: View {
             VStack(alignment: .leading, spacing: 4) {
                 Text(title.localizedForSwiftUI)
                     .font(.system(size: 14))
-                    .frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
-                Text(description.localizedForSwiftUI)
-                    .foregroundColor(Color.secondary)
-                    .font(.system(size: 13))
-                    .fixedSize(horizontal: false, vertical: true)
-                    .frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
+                    .lineLimit(3)
+                HStack {
+                    Text(description.localizedForSwiftUI)
+                        .foregroundColor(Color.secondary)
+                        .font(.system(size: 13))
+                        .lineLimit(3)
+                        .fixedSize(horizontal: false, vertical: true)
+                        .frame(minWidth: 0, maxWidth: .infinity, alignment: .leading)
+                    }
             }
         }
-        .frame(maxWidth: .infinity)
-        .padding(18)
-        .overlay(
-            RoundedRectangle(cornerRadius: 5)
-                .stroke(Color.gray.opacity(0.3), lineWidth: 1)
-        )
+        .padding()
+        .overlay(RoundedRectangle(cornerRadius: 5).stroke(Color.gray.opacity(0.3), lineWidth: 1))
     }
 }
 
@@ -86,7 +86,10 @@ struct OnboardingView: View {
                             .frame(width: 24, height: 24)
                             .foregroundColor(Color.appSecondary)
                             .padding(.trailing, 10)
-                        Text("onboarding.tour.faq_hint".localizedForSwiftUI)
+                        HStack {
+                            Text("onboarding.tour.faq_hint".localizedForSwiftUI)
+                                .lineLimit(5)
+                        }.fixedSize(horizontal: false, vertical: true)
                     }
                     VStack {
                         Text("onboarding.tour.once".localized)
@@ -94,18 +97,15 @@ struct OnboardingView: View {
                             .foregroundColor(.gray)
                             .padding(.top, 5)
                             .padding(.bottom, 5)
+                            .lineLimit(5)
                         Button("onboarding.tour.close".localized) {
                             App.shared.onboardingWindowController?.close()
                         }
                     }
                 }.padding()
             }
-            .frame(maxWidth: .infinity)
-            .frame(maxHeight: 580)
         }
         .padding(.top, 8)
-        .padding(.leading)
-        .padding(.trailing)
     }
 }
 
diff --git a/phpmon/Localizable.strings b/phpmon/Localizable.strings
index 3ca811a..ec6a642 100644
--- a/phpmon/Localizable.strings
+++ b/phpmon/Localizable.strings
@@ -515,7 +515,7 @@ If you are seeing this message but are confused why this folder has gone missing
 "onboarding.welcome" = "Welcome to PHP Monitor!";
 "onboarding.explore" = "Learn more about some of the features that PHP Monitor has to offer.";
 "onboarding.tour.menu_bar.title" = "Get Started";
-"onboarding.tour.menu_bar" = "PHP Monitor lives in your menu bar. From here, you can switch the globally linked PHP version, start or stop services, locate configuration files, and more.";
+"onboarding.tour.menu_bar" = "PHP Monitor lives in your menu bar. From here, you can switch the globally linked PHP version, start or stop services, locate config files, and more.";
 "onboarding.tour.faq_hint" = "I recommend that you check out the [README](https://github.com/nicoverbruggen/phpmon/blob/main/README.md) on GitHub: it contains a comprehensive FAQ with various tips and common questions and answers.";
 "onboarding.tour.domains.title" = "Domains";
 "onboarding.tour.domains" = "By opening the Domains window via the Menu Bar item, you can view which domains are linked and parked.";