Merge pull request #2288 from woocommerce/issue/2287-product-short-description-multiline

jaclync · web-flow · commit 7681f2ee2266 · 2020-05-15T15:57:47.000+08:00
Product short description row should show maximum one line
diff --git a/WooCommerce/Classes/ViewRelated/Products/Edit Product/DefaultProductFormTableViewModel.swift b/WooCommerce/Classes/ViewRelated/Products/Edit Product/DefaultProductFormTableViewModel.swift
@@ -196,7 +196,8 @@ private extension DefaultProductFormTableViewModel {
 
         return ProductFormSection.SettingsRow.ViewModel(icon: icon,
                                                         title: title,
-                                                        details: details)
+                                                        details: details,
+                                                        numberOfLinesForDetails: 1)
     }
 }
 
diff --git a/WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormTableViewDataSource.swift b/WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormTableViewDataSource.swift
@@ -7,7 +7,7 @@ private extension ProductFormSection.SettingsRow.ViewModel {
                                                            text: details,
                                                            image: icon,
                                                            imageTintColor: .textSubtle,
-                                                           numberOfLinesForText: 0)
+                                                           numberOfLinesForText: numberOfLinesForDetails)
     }
 }
 
diff --git a/WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormTableViewModel.swift b/WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormTableViewModel.swift
@@ -22,6 +22,14 @@ enum ProductFormSection {
             let icon: UIImage
             let title: String?
             let details: String?
+            let numberOfLinesForDetails: Int
+
+            init(icon: UIImage, title: String?, details: String?, numberOfLinesForDetails: Int = 0) {
+                self.icon = icon
+                self.title = title
+                self.details = details
+                self.numberOfLinesForDetails = numberOfLinesForDetails
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,8 @@ private extension DefaultProductFormTableViewModel {`
`196`	`196`
`197`	`197`	`return ProductFormSection.SettingsRow.ViewModel(icon: icon,`
`198`	`198`	`title: title,`
`199`		`- details: details)`
	`199`	`+ details: details,`
	`200`	`+ numberOfLinesForDetails: 1)`
`200`	`201`	`}`
`201`	`202`	`}`
`202`	`203`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ private extension ProductFormSection.SettingsRow.ViewModel {`
`7`	`7`	`text: details,`
`8`	`8`	`image: icon,`
`9`	`9`	`imageTintColor: .textSubtle,`
`10`		`- numberOfLinesForText: 0)`
	`10`	`+ numberOfLinesForText: numberOfLinesForDetails)`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,14 @@ enum ProductFormSection {`
`22`	`22`	`let icon: UIImage`
`23`	`23`	`let title: String?`
`24`	`24`	`let details: String?`
	`25`	`+ let numberOfLinesForDetails: Int`
	`26`	`+`
	`27`	`+ init(icon: UIImage, title: String?, details: String?, numberOfLinesForDetails: Int = 0) {`
	`28`	`+ self.icon = icon`
	`29`	`+ self.title = title`
	`30`	`+ self.details = details`
	`31`	`+ self.numberOfLinesForDetails = numberOfLinesForDetails`
	`32`	`+ }`
`25`	`33`	`}`
`26`	`34`	`}`
`27`	`35`	`}`