Skip to content

Commit 442cfcd

Browse files
raphschwanderraphschwander
authored
Merge pull request #15 from appswithlove/feature/darkMode
dark mode fixes
2 parents f214c42 + 3cd02e8 commit 442cfcd

2 files changed

Lines changed: 15 additions & 14 deletions

File tree

‎Updraft/Feedback/View/Description/FeedbackDescriptionViewController.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,10 @@ extension FeedbackDescriptionViewController: UIPickerViewDataSource {
211211

212212
extension FeedbackDescriptionViewController: UIPickerViewDelegate {
213213

214-
func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
215-
let title = tags[row]?.localized ?? ""
216-
return title
217-
}
214+
func pickerView(_ pickerView: UIPickerView, attributedTitleForRow row: Int, forComponent component: Int) -> NSAttributedString? {
215+
let title = tags[row]?.localized ?? ""
216+
return NSAttributedString(string: title, attributes: [NSAttributedString.Key.foregroundColor: UIColor.black])
217+
}
218218

219219
func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
220220
guard let tag = tags[row] else { return }

‎Updraft/Feedback/View/Description/FeedbackDescriptionViewController.xib‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="24128" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
33
<device id="retina5_9" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24063"/>
77
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
88
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
99
</dependencies>
@@ -31,26 +31,27 @@
3131
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
3232
<subviews>
3333
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="cfC-Jp-oVS" customClass="FeedbackEmailTextField" customModule="Updraft">
34-
<rect key="frame" x="16" y="435" width="343" height="50"/>
34+
<rect key="frame" x="16" y="491" width="343" height="50"/>
3535
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
3636
<constraints>
3737
<constraint firstAttribute="height" constant="50" id="Ytm-LG-yz5"/>
3838
</constraints>
39+
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
3940
<fontDescription key="fontDescription" type="system" pointSize="14"/>
4041
<textInputTraits key="textInputTraits"/>
4142
<connections>
4243
<action selector="emailChanged:" destination="-1" eventType="editingChanged" id="tuy-X9-n2p"/>
4344
</connections>
4445
</textField>
4546
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="S7z-1R-HMv" customClass="NavigationButton" customModule="Updraft">
46-
<rect key="frame" x="16" y="529" width="59" height="30"/>
47+
<rect key="frame" x="16" y="585" width="59" height="30"/>
4748
<state key="normal" title="previous"/>
4849
<connections>
4950
<action selector="showPrevious:" destination="-1" eventType="touchUpInside" id="nql-zb-kk0"/>
5051
</connections>
5152
</button>
5253
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4FE-HS-ZvP" customClass="ActionButton" customModule="Updraft">
53-
<rect key="frame" x="187" y="515" width="172" height="44"/>
54+
<rect key="frame" x="187" y="571" width="172" height="44"/>
5455
<constraints>
5556
<constraint firstAttribute="width" constant="172" id="I2r-5V-zGp"/>
5657
<constraint firstAttribute="height" constant="44" id="aza-5T-NEZ"/>
@@ -61,15 +62,15 @@
6162
</connections>
6263
</button>
6364
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gEX-wn-hc9">
64-
<rect key="frame" x="16" y="74" width="343" height="50"/>
65+
<rect key="frame" x="16" y="130" width="343" height="50"/>
6566
<subviews>
6667
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jmA-ej-aC4">
6768
<rect key="frame" x="305" y="8" width="30" height="34"/>
6869
</button>
6970
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aZh-RS-C9b">
70-
<rect key="frame" x="8" y="14.666666666666671" width="42" height="21"/>
71+
<rect key="frame" x="8" y="14.666666666666657" width="42" height="21"/>
7172
<fontDescription key="fontDescription" type="system" pointSize="17"/>
72-
<nil key="textColor"/>
73+
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
7374
<nil key="highlightedColor"/>
7475
</label>
7576
</subviews>
@@ -83,14 +84,14 @@
8384
</constraints>
8485
</view>
8586
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BP9-Qb-BS1" customClass="FeedbackDescriptionTextView" customModule="Updraft">
86-
<rect key="frame" x="16" y="305" width="343" height="100"/>
87+
<rect key="frame" x="16" y="361" width="343" height="100"/>
8788
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
8889
<constraints>
8990
<constraint firstAttribute="height" constant="100" id="chL-Uf-4rc"/>
9091
</constraints>
9192
</view>
9293
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QBD-9j-ba1">
93-
<rect key="frame" x="16" y="125" width="343" height="150"/>
94+
<rect key="frame" x="16" y="181" width="343" height="150"/>
9495
<subviews>
9596
<pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ikz-1L-Q7d">
9697
<rect key="frame" x="0.0" y="0.0" width="343" height="150"/>

0 commit comments

Comments
 (0)