Skip to content
This repository was archived by the owner on Sep 20, 2023. It is now read-only.

Commit e2b967b

Browse files
rnystromrnystrom
authored
Switches share style, fix default reaction padding (#2095)
1 parent ca93113 commit e2b967b

File tree

4 files changed

+29
-13
lines changed

4 files changed

+29
-13
lines changed

‎Classes/Settings/Settings.storyboard‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
<color key="textColor" red="0.14117647058823529" green="0.16078431372549018" blue="0.1803921568627451" alpha="1" colorSpace="calibratedRGB"/>
203203
<nil key="highlightedColor"/>
204204
</label>
205-
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FvK-93-raA">
205+
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FvK-93-raA" customClass="StyledSwitch" customModule="Freetime" customModuleProvider="target">
206206
<rect key="frame" x="311" y="6" width="51" height="31"/>
207207
<connections>
208208
<action selector="onBackgroundFetchChanged" destination="NnB-TU-bkW" eventType="valueChanged" id="gPu-bQ-K9r"/>
@@ -243,7 +243,7 @@
243243
<color key="textColor" red="0.14117647059999999" green="0.16078431369999999" blue="0.18039215689999999" alpha="1" colorSpace="calibratedRGB"/>
244244
<nil key="highlightedColor"/>
245245
</label>
246-
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8dQ-YU-Yuw">
246+
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8dQ-YU-Yuw" customClass="StyledSwitch" customModule="Freetime" customModuleProvider="target">
247247
<rect key="frame" x="311" y="6" width="51" height="31"/>
248248
<connections>
249249
<action selector="onMarkRead:" destination="NnB-TU-bkW" eventType="valueChanged" id="QPk-DK-Ufx"/>
@@ -272,7 +272,7 @@
272272
<color key="textColor" red="0.14117647059999999" green="0.16078431369999999" blue="0.18039215689999999" alpha="1" colorSpace="calibratedRGB"/>
273273
<nil key="highlightedColor"/>
274274
</label>
275-
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZWv-km-fU1">
275+
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZWv-km-fU1" customClass="StyledSwitch" customModule="Freetime" customModuleProvider="target">
276276
<rect key="frame" x="311" y="6" width="51" height="31"/>
277277
<connections>
278278
<action selector="onSignature:" destination="NnB-TU-bkW" eventType="valueChanged" id="XNf-Bz-K8B"/>
@@ -389,21 +389,21 @@
389389
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
390390
<autoresizingMask key="autoresizingMask"/>
391391
<subviews>
392-
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Dj7-Q0-qBc">
393-
<rect key="frame" x="300" y="6" width="51" height="31"/>
392+
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Dj7-Q0-qBc" customClass="StyledSwitch" customModule="Freetime" customModuleProvider="target">
393+
<rect key="frame" x="311" y="6" width="51" height="31"/>
394394
<connections>
395395
<action selector="toggleDefaultReaction:" destination="D6n-Kh-ydE" eventType="valueChanged" id="WZ3-CL-0ma"/>
396396
</connections>
397397
</switch>
398398
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GDm-2V-Cpa">
399-
<rect key="frame" x="16" y="11" width="173" height="21"/>
399+
<rect key="frame" x="16" y="11" width="184" height="21"/>
400400
<fontDescription key="fontDescription" type="system" pointSize="16"/>
401401
<color key="textColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
402402
<nil key="highlightedColor"/>
403403
</label>
404404
</subviews>
405405
<constraints>
406-
<constraint firstAttribute="trailing" secondItem="Dj7-Q0-qBc" secondAttribute="trailing" constant="26" id="3VX-9T-e8F"/>
406+
<constraint firstAttribute="trailing" secondItem="Dj7-Q0-qBc" secondAttribute="trailing" constant="15" id="3VX-9T-e8F"/>
407407
<constraint firstItem="Dj7-Q0-qBc" firstAttribute="top" secondItem="xcP-b2-e1A" secondAttribute="top" constant="6" id="Awt-Ph-eh5"/>
408408
<constraint firstAttribute="bottom" secondItem="GDm-2V-Cpa" secondAttribute="bottom" constant="11.5" id="Jls-ZB-Fzs"/>
409409
<constraint firstItem="Dj7-Q0-qBc" firstAttribute="leading" secondItem="GDm-2V-Cpa" secondAttribute="trailing" constant="111" id="QX1-31-arh"/>

‎Classes/Settings/SettingsViewController.swift‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ NewIssueTableViewControllerDelegate {
4848
signatureSwitch.isOn = Signature.enabled
4949

5050
updateBadge()
51-
style()
5251

5352
NotificationCenter.default.addObserver(
5453
self,
@@ -253,11 +252,6 @@ NewIssueTableViewControllerDelegate {
253252
NotificationModelController.setReadOnOpen(open: markReadSwitch.isOn)
254253
}
255254

256-
private func style() {
257-
[backgroundFetchSwitch, markReadSwitch, signatureSwitch]
258-
.forEach({ $0.onTintColor = Styles.Colors.Green.medium.color })
259-
}
260-
261255
@IBAction func onSignature(_ sender: Any) {
262256
Signature.enabled = signatureSwitch.isOn
263257
}

‎Classes/Views/StyledSwitch.swift‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//
2+
// StyledSwitch.swift
3+
// Freetime
4+
//
5+
// Created by Ryan Nystrom on 8/11/18.
6+
// Copyright © 2018 Ryan Nystrom. All rights reserved.
7+
//
8+
9+
import UIKit
10+
11+
class StyledSwitch: UISwitch {
12+
13+
override func awakeFromNib() {
14+
super.awakeFromNib()
15+
onTintColor = Styles.Colors.Green.medium.color
16+
}
17+
18+
}

‎Freetime.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
292FF8B91F303DB0009E63F7 /* IssuePreviewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 292FF8B81F303DB0009E63F7 /* IssuePreviewModel.swift */; };
117117
2930988D211F327C00E1178B /* Defaults+Reaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2930988C211F327B00E1178B /* Defaults+Reaction.swift */; };
118118
2930988F211F32D100E1178B /* DefaultReactionDetailController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2930988E211F32D100E1178B /* DefaultReactionDetailController.swift */; };
119+
29309895211FD7CC00E1178B /* StyledSwitch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29309894211FD7CC00E1178B /* StyledSwitch.swift */; };
119120
2930F2711F894AA10082BA26 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 2930F2701F894AA10082BA26 /* Settings.bundle */; };
120121
2930F2731F8A27750082BA26 /* WidthCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2930F2721F8A27750082BA26 /* WidthCache.swift */; };
121122
29316DB51ECC7DEB007CAE3F /* ButtonCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29316DB41ECC7DEB007CAE3F /* ButtonCell.swift */; };
@@ -630,6 +631,7 @@
630631
292FF8B81F303DB0009E63F7 /* IssuePreviewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IssuePreviewModel.swift; sourceTree = "<group>"; };
631632
2930988C211F327B00E1178B /* Defaults+Reaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Defaults+Reaction.swift"; sourceTree = "<group>"; };
632633
2930988E211F32D100E1178B /* DefaultReactionDetailController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultReactionDetailController.swift; sourceTree = "<group>"; };
634+
29309894211FD7CC00E1178B /* StyledSwitch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StyledSwitch.swift; sourceTree = "<group>"; };
633635
2930F2701F894AA10082BA26 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = SOURCE_ROOT; };
634636
2930F2721F8A27750082BA26 /* WidthCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidthCache.swift; sourceTree = "<group>"; };
635637
29316DB41ECC7DEB007CAE3F /* ButtonCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonCell.swift; sourceTree = "<group>"; };
@@ -1738,6 +1740,7 @@
17381740
29C2950F1EC7B7FF00D46CD2 /* ShowMoreDetailsLabel.swift */,
17391741
295840701EE9F4D3007723C6 /* ShowMoreDetailsLabel+Date.swift */,
17401742
2971722C1F069E96005E43AC /* SpinnerCell.swift */,
1743+
29309894211FD7CC00E1178B /* StyledSwitch.swift */,
17411744
291929621F3FF0DA0012067B /* StyledTableCell.swift */,
17421745
299F63E7205F09900015D901 /* StyledTextRenderer+ListDiffable.swift */,
17431746
299F63D9205DD86E0015D901 /* StyledTextViewCell.swift */,
@@ -2950,6 +2953,7 @@
29502953
5DB4DD471FC5C10000DF7ABF /* Accessibility.swift in Sources */,
29512954
D8BAD0641FDF221900C41071 /* LabelListView.swift in Sources */,
29522955
2924C18820D5B2F200FCFCFF /* PeopleSectionController.swift in Sources */,
2956+
29309895211FD7CC00E1178B /* StyledSwitch.swift in Sources */,
29532957
292ACE181F5C945B00C9A02C /* RepositoryIssueSummaryModel.swift in Sources */,
29542958
DCA5ED1B1FAEF78B0072F074 /* BookmarkSectionController.swift in Sources */,
29552959
29693EE520FAA05F00336200 /* IssueAutocomplete.swift in Sources */,

0 commit comments

Comments
 (0)