diff options
author | Paul Young <paulyoungonline@gmail.com> | 2013-07-11 23:49:08 -0400 |
---|---|---|
committer | Paul Young <paulyoungonline@gmail.com> | 2013-07-11 23:49:08 -0400 |
commit | 45509d4ce0d5410ad61fe30643b5fab3acff4d73 (patch) | |
tree | b50c354ecbd2e93c4fb2b1795baecc6963a07570 /example/common/gtm-oauth2/Source/Touch/GTMOAuth2ViewTouch.xib | |
parent | 168dcffc765954fb7e5134723854b013351c5c59 (diff) | |
parent | b23a4ecf0a5544894a6ce5effe248fa273e7f574 (diff) |
Merge remote-tracking branch 'upstream/master' into message-preview-in-examples
Conflicts:
example/ios/iOS UI Test/iOS UI Test/en.lproj/MainStoryboard.storyboard
Diffstat (limited to 'example/common/gtm-oauth2/Source/Touch/GTMOAuth2ViewTouch.xib')
-rw-r--r-- | example/common/gtm-oauth2/Source/Touch/GTMOAuth2ViewTouch.xib | 264 |
1 files changed, 71 insertions, 193 deletions
diff --git a/example/common/gtm-oauth2/Source/Touch/GTMOAuth2ViewTouch.xib b/example/common/gtm-oauth2/Source/Touch/GTMOAuth2ViewTouch.xib index 4f91fa4a..d8cb21c8 100644 --- a/example/common/gtm-oauth2/Source/Touch/GTMOAuth2ViewTouch.xib +++ b/example/common/gtm-oauth2/Source/Touch/GTMOAuth2ViewTouch.xib @@ -1,17 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10"> +<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> <data> <int key="IBDocument.SystemTarget">1024</int> - <string key="IBDocument.SystemVersion">12C60</string> - <string key="IBDocument.InterfaceBuilderVersion">2840</string> - <string key="IBDocument.AppKitVersion">1187.34</string> - <string key="IBDocument.HIToolboxVersion">625.00</string> + <string key="IBDocument.SystemVersion">12E55</string> + <string key="IBDocument.InterfaceBuilderVersion">4457.6</string> + <string key="IBDocument.AppKitVersion">1187.39</string> + <string key="IBDocument.HIToolboxVersion">626.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="NS.object.0">1926</string> + <string key="NS.object.0">3682.6</string> </object> - <object class="NSArray" key="IBDocument.IntegratedClassDependencies"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array key="IBDocument.IntegratedClassDependencies"> <string>IBProxyObject</string> <string>IBUIActivityIndicatorView</string> <string>IBUIBarButtonItem</string> @@ -19,17 +18,15 @@ <string>IBUINavigationItem</string> <string>IBUIView</string> <string>IBUIWebView</string> - </object> - <object class="NSArray" key="IBDocument.PluginDependencies"> - <bool key="EncodedWithXMLCoder">YES</bool> + </array> + <array key="IBDocument.PluginDependencies"> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - </object> + </array> <object class="NSMutableDictionary" key="IBDocument.Metadata"> <string key="NS.key.0">PluginDependencyRecalculationVersion</string> <integer value="1" key="NS.object.0"/> </object> - <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> <object class="IBProxyObject" id="372490531"> <string key="IBProxiedObjectIdentifier">IBFilesOwner</string> <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> @@ -47,16 +44,14 @@ <int key="IBUIStyle">1</int> </object> <object class="IBUIView" id="808907889"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">292</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="IBUIButton" id="453250804"> <reference key="NSNextResponder" ref="808907889"/> <int key="NSvFlags">292</int> <string key="NSFrameSize">{30, 30}</string> <reference key="NSSuperview" ref="808907889"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="981703116"/> <bool key="IBUIOpaque">NO</bool> <bool key="IBUIClearsContextBeforeDrawing">NO</bool> @@ -95,8 +90,6 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{30, 0}, {30, 30}}</string> <reference key="NSSuperview" ref="808907889"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView"/> <bool key="IBUIOpaque">NO</bool> <bool key="IBUIClearsContextBeforeDrawing">NO</bool> <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> @@ -114,10 +107,8 @@ <reference key="IBUIFontDescription" ref="621440819"/> <reference key="IBUIFont" ref="530402572"/> </object> - </object> + </array> <string key="NSFrameSize">{60, 30}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="453250804"/> <object class="NSColor" key="IBUIBackgroundColor"> <int key="NSColorSpace">3</int> @@ -132,16 +123,14 @@ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> </object> <object class="IBUIView" id="426018584"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">274</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="IBUIWebView" id="663477729"> <reference key="NSNextResponder" ref="426018584"/> <int key="NSvFlags">274</int> <string key="NSFrameSize">{320, 460}</string> <reference key="NSSuperview" ref="426018584"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="268967673"/> <object class="NSColor" key="IBUIBackgroundColor"> <int key="NSColorSpace">1</int> @@ -158,8 +147,6 @@ <int key="NSvFlags">301</int> <string key="NSFrame">{{150, 115}, {20, 20}}</string> <reference key="NSSuperview" ref="426018584"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView"/> <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="IBUIOpaque">NO</bool> <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> @@ -167,10 +154,8 @@ <bool key="IBUIAnimating">YES</bool> <int key="IBUIStyle">2</int> </object> - </object> + </array> <string key="NSFrameSize">{320, 460}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="663477729"/> <object class="NSColor" key="IBUIBackgroundColor"> <int key="NSColorSpace">3</int> @@ -181,17 +166,17 @@ </object> <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> </object> - </object> + </array> <object class="IBObjectContainer" key="IBDocument.Objects"> - <object class="NSMutableArray" key="connectionRecords"> - <bool key="EncodedWithXMLCoder">YES</bool> + <bool key="usesAutoincrementingIDs">NO</bool> + <array class="NSMutableArray" key="connectionRecords"> <object class="IBConnectionRecord"> <object class="IBCocoaTouchOutletConnection" key="connection"> <string key="label">rightBarButtonItem</string> <reference key="source" ref="372490531"/> <reference key="destination" ref="961671599"/> </object> - <int key="connectionID">20</int> + <string key="id">20</string> </object> <object class="IBConnectionRecord"> <object class="IBCocoaTouchOutletConnection" key="connection"> @@ -199,7 +184,7 @@ <reference key="source" ref="372490531"/> <reference key="destination" ref="808907889"/> </object> - <int key="connectionID">22</int> + <string key="id">22</string> </object> <object class="IBConnectionRecord"> <object class="IBCocoaTouchOutletConnection" key="connection"> @@ -207,7 +192,7 @@ <reference key="source" ref="372490531"/> <reference key="destination" ref="453250804"/> </object> - <int key="connectionID">25</int> + <string key="id">25</string> </object> <object class="IBConnectionRecord"> <object class="IBCocoaTouchOutletConnection" key="connection"> @@ -215,7 +200,7 @@ <reference key="source" ref="372490531"/> <reference key="destination" ref="981703116"/> </object> - <int key="connectionID">26</int> + <string key="id">26</string> </object> <object class="IBConnectionRecord"> <object class="IBCocoaTouchOutletConnection" key="connection"> @@ -223,7 +208,7 @@ <reference key="source" ref="372490531"/> <reference key="destination" ref="426018584"/> </object> - <int key="connectionID">28</int> + <string key="id">28</string> </object> <object class="IBConnectionRecord"> <object class="IBCocoaTouchOutletConnection" key="connection"> @@ -231,7 +216,7 @@ <reference key="source" ref="372490531"/> <reference key="destination" ref="663477729"/> </object> - <int key="connectionID">29</int> + <string key="id">29</string> </object> <object class="IBConnectionRecord"> <object class="IBCocoaTouchOutletConnection" key="connection"> @@ -239,7 +224,7 @@ <reference key="source" ref="372490531"/> <reference key="destination" ref="268967673"/> </object> - <int key="connectionID">33</int> + <string key="id">33</string> </object> <object class="IBConnectionRecord"> <object class="IBCocoaTouchOutletConnection" key="connection"> @@ -247,7 +232,7 @@ <reference key="source" ref="663477729"/> <reference key="destination" ref="372490531"/> </object> - <int key="connectionID">9</int> + <string key="id">9</string> </object> <object class="IBConnectionRecord"> <object class="IBCocoaTouchOutletConnection" key="connection"> @@ -255,7 +240,7 @@ <reference key="source" ref="1047805472"/> <reference key="destination" ref="961671599"/> </object> - <int key="connectionID">14</int> + <string key="id">14</string> </object> <object class="IBConnectionRecord"> <object class="IBCocoaTouchEventConnection" key="connection"> @@ -264,7 +249,7 @@ <reference key="destination" ref="663477729"/> <int key="IBEventType">7</int> </object> - <int key="connectionID">18</int> + <string key="id">18</string> </object> <object class="IBConnectionRecord"> <object class="IBCocoaTouchEventConnection" key="connection"> @@ -273,206 +258,99 @@ <reference key="destination" ref="663477729"/> <int key="IBEventType">7</int> </object> - <int key="connectionID">19</int> + <string key="id">19</string> </object> - </object> + </array> <object class="IBMutableOrderedSet" key="objectRecords"> - <object class="NSArray" key="orderedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array key="orderedObjects"> <object class="IBObjectRecord"> - <int key="objectID">0</int> - <object class="NSArray" key="object" id="0"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <string key="id">0</string> + <array key="object" id="0"/> <reference key="children" ref="1000"/> <nil key="parent"/> </object> <object class="IBObjectRecord"> - <int key="objectID">-1</int> + <string key="id">-1</string> <reference key="object" ref="372490531"/> <reference key="parent" ref="0"/> <string key="objectName">File's Owner</string> </object> <object class="IBObjectRecord"> - <int key="objectID">-2</int> + <string key="id">-2</string> <reference key="object" ref="975951072"/> <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6</int> + <string key="id">6</string> <reference key="object" ref="1047805472"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <array class="NSMutableArray" key="children"/> <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> - <int key="objectID">10</int> + <string key="id">10</string> <reference key="object" ref="961671599"/> <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> - <int key="objectID">15</int> + <string key="id">15</string> <reference key="object" ref="808907889"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="453250804"/> <reference ref="981703116"/> - </object> + </array> <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> - <int key="objectID">16</int> + <string key="id">16</string> <reference key="object" ref="453250804"/> <reference key="parent" ref="808907889"/> </object> <object class="IBObjectRecord"> - <int key="objectID">17</int> + <string key="id">17</string> <reference key="object" ref="981703116"/> <reference key="parent" ref="808907889"/> </object> <object class="IBObjectRecord"> - <int key="objectID">27</int> + <string key="id">27</string> <reference key="object" ref="426018584"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="663477729"/> <reference ref="268967673"/> - </object> + </array> <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> - <int key="objectID">4</int> + <string key="id">4</string> <reference key="object" ref="663477729"/> <reference key="parent" ref="426018584"/> </object> <object class="IBObjectRecord"> - <int key="objectID">31</int> + <string key="id">31</string> <reference key="object" ref="268967673"/> <reference key="parent" ref="426018584"/> </object> - </object> - </object> - <object class="NSMutableDictionary" key="flattenedProperties"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>-1.CustomClassName</string> - <string>-1.IBPluginDependency</string> - <string>-2.CustomClassName</string> - <string>-2.IBPluginDependency</string> - <string>10.IBPluginDependency</string> - <string>15.IBPluginDependency</string> - <string>16.IBPluginDependency</string> - <string>17.IBPluginDependency</string> - <string>27.IBPluginDependency</string> - <string>31.IBPluginDependency</string> - <string>4.IBPluginDependency</string> - <string>6.IBPluginDependency</string> - </object> - <object class="NSArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>GTMOAuth2ViewControllerTouch</string> - <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string>UIResponder</string> - <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - </object> - </object> - <object class="NSMutableDictionary" key="unlocalizedProperties"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> - <reference key="dict.values" ref="0"/> + </array> </object> + <dictionary class="NSMutableDictionary" key="flattenedProperties"> + <string key="-1.CustomClassName">GTMOAuth2ViewControllerTouch</string> + <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="-2.CustomClassName">UIResponder</string> + <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="10.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="15.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="16.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="27.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="31.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + </dictionary> + <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> <nil key="activeLocalization"/> - <object class="NSMutableDictionary" key="localizations"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> - <reference key="dict.values" ref="0"/> - </object> + <dictionary class="NSMutableDictionary" key="localizations"/> <nil key="sourceID"/> - <int key="maxID">33</int> - </object> - <object class="IBClassDescriber" key="IBDocument.Classes"> - <object class="NSMutableArray" key="referencedPartialClassDescriptions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBPartialClassDescription"> - <string key="className">GTMOAuth2ViewControllerTouch</string> - <string key="superclassName">UIViewController</string> - <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>backButton</string> - <string>forwardButton</string> - <string>initialActivityIndicator</string> - <string>navButtonsView</string> - <string>rightBarButtonItem</string> - <string>webView</string> - </object> - <object class="NSArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>UIButton</string> - <string>UIButton</string> - <string>UIActivityIndicatorView</string> - <string>UIView</string> - <string>UIBarButtonItem</string> - <string>UIWebView</string> - </object> - </object> - <object class="NSMutableDictionary" key="toOneOutletInfosByName"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>backButton</string> - <string>forwardButton</string> - <string>initialActivityIndicator</string> - <string>navButtonsView</string> - <string>rightBarButtonItem</string> - <string>webView</string> - </object> - <object class="NSArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBToOneOutletInfo"> - <string key="name">backButton</string> - <string key="candidateClassName">UIButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">forwardButton</string> - <string key="candidateClassName">UIButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">initialActivityIndicator</string> - <string key="candidateClassName">UIActivityIndicatorView</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">navButtonsView</string> - <string key="candidateClassName">UIView</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">rightBarButtonItem</string> - <string key="candidateClassName">UIBarButtonItem</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">webView</string> - <string key="candidateClassName">UIWebView</string> - </object> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">./Classes/GTMOAuth2ViewControllerTouch.h</string> - </object> - </object> - </object> </object> + <object class="IBClassDescriber" key="IBDocument.Classes"/> <int key="IBDocument.localizationMode">0</int> <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> @@ -481,14 +359,14 @@ </object> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string> - <real value="1536" key="NS.object.0"/> + <real value="1552" key="NS.object.0"/> </object> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string> - <integer value="3000" key="NS.object.0"/> + <integer value="4600" key="NS.object.0"/> </object> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <int key="IBDocument.defaultPropertyAccessControl">3</int> - <string key="IBCocoaTouchPluginVersion">1926</string> + <string key="IBCocoaTouchPluginVersion">3682.6</string> </data> </archive> |