Fixed warnings in storyboards + formatting

danblakemore · Aug 14, 2020 · 216c5b5 · 216c5b5
1 parent 602066c
commit 216c5b5
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 29 deletions.
diff --git a/Examples/Example-iOS_ObjC-Carthage/Example_Extension/Base.lproj/MainInterface.storyboard b/Examples/Example-iOS_ObjC-Carthage/Example_Extension/Base.lproj/MainInterface.storyboard
@@ -45,6 +45,7 @@
                             <constraint firstItem="66l-TF-F1n" firstAttribute="top" secondItem="Wrl-gw-XJK" secondAttribute="bottom" constant="8" id="TPg-P8-h47"/>
                             <constraint firstItem="ayH-z8-Pku" firstAttribute="top" secondItem="66l-TF-F1n" secondAttribute="bottom" constant="8" id="TRo-kO-AZz"/>
                             <constraint firstItem="66l-TF-F1n" firstAttribute="leading" secondItem="ssy-KU-ocm" secondAttribute="leading" constant="8" id="Wd5-Dp-LJF"/>
+                            <constraint firstItem="ssy-KU-ocm" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="66l-TF-F1n" secondAttribute="trailing" constant="8" id="Zcu-2V-lkR"/>
                             <constraint firstItem="ayH-z8-Pku" firstAttribute="leading" secondItem="66l-TF-F1n" secondAttribute="leading" id="bq9-CH-Qvg"/>
                             <constraint firstItem="ssy-KU-ocm" firstAttribute="top" secondItem="Wrl-gw-XJK" secondAttribute="top" constant="8" id="lad-4e-RTz"/>
                             <constraint firstItem="Wrl-gw-XJK" firstAttribute="centerX" secondItem="S3S-Oj-5AN" secondAttribute="centerX" id="nHH-7M-rI5"/>

diff --git a/Examples/Example-iOS_ObjC/Example-iOS_ObjC_Extension/Base.lproj/MainInterface.storyboard b/Examples/Example-iOS_ObjC/Example-iOS_ObjC_Extension/Base.lproj/MainInterface.storyboard
@@ -43,6 +43,7 @@
                             <constraint firstItem="AiD-Q7-M0I" firstAttribute="top" secondItem="YY6-lX-cn2" secondAttribute="bottom" constant="8" id="0Yb-JH-FMU"/>
                             <constraint firstItem="YY6-lX-cn2" firstAttribute="top" secondItem="Ueb-rd-oaa" secondAttribute="bottom" constant="8" id="5mU-tH-hP1"/>
                             <constraint firstItem="ssy-KU-ocm" firstAttribute="bottom" secondItem="AiD-Q7-M0I" secondAttribute="bottom" constant="8" id="6DA-bw-L9M"/>
+                            <constraint firstItem="ssy-KU-ocm" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="YY6-lX-cn2" secondAttribute="trailing" constant="8" id="PKo-Pm-HC1"/>
                             <constraint firstItem="AiD-Q7-M0I" firstAttribute="leading" secondItem="YY6-lX-cn2" secondAttribute="leading" id="UHN-Bw-uZJ"/>
                             <constraint firstItem="YY6-lX-cn2" firstAttribute="leading" secondItem="ssy-KU-ocm" secondAttribute="leading" constant="8" id="ZHD-EG-EQB"/>
                             <constraint firstItem="ssy-KU-ocm" firstAttribute="trailing" secondItem="AiD-Q7-M0I" secondAttribute="trailing" constant="8" id="bWH-bb-nBT"/>

diff --git a/Examples/Example-iOS_ObjC/Example-iOS_ObjC_Extension/TodayViewController.h b/Examples/Example-iOS_ObjC/Example-iOS_ObjC_Extension/TodayViewController.h
@@ -1,19 +1,19 @@
 /*! @file TodayViewController.h
- @brief AppAuth iOS SDK Example
- @copyright
- Copyright 2015 Google Inc. All Rights Reserved.
- @copydetails
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+    @brief AppAuth iOS SDK Example
+    @copyright
+        Copyright 2015 Google Inc. All Rights Reserved.
+    @copydetails
+        Licensed under the Apache License, Version 2.0 (the "License");
+        you may not use this file except in compliance with the License.
+        You may obtain a copy of the License at
  
- http://www.apache.org/licenses/LICENSE-2.0
+        http://www.apache.org/licenses/LICENSE-2.0
  
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
  */
 
 #import <UIKit/UIKit.h>

diff --git a/Examples/Example-iOS_ObjC/Example-iOS_ObjC_Extension/TodayViewController.m b/Examples/Example-iOS_ObjC/Example-iOS_ObjC_Extension/TodayViewController.m
@@ -1,19 +1,19 @@
 /*! @file TodayViewController.m
- @brief AppAuth iOS SDK Example
- @copyright
- Copyright 2015 Google Inc. All Rights Reserved.
- @copydetails
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+    @brief AppAuth iOS SDK Example
+    @copyright
+        Copyright 2015 Google Inc. All Rights Reserved.
+    @copydetails
+        Licensed under the Apache License, Version 2.0 (the "License");
+        you may not use this file except in compliance with the License.
+        You may obtain a copy of the License at
  
- http://www.apache.org/licenses/LICENSE-2.0
+        http://www.apache.org/licenses/LICENSE-2.0
  
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
  */
 
 #import "TodayViewController.h"

diff --git a/Examples/Example-iOS_Swift-Carthage/Example_Extension/Base.lproj/MainInterface.storyboard b/Examples/Example-iOS_Swift-Carthage/Example_Extension/Base.lproj/MainInterface.storyboard
@@ -43,6 +43,7 @@
                             <constraint firstItem="6YF-3j-aPa" firstAttribute="centerX" secondItem="S3S-Oj-5AN" secondAttribute="centerX" id="3Au-Gy-34g"/>
                             <constraint firstItem="sEP-NR-Ej5" firstAttribute="leading" secondItem="ssy-KU-ocm" secondAttribute="leading" constant="8" id="7DG-gr-aTC"/>
                             <constraint firstItem="sEP-NR-Ej5" firstAttribute="top" secondItem="6YF-3j-aPa" secondAttribute="bottom" constant="8" id="MYM-Qp-fDV"/>
+                            <constraint firstItem="ssy-KU-ocm" firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="sEP-NR-Ej5" secondAttribute="trailing" constant="8" id="Urq-Tf-326"/>
                             <constraint firstItem="ssy-KU-ocm" firstAttribute="bottom" secondItem="tja-ia-dT6" secondAttribute="bottom" constant="8" id="X4C-ds-cXn"/>
                             <constraint firstItem="tja-ia-dT6" firstAttribute="top" secondItem="sEP-NR-Ej5" secondAttribute="bottom" constant="8" id="dKM-iB-4u0"/>
                             <constraint firstItem="tja-ia-dT6" firstAttribute="leading" secondItem="sEP-NR-Ej5" secondAttribute="leading" id="ddn-cr-EWQ"/>

diff --git a/Examples/Example-iOS_Swift-Carthage/Example_Extension/TodayViewController.swift b/Examples/Example-iOS_Swift-Carthage/Example_Extension/TodayViewController.swift
@@ -34,10 +34,10 @@ class TodayViewController: UIViewController, NCWidgetProviding {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        if let extensionContext = self.extensionContext, extensionContext.responds(to: #selector(setter: NSExtensionContext.widgetLargestAvailableDisplayMode)) { // iOS 10+
-            extensionContext.widgetLargestAvailableDisplayMode = .expanded
+        if #available(iOS 10.0, *) {
+            self.extensionContext?.widgetLargestAvailableDisplayMode = .expanded
         } else {
-            preferredContentSize = CGSize(width: 0, height: 600.0) // iOS 10-
+            self.preferredContentSize = CGSize(width: 0, height: 600.0)
         }
 
         self.loadState()