Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

remove action button from split view to avoid iOS5 bug

  • Loading branch information...
commit 3beab8523e7bf5c1aa168d20903416e669e6026d 1 parent 423188a
@tmurakam authored
View
7 Classes/controllers/AssetListVC.m
@@ -108,9 +108,12 @@ - (void)viewDidLoad
- (void)viewDidUnload {
NSLog(@"AssetLivewViewController:viewDidUnload");
- [super viewDidUnload];
-
mIconArray = nil;
+
+ mTableView = nil;
+ mBarActionButton = nil;
+ mBarSumLabel = nil;
+ [super viewDidUnload];
}
- (void)didReceiveMemoryWarning {
View
12 Classes/controllers/TransactionListVC.m
@@ -455,6 +455,7 @@ - (void)doAction:(id)sender
delegate:self
cancelButtonTitle:_L(@"Cancel")
destructiveButtonTitle:nil otherButtonTitles:
+ [NSString stringWithFormat:@"%@ (%@)", _L(@"Export"), _L(@"All")],
_L(@"Export"),
[NSString stringWithFormat:@"%@ / %@", _L(@"Sync"), _L(@"Backup")],
_L(@"Config"),
@@ -481,21 +482,26 @@ - (void)actionSheet:(UIActionSheet*)as clickedButtonAtIndex:(NSInteger)buttonInd
switch (buttonIndex) {
case 0:
+ exportVC = [[ExportVC alloc] initWithAsset:nil];
+ vc = exportVC;
+ break;
+
+ case 1:
exportVC = [[ExportVC alloc] initWithAsset:self.asset];
vc = exportVC;
break;
- case 1:
+ case 2:
backupVC = [BackupViewController backupViewController:self];
vc = backupVC;
break;
- case 2:
+ case 3:
configVC = [[ConfigViewController alloc] init];
vc = configVC;
break;
- case 3:
+ case 4:
infoVC = [[InfoVC alloc] init];
vc = infoVC;
break;
View
98 Resources-iPad/AssetListView-ipad.xib
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">800</int>
- <string key="IBDocument.SystemVersion">10J567</string>
- <string key="IBDocument.InterfaceBuilderVersion">1305</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">462.00</string>
+ <string key="IBDocument.SystemVersion">11D50</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2182</string>
+ <string key="IBDocument.AppKitVersion">1138.32</string>
+ <string key="IBDocument.HIToolboxVersion">568.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">300</string>
+ <string key="NS.object.0">1181</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBUIBarButtonItem</string>
@@ -20,7 +20,10 @@
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</array>
- <dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
+ </object>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<object class="IBProxyObject" id="372490531">
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
@@ -85,16 +88,6 @@
<float key="IBUIWidth">229</float>
<reference key="IBUIToolbar" ref="1024968948"/>
</object>
- <object class="IBUIBarButtonItem" id="992766585">
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <reference key="IBUIToolbar" ref="1024968948"/>
- <int key="IBUISystemItemIdentifier">5</int>
- </object>
- <object class="IBUIBarButtonItem" id="1036565278">
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <reference key="IBUIToolbar" ref="1024968948"/>
- <int key="IBUISystemItemIdentifier">9</int>
- </object>
</array>
</object>
</array>
@@ -118,22 +111,6 @@
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">dataSource</string>
- <reference key="source" ref="188382249"/>
- <reference key="destination" ref="372490531"/>
- </object>
- <int key="connectionID">10</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="188382249"/>
- <reference key="destination" ref="372490531"/>
- </object>
- <int key="connectionID">11</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="191373211"/>
@@ -149,28 +126,28 @@
<int key="connectionID">14</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">doAction:</string>
- <reference key="source" ref="1036565278"/>
- <reference key="destination" ref="372490531"/>
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">mBarSumLabel</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="507327809"/>
</object>
- <int key="connectionID">17</int>
+ <int key="connectionID">28</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">mBarActionButton</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="1036565278"/>
+ <string key="label">dataSource</string>
+ <reference key="source" ref="188382249"/>
+ <reference key="destination" ref="372490531"/>
</object>
- <int key="connectionID">25</int>
+ <int key="connectionID">10</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">mBarSumLabel</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="507327809"/>
+ <string key="label">delegate</string>
+ <reference key="source" ref="188382249"/>
+ <reference key="destination" ref="372490531"/>
</object>
- <int key="connectionID">28</int>
+ <int key="connectionID">11</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
@@ -215,8 +192,6 @@
<array class="NSMutableArray" key="children">
<reference ref="1057254807"/>
<reference ref="507327809"/>
- <reference ref="992766585"/>
- <reference ref="1036565278"/>
<reference ref="565228097"/>
</array>
<reference key="parent" ref="191373211"/>
@@ -227,11 +202,6 @@
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">16</int>
- <reference key="object" ref="1036565278"/>
- <reference key="parent" ref="1024968948"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">23</int>
<reference key="object" ref="1057254807"/>
<reference key="parent" ref="1024968948"/>
@@ -242,11 +212,6 @@
<reference key="parent" ref="1024968948"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">27</int>
- <reference key="object" ref="992766585"/>
- <reference key="parent" ref="1024968948"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">29</int>
<reference key="object" ref="565228097"/>
<reference key="parent" ref="1024968948"/>
@@ -255,13 +220,12 @@
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.CustomClassName">AssetListViewController</string>
+ <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="-2.CustomClassName">UIResponder</string>
- <string key="1.IBEditorWindowLastContentRect">{{295, 330}, {320, 480}}</string>
+ <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="16.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="27.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -296,6 +260,7 @@
<string key="mBarSumLabel">UIBarButtonItem</string>
<string key="mSplitTransactionListViewController">TransactionListViewController</string>
<string key="mTableView">UITableView</string>
+ <string key="mToolbar">UIToolbar</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="mBarActionButton">
@@ -314,6 +279,10 @@
<string key="name">mTableView</string>
<string key="candidateClassName">UITableView</string>
</object>
+ <object class="IBToOneOutletInfo" key="mToolbar">
+ <string key="name">mToolbar</string>
+ <string key="candidateClassName">UIToolbar</string>
+ </object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
@@ -342,6 +311,7 @@
<string key="mBarBalanceLabel">UIBarButtonItem</string>
<string key="mSplitAssetListViewController">AssetListViewController</string>
<string key="mTableView">UITableView</string>
+ <string key="mToolbar">UIToolbar</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="mBarActionButton">
@@ -360,6 +330,10 @@
<string key="name">mTableView</string>
<string key="candidateClassName">UITableView</string>
</object>
+ <object class="IBToOneOutletInfo" key="mToolbar">
+ <string key="name">mToolbar</string>
+ <string key="candidateClassName">UIToolbar</string>
+ </object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
@@ -376,7 +350,7 @@
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1024" key="NS.object.0"/>
+ <real value="1296" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
@@ -384,6 +358,6 @@
<string key="NS.key.0">report.png</string>
<string key="NS.object.0">{21, 21}</string>
</object>
- <string key="IBCocoaTouchPluginVersion">300</string>
+ <string key="IBCocoaTouchPluginVersion">1181</string>
</data>
</archive>
View
89 Resources/AssetListView.xib
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">768</int>
- <string key="IBDocument.SystemVersion">10J567</string>
- <string key="IBDocument.InterfaceBuilderVersion">1305</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">462.00</string>
+ <string key="IBDocument.SystemVersion">11D50</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2182</string>
+ <string key="IBDocument.AppKitVersion">1138.32</string>
+ <string key="IBDocument.HIToolboxVersion">568.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">300</string>
+ <string key="NS.object.0">1181</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBUIBarButtonItem</string>
@@ -20,7 +20,10 @@
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</array>
- <dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
+ </object>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<object class="IBProxyObject" id="372490531">
<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
@@ -63,7 +66,6 @@
<string key="NSFrame">{{0, 392}, {320, 44}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -120,22 +122,6 @@
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">dataSource</string>
- <reference key="source" ref="188382249"/>
- <reference key="destination" ref="372490531"/>
- </object>
- <int key="connectionID">10</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="188382249"/>
- <reference key="destination" ref="372490531"/>
- </object>
- <int key="connectionID">11</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="191373211"/>
@@ -151,14 +137,6 @@
<int key="connectionID">14</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBCocoaTouchEventConnection" key="connection">
- <string key="label">doAction:</string>
- <reference key="source" ref="1036565278"/>
- <reference key="destination" ref="372490531"/>
- </object>
- <int key="connectionID">17</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">mBarActionButton</string>
<reference key="source" ref="372490531"/>
@@ -175,6 +153,30 @@
<int key="connectionID">29</int>
</object>
<object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">dataSource</string>
+ <reference key="source" ref="188382249"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">10</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="188382249"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">11</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">doAction:</string>
+ <reference key="source" ref="1036565278"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">17</int>
+ </object>
+ <object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">showReport:</string>
<reference key="source" ref="917927877"/>
@@ -257,8 +259,9 @@
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.CustomClassName">AssetListViewController</string>
+ <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="-2.CustomClassName">UIResponder</string>
- <string key="1.IBEditorWindowLastContentRect">{{246, 231}, {320, 480}}</string>
+ <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -272,7 +275,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">31</int>
+ <int key="maxID">38</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -298,6 +301,7 @@
<string key="mBarSumLabel">UIBarButtonItem</string>
<string key="mSplitTransactionListViewController">TransactionListViewController</string>
<string key="mTableView">UITableView</string>
+ <string key="mToolbar">UIToolbar</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="mBarActionButton">
@@ -316,6 +320,10 @@
<string key="name">mTableView</string>
<string key="candidateClassName">UITableView</string>
</object>
+ <object class="IBToOneOutletInfo" key="mToolbar">
+ <string key="name">mToolbar</string>
+ <string key="candidateClassName">UIToolbar</string>
+ </object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
@@ -327,15 +335,15 @@
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="doAction:">id</string>
- <string key="showHelp:">id</string>
+ <string key="showReport:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="doAction:">
<string key="name">doAction:</string>
<string key="candidateClassName">id</string>
</object>
- <object class="IBActionInfo" key="showHelp:">
- <string key="name">showHelp:</string>
+ <object class="IBActionInfo" key="showReport:">
+ <string key="name">showReport:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
@@ -344,6 +352,7 @@
<string key="mBarBalanceLabel">UIBarButtonItem</string>
<string key="mSplitAssetListViewController">AssetListViewController</string>
<string key="mTableView">UITableView</string>
+ <string key="mToolbar">UIToolbar</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="mBarActionButton">
@@ -362,6 +371,10 @@
<string key="name">mTableView</string>
<string key="candidateClassName">UITableView</string>
</object>
+ <object class="IBToOneOutletInfo" key="mToolbar">
+ <string key="name">mToolbar</string>
+ <string key="candidateClassName">UIToolbar</string>
+ </object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
@@ -378,7 +391,7 @@
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <integer value="1024" key="NS.object.0"/>
+ <real value="1296" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
@@ -386,6 +399,6 @@
<string key="NS.key.0">report.png</string>
<string key="NS.object.0">{21, 21}</string>
</object>
- <string key="IBCocoaTouchPluginVersion">300</string>
+ <string key="IBCocoaTouchPluginVersion">1181</string>
</data>
</archive>
Please sign in to comment.
Something went wrong with that request. Please try again.