Web image height capped, center images (#1421)

rnystrom · web-flow · commit b8bacd5f9c1f · 2018-01-14T23:13:33.000-05:00
* larger overlay min height

* cap html image heights, center image crops
diff --git a/Classes/Issues/Comments/Html/IssueCommentHtmlCell.swift b/Classes/Issues/Comments/Html/IssueCommentHtmlCell.swift
@@ -64,7 +64,7 @@ final class IssueCommentHtmlCell: IssueCommentBaseCell, ListBindable, UIWebViewD
     table{border-spacing: 0; border-collapse: collapse;}
     th, td{border: 1px solid #\(Styles.Colors.Gray.border); padding: 6px 13px;}
     th{font-weight: \(Styles.Sizes.HTML.boldWeight); text-align: center;}
-    img{max-width:100%; box-sizing: border-box;}
+    img{max-width:100%; box-sizing: border-box; max-height: \(Styles.Sizes.maxImageHeight)px;}
     </style>
     </head><body>
     """
diff --git a/Classes/Issues/Comments/IssueCommentBaseCell.swift b/Classes/Issues/Comments/IssueCommentBaseCell.swift
@@ -14,7 +14,7 @@ protocol IssueCommentDoubleTapDelegate: class {
 
 class IssueCommentBaseCell: UICollectionViewCell, UIGestureRecognizerDelegate {
 
-    static let collapseCellMinHeight: CGFloat = 20
+    static let collapseCellMinHeight: CGFloat = 30
 
     enum BorderType {
         case head
@@ -158,7 +158,7 @@ class IssueCommentBaseCell: UICollectionViewCell, UIGestureRecognizerDelegate {
 
             collapseButton.center = CGPoint(
                 x: collapseFrame.width / 2,
-                y: collapseFrame.maxY - collapseButton.bounds.height / 2 - 1
+                y: collapseFrame.maxY - collapseButton.bounds.height / 2
             )
         }
     }
diff --git a/Classes/Views/BoundedImageSize.swift b/Classes/Views/BoundedImageSize.swift
@@ -9,7 +9,15 @@
 import UIKit
 
 func BoundedImageSize(originalSize: CGSize, containerWidth: CGFloat) -> CGSize {
-    guard originalSize.width > containerWidth else { return originalSize }
+    guard originalSize.width > containerWidth else {
+        return CGSize(
+            width: containerWidth,
+            height: min(originalSize.height, Styles.Sizes.maxImageHeight)
+        )
+    }
     let ratio = originalSize.width / originalSize.height
-    return CGSize(width: containerWidth, height: min(ceil(containerWidth / ratio), 300))
+    return CGSize(
+        width: containerWidth,
+        height: min(ceil(containerWidth / ratio), Styles.Sizes.maxImageHeight)
+    )
 }
diff --git a/Classes/Views/Styles.swift b/Classes/Views/Styles.swift
@@ -50,6 +50,7 @@ enum Styles {
             bottom: 0,
             right: Styles.Sizes.commentGutter
         )
+        static let maxImageHeight: CGFloat = 300
 
         enum Text {
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ protocol IssueCommentDoubleTapDelegate: class {`
`14`	`14`
`15`	`15`	`class IssueCommentBaseCell: UICollectionViewCell, UIGestureRecognizerDelegate {`
`16`	`16`
`17`		`- static let collapseCellMinHeight: CGFloat = 20`
	`17`	`+ static let collapseCellMinHeight: CGFloat = 30`
`18`	`18`
`19`	`19`	`enum BorderType {`
`20`	`20`	`case head`
`@@ -158,7 +158,7 @@ class IssueCommentBaseCell: UICollectionViewCell, UIGestureRecognizerDelegate {`
`158`	`158`
`159`	`159`	`collapseButton.center = CGPoint(`
`160`	`160`	`x: collapseFrame.width / 2,`
`161`		`- y: collapseFrame.maxY - collapseButton.bounds.height / 2 - 1`
	`161`	`+ y: collapseFrame.maxY - collapseButton.bounds.height / 2`
`162`	`162`	`)`
`163`	`163`	`}`
`164`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ enum Styles {`
`50`	`50`	`bottom: 0,`
`51`	`51`	`right: Styles.Sizes.commentGutter`
`52`	`52`	`)`
	`53`	`+ static let maxImageHeight: CGFloat = 300`
`53`	`54`
`54`	`55`	`enum Text {`
`55`	`56`