[HOTFIX] fix curation subtitle linelimit

Team-ShortcutsZip · Dec 3, 2022 · b298e9e · b298e9e
1 parent 6d39a7f
commit b298e9e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/HappyAnding/HappyAnding/Views/Components/CurationListView.swift b/HappyAnding/HappyAnding/Views/Components/CurationListView.swift
@@ -23,7 +23,8 @@ struct CurationListView: View {
                                                               navigationParentView: self.data.navigationParentView)
                     NavigationLink(value: data) {
                         UserCurationCell(curation: curation,
-                                         navigationParentView: self.data.navigationParentView)
+                                         navigationParentView: self.data.navigationParentView,
+                                         lineLimit: 2)
                     }
                 }
             }

diff --git a/HappyAnding/HappyAnding/Views/Components/UserCurationCell.swift b/HappyAnding/HappyAnding/Views/Components/UserCurationCell.swift
@@ -13,6 +13,7 @@ struct UserCurationCell: View {
 
     @State var curation: Curation
     let navigationParentView: NavigationParentView
+    var lineLimit: Int?
 
     var body: some View {
         ZStack {
@@ -67,7 +68,7 @@ struct UserCurationCell: View {
                 Text(curation.subtitle)
                     .Body2()
                     .multilineTextAlignment(.leading)
-                    .lineLimit(10)
+                    .lineLimit(lineLimit)
                     .foregroundColor(Color.Gray5)
                     .padding(.bottom, 20)
                     .fixedSize(horizontal: false, vertical: true)

diff --git a/HappyAnding/HappyAnding/Views/Components/UserCurationListView.swift b/HappyAnding/HappyAnding/Views/Components/UserCurationListView.swift
@@ -46,7 +46,8 @@ struct UserCurationListView: View {
                 if index < 2 {
                     NavigationLink(value: data) {
                         UserCurationCell(curation: curation,
-                                         navigationParentView: self.data.navigationParentView)
+                                         navigationParentView: self.data.navigationParentView,
+                                         lineLimit: 2)
                     }
                 }
             }

diff --git a/HappyAnding/HappyAnding/Views/ExploreCurationViews/ListCurationView.swift b/HappyAnding/HappyAnding/Views/ExploreCurationViews/ListCurationView.swift
@@ -45,7 +45,8 @@ struct ListCurationView: View {
 
                         NavigationLink(value: data) {
                             UserCurationCell(curation: curation,
-                                             navigationParentView: self.data.navigationParentView)
+                                             navigationParentView: self.data.navigationParentView,
+                                             lineLimit: 2)
                             .listRowInsets(EdgeInsets())
                             .listRowSeparator(.hidden)
                             .listRowBackground(Color.Background)

diff --git a/HappyAnding/HappyAnding/Views/ExploreCurationViews/ReadUserCurationView.swift b/HappyAnding/HappyAnding/Views/ExploreCurationViews/ReadUserCurationView.swift
@@ -41,9 +41,10 @@ struct ReadUserCurationView: View {
 
                     UserCurationCell(curation: data.userCuration,
                                      navigationParentView: data.navigationParentView)
-                    .padding(.bottom, 12)
                 }
             }
+            .background(Color.white)
+            .padding(.bottom, 12)
 
             VStack(spacing: 0){
                 ForEach(self.data.userCuration.shortcuts, id: \.self) { shortcut in

diff --git a/HappyAnding/HappyAnding/Views/ShortcutDetailViews/ShowProfileView.swift b/HappyAnding/HappyAnding/Views/ShortcutDetailViews/ShowProfileView.swift
@@ -157,7 +157,8 @@ extension ShowProfileView {
                                                                       navigationParentView: .shortcuts)
                             NavigationLink(value: data) {
                                 UserCurationCell(curation: curation,
-                                                 navigationParentView: data.navigationParentView)
+                                                 navigationParentView: data.navigationParentView,
+                                                 lineLimit: 2)
                             }
                         }