Fix layout of multiline modules (#916)

- Align to .leading in multi-line - Wrap profile rows into top/bottom spacers to adjust to tallest cell in grid See #915
passepartoutvpn · Nov 22, 2024 · bd237c4 · bd237c4
1 parent fb0d1ab
commit bd237c4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileCardView.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileCardView.swift
@@ -51,6 +51,7 @@ struct ProfileCardView: View {
                     .themeTruncating()
 
                 Text(preview.subtitle ?? Strings.Views.Profiles.Rows.noModules)
+                    .multilineTextAlignment(.leading)
                     .font(.subheadline)
                     .foregroundStyle(.secondary)
             }

diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileRowView.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/ProfileRowView.swift
@@ -54,24 +54,28 @@ struct ProfileRowView: View, Routable {
     var flow: ProfileFlow?
 
     var body: some View {
-        HStack {
-            Group {
-                if withMarker {
-                    markerView
+        VStack(spacing: .zero) {
+            Spacer(minLength: .zero)
+            HStack {
+                Group {
+                    if withMarker {
+                        markerView
+                    }
+                    cardView
                 }
-                cardView
-            }
-            Spacer()
-            HStack(spacing: 10.0) {
-                ProfileAttributesView(
-                    attributes: attributes,
-                    isRemoteImportingEnabled: profileManager.isRemoteImportingEnabled
-                )
-                ProfileInfoButton(preview: preview) {
-                    flow?.onEditProfile($0)
+                Spacer()
+                HStack(spacing: 10.0) {
+                    ProfileAttributesView(
+                        attributes: attributes,
+                        isRemoteImportingEnabled: profileManager.isRemoteImportingEnabled
+                    )
+                    ProfileInfoButton(preview: preview) {
+                        flow?.onEditProfile($0)
+                    }
                 }
+                .imageScale(.large)
             }
-            .imageScale(.large)
+            Spacer(minLength: .zero)
         }
     }
 }