Skip to content

Commit 600d09c

Browse files
HazATHazAT
committed
Fix placholder color, Remove PDF and add prerendered pngs
1 parent e8cede1 commit 600d09c

8 files changed

+30
-15
lines changed

‎Sources/ios/Assets.xcassets/sentry-glyph-black.imageset/Contents.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,18 @@
22
"images" : [
33
{
44
"idiom" : "universal",
5-
"filename" : "sentry-glyph-black.pdf"
5+
"filename" : "sentry-glyph-black.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "[email protected]",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "[email protected]",
16+
"scale" : "3x"
617
}
718
],
819
"info" : {

‎Sources/ios/Assets.xcassets/sentry-glyph-black.imageset/sentry-glyph-black.pdf

-1.56 KB
Binary file not shown.

‎Sources/ios/Assets.xcassets/sentry-glyph-black.imageset/sentry-glyph-black.png

546 Bytes
Loading

‎Sources/ios/Assets.xcassets/sentry-glyph-black.imageset/[email protected]

1.14 KB
Loading

‎Sources/ios/Assets.xcassets/sentry-glyph-black.imageset/[email protected]

1.8 KB
Loading

‎Sources/ios/UserFeedback.storyboard

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -159,31 +159,31 @@
159159
<autoresizingMask key="autoresizingMask"/>
160160
<subviews>
161161
<label opaque="NO" userInteractionEnabled="NO" alpha="0.75" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SENTRY" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tf4-kn-B2U">
162-
<rect key="frame" x="333.33333333333326" y="20" width="60.666666666666686" height="19.333333333333336"/>
163-
<fontDescription key="fontDescription" type="system" pointSize="16"/>
162+
<rect key="frame" x="340" y="21.333333333333336" width="54" height="17.000000000000007"/>
163+
<fontDescription key="fontDescription" type="system" pointSize="14"/>
164164
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
165165
<nil key="highlightedColor"/>
166166
</label>
167167
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Crash reports powered by" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b3o-7r-1u9">
168-
<rect key="frame" x="154.33333333333331" y="22" width="146.99999999999994" height="15"/>
169-
<fontDescription key="fontDescription" type="system" pointSize="12"/>
168+
<rect key="frame" x="171.66666666666663" y="23" width="136.33333333333337" height="13.333333333333336"/>
169+
<fontDescription key="fontDescription" type="system" pointSize="11"/>
170170
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
171171
<nil key="highlightedColor"/>
172172
</label>
173-
<imageView userInteractionEnabled="NO" alpha="0.75" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="NFt-xw-keo">
174-
<rect key="frame" x="301.33333333333331" y="14" width="32" height="32"/>
173+
<imageView userInteractionEnabled="NO" alpha="0.75" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="NFt-xw-keo">
174+
<rect key="frame" x="316" y="20" width="20" height="20"/>
175175
<constraints>
176-
<constraint firstAttribute="width" constant="32" id="8Lu-8a-DHh"/>
177-
<constraint firstAttribute="height" constant="32" id="OKW-29-URA"/>
176+
<constraint firstAttribute="width" constant="20" id="8Lu-8a-DHh"/>
177+
<constraint firstAttribute="height" constant="20" id="OKW-29-URA"/>
178178
</constraints>
179179
</imageView>
180180
</subviews>
181181
<constraints>
182182
<constraint firstAttribute="trailingMargin" secondItem="tf4-kn-B2U" secondAttribute="trailing" constant="12" id="9kE-H0-qrl"/>
183-
<constraint firstItem="NFt-xw-keo" firstAttribute="leading" secondItem="b3o-7r-1u9" secondAttribute="trailing" id="ZgZ-K2-xgl"/>
183+
<constraint firstItem="NFt-xw-keo" firstAttribute="leading" secondItem="b3o-7r-1u9" secondAttribute="trailing" constant="8" id="ZgZ-K2-xgl"/>
184184
<constraint firstItem="b3o-7r-1u9" firstAttribute="centerY" secondItem="kHQ-92-YRE" secondAttribute="centerY" id="ase-Bs-yEN"/>
185185
<constraint firstItem="NFt-xw-keo" firstAttribute="centerY" secondItem="kHQ-92-YRE" secondAttribute="centerY" id="h3r-xs-Mdr"/>
186-
<constraint firstItem="tf4-kn-B2U" firstAttribute="leading" secondItem="NFt-xw-keo" secondAttribute="trailing" id="oZ2-oD-1Lo"/>
186+
<constraint firstItem="tf4-kn-B2U" firstAttribute="leading" secondItem="NFt-xw-keo" secondAttribute="trailing" constant="4" id="oZ2-oD-1Lo"/>
187187
<constraint firstItem="tf4-kn-B2U" firstAttribute="centerY" secondItem="kHQ-92-YRE" secondAttribute="centerY" id="vqc-8c-duv"/>
188188
</constraints>
189189
</tableViewCellContentView>

‎Sources/ios/UserFeedbackTableViewController.swift

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,19 @@ public final class UserFeedbackTableViewController: UITableViewController, UITex
6363
nameTextField.text = viewModel.nameTextFieldValue
6464
emailTextField.text = viewModel.emailTextFieldValue
6565
commentsTextField.text = viewModel.commentsTextFieldValue
66+
nameTextField.textColor = viewModel.defaultTextColor
67+
emailTextField.textColor = viewModel.defaultTextColor
68+
commentsTextField.textColor = viewModel.defaultTextColor
6669

6770
titleLabel.text = viewModel.title
6871
subtitleLabel.text = viewModel.subTitle
6972

7073
nameLabel.text = viewModel.nameLabel
7174

7275
emailLabel.text = viewModel.emailLabel
73-
74-
commentsTextField.placeholder = viewModel.commentsTextFieldPlaceholder
75-
76+
7677
#if swift(>=3.0)
78+
commentsTextField.attributedPlaceholder = NSAttributedString(string: viewModel.commentsTextFieldPlaceholder, attributes: [NSForegroundColorAttributeName: UIColor.darkGray])
7779
poweredByTableViewCell.isHidden = !viewModel.showSentryBranding
7880

7981
navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(dismissViewController))
@@ -82,6 +84,8 @@ public final class UserFeedbackTableViewController: UITableViewController, UITex
8284
sentryLogoImageView.image = UIImage(named: "sentry-glyph-black", in: bundle, compatibleWith: nil)
8385
}
8486
#else
87+
commentsTextField.attributedPlaceholder = NSAttributedString(string: viewModel.commentsTextFieldPlaceholder, attributes: [NSForegroundColorAttributeName: UIColor.darkGrayColor()])
88+
8589
poweredByTableViewCell.hidden = !viewModel.showSentryBranding
8690

8791
navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .Cancel, target: self, action: #selector(dismissViewController))

‎Sources/ios/UserFeedbackViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protocol ViewModel {
3939
#if swift(>=3.0)
4040
public var defaultTextColor = UIColor.darkText
4141
#else
42-
public var defaultTextColor = UIColor.darkGrayColor()
42+
public var defaultTextColor = UIColor.darkTextColor()
4343
#endif
4444

4545
public var showSentryBranding = true

0 commit comments

Comments
 (0)