Skip to content
This repository was archived by the owner on Dec 1, 2025. It is now read-only.

Commit c5e6964

Browse files
koogawakoogawa
authored
Merge pull request #50 from codeformiyazaki/issue/49
iOS 12 で「アイコンの設定」が閉じれないバグを修正
2 parents 7c41aae + 2fac8a1 commit c5e6964

2 files changed

Lines changed: 37 additions & 24 deletions

File tree

‎iosapp/06-earthquake/Base.lproj/Main.storyboard‎

Lines changed: 33 additions & 24 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.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="49e-Tb-3d3">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="49e-Tb-3d3">
33
<device id="retina5_5" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
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>
@@ -179,30 +179,30 @@
179179
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
180180
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
181181
<subviews>
182+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="宮崎津波防災" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uam-Rf-Xgt">
183+
<rect key="frame" x="16" y="0.0" width="382" height="44"/>
184+
<constraints>
185+
<constraint firstAttribute="height" constant="44" id="jHf-Rh-zgY"/>
186+
</constraints>
187+
<fontDescription key="fontDescription" type="system" pointSize="17"/>
188+
<nil key="textColor"/>
189+
<nil key="highlightedColor"/>
190+
</label>
182191
<wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KxN-bd-t8E">
183-
<rect key="frame" x="0.0" y="31" width="414" height="656"/>
192+
<rect key="frame" x="0.0" y="44" width="414" height="643"/>
184193
<color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
185194
<wkWebViewConfiguration key="configuration">
186195
<audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" none="YES"/>
187196
<wkPreferences key="preferences"/>
188197
</wkWebViewConfiguration>
189198
</wkWebView>
190-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="宮崎津波防災" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uam-Rf-Xgt">
191-
<rect key="frame" x="16" y="0.0" width="382" height="23"/>
192-
<constraints>
193-
<constraint firstAttribute="height" constant="23" id="jHf-Rh-zgY"/>
194-
</constraints>
195-
<fontDescription key="fontDescription" name="Futura-Medium" family="Futura" pointSize="17"/>
196-
<nil key="textColor"/>
197-
<nil key="highlightedColor"/>
198-
</label>
199199
</subviews>
200200
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
201201
<constraints>
202202
<constraint firstItem="KxN-bd-t8E" firstAttribute="trailing" secondItem="O1u-W8-tvY" secondAttribute="trailing" id="L4g-fq-XSi"/>
203203
<constraint firstItem="O1u-W8-tvY" firstAttribute="trailing" secondItem="Uam-Rf-Xgt" secondAttribute="trailing" constant="16" id="Skc-bE-jpR"/>
204204
<constraint firstItem="Uam-Rf-Xgt" firstAttribute="top" secondItem="O1u-W8-tvY" secondAttribute="top" id="dE0-2I-zkv"/>
205-
<constraint firstItem="KxN-bd-t8E" firstAttribute="top" secondItem="Uam-Rf-Xgt" secondAttribute="bottom" constant="8" id="jmt-MN-vCD"/>
205+
<constraint firstItem="KxN-bd-t8E" firstAttribute="top" secondItem="Uam-Rf-Xgt" secondAttribute="bottom" id="jmt-MN-vCD"/>
206206
<constraint firstItem="KxN-bd-t8E" firstAttribute="leading" secondItem="O1u-W8-tvY" secondAttribute="leading" id="jwj-XE-4Qj"/>
207207
<constraint firstItem="KxN-bd-t8E" firstAttribute="bottom" secondItem="O1u-W8-tvY" secondAttribute="bottom" id="kL0-4x-hQh"/>
208208
<constraint firstItem="Uam-Rf-Xgt" firstAttribute="leading" secondItem="O1u-W8-tvY" secondAttribute="leading" constant="16" id="mVX-XQ-Ej5"/>
@@ -227,25 +227,25 @@
227227
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
228228
<subviews>
229229
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="宮崎津波防災" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B46-W0-6gW">
230-
<rect key="frame" x="16" y="0.0" width="382" height="23"/>
230+
<rect key="frame" x="16" y="0.0" width="382" height="44"/>
231231
<constraints>
232-
<constraint firstAttribute="height" constant="23" id="VHR-Wm-QDS"/>
232+
<constraint firstAttribute="height" constant="44" id="VHR-Wm-QDS"/>
233233
</constraints>
234234
<fontDescription key="fontDescription" type="system" pointSize="17"/>
235235
<nil key="textColor"/>
236236
<nil key="highlightedColor"/>
237237
</label>
238238
<mapView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" mapType="standard" showsUserLocation="YES" translatesAutoresizingMaskIntoConstraints="NO" id="F4G-9S-2LS">
239-
<rect key="frame" x="0.0" y="31" width="414" height="656"/>
239+
<rect key="frame" x="0.0" y="44" width="414" height="643"/>
240240
<connections>
241241
<outlet property="delegate" destination="weR-rN-Xxu" id="bZX-yo-rbk"/>
242242
</connections>
243243
</mapView>
244244
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1ky-N5-sfQ">
245-
<rect key="frame" x="10" y="2.6666666666666661" width="22" height="22"/>
245+
<rect key="frame" x="10" y="9" width="30" height="30"/>
246246
<constraints>
247-
<constraint firstAttribute="width" constant="22" id="BB0-Q3-csa"/>
248-
<constraint firstAttribute="height" constant="22" id="Gd9-VC-3sY"/>
247+
<constraint firstAttribute="width" constant="30" id="BB0-Q3-csa"/>
248+
<constraint firstAttribute="height" constant="30" id="Gd9-VC-3sY"/>
249249
</constraints>
250250
<color key="tintColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>
251251
<state key="normal" image="near-me"/>
@@ -254,10 +254,10 @@
254254
</connections>
255255
</button>
256256
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Onv-yG-px1">
257-
<rect key="frame" x="382" y="2.6666666666666661" width="22" height="22"/>
257+
<rect key="frame" x="374" y="9" width="30" height="30"/>
258258
<constraints>
259-
<constraint firstAttribute="height" constant="22" id="f8y-Hu-HgJ"/>
260-
<constraint firstAttribute="width" constant="22" id="jE7-BY-d2l"/>
259+
<constraint firstAttribute="height" constant="30" id="f8y-Hu-HgJ"/>
260+
<constraint firstAttribute="width" constant="30" id="jE7-BY-d2l"/>
261261
</constraints>
262262
<color key="tintColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>
263263
<state key="normal" image="layer"/>
@@ -272,7 +272,7 @@
272272
<constraint firstItem="lPu-td-LCo" firstAttribute="trailing" secondItem="B46-W0-6gW" secondAttribute="trailing" constant="16" id="30Y-dY-GIN"/>
273273
<constraint firstItem="B46-W0-6gW" firstAttribute="top" secondItem="lPu-td-LCo" secondAttribute="top" id="4Hr-Md-F34"/>
274274
<constraint firstItem="B46-W0-6gW" firstAttribute="leading" secondItem="lPu-td-LCo" secondAttribute="leading" constant="16" id="8lj-mQ-0w9"/>
275-
<constraint firstItem="F4G-9S-2LS" firstAttribute="top" secondItem="B46-W0-6gW" secondAttribute="bottom" constant="8" id="e3w-15-faZ"/>
275+
<constraint firstItem="F4G-9S-2LS" firstAttribute="top" secondItem="B46-W0-6gW" secondAttribute="bottom" id="e3w-15-faZ"/>
276276
<constraint firstItem="1ky-N5-sfQ" firstAttribute="centerY" secondItem="B46-W0-6gW" secondAttribute="centerY" constant="2" id="m1W-D6-FA9"/>
277277
<constraint firstItem="F4G-9S-2LS" firstAttribute="leading" secondItem="lPu-td-LCo" secondAttribute="leading" id="pNw-z9-8Nv"/>
278278
<constraint firstItem="lPu-td-LCo" firstAttribute="trailing" secondItem="Onv-yG-px1" secondAttribute="trailing" constant="10" id="qMZ-Me-4WV"/>
@@ -304,6 +304,15 @@
304304
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
305305
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
306306
<subviews>
307+
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zWv-24-xql">
308+
<rect key="frame" x="8" y="2" width="40" height="41"/>
309+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
310+
<fontDescription key="fontDescription" type="system" pointSize="30"/>
311+
<state key="normal" title="✗"/>
312+
<connections>
313+
<action selector="closeButtonDidTap:" destination="v19-a3-j0z" eventType="touchUpInside" id="w2L-fB-axr"/>
314+
</connections>
315+
</button>
307316
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="アイコンの設定" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8m2-wG-0UC">
308317
<rect key="frame" x="146" y="11.666666666666664" width="122" height="21"/>
309318
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
@@ -324,7 +333,7 @@
324333
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="チェックを入れたアイコンが地図上に表示されます" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ftT-ng-Wag">
325334
<rect key="frame" x="31" y="13" width="352" height="18"/>
326335
<fontDescription key="fontDescription" type="system" pointSize="15"/>
327-
<color key="textColor" systemColor="secondaryLabelColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
336+
<color key="textColor" systemColor="secondaryLabelColor" red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
328337
<nil key="highlightedColor"/>
329338
</label>
330339
</subviews>

‎iosapp/06-earthquake/IconSettingsViewController.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ class IconSettingsViewController: UITableViewController {
2525

2626
private lazy var iconSettingsRepository: IconSettingsRepository = IconSettingsRepositoryImpl()
2727

28+
@IBAction func closeButtonDidTap(_ sender: Any) {
29+
dismiss(animated: true, completion: nil)
30+
}
31+
2832
override func viewDidLoad() {
2933
super.viewDidLoad()
3034
}

0 commit comments

Comments
 (0)