removed tab + edits to constraints for buttons

dnarcese · Jun 24, 2020 · 33f8d21 · 33f8d21
1 parent 48a429a
commit 33f8d21
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 23 deletions.
diff --git a/Extensions/Today/Images.xcassets/private-search.imageset/Contents.json b/Extensions/Today/Images.xcassets/private-search.imageset/Contents.json
@@ -2,20 +2,14 @@
   "images" : [
     {
       "filename" : "private-search.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
     }
   ],
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
   }
 }
diff --git a/Extensions/Today/Images.xcassets/search-button.imageset/Contents.json b/Extensions/Today/Images.xcassets/search-button.imageset/Contents.json
@@ -2,16 +2,7 @@
   "images" : [
     {
       "filename" : "search.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "idiom" : "universal"
     }
   ],
   "info" : {

diff --git a/Extensions/Today/TodayViewController.swift b/Extensions/Today/TodayViewController.swift
@@ -132,7 +132,7 @@ class TodayViewController: UIViewController, NCWidgetProviding {
         super.viewWillAppear(animated)
         updateCopiedLink()
     }
-    
+
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         let edge = size.width * TodayUX.buttonsHorizontalMarginPercentage
         buttonStackView.layoutMargins = UIEdgeInsets(top: 0, left: edge, bottom: 0, right: edge)
@@ -228,7 +228,8 @@ class ImageButtonWithLabel: UIView {
     func performLayout() {
         addSubview(button)
         addSubview(label)
-
+
+        button.contentMode = .scaleAspectFill
         button.snp.makeConstraints { make in
             make.centerX.equalTo(self)
             make.top.equalTo(self.safeAreaLayoutGuide)
@@ -289,7 +290,7 @@ class ButtonWithSublabel: UIButton {
         titleLabel.snp.makeConstraints { make in
             make.left.equalTo(imageView.snp.right).offset(10)
             make.trailing.top.equalTo(self)
-            make.height.equalTo(12)
+            make.height.greaterThanOrEqualTo(12)
 
         }