Merge pull request #4777 from wikimedia/half-sheet-modal-UI

Image Recommendations: Bottom Modal Sheet
wikimedia · Mar 21, 2024 · eda4703 · eda4703
2 parents 4e95344 + ff0bbe5
commit eda4703
Show file tree

Hide file tree

Showing 29 changed files with 793 additions and 782 deletions.
diff --git a/Components/Sources/Components/Assets.xcassets/ImageRecommendations/Contents.json b/Components/Sources/Components/Assets.xcassets/ImageRecommendations/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...onents/Sources/Components/Assets.xcassets/ImageRecommendations/bot.imageset/Contents.json b/...onents/Sources/Components/Assets.xcassets/ImageRecommendations/bot.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "bot.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/Components/Sources/Components/Assets.xcassets/ImageRecommendations/bot.imageset/bot.pdf b/Components/Sources/Components/Assets.xcassets/ImageRecommendations/bot.imageset/bot.pdf
diff --git a/...rces/Components/Assets.xcassets/ImageRecommendations/external-link.imageset/Contents.json b/...rces/Components/Assets.xcassets/ImageRecommendations/external-link.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "mini-external.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/.../Components/Assets.xcassets/ImageRecommendations/external-link.imageset/mini-external.pdf b/.../Components/Assets.xcassets/ImageRecommendations/external-link.imageset/mini-external.pdf
diff --git a/Components/Sources/Components/Components/Shared/WKArticleSummaryView.swift b/Components/Sources/Components/Components/Shared/WKArticleSummaryView.swift
@@ -19,6 +19,8 @@ struct WKArticleSummaryView: View {
     }
 
     var body: some View {
+
+
         VStack(alignment: .leading, spacing: 8) {
             Spacer()
                 .frame(height: 12)
@@ -43,5 +45,8 @@ struct WKArticleSummaryView: View {
                 .frame(height: 2)
             WKHtmlText(html: articleSummary.extractHtml, styles: summaryStyles)
         }
+
     }
+
+
 }
diff --git a/Components/Sources/Components/Components/Shared/WKHtmlText.swift b/Components/Sources/Components/Components/Shared/WKHtmlText.swift
@@ -19,5 +19,6 @@ struct WKHtmlText: View {
         Text(attributedString)
             .lineLimit(nil)
             .lineSpacing(styles.lineSpacing)
+            .fixedSize(horizontal: false, vertical: true)
     }
 }