Improve animations and subview placement when folder filter is activated or de-activated. Fix other bugs.
if ([account.containers count] > 0) {
container = [self.account.pithosSortedContainers objectAtIndex:indexPath.row];
- FolderViewController *vc = [[FolderViewController alloc] initWithNibName:@"FolderViewController" bundle:nil];
+ FolderViewController *vc = ((UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) ?
+ [[FolderViewController alloc] initWithNibName:@"FolderViewController-iPad" bundle:nil] :
+ [[FolderViewController alloc] initWithNibName:@"FolderViewController" bundle:nil]);
vc.account = self.account;
vc.container = container;
vc.containersViewController = self;
--- /dev/null
+//
+// FolderView.h
+// pithos-ios
+//
+// Copyright 2012 GRNET S.A. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or
+// without modification, are permitted provided that the following
+// conditions are met:
+//
+// 1. Redistributions of source code must retain the above
+// copyright notice, this list of conditions and the following
+// disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following
+// disclaimer in the documentation and/or other materials
+// provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+// USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// The views and conclusions contained in the software and
+// documentation are those of the authors and should not be
+// interpreted as representing official policies, either expressed
+// or implied, of GRNET S.A.
+
+@interface FolderView : UIView
+
+@property (nonatomic, retain) IBOutlet UISearchBar *searchBar;
+@property (nonatomic, retain) IBOutlet UITableView *tableView;
+
+@end
--- /dev/null
+//
+// FolderView.m
+// pithos-ios
+//
+// Copyright 2012 GRNET S.A. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or
+// without modification, are permitted provided that the following
+// conditions are met:
+//
+// 1. Redistributions of source code must retain the above
+// copyright notice, this list of conditions and the following
+// disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following
+// disclaimer in the documentation and/or other materials
+// provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+// USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// The views and conclusions contained in the software and
+// documentation are those of the authors and should not be
+// interpreted as representing official policies, either expressed
+// or implied, of GRNET S.A.
+
+#import "FolderView.h"
+
+@implementation FolderView
+@synthesize searchBar, tableView;
+
+- (void)dealloc {
+ [searchBar release];
+ [tableView release];
+ [super dealloc];
+}
+
+- (void)layoutSubviews {
+ [super layoutSubviews];
+ if ((UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) && !searchBar.hidden) {
+ CGFloat correction = searchBar.frame.size.height - tableView.frame.origin.y;
+ if (correction != 0.0) {
+ CGRect tableViewFrame = tableView.frame;
+ tableViewFrame.origin.y += correction;
+ tableViewFrame.size.height -= correction;
+ tableView.frame = tableViewFrame;
+ }
+ }
+}
+
+@end
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1536</int>
+ <string key="IBDocument.SystemVersion">11G63</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2843</string>
+ <string key="IBDocument.AppKitVersion">1138.51</string>
+ <string key="IBDocument.HIToolboxVersion">569.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">1929</string>
+ </object>
+ <object class="NSArray" key="IBDocument.IntegratedClassDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>IBProxyObject</string>
+ <string>IBUIBarButtonItem</string>
+ <string>IBUISearchBar</string>
+ <string>IBUISearchDisplayController</string>
+ <string>IBUITableView</string>
+ <string>IBUIToolbar</string>
+ <string>IBUIView</string>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <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>
+ <object class="IBProxyObject" id="372490531">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBProxyObject" id="975951072">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUIView" id="228054471">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIToolbar" id="599029925">
+ <reference key="NSNextResponder" ref="228054471"/>
+ <int key="NSvFlags">266</int>
+ <string key="NSFrame">{{0, 416}, {320, 44}}</string>
+ <reference key="NSSuperview" ref="228054471"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIBarStyle">1</int>
+ <object class="NSMutableArray" key="IBUIItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIBarButtonItem" id="187093173">
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <reference key="IBUIToolbar" ref="599029925"/>
+ <int key="IBUISystemItemIdentifier">13</int>
+ </object>
+ <object class="IBUIBarButtonItem" id="133076782">
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <reference key="IBUIToolbar" ref="599029925"/>
+ <int key="IBUISystemItemIdentifier">5</int>
+ </object>
+ </object>
+ </object>
+ <object class="IBUITableView" id="173989330">
+ <reference key="NSNextResponder" ref="228054471"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrameSize">{320, 416}</string>
+ <reference key="NSSuperview" ref="228054471"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="370366682"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <bool key="IBUIAlwaysBounceVertical">YES</bool>
+ <int key="IBUISeparatorStyle">1</int>
+ <int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+ <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
+ <float key="IBUIRowHeight">44</float>
+ <float key="IBUISectionHeaderHeight">22</float>
+ <float key="IBUISectionFooterHeight">22</float>
+ </object>
+ <object class="IBUISearchBar" id="370366682">
+ <reference key="NSNextResponder" ref="228054471"/>
+ <int key="NSvFlags">-2147483358</int>
+ <string key="NSFrame">{{0, -44}, {320, 44}}</string>
+ <reference key="NSSuperview" ref="228054471"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="599029925"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <int key="IBUIContentMode">3</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBBarStyle">1</int>
+ <string key="IBPlaceholder">Search Folder</string>
+ <object class="IBUITextInputTraits" key="IBTextInputTraits">
+ <int key="IBUIAutocorrectionType">1</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="NSArray" key="IBScopeButtonTitles">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>name</string>
+ <string>date</string>
+ <string>type</string>
+ <string>all</string>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrameSize">{320, 460}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="173989330"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ <object class="NSColorSpace" key="NSCustomColorSpace">
+ <int key="NSID">2</int>
+ </object>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUISearchDisplayController" id="470541125">
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="228054471"/>
+ </object>
+ <int key="connectionID">11</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">toolbar</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="599029925"/>
+ </object>
+ <int key="connectionID">15</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">tableView</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="173989330"/>
+ </object>
+ <int key="connectionID">27</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">refreshButton</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="187093173"/>
+ </object>
+ <int key="connectionID">28</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">searchDisplayController</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="470541125"/>
+ </object>
+ <int key="connectionID">39</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">searchBar</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="370366682"/>
+ </object>
+ <int key="connectionID">38</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">searchBar</string>
+ <reference key="source" ref="228054471"/>
+ <reference key="destination" ref="370366682"/>
+ </object>
+ <int key="connectionID">42</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">tableView</string>
+ <reference key="source" ref="228054471"/>
+ <reference key="destination" ref="173989330"/>
+ </object>
+ <int key="connectionID">43</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">dataSource</string>
+ <reference key="source" ref="173989330"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">16</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="173989330"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">17</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">refreshButtonPressed:</string>
+ <reference key="source" ref="187093173"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">26</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="470541125"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">34</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">searchContentsController</string>
+ <reference key="source" ref="470541125"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">35</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">searchResultsDataSource</string>
+ <reference key="source" ref="470541125"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">36</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">searchResultsDelegate</string>
+ <reference key="source" ref="470541125"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">37</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">searchBar</string>
+ <reference key="source" ref="470541125"/>
+ <reference key="destination" ref="370366682"/>
+ </object>
+ <int key="connectionID">33</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <object class="NSArray" key="object" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <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>
+ <reference key="object" ref="975951072"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">9</int>
+ <reference key="object" ref="228054471"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="599029925"/>
+ <reference ref="173989330"/>
+ <reference ref="370366682"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">10</int>
+ <reference key="object" ref="173989330"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <reference key="parent" ref="228054471"/>
+ <string key="objectName">Table View</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">13</int>
+ <reference key="object" ref="599029925"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="187093173"/>
+ <reference ref="133076782"/>
+ </object>
+ <reference key="parent" ref="228054471"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">22</int>
+ <reference key="object" ref="187093173"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <reference key="parent" ref="599029925"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">24</int>
+ <reference key="object" ref="133076782"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <reference key="parent" ref="599029925"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">31</int>
+ <reference key="object" ref="470541125"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">32</int>
+ <reference key="object" ref="370366682"/>
+ <reference key="parent" ref="228054471"/>
+ </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>13.IBPluginDependency</string>
+ <string>22.IBPluginDependency</string>
+ <string>24.IBPluginDependency</string>
+ <string>31.IBPluginDependency</string>
+ <string>32.IBPluginDependency</string>
+ <string>9.CustomClassName</string>
+ <string>9.IBPluginDependency</string>
+ </object>
+ <object class="NSArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>FolderViewController</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>FolderView</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"/>
+ </object>
+ <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>
+ <nil key="sourceID"/>
+ <int key="maxID">43</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">FolderView</string>
+ <string key="superclassName">UIView</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>searchBar</string>
+ <string>tableView</string>
+ </object>
+ <object class="NSArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>UISearchBar</string>
+ <string>UITableView</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>searchBar</string>
+ <string>tableView</string>
+ </object>
+ <object class="NSArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">searchBar</string>
+ <string key="candidateClassName">UISearchBar</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">tableView</string>
+ <string key="candidateClassName">UITableView</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/FolderView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">FolderViewController</string>
+ <string key="superclassName">OpenStackViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>homeButtonPressed:</string>
+ <string>refreshButtonPressed:</string>
+ </object>
+ <object class="NSArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>homeButtonPressed:</string>
+ <string>refreshButtonPressed:</string>
+ </object>
+ <object class="NSArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">homeButtonPressed:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">refreshButtonPressed:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>homeButton</string>
+ <string>refreshButton</string>
+ <string>searchBar</string>
+ <string>searchDisplayController</string>
+ <string>tableView</string>
+ </object>
+ <object class="NSArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>UIBarButtonItem</string>
+ <string>UIBarButtonItem</string>
+ <string>UISearchBar</string>
+ <string>UISearchDisplayController</string>
+ <string>UITableView</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>homeButton</string>
+ <string>refreshButton</string>
+ <string>searchBar</string>
+ <string>searchDisplayController</string>
+ <string>tableView</string>
+ </object>
+ <object class="NSArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">homeButton</string>
+ <string key="candidateClassName">UIBarButtonItem</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">refreshButton</string>
+ <string key="candidateClassName">UIBarButtonItem</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">searchBar</string>
+ <string key="candidateClassName">UISearchBar</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">searchDisplayController</string>
+ <string key="candidateClassName">UISearchDisplayController</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">tableView</string>
+ <string key="candidateClassName">UITableView</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/FolderViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">OpenStackViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <string key="NS.key.0">toolbar</string>
+ <string key="NS.object.0">UIToolbar</string>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">toolbar</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">toolbar</string>
+ <string key="candidateClassName">UIToolbar</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/OpenStackViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <real value="1536" 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"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <string key="IBCocoaTouchPluginVersion">1929</string>
+ </data>
+</archive>
IBOutlet UITableView *tableView;
IBOutlet UIBarButtonItem *homeButton;
IBOutlet UIBarButtonItem *refreshButton;
- UISearchBar *searchBar;
- UISearchDisplayController *searchDisplayController;
+ IBOutlet UISearchBar *searchBar;
+ IBOutlet UISearchDisplayController *searchDisplayController;
NSString *searchFilter;
FolderDetailViewController *folderDetailVC;
@property (nonatomic, assign) BOOL refreshWhenAppeared;
@property (nonatomic, retain) IBOutlet UITableView *tableView;
@property (nonatomic, retain) IBOutlet UIBarButtonItem *refreshButton;
-@property (nonatomic, readonly) UISearchBar *searchBar;
-@property (nonatomic, readonly) UISearchDisplayController *searchDisplayController;
+@property (nonatomic, retain) IBOutlet UISearchBar *searchBar;
+@property (nonatomic, retain) IBOutlet UISearchDisplayController *searchDisplayController;
@property (nonatomic, retain) NSString *searchFilter;
@property (nonatomic, assign) FolderDetailViewController *folderDetailVC;
@property (nonatomic, assign) StorageObjectViewController *selectedObjectViewController;
[super viewDidLoad];
[self addAddButton];
[self addHomeButton];
-
- searchDisplayController = [[UISearchDisplayController alloc] initWithSearchBar:self.searchBar contentsController:self];
- searchDisplayController.delegate = self;
- searchDisplayController.searchResultsDataSource = self;
- searchDisplayController.searchResultsDelegate = self;
}
- (void)viewWillAppear:(BOOL)animated {
#pragma mark - Internal
- (void)showSearchBar:(BOOL)show {
- if (show && ![self.tableView.tableHeaderView isEqual:self.searchBar]) {
- self.searchBar.hidden = NO;
- self.tableView.tableHeaderView = self.searchBar;
- if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPad) {
+ if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
+ if (show && !self.tableView.tableHeaderView) {
+ self.tableView.tableHeaderView = self.searchBar;
self.tableView.contentOffset = CGPointMake(0.0, 44.0);
+ } else if (!show) {
+ if (self.searchDisplayController.active)
+ [self.searchDisplayController setActive:NO animated:NO];
+ self.tableView.tableHeaderView = nil;
+ }
+ } else {
+ if (show && self.searchBar.hidden) {
+ self.searchBar.hidden = NO;
+ self.searchBar.frame = CGRectMake(0.0, 0.0, self.searchBar.frame.size.width, self.searchBar.frame.size.height);
+ self.tableView.frame = CGRectMake(0.0, self.searchBar.frame.size.height, self.tableView.frame.size.width, self.tableView.frame.size.height - self.searchBar.frame.size.height);
+ } else if (!show && !self.searchBar.hidden) {
+ if (self.searchDisplayController.active)
+ [self.searchDisplayController setActive:NO animated:NO];
+ self.searchBar.frame = CGRectMake(0.0, -self.searchBar.frame.size.height, self.searchBar.frame.size.width, self.searchBar.frame.size.height);
+ self.tableView.frame = CGRectMake(0.0, 0, self.tableView.frame.size.width, self.tableView.frame.size.height + self.searchBar.frame.size.height);
+ self.searchBar.hidden = YES;
}
- } else if (!show) {
- self.tableView.tableHeaderView = nil;
- self.searchBar.hidden = YES;
}
}
#pragma mark - Properties
-- (UISearchBar *)searchBar {
- if (!searchBar) {
- searchBar = [[UISearchBar alloc] initWithFrame:CGRectMake(0.0, 0.0, 320.0, 44.0)];
- searchBar.placeholder = @"Search Folder";
- searchBar.barStyle = UIBarStyleBlackOpaque;
- searchBar.autocapitalizationType = UITextAutocapitalizationTypeNone;
- searchBar.autocorrectionType = UITextAutocorrectionTypeNo;
- searchBar.scopeButtonTitles = @[@"name", @"date", @"type", @"all"];
- searchBar.selectedScopeButtonIndex = 0;
- searchBar.hidden = YES;
- }
- return searchBar;
-}
-
- (void)setFolder:(Folder *)aFolder {
[folder release];
folder = [aFolder retain];
[NSTimer scheduledTimerWithTimeInterval:0.75 target:self selector:@selector(deleteObjectRow:) userInfo:userInfo repeats:NO];
}
-#pragma mark - UIScrollViewDelegate
-
-- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
- if ((UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) && (scrollView == self.tableView) &&
- !self.searchBar.hidden && !self.searchDisplayController.active) {
- CGRect searchBarFrame = self.searchBar.frame;
- searchBarFrame.origin.y = scrollView.contentOffset.y;
- searchBar.frame = searchBarFrame;
- }
-}
-
#pragma mark - UITableViewDataSource
- (NSInteger)tableView:(UITableView *)aTableView numberOfRowsInSection:(NSInteger)section {
if (folder.objectsAndFoldersCount) {
id item = [[self searchResults] objectAtIndex:indexPath.row];
if ([[item class] isEqual:[Folder class]]) {
- FolderViewController *vc = [[FolderViewController alloc] initWithNibName:@"FolderViewController" bundle:nil];
+ FolderViewController *vc = ((UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) ?
+ [[FolderViewController alloc] initWithNibName:@"FolderViewController-iPad" bundle:nil] :
+ [[FolderViewController alloc] initWithNibName:@"FolderViewController" bundle:nil]);
vc.account = self.account;
vc.container = self.container;
vc.name = [item name];
return NO;
}
+- (void)searchDisplayController:(UISearchDisplayController *)controller didShowSearchResultsTableView:(UITableView *)aTableView {
+ CGRect tableViewFrame = self.searchDisplayController.searchResultsTableView.frame;
+ tableViewFrame.size.height -= self.toolbar.frame.size.height;
+ self.searchDisplayController.searchResultsTableView.frame = tableViewFrame;
+}
+
- (void)searchDisplayControllerWillEndSearch:(UISearchDisplayController *)controller {
self.searchFilter = nil;
[self reloadData];
[activityIndicatorView removeFromSuperviewAndRelease];
[self alert:@"There was a problem deleting this folder." request:request];
[object release];
- }];
+ }];
}
}
<bool key="EncodedWithXMLCoder">YES</bool>
<string>IBProxyObject</string>
<string>IBUIBarButtonItem</string>
+ <string>IBUISearchBar</string>
+ <string>IBUISearchDisplayController</string>
<string>IBUITableView</string>
<string>IBUIToolbar</string>
<string>IBUIView</string>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{0, 416}, {320, 44}}</string>
<reference key="NSSuperview" ref="228054471"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{320, 416}</string>
<reference key="NSSuperview" ref="228054471"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="599029925"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
</object>
<string key="NSFrameSize">{320, 460}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="173989330"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
+ <object class="IBUISearchDisplayController" id="956537548">
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUISearchBar" id="223958266">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">290</int>
+ <string key="NSFrameSize">{320, 44}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <int key="IBUIContentMode">3</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBBarStyle">1</int>
+ <string key="IBPlaceholder">Search Folder</string>
+ <object class="IBUITextInputTraits" key="IBTextInputTraits">
+ <int key="IBUIAutocorrectionType">1</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="NSArray" key="IBScopeButtonTitles">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>name</string>
+ <string>date</string>
+ <string>type</string>
+ <string>all</string>
+ </object>
+ </object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">searchDisplayController</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="956537548"/>
+ </object>
+ <int key="connectionID">34</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">searchBar</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="223958266"/>
+ </object>
+ <int key="connectionID">40</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">dataSource</string>
<reference key="source" ref="173989330"/>
<reference key="destination" ref="372490531"/>
</object>
<int key="connectionID">26</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">searchContentsController</string>
+ <reference key="source" ref="956537548"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">35</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">searchResultsDataSource</string>
+ <reference key="source" ref="956537548"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">36</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">searchResultsDelegate</string>
+ <reference key="source" ref="956537548"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">37</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="956537548"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">38</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">searchBar</string>
+ <reference key="source" ref="956537548"/>
+ <reference key="destination" ref="223958266"/>
+ </object>
+ <int key="connectionID">33</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
</object>
<reference key="parent" ref="599029925"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">32</int>
+ <reference key="object" ref="956537548"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">31</int>
+ <reference key="object" ref="223958266"/>
+ <reference key="parent" ref="0"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<string>13.IBPluginDependency</string>
<string>22.IBPluginDependency</string>
<string>24.IBPluginDependency</string>
+ <string>31.IBPluginDependency</string>
+ <string>32.IBPluginDependency</string>
<string>9.IBPluginDependency</string>
</object>
<object class="NSArray" key="dict.values">
<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">
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
- <int key="maxID">30</int>
+ <int key="maxID">43</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">FolderViewController</string>
+ <string key="superclassName">OpenStackViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>homeButtonPressed:</string>
+ <string>refreshButtonPressed:</string>
+ </object>
+ <object class="NSArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>homeButtonPressed:</string>
+ <string>refreshButtonPressed:</string>
+ </object>
+ <object class="NSArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">homeButtonPressed:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">refreshButtonPressed:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>homeButton</string>
+ <string>refreshButton</string>
+ <string>searchBar</string>
+ <string>searchDisplayController</string>
+ <string>tableView</string>
+ </object>
+ <object class="NSArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>UIBarButtonItem</string>
+ <string>UIBarButtonItem</string>
+ <string>UISearchBar</string>
+ <string>UISearchDisplayController</string>
+ <string>UITableView</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>homeButton</string>
+ <string>refreshButton</string>
+ <string>searchBar</string>
+ <string>searchDisplayController</string>
+ <string>tableView</string>
+ </object>
+ <object class="NSArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">homeButton</string>
+ <string key="candidateClassName">UIBarButtonItem</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">refreshButton</string>
+ <string key="candidateClassName">UIBarButtonItem</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">searchBar</string>
+ <string key="candidateClassName">UISearchBar</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">searchDisplayController</string>
+ <string key="candidateClassName">UISearchDisplayController</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">tableView</string>
+ <string key="candidateClassName">UITableView</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/FolderViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">OpenStackViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <string key="NS.key.0">toolbar</string>
+ <string key="NS.object.0">UIToolbar</string>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">toolbar</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">toolbar</string>
+ <string key="candidateClassName">UIToolbar</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/OpenStackViewController.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.PluginDeclaredDependencyDefaults">
[window makeKeyAndVisible];
[vc release];
} else {
+ window.rootViewController = navigationController;
[window addSubview:navigationController.view];
[window makeKeyAndVisible];
}
6142B27B1523601E00A1BFAD /* pithos_icon_iPad.png in Resources */ = {isa = PBXBuildFile; fileRef = 6142B27A1523601E00A1BFAD /* pithos_icon_iPad.png */; };
6142B27D1523602300A1BFAD /* pithos_icon_iPad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6142B27C1523602300A1BFAD /* pithos_icon_iPad@2x.png */; };
6152AEEF166519F200A3EA6B /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 6152AEEE166519F200A3EA6B /* Default-568h@2x.png */; };
+ 61BC2A2D166BDAE5002DF74D /* FolderViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61BC2A2C166BDAE5002DF74D /* FolderViewController-iPad.xib */; };
61DEA8F714904BC000E0D3AD /* pithos_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 61DEA8F514904BC000E0D3AD /* pithos_icon.png */; };
61DEA8F814904BC000E0D3AD /* pithos_icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 61DEA8F614904BC000E0D3AD /* pithos_icon@2x.png */; };
+ 61F7C303166C1E2300703CA4 /* FolderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61F7C302166C1E2300703CA4 /* FolderView.m */; };
7F8F374913859F190034710B /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F8F374813859F190034710B /* libxml2.dylib */; };
7F9351B913845AC80097720F /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F9351B813845AC80097720F /* libsqlite3.0.dylib */; };
/* End PBXBuildFile section */
6142B27A1523601E00A1BFAD /* pithos_icon_iPad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pithos_icon_iPad.png; sourceTree = "<group>"; };
6142B27C1523602300A1BFAD /* pithos_icon_iPad@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pithos_icon_iPad@2x.png"; sourceTree = "<group>"; };
6152AEEE166519F200A3EA6B /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
+ 61BC2A2C166BDAE5002DF74D /* FolderViewController-iPad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "FolderViewController-iPad.xib"; sourceTree = "<group>"; };
61DEA8F514904BC000E0D3AD /* pithos_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pithos_icon.png; sourceTree = "<group>"; };
61DEA8F614904BC000E0D3AD /* pithos_icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pithos_icon@2x.png"; sourceTree = "<group>"; };
+ 61F7C301166C1E2300703CA4 /* FolderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FolderView.h; sourceTree = "<group>"; };
+ 61F7C302166C1E2300703CA4 /* FolderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FolderView.m; sourceTree = "<group>"; };
7F8F374813859F190034710B /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
7F9351B813845AC80097720F /* libsqlite3.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.0.dylib; path = usr/lib/libsqlite3.0.dylib; sourceTree = SDKROOT; };
8D1107310486CEB800E47090 /* OpenStack-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "OpenStack-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
278699381263DF7A00CE3435 /* TextViewCell.m */,
271EF650127B333200431D19 /* AnimatedProgressView.h */,
271EF651127B333200431D19 /* AnimatedProgressView.m */,
+ 61F7C301166C1E2300703CA4 /* FolderView.h */,
+ 61F7C302166C1E2300703CA4 /* FolderView.m */,
);
name = "Custom Views";
sourceTree = "<group>";
277B89B212B97D6D006483B0 /* FolderViewController.h */,
277B89B312B97D6D006483B0 /* FolderViewController.m */,
277B89B412B97D6D006483B0 /* FolderViewController.xib */,
+ 61BC2A2C166BDAE5002DF74D /* FolderViewController-iPad.xib */,
278906DB12BEDAB5007112B6 /* StorageObjectViewController.h */,
278907A112BEF72C007112B6 /* StorageObjectViewController.m */,
278906DD12BEDAB5007112B6 /* StorageObjectViewController.xib */,
6142B27B1523601E00A1BFAD /* pithos_icon_iPad.png in Resources */,
6142B27D1523602300A1BFAD /* pithos_icon_iPad@2x.png in Resources */,
6152AEEF166519F200A3EA6B /* Default-568h@2x.png in Resources */,
+ 61BC2A2D166BDAE5002DF74D /* FolderViewController-iPad.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
24332D5A1472A35800063C8B /* SharingAccountsViewController.m in Sources */,
24C9DE5B1484E3E9001F4DB9 /* PithosUtilities.m in Sources */,
249F004C14BC836A000AB729 /* ObjectVersionsViewController.m in Sources */,
+ 61F7C303166C1E2300703CA4 /* FolderView.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
projects / pithos-ios / commitdiff