Skip to content

Commit 725fb86

Browse files
christibbschristibbs
authored
Remove RoundedCornersView since there's an issue with IBDesignables (#3969)
* Remove RoundedCornersView since there's an issue with IBDesignables in Xcode 11 - Wasn't saving us much code anyway * Run styles.sh
1 parent bca8785 commit 725fb86

File tree

5 files changed

+27
-76
lines changed

5 files changed

+27
-76
lines changed

‎Firebase/InAppMessagingDisplay/Card/FIDCardViewController.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ - (void)viewDidLoad {
9494
[super viewDidLoad];
9595

9696
self.cardView.backgroundColor = self.cardDisplayMessage.displayBackgroundColor;
97+
self.cardView.layer.cornerRadius = 4;
9798

9899
self.bodyTextView.contentInset = UIEdgeInsetsZero;
99100
self.bodyTextView.textContainer.lineFragmentPadding = 0;

‎Firebase/InAppMessagingDisplay/Modal/FIDModalViewController.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ - (void)viewDidLoad {
116116

117117
// make the background half transparent
118118
[self.view setBackgroundColor:[UIColor.grayColor colorWithAlphaComponent:0.5]];
119+
self.messageCardView.layer.cornerRadius = 4;
119120

120121
// populating values for display elements
121122

‎Firebase/InAppMessagingDisplay/Resources/FIRInAppMessageDisplayStoryboard.storyboard

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
3-
<device id="retina5_9" orientation="portrait">
4-
<adaptation id="fullscreen"/>
5-
</device>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
3+
<device id="retina6_5" orientation="portrait" appearance="light"/>
64
<dependencies>
75
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
97
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
108
</dependencies>
119
<scenes>
@@ -18,7 +16,7 @@
1816
<viewControllerLayoutGuide type="bottom" id="8Ta-Lb-9Rg"/>
1917
</layoutGuides>
2018
<view key="view" contentMode="scaleToFill" id="ef6-R8-q1S">
21-
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
19+
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
2220
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2321
<subviews>
2422
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rA8-LH-EYm">
@@ -59,7 +57,7 @@
5957
<viewControllerLayoutGuide type="bottom" id="K7E-8I-Yw5"/>
6058
</layoutGuides>
6159
<view key="view" contentMode="scaleToFill" id="vRb-yf-OWE">
62-
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
60+
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
6361
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
6462
<subviews>
6563
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="VfB-vw-7up">
@@ -73,14 +71,14 @@
7371
</constraints>
7472
</imageView>
7573
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Messaging Title" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rzo-9i-rXZ">
76-
<rect key="frame" x="70" y="47" width="289" height="20.333333333333329"/>
74+
<rect key="frame" x="70" y="47" width="324" height="20.333333333333329"/>
7775
<accessibility key="accessibilityConfiguration" identifier="banner-message-title-view"/>
7876
<fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
7977
<nil key="textColor"/>
8078
<nil key="highlightedColor"/>
8179
</label>
8280
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="message body" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GOK-vx-mU8">
83-
<rect key="frame" x="70" y="75.333333333333329" width="289" height="202.66666666666669"/>
81+
<rect key="frame" x="70" y="75.333333333333343" width="324" height="286.66666666666663"/>
8482
<accessibility key="accessibilityConfiguration" identifier="banner-body-label"/>
8583
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
8684
<nil key="textColor"/>
@@ -129,14 +127,14 @@
129127
<viewControllerLayoutGuide type="bottom" id="1nT-S0-O8H"/>
130128
</layoutGuides>
131129
<view key="view" contentMode="scaleToFill" id="1pz-BP-O6T">
132-
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
130+
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
133131
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
134132
<subviews>
135-
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jER-Re-ODh" customClass="RoundedCornersView">
136-
<rect key="frame" x="26" y="145.66666666666669" width="323" height="520.66666666666652"/>
133+
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jER-Re-ODh">
134+
<rect key="frame" x="30" y="187.66666666666669" width="354" height="520.66666666666652"/>
137135
<subviews>
138136
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="1000" text="Message Title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Edi-DJ-cR8">
139-
<rect key="frame" x="24" y="24" width="275" height="34"/>
137+
<rect key="frame" x="24" y="24" width="306" height="34"/>
140138
<constraints>
141139
<constraint firstAttribute="height" constant="34" identifier="Title Label Height Constraint" id="Gzz-dd-hYn" userLabel="Title Label Height Constraint"/>
142140
</constraints>
@@ -145,7 +143,7 @@
145143
<nil key="highlightedColor"/>
146144
</label>
147145
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="700" translatesAutoresizingMaskIntoConstraints="NO" id="c7x-Lf-M58">
148-
<rect key="frame" x="24" y="81.999999999999986" width="275" height="230.66666666666663"/>
146+
<rect key="frame" x="24" y="82.000000000000043" width="306" height="230.66666666666663"/>
149147
<accessibility key="accessibilityConfiguration" identifier="modal-image-view">
150148
<bool key="isElement" value="YES"/>
151149
</accessibility>
@@ -172,7 +170,7 @@
172170
</variation>
173171
</imageView>
174172
<button opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="252" verticalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VmW-ue-K1q">
175-
<rect key="frame" x="98.666666666666686" y="460.66666666666674" width="126" height="36"/>
173+
<rect key="frame" x="114" y="460.66666666666674" width="126" height="36"/>
176174
<accessibility key="accessibilityConfiguration" identifier="message-action-button"/>
177175
<constraints>
178176
<constraint firstAttribute="height" constant="36" identifier="Max Action Button Height" id="6T1-on-oWM"/>
@@ -184,7 +182,7 @@
184182
</connections>
185183
</button>
186184
<textView clipsSubviews="YES" clearsContextBeforeDrawing="NO" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" text="Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor " textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="24j-6H-N9j">
187-
<rect key="frame" x="24" y="336.66666666666663" width="275" height="100"/>
185+
<rect key="frame" x="24" y="336.66666666666674" width="306" height="100"/>
188186
<accessibility key="accessibilityConfiguration" identifier="message-body-textview"/>
189187
<constraints>
190188
<constraint firstAttribute="height" constant="100" identifier="Body Text View Height Constraint" id="h2w-ub-tEc"/>
@@ -306,7 +304,7 @@
306304
</variation>
307305
</view>
308306
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="akA-AE-VPc">
309-
<rect key="frame" x="329" y="125.66666666666669" width="40" height="40"/>
307+
<rect key="frame" x="364" y="167.66666666666666" width="40" height="40"/>
310308
<accessibility key="accessibilityConfiguration" identifier="close-button"/>
311309
<constraints>
312310
<constraint firstAttribute="width" constant="40" identifier="Close button width = 40" id="Dwi-In-x47"/>
@@ -386,11 +384,11 @@
386384
<viewControllerLayoutGuide type="bottom" id="I6y-sz-UcT"/>
387385
</layoutGuides>
388386
<view key="view" contentMode="scaleToFill" id="SM1-hn-m3n">
389-
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
387+
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
390388
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
391389
<subviews>
392-
<view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Aft-rr-icV" userLabel="Card view" customClass="RoundedCornersView">
393-
<rect key="frame" x="67.666666666666686" y="232" width="240" height="348"/>
390+
<view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Aft-rr-icV" userLabel="Card view">
391+
<rect key="frame" x="87" y="87" width="240" height="240"/>
394392
<subviews>
395393
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="gB0-8W-G9z">
396394
<rect key="frame" x="0.0" y="0.0" width="240" height="160"/>
@@ -458,7 +456,7 @@
458456
</constraints>
459457
</scrollView>
460458
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" horizontalCompressionResistancePriority="251" verticalCompressionResistancePriority="1000" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aZE-3x-WHk" userLabel="Primary action button">
461-
<rect key="frame" x="163" y="294" width="53" height="30"/>
459+
<rect key="frame" x="163" y="186" width="53" height="30"/>
462460
<accessibility key="accessibilityConfiguration" identifier="card-primary-action-button"/>
463461
<constraints>
464462
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="44" id="pxm-yD-xhm"/>
@@ -469,7 +467,7 @@
469467
</connections>
470468
</button>
471469
<button hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="1000" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Feg-VM-jUf" userLabel="Secondary action button">
472-
<rect key="frame" x="64.999999999999986" y="294" width="74.000000000000014" height="30"/>
470+
<rect key="frame" x="65" y="186" width="74" height="30"/>
473471
<accessibility key="accessibilityConfiguration" identifier="card-secondary-action-button"/>
474472
<constraints>
475473
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="44" id="bpF-9w-pDe"/>
@@ -519,37 +517,37 @@
519517
<exclude reference="7IV-jj-DjU"/>
520518
<exclude reference="RVJ-ts-fU5"/>
521519
<exclude reference="T6F-Mi-UaM"/>
522-
<exclude reference="6oY-Eb-2Mh"/>
523-
<exclude reference="Q0o-hu-ttH"/>
524520
<exclude reference="dN2-Ih-eEj"/>
525521
<exclude reference="jgB-Ie-frE"/>
522+
<exclude reference="6oY-Eb-2Mh"/>
523+
<exclude reference="Q0o-hu-ttH"/>
526524
</mask>
527525
</variation>
528526
<variation key="heightClass=compact">
529527
<mask key="constraints">
530528
<include reference="Voc-mp-Yh8"/>
531529
<include reference="4aZ-wP-20V"/>
532530
<include reference="7IV-jj-DjU"/>
533-
<include reference="Q0o-hu-ttH"/>
534531
<include reference="dN2-Ih-eEj"/>
532+
<include reference="Q0o-hu-ttH"/>
535533
</mask>
536534
</variation>
537535
<variation key="widthClass=regular">
538536
<mask key="constraints">
539537
<include reference="Voc-mp-Yh8"/>
540538
<include reference="4aZ-wP-20V"/>
541539
<include reference="7IV-jj-DjU"/>
542-
<include reference="Q0o-hu-ttH"/>
543540
<include reference="dN2-Ih-eEj"/>
541+
<include reference="Q0o-hu-ttH"/>
544542
</mask>
545543
</variation>
546544
<variation key="heightClass=regular-widthClass=compact">
547545
<mask key="constraints">
548546
<include reference="xX5-sm-qJG"/>
549547
<include reference="RVJ-ts-fU5"/>
550548
<include reference="T6F-Mi-UaM"/>
551-
<include reference="6oY-Eb-2Mh"/>
552549
<include reference="jgB-Ie-frE"/>
550+
<include reference="6oY-Eb-2Mh"/>
553551
</mask>
554552
</variation>
555553
<variation key="heightClass=regular-widthClass=regular">

‎Firebase/InAppMessagingDisplay/Util/RoundedCornersView.h

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎Firebase/InAppMessagingDisplay/Util/RoundedCornersView.m

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)