diff options
author | Paul Gardiner <paul.gardiner@artifex.com> | 2014-01-07 12:23:58 +0000 |
---|---|---|
committer | Paul Gardiner <paul.gardiner@artifex.com> | 2014-01-07 12:44:23 +0000 |
commit | 9364966a041cd85a3ee4ff9c70324446a46a6414 (patch) | |
tree | 81a4cf15bf8e68f30dbfeab174ce874e94ffb306 | |
parent | d2069d645c1f638fcec2ab689d86dc1c9a1aca5a (diff) | |
download | mupdf-9364966a041cd85a3ee4ff9c70324446a46a6414.tar.xz |
iOS: update the form filling dialogs to avoid the keyboard hiding the buttons
Also bring up the keyboard automatically
-rw-r--r-- | platform/ios/Classes/MuChoiceFieldController.h | 3 | ||||
-rw-r--r-- | platform/ios/Classes/MuChoiceFieldController.m | 12 | ||||
-rw-r--r-- | platform/ios/Classes/MuChoiceFieldController.xib | 688 | ||||
-rw-r--r-- | platform/ios/Classes/MuTextFieldController.h | 3 | ||||
-rw-r--r-- | platform/ios/Classes/MuTextFieldController.m | 14 | ||||
-rw-r--r-- | platform/ios/Classes/MuTextFieldController.xib | 666 | ||||
-rw-r--r-- | platform/ios/MuPDF.xcodeproj/project.pbxproj | 40 |
7 files changed, 139 insertions, 1287 deletions
diff --git a/platform/ios/Classes/MuChoiceFieldController.h b/platform/ios/Classes/MuChoiceFieldController.h index d99f8cd5..a9742282 100644 --- a/platform/ios/Classes/MuChoiceFieldController.h +++ b/platform/ios/Classes/MuChoiceFieldController.h @@ -13,8 +13,5 @@ NSArray *choices; int selected; } -@property (retain, nonatomic) IBOutlet UIPickerView *picker; - (id)initWithChoices:(NSArray *)choices okayAction:(void (^)(NSArray *))block; -- (IBAction)okayTapped:(id)sender; -- (IBAction)cancelTapped:(id)sender; @end diff --git a/platform/ios/Classes/MuChoiceFieldController.m b/platform/ios/Classes/MuChoiceFieldController.m index d32383b6..d4806dbf 100644 --- a/platform/ios/Classes/MuChoiceFieldController.m +++ b/platform/ios/Classes/MuChoiceFieldController.m @@ -8,7 +8,9 @@ #import "MuChoiceFieldController.h" @interface MuChoiceFieldController () - +- (IBAction)onCancel:(id)sender; +- (IBAction)onOkay:(id)sender; +@property (retain, nonatomic) IBOutlet UIPickerView *picker; @end @implementation MuChoiceFieldController @@ -20,7 +22,7 @@ { okayBlock = Block_copy(block); choices = [_choices retain]; - selected = -1; + selected = 0; } return self; } @@ -67,14 +69,14 @@ selected = row; } -- (IBAction)okayTapped:(id)sender +- (IBAction)onOkay:(id)sender { - if (selected > -1) + if (selected >= 0 && selected < [choices count]) okayBlock([NSArray arrayWithObject:[choices objectAtIndex:selected]]); [self dismissViewControllerAnimated:YES completion:nil]; } -- (IBAction)cancelTapped:(id)sender +- (IBAction)onCancel:(id)sender { [self dismissViewControllerAnimated:YES completion:nil]; } diff --git a/platform/ios/Classes/MuChoiceFieldController.xib b/platform/ios/Classes/MuChoiceFieldController.xib index 0b225782..8ec37dcf 100644 --- a/platform/ios/Classes/MuChoiceFieldController.xib +++ b/platform/ios/Classes/MuChoiceFieldController.xib @@ -1,639 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> - <data> - <int key="IBDocument.SystemTarget">1552</int> - <string key="IBDocument.SystemVersion">11G63b</string> - <string key="IBDocument.InterfaceBuilderVersion">3084</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">2083</string> - </object> - <array key="IBDocument.IntegratedClassDependencies"> - <string>IBNSLayoutConstraint</string> - <string>IBProxyObject</string> - <string>IBUIButton</string> - <string>IBUILabel</string> - <string>IBUIPickerView</string> - <string>IBUIView</string> - </array> - <array key="IBDocument.PluginDependencies"> - <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - </array> - <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> - <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="191373211"> - <reference key="NSNextResponder"/> - <int key="NSvFlags">274</int> - <array class="NSMutableArray" key="NSSubviews"> - <object class="IBUILabel" id="852968923"> - <reference key="NSNextResponder" ref="191373211"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{20, 47}, {281, 21}}</string> - <reference key="NSSuperview" ref="191373211"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="5968742"/> - <string key="NSReuseIdentifierKey">_NS:9</string> - <bool key="IBUIOpaque">NO</bool> - <bool key="IBUIClipsSubviews">YES</bool> - <int key="IBUIContentMode">7</int> - <bool key="IBUIUserInteractionEnabled">NO</bool> - <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> - <string key="IBUIText">Choose value</string> - <object class="NSColor" key="IBUITextColor" id="96159386"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MQA</bytes> - </object> - <nil key="IBUIHighlightedColor"/> - <int key="IBUIBaselineAdjustment">0</int> - <int key="IBUITextAlignment">1</int> - <object class="IBUIFontDescription" key="IBUIFontDescription"> - <int key="type">1</int> - <double key="pointSize">17</double> - </object> - <object class="NSFont" key="IBUIFont"> - <string key="NSName">Helvetica</string> - <double key="NSSize">17</double> - <int key="NSfFlags">16</int> - </object> - <bool key="IBUIAdjustsFontSizeToFit">NO</bool> - </object> - <object class="IBUIButton" id="831564724"> - <reference key="NSNextResponder" ref="191373211"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{20, 416}, {280, 44}}</string> - <reference key="NSSuperview" ref="191373211"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="65437148"/> - <string key="NSReuseIdentifierKey">_NS:9</string> - <bool key="IBUIOpaque">NO</bool> - <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> - <int key="IBUIContentHorizontalAlignment">0</int> - <int key="IBUIContentVerticalAlignment">0</int> - <int key="IBUIButtonType">1</int> - <string key="IBUINormalTitle">Okay</string> - <reference key="IBUIHighlightedTitleColor" ref="96159386"/> - <object class="NSColor" key="IBUINormalTitleColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes> - </object> - <object class="NSColor" key="IBUINormalTitleShadowColor" id="607563219"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC41AA</bytes> - </object> - <object class="IBUIFontDescription" key="IBUIFontDescription" id="616815177"> - <int key="type">2</int> - <double key="pointSize">15</double> - </object> - <object class="NSFont" key="IBUIFont" id="536603733"> - <string key="NSName">Helvetica-Bold</string> - <double key="NSSize">15</double> - <int key="NSfFlags">16</int> - </object> - </object> - <object class="IBUIButton" id="65437148"> - <reference key="NSNextResponder" ref="191373211"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{20, 476}, {281, 44}}</string> - <reference key="NSSuperview" ref="191373211"/> - <reference key="NSWindow"/> - <string key="NSReuseIdentifierKey">_NS:9</string> - <bool key="IBUIOpaque">NO</bool> - <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> - <int key="IBUIContentHorizontalAlignment">0</int> - <int key="IBUIContentVerticalAlignment">0</int> - <int key="IBUIButtonType">1</int> - <string key="IBUINormalTitle">Cancel</string> - <reference key="IBUIHighlightedTitleColor" ref="96159386"/> - <object class="NSColor" key="IBUINormalTitleColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes> - </object> - <reference key="IBUINormalTitleShadowColor" ref="607563219"/> - <reference key="IBUIFontDescription" ref="616815177"/> - <reference key="IBUIFont" ref="536603733"/> - </object> - <object class="IBUIPickerView" id="5968742"> - <reference key="NSNextResponder" ref="191373211"/> - <int key="NSvFlags">290</int> - <string key="NSFrame">{{20, 119}, {280, 216}}</string> - <reference key="NSSuperview" ref="191373211"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="831564724"/> - <string key="NSReuseIdentifierKey">_NS:9</string> - <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> - <bool key="IBUIShowsSelectionIndicator">YES</bool> - </object> - </array> - <string key="NSFrame">{{0, 20}, {320, 548}}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="852968923"/> - <object class="NSColor" key="IBUIBackgroundColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes> - </object> - <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> - <object class="IBUIScreenMetrics" key="IBUISimulatedDestinationMetrics"> - <string key="IBUISimulatedSizeMetricsClass">IBUIScreenMetrics</string> - <object class="NSMutableDictionary" key="IBUINormalizedOrientationToSizeMap"> - <bool key="EncodedWithXMLCoder">YES</bool> - <array key="dict.sortedKeys"> - <integer value="1"/> - <integer value="3"/> - </array> - <array key="dict.values"> - <string>{320, 568}</string> - <string>{568, 320}</string> - </array> - </object> - <string key="IBUITargetRuntime">IBCocoaTouchFramework</string> - <string key="IBUIDisplayName">Retina 4 Full Screen</string> - <int key="IBUIType">2</int> - </object> - <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> - </object> - </array> - <object class="IBObjectContainer" key="IBDocument.Objects"> - <array class="NSMutableArray" key="connectionRecords"> - <object class="IBConnectionRecord"> - <object class="IBCocoaTouchOutletConnection" key="connection"> - <string key="label">view</string> - <reference key="source" ref="372490531"/> - <reference key="destination" ref="191373211"/> - </object> - <int key="connectionID">3</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBCocoaTouchOutletConnection" key="connection"> - <string key="label">picker</string> - <reference key="source" ref="372490531"/> - <reference key="destination" ref="5968742"/> - </object> - <int key="connectionID">87</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBCocoaTouchEventConnection" key="connection"> - <string key="label">okayTapped:</string> - <reference key="source" ref="831564724"/> - <reference key="destination" ref="372490531"/> - <int key="IBEventType">7</int> - </object> - <int key="connectionID">88</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBCocoaTouchEventConnection" key="connection"> - <string key="label">cancelTapped:</string> - <reference key="source" ref="65437148"/> - <reference key="destination" ref="372490531"/> - <int key="IBEventType">7</int> - </object> - <int key="connectionID">89</int> - </object> - </array> - <object class="IBMutableOrderedSet" key="objectRecords"> - <array key="orderedObjects"> - <object class="IBObjectRecord"> - <int key="objectID">0</int> - <array key="object" id="0"/> - <reference key="children" ref="1000"/> - <nil key="parent"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1</int> - <reference key="object" ref="191373211"/> - <array class="NSMutableArray" key="children"> - <object class="IBNSLayoutConstraint" id="39033334"> - <reference key="firstItem" ref="65437148"/> - <int key="firstAttribute">5</int> - <int key="relation">0</int> - <reference key="secondItem" ref="191373211"/> - <int key="secondAttribute">5</int> - <float key="multiplier">1</float> - <object class="IBNSLayoutSymbolicConstant" key="constant"> - <double key="value">20</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">8</int> - <float key="scoringTypeFloat">29</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="1029677805"> - <reference key="firstItem" ref="191373211"/> - <int key="firstAttribute">4</int> - <int key="relation">0</int> - <reference key="secondItem" ref="65437148"/> - <int key="secondAttribute">4</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">29</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="942754903"> - <reference key="firstItem" ref="191373211"/> - <int key="firstAttribute">4</int> - <int key="relation">0</int> - <reference key="secondItem" ref="831564724"/> - <int key="secondAttribute">4</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">89</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="745573488"> - <reference key="firstItem" ref="831564724"/> - <int key="firstAttribute">9</int> - <int key="relation">0</int> - <reference key="secondItem" ref="65437148"/> - <int key="secondAttribute">9</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">0.0</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">6</int> - <float key="scoringTypeFloat">24</float> - <int key="contentType">2</int> - </object> - <object class="IBNSLayoutConstraint" id="374543723"> - <reference key="firstItem" ref="191373211"/> - <int key="firstAttribute">6</int> - <int key="relation">0</int> - <reference key="secondItem" ref="831564724"/> - <int key="secondAttribute">6</int> - <float key="multiplier">1</float> - <object class="IBNSLayoutSymbolicConstant" key="constant"> - <double key="value">20</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">8</int> - <float key="scoringTypeFloat">29</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="357946085"> - <reference key="firstItem" ref="831564724"/> - <int key="firstAttribute">5</int> - <int key="relation">0</int> - <reference key="secondItem" ref="191373211"/> - <int key="secondAttribute">5</int> - <float key="multiplier">1</float> - <object class="IBNSLayoutSymbolicConstant" key="constant"> - <double key="value">20</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">8</int> - <float key="scoringTypeFloat">29</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="981314549"> - <reference key="firstItem" ref="191373211"/> - <int key="firstAttribute">6</int> - <int key="relation">0</int> - <reference key="secondItem" ref="5968742"/> - <int key="secondAttribute">6</int> - <float key="multiplier">1</float> - <object class="IBNSLayoutSymbolicConstant" key="constant"> - <double key="value">20</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">8</int> - <float key="scoringTypeFloat">29</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="855118322"> - <reference key="firstItem" ref="5968742"/> - <int key="firstAttribute">5</int> - <int key="relation">0</int> - <reference key="secondItem" ref="191373211"/> - <int key="secondAttribute">5</int> - <float key="multiplier">1</float> - <object class="IBNSLayoutSymbolicConstant" key="constant"> - <double key="value">20</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">8</int> - <float key="scoringTypeFloat">29</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="543940552"> - <reference key="firstItem" ref="5968742"/> - <int key="firstAttribute">3</int> - <int key="relation">0</int> - <reference key="secondItem" ref="191373211"/> - <int key="secondAttribute">3</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">119</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="856939218"> - <reference key="firstItem" ref="852968923"/> - <int key="firstAttribute">6</int> - <int key="relation">0</int> - <reference key="secondItem" ref="65437148"/> - <int key="secondAttribute">6</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">0.0</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">6</int> - <float key="scoringTypeFloat">24</float> - <int key="contentType">2</int> - </object> - <object class="IBNSLayoutConstraint" id="37372808"> - <reference key="firstItem" ref="852968923"/> - <int key="firstAttribute">3</int> - <int key="relation">0</int> - <reference key="secondItem" ref="191373211"/> - <int key="secondAttribute">3</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">47</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="576864315"> - <reference key="firstItem" ref="852968923"/> - <int key="firstAttribute">5</int> - <int key="relation">0</int> - <reference key="secondItem" ref="191373211"/> - <int key="secondAttribute">5</int> - <float key="multiplier">1</float> - <object class="IBNSLayoutSymbolicConstant" key="constant"> - <double key="value">20</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">8</int> - <float key="scoringTypeFloat">29</float> - <int key="contentType">3</int> - </object> - <reference ref="852968923"/> - <reference ref="831564724"/> - <reference ref="65437148"/> - <reference ref="5968742"/> - </array> - <reference key="parent" ref="0"/> - </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">4</int> - <reference key="object" ref="852968923"/> - <array class="NSMutableArray" key="children"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">11</int> - <reference key="object" ref="576864315"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">22</int> - <reference key="object" ref="831564724"/> - <array class="NSMutableArray" key="children"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">41</int> - <reference key="object" ref="37372808"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">48</int> - <reference key="object" ref="357946085"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">49</int> - <reference key="object" ref="374543723"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">59</int> - <reference key="object" ref="65437148"/> - <array class="NSMutableArray" key="children"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">60</int> - <reference key="object" ref="1029677805"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">62</int> - <reference key="object" ref="39033334"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">64</int> - <reference key="object" ref="745573488"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">68</int> - <reference key="object" ref="942754903"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">73</int> - <reference key="object" ref="856939218"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">74</int> - <reference key="object" ref="5968742"/> - <array class="NSMutableArray" key="children"> - <object class="IBNSLayoutConstraint" id="1019750097"> - <reference key="firstItem" ref="5968742"/> - <int key="firstAttribute">8</int> - <int key="relation">0</int> - <nil key="secondItem"/> - <int key="secondAttribute">0</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">216</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="5968742"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">1</int> - </object> - </array> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">76</int> - <reference key="object" ref="1019750097"/> - <reference key="parent" ref="5968742"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">83</int> - <reference key="object" ref="981314549"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">81</int> - <reference key="object" ref="543940552"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">82</int> - <reference key="object" ref="855118322"/> - <reference key="parent" ref="191373211"/> - </object> - </array> - </object> - <dictionary class="NSMutableDictionary" key="flattenedProperties"> - <string key="-1.CustomClassName">MuChoiceFieldController</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="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <array class="NSMutableArray" key="1.IBViewMetadataConstraints"> - <reference ref="576864315"/> - <reference ref="37372808"/> - <reference ref="856939218"/> - <reference ref="543940552"/> - <reference ref="855118322"/> - <reference ref="981314549"/> - <reference ref="357946085"/> - <reference ref="374543723"/> - <reference ref="745573488"/> - <reference ref="942754903"/> - <reference ref="1029677805"/> - <reference ref="39033334"/> - </array> - <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <boolean value="NO" key="22.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> - <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <boolean value="NO" key="4.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> - <string key="41.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="48.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="49.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="59.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <boolean value="NO" key="59.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> - <string key="60.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="62.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="64.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="68.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="74.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <array class="NSMutableArray" key="74.IBViewMetadataConstraints"> - <reference ref="1019750097"/> - </array> - <boolean value="NO" key="74.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> - <string key="76.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="81.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="82.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="83.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - </dictionary> - <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> - <nil key="activeLocalization"/> - <dictionary class="NSMutableDictionary" key="localizations"/> - <nil key="sourceID"/> - <int key="maxID">89</int> - </object> - <object class="IBClassDescriber" key="IBDocument.Classes"> - <array class="NSMutableArray" key="referencedPartialClassDescriptions"> - <object class="IBPartialClassDescription"> - <string key="className">MuChoiceFieldController</string> - <string key="superclassName">UIViewController</string> - <dictionary class="NSMutableDictionary" key="actions"> - <string key="cancelTapped:">id</string> - <string key="okayTapped:">id</string> - </dictionary> - <dictionary class="NSMutableDictionary" key="actionInfosByName"> - <object class="IBActionInfo" key="cancelTapped:"> - <string key="name">cancelTapped:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo" key="okayTapped:"> - <string key="name">okayTapped:</string> - <string key="candidateClassName">id</string> - </object> - </dictionary> - <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">picker</string> - <string key="NS.object.0">UIPickerView</string> - </object> - <object class="NSMutableDictionary" key="toOneOutletInfosByName"> - <string key="NS.key.0">picker</string> - <object class="IBToOneOutletInfo" key="NS.object.0"> - <string key="name">picker</string> - <string key="candidateClassName">UIPickerView</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">./Classes/MuChoiceFieldController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSLayoutConstraint</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">./Classes/NSLayoutConstraint.h</string> - </object> - </object> - </array> - </object> - <int key="IBDocument.localizationMode">0</int> - <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> - <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> - <int key="IBDocument.defaultPropertyAccessControl">3</int> - <bool key="IBDocument.UseAutolayout">YES</bool> - <string key="IBCocoaTouchPluginVersion">2083</string> - </data> -</archive> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none"> + <dependencies> + <deployment defaultVersion="1552" identifier="iOS"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/> + </dependencies> + <objects> + <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MuChoiceFieldController"> + <connections> + <outlet property="picker" destination="ObZ-B5-91l" id="9fH-1p-jPy"/> + <outlet property="view" destination="1" id="3"/> + </connections> + </placeholder> + <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> + <view contentMode="scaleToFill" id="1"> + <rect key="frame" x="0.0" y="0.0" width="320" height="480"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <subviews> + <navigationBar contentMode="scaleToFill" id="awm-dX-cWs"> + <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> + <items> + <navigationItem title="Choose value" id="CQX-gg-Sq8"> + <barButtonItem key="leftBarButtonItem" image="ic_cancel.png" id="okq-YT-wra"> + <connections> + <action selector="onCancel:" destination="-1" id="vH7-Kh-HIj"/> + </connections> + </barButtonItem> + <barButtonItem key="rightBarButtonItem" image="ic_check.png" id="HV4-3D-vB9"> + <connections> + <action selector="onOkay:" destination="-1" id="1St-96-Qkc"/> + </connections> + </barButtonItem> + </navigationItem> + </items> + </navigationBar> + <pickerView contentMode="scaleToFill" id="ObZ-B5-91l"> + <rect key="frame" x="0.0" y="44" width="320" height="162"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> + </pickerView> + </subviews> + <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> + </view> + </objects> + <resources> + <image name="ic_cancel.png" width="24" height="24"/> + <image name="ic_check.png" width="24" height="19"/> + </resources> +</document>
\ No newline at end of file diff --git a/platform/ios/Classes/MuTextFieldController.h b/platform/ios/Classes/MuTextFieldController.h index f74f0610..1783bc08 100644 --- a/platform/ios/Classes/MuTextFieldController.h +++ b/platform/ios/Classes/MuTextFieldController.h @@ -12,8 +12,5 @@ void (^okayBlock)(NSString *); NSString *initialText; } -@property (retain, nonatomic) IBOutlet UITextView *textView; - (id)initWithText:(NSString *)text okayAction:(void (^)(NSString *))block; -- (IBAction)okayTapped:(id)sender; -- (IBAction)cancelTapped:(id)sender; @end diff --git a/platform/ios/Classes/MuTextFieldController.m b/platform/ios/Classes/MuTextFieldController.m index 45e53054..0d978486 100644 --- a/platform/ios/Classes/MuTextFieldController.m +++ b/platform/ios/Classes/MuTextFieldController.m @@ -8,6 +8,11 @@ #import "MuTextFieldController.h" @interface MuTextFieldController () +@property (retain, nonatomic) IBOutlet UINavigationBar *navBar; +- (IBAction)onCancel:(id)sender; +- (IBAction)onOkay:(id)sender; +@property (retain, nonatomic) IBOutlet UITextView *textView; + @end @implementation MuTextFieldController @@ -27,32 +32,31 @@ { [super viewDidLoad]; _textView.text = initialText; - // Do any additional setup after loading the view from its nib. + [_textView becomeFirstResponder]; } - (void)didReceiveMemoryWarning { [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. } - (void)dealloc { [okayBlock release]; [initialText release]; + [_navBar release]; [_textView release]; [super dealloc]; } -- (IBAction)okayTapped:(id)sender +- (IBAction)onOkay:(id)sender { okayBlock(_textView.text); [self dismissViewControllerAnimated:YES completion:nil]; } -- (IBAction)cancelTapped:(id)sender +- (IBAction)onCancel:(id)sender { [self dismissViewControllerAnimated:YES completion:nil]; } - @end diff --git a/platform/ios/Classes/MuTextFieldController.xib b/platform/ios/Classes/MuTextFieldController.xib index 298e1508..cf59cf01 100644 --- a/platform/ios/Classes/MuTextFieldController.xib +++ b/platform/ios/Classes/MuTextFieldController.xib @@ -1,612 +1,54 @@ -<?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> - <data> - <int key="IBDocument.SystemTarget">1552</int> - <string key="IBDocument.SystemVersion">11G63b</string> - <string key="IBDocument.InterfaceBuilderVersion">3084</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">2083</string> - </object> - <array key="IBDocument.IntegratedClassDependencies"> - <string>IBNSLayoutConstraint</string> - <string>IBProxyObject</string> - <string>IBUIButton</string> - <string>IBUILabel</string> - <string>IBUITextView</string> - <string>IBUIView</string> - </array> - <array key="IBDocument.PluginDependencies"> - <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - </array> - <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> - <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="191373211"> - <reference key="NSNextResponder"/> - <int key="NSvFlags">274</int> - <array class="NSMutableArray" key="NSSubviews"> - <object class="IBUILabel" id="852968923"> - <reference key="NSNextResponder" ref="191373211"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{20, 47}, {281, 21}}</string> - <reference key="NSSuperview" ref="191373211"/> - <reference key="NSNextKeyView" ref="458048931"/> - <string key="NSReuseIdentifierKey">_NS:9</string> - <bool key="IBUIOpaque">NO</bool> - <bool key="IBUIClipsSubviews">YES</bool> - <int key="IBUIContentMode">7</int> - <bool key="IBUIUserInteractionEnabled">NO</bool> - <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> - <string key="IBUIText">Fill in text field</string> - <object class="NSColor" key="IBUITextColor" id="96159386"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MQA</bytes> - </object> - <nil key="IBUIHighlightedColor"/> - <int key="IBUIBaselineAdjustment">0</int> - <int key="IBUITextAlignment">1</int> - <object class="IBUIFontDescription" key="IBUIFontDescription"> - <int key="type">1</int> - <double key="pointSize">17</double> - </object> - <object class="NSFont" key="IBUIFont"> - <string key="NSName">Helvetica</string> - <double key="NSSize">17</double> - <int key="NSfFlags">16</int> - </object> - <bool key="IBUIAdjustsFontSizeToFit">NO</bool> - </object> - <object class="IBUITextView" id="458048931"> - <reference key="NSNextResponder" ref="191373211"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{20, 89}, {281, 281}}</string> - <reference key="NSSuperview" ref="191373211"/> - <reference key="NSNextKeyView" ref="831564724"/> - <string key="NSReuseIdentifierKey">_NS:9</string> - <object class="NSColor" key="IBUIBackgroundColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MSAxIDEAA</bytes> - </object> - <bool key="IBUIClipsSubviews">YES</bool> - <bool key="IBUIMultipleTouchEnabled">YES</bool> - <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> - <string key="IBUIText"/> - <object class="IBUITextInputTraits" key="IBUITextInputTraits"> - <int key="IBUIAutocapitalizationType">2</int> - <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> - </object> - <object class="IBUIFontDescription" key="IBUIFontDescription"> - <string key="name">Helvetica</string> - <string key="family">Helvetica</string> - <int key="traits">0</int> - <double key="pointSize">14</double> - </object> - <object class="NSFont" key="IBUIFont"> - <string key="NSName">Helvetica</string> - <double key="NSSize">14</double> - <int key="NSfFlags">16</int> - </object> - </object> - <object class="IBUIButton" id="831564724"> - <reference key="NSNextResponder" ref="191373211"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{20, 416}, {280, 44}}</string> - <reference key="NSSuperview" ref="191373211"/> - <reference key="NSNextKeyView" ref="65437148"/> - <string key="NSReuseIdentifierKey">_NS:9</string> - <bool key="IBUIOpaque">NO</bool> - <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> - <int key="IBUIContentHorizontalAlignment">0</int> - <int key="IBUIContentVerticalAlignment">0</int> - <int key="IBUIButtonType">1</int> - <string key="IBUINormalTitle">Okay</string> - <reference key="IBUIHighlightedTitleColor" ref="96159386"/> - <object class="NSColor" key="IBUINormalTitleColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes> - </object> - <object class="NSColor" key="IBUINormalTitleShadowColor" id="607563219"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC41AA</bytes> - </object> - <object class="IBUIFontDescription" key="IBUIFontDescription" id="616815177"> - <int key="type">2</int> - <double key="pointSize">15</double> - </object> - <object class="NSFont" key="IBUIFont" id="536603733"> - <string key="NSName">Helvetica-Bold</string> - <double key="NSSize">15</double> - <int key="NSfFlags">16</int> - </object> - </object> - <object class="IBUIButton" id="65437148"> - <reference key="NSNextResponder" ref="191373211"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{20, 476}, {281, 44}}</string> - <reference key="NSSuperview" ref="191373211"/> - <reference key="NSNextKeyView"/> - <string key="NSReuseIdentifierKey">_NS:9</string> - <bool key="IBUIOpaque">NO</bool> - <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> - <int key="IBUIContentHorizontalAlignment">0</int> - <int key="IBUIContentVerticalAlignment">0</int> - <int key="IBUIButtonType">1</int> - <string key="IBUINormalTitle">Cancel</string> - <reference key="IBUIHighlightedTitleColor" ref="96159386"/> - <object class="NSColor" key="IBUINormalTitleColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes> - </object> - <reference key="IBUINormalTitleShadowColor" ref="607563219"/> - <reference key="IBUIFontDescription" ref="616815177"/> - <reference key="IBUIFont" ref="536603733"/> - </object> - </array> - <string key="NSFrame">{{0, 20}, {320, 548}}</string> - <reference key="NSSuperview"/> - <reference key="NSNextKeyView" ref="852968923"/> - <object class="NSColor" key="IBUIBackgroundColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes> - </object> - <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> - <object class="IBUIScreenMetrics" key="IBUISimulatedDestinationMetrics"> - <string key="IBUISimulatedSizeMetricsClass">IBUIScreenMetrics</string> - <object class="NSMutableDictionary" key="IBUINormalizedOrientationToSizeMap"> - <bool key="EncodedWithXMLCoder">YES</bool> - <array key="dict.sortedKeys"> - <integer value="1"/> - <integer value="3"/> - </array> - <array key="dict.values"> - <string>{320, 568}</string> - <string>{568, 320}</string> - </array> - </object> - <string key="IBUITargetRuntime">IBCocoaTouchFramework</string> - <string key="IBUIDisplayName">Retina 4 Full Screen</string> - <int key="IBUIType">2</int> - </object> - <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> - </object> - </array> - <object class="IBObjectContainer" key="IBDocument.Objects"> - <array class="NSMutableArray" key="connectionRecords"> - <object class="IBConnectionRecord"> - <object class="IBCocoaTouchOutletConnection" key="connection"> - <string key="label">view</string> - <reference key="source" ref="372490531"/> - <reference key="destination" ref="191373211"/> - </object> - <int key="connectionID">3</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBCocoaTouchOutletConnection" key="connection"> - <string key="label">textView</string> - <reference key="source" ref="372490531"/> - <reference key="destination" ref="458048931"/> - </object> - <int key="connectionID">70</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBCocoaTouchEventConnection" key="connection"> - <string key="label">okayTapped:</string> - <reference key="source" ref="831564724"/> - <reference key="destination" ref="372490531"/> - <int key="IBEventType">7</int> - </object> - <int key="connectionID">71</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBCocoaTouchEventConnection" key="connection"> - <string key="label">cancelTapped:</string> - <reference key="source" ref="65437148"/> - <reference key="destination" ref="372490531"/> - <int key="IBEventType">7</int> - </object> - <int key="connectionID">72</int> - </object> - </array> - <object class="IBMutableOrderedSet" key="objectRecords"> - <array key="orderedObjects"> - <object class="IBObjectRecord"> - <int key="objectID">0</int> - <array key="object" id="0"/> - <reference key="children" ref="1000"/> - <nil key="parent"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1</int> - <reference key="object" ref="191373211"/> - <array class="NSMutableArray" key="children"> - <object class="IBNSLayoutConstraint" id="39033334"> - <reference key="firstItem" ref="65437148"/> - <int key="firstAttribute">5</int> - <int key="relation">0</int> - <reference key="secondItem" ref="191373211"/> - <int key="secondAttribute">5</int> - <float key="multiplier">1</float> - <object class="IBNSLayoutSymbolicConstant" key="constant"> - <double key="value">20</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">8</int> - <float key="scoringTypeFloat">29</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="1029677805"> - <reference key="firstItem" ref="191373211"/> - <int key="firstAttribute">4</int> - <int key="relation">0</int> - <reference key="secondItem" ref="65437148"/> - <int key="secondAttribute">4</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">29</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="942754903"> - <reference key="firstItem" ref="191373211"/> - <int key="firstAttribute">4</int> - <int key="relation">0</int> - <reference key="secondItem" ref="831564724"/> - <int key="secondAttribute">4</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">89</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="745573488"> - <reference key="firstItem" ref="831564724"/> - <int key="firstAttribute">9</int> - <int key="relation">0</int> - <reference key="secondItem" ref="65437148"/> - <int key="secondAttribute">9</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">0.0</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">6</int> - <float key="scoringTypeFloat">24</float> - <int key="contentType">2</int> - </object> - <object class="IBNSLayoutConstraint" id="374543723"> - <reference key="firstItem" ref="191373211"/> - <int key="firstAttribute">6</int> - <int key="relation">0</int> - <reference key="secondItem" ref="831564724"/> - <int key="secondAttribute">6</int> - <float key="multiplier">1</float> - <object class="IBNSLayoutSymbolicConstant" key="constant"> - <double key="value">20</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">8</int> - <float key="scoringTypeFloat">29</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="357946085"> - <reference key="firstItem" ref="831564724"/> - <int key="firstAttribute">5</int> - <int key="relation">0</int> - <reference key="secondItem" ref="191373211"/> - <int key="secondAttribute">5</int> - <float key="multiplier">1</float> - <object class="IBNSLayoutSymbolicConstant" key="constant"> - <double key="value">20</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">8</int> - <float key="scoringTypeFloat">29</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="109301233"> - <reference key="firstItem" ref="458048931"/> - <int key="firstAttribute">3</int> - <int key="relation">0</int> - <reference key="secondItem" ref="191373211"/> - <int key="secondAttribute">3</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">89</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="856939218"> - <reference key="firstItem" ref="458048931"/> - <int key="firstAttribute">6</int> - <int key="relation">0</int> - <reference key="secondItem" ref="65437148"/> - <int key="secondAttribute">6</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">0.0</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">6</int> - <float key="scoringTypeFloat">24</float> - <int key="contentType">2</int> - </object> - <object class="IBNSLayoutConstraint" id="40991801"> - <reference key="firstItem" ref="458048931"/> - <int key="firstAttribute">6</int> - <int key="relation">0</int> - <reference key="secondItem" ref="852968923"/> - <int key="secondAttribute">6</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">0.0</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">6</int> - <float key="scoringTypeFloat">24</float> - <int key="contentType">2</int> - </object> - <object class="IBNSLayoutConstraint" id="855118322"> - <reference key="firstItem" ref="458048931"/> - <int key="firstAttribute">5</int> - <int key="relation">0</int> - <reference key="secondItem" ref="191373211"/> - <int key="secondAttribute">5</int> - <float key="multiplier">1</float> - <object class="IBNSLayoutSymbolicConstant" key="constant"> - <double key="value">20</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">8</int> - <float key="scoringTypeFloat">29</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="37372808"> - <reference key="firstItem" ref="852968923"/> - <int key="firstAttribute">3</int> - <int key="relation">0</int> - <reference key="secondItem" ref="191373211"/> - <int key="secondAttribute">3</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">47</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">3</int> - </object> - <object class="IBNSLayoutConstraint" id="576864315"> - <reference key="firstItem" ref="852968923"/> - <int key="firstAttribute">5</int> - <int key="relation">0</int> - <reference key="secondItem" ref="191373211"/> - <int key="secondAttribute">5</int> - <float key="multiplier">1</float> - <object class="IBNSLayoutSymbolicConstant" key="constant"> - <double key="value">20</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="191373211"/> - <int key="scoringType">8</int> - <float key="scoringTypeFloat">29</float> - <int key="contentType">3</int> - </object> - <reference ref="852968923"/> - <reference ref="831564724"/> - <reference ref="65437148"/> - <reference ref="458048931"/> - </array> - <reference key="parent" ref="0"/> - </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">4</int> - <reference key="object" ref="852968923"/> - <array class="NSMutableArray" key="children"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">11</int> - <reference key="object" ref="576864315"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">12</int> - <reference key="object" ref="458048931"/> - <array class="NSMutableArray" key="children"> - <object class="IBNSLayoutConstraint" id="921803831"> - <reference key="firstItem" ref="458048931"/> - <int key="firstAttribute">8</int> - <int key="relation">0</int> - <nil key="secondItem"/> - <int key="secondAttribute">0</int> - <float key="multiplier">1</float> - <object class="IBLayoutConstant" key="constant"> - <double key="value">281</double> - </object> - <float key="priority">1000</float> - <reference key="containingView" ref="458048931"/> - <int key="scoringType">3</int> - <float key="scoringTypeFloat">9</float> - <int key="contentType">1</int> - </object> - </array> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">21</int> - <reference key="object" ref="855118322"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">22</int> - <reference key="object" ref="831564724"/> - <array class="NSMutableArray" key="children"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">41</int> - <reference key="object" ref="37372808"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">43</int> - <reference key="object" ref="921803831"/> - <reference key="parent" ref="458048931"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">48</int> - <reference key="object" ref="357946085"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">49</int> - <reference key="object" ref="374543723"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">54</int> - <reference key="object" ref="40991801"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">59</int> - <reference key="object" ref="65437148"/> - <array class="NSMutableArray" key="children"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">60</int> - <reference key="object" ref="1029677805"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">62</int> - <reference key="object" ref="39033334"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">64</int> - <reference key="object" ref="745573488"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">65</int> - <reference key="object" ref="856939218"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">68</int> - <reference key="object" ref="942754903"/> - <reference key="parent" ref="191373211"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">69</int> - <reference key="object" ref="109301233"/> - <reference key="parent" ref="191373211"/> - </object> - </array> - </object> - <dictionary class="NSMutableDictionary" key="flattenedProperties"> - <string key="-1.CustomClassName">MuTextFieldController</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="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <array class="NSMutableArray" key="1.IBViewMetadataConstraints"> - <reference ref="576864315"/> - <reference ref="37372808"/> - <reference ref="855118322"/> - <reference ref="40991801"/> - <reference ref="856939218"/> - <reference ref="109301233"/> - <reference ref="357946085"/> - <reference ref="374543723"/> - <reference ref="745573488"/> - <reference ref="942754903"/> - <reference ref="1029677805"/> - <reference ref="39033334"/> - </array> - <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <array class="NSMutableArray" key="12.IBViewMetadataConstraints"> - <reference ref="921803831"/> - </array> - <boolean value="NO" key="12.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> - <string key="21.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <boolean value="NO" key="22.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> - <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <boolean value="NO" key="4.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> - <string key="41.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="43.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="48.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="49.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="54.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="59.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <boolean value="NO" key="59.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/> - <string key="60.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="62.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="64.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="65.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="68.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="69.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - </dictionary> - <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> - <nil key="activeLocalization"/> - <dictionary class="NSMutableDictionary" key="localizations"/> - <nil key="sourceID"/> - <int key="maxID">72</int> - </object> - <object class="IBClassDescriber" key="IBDocument.Classes"/> - <int key="IBDocument.localizationMode">0</int> - <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> - <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> - <int key="IBDocument.defaultPropertyAccessControl">3</int> - <bool key="IBDocument.UseAutolayout">YES</bool> - <string key="IBCocoaTouchPluginVersion">2083</string> - </data> -</archive> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none"> + <dependencies> + <deployment defaultVersion="1552" identifier="iOS"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/> + </dependencies> + <objects> + <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MuTextFieldController"> + <connections> + <outlet property="navBar" destination="6Jq-f2-vyU" id="2pw-wC-kWN"/> + <outlet property="textView" destination="w7Z-oh-2jS" id="qeP-Gn-zJl"/> + <outlet property="view" destination="1" id="3"/> + </connections> + </placeholder> + <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> + <view contentMode="scaleToFill" id="1"> + <rect key="frame" x="0.0" y="0.0" width="480" height="320"/> + <autoresizingMask key="autoresizingMask" heightSizable="YES" flexibleMaxY="YES"/> + <subviews> + <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="w7Z-oh-2jS"> + <rect key="frame" x="20" y="65" width="440" height="119"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> + <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> + <fontDescription key="fontDescription" type="system" pointSize="14"/> + <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/> + </textView> + <navigationBar contentMode="scaleToFill" id="6Jq-f2-vyU"> + <rect key="frame" x="0.0" y="0.0" width="480" height="44"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/> + <items> + <navigationItem title="Fill out text field" id="FqH-n2-lG7"> + <barButtonItem key="leftBarButtonItem" image="ic_cancel.png" id="VNN-6U-foB"> + <connections> + <action selector="onCancel:" destination="-1" id="K03-ay-2Vk"/> + </connections> + </barButtonItem> + <barButtonItem key="rightBarButtonItem" image="ic_check.png" id="BBZ-VY-Z8l"> + <connections> + <action selector="onOkay:" destination="-1" id="Zud-YG-Opq"/> + </connections> + </barButtonItem> + </navigationItem> + </items> + </navigationBar> + </subviews> + <color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> + <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/> + </view> + </objects> + <resources> + <image name="ic_cancel.png" width="24" height="24"/> + <image name="ic_check.png" width="24" height="19"/> + </resources> +</document>
\ No newline at end of file diff --git a/platform/ios/MuPDF.xcodeproj/project.pbxproj b/platform/ios/MuPDF.xcodeproj/project.pbxproj index efcd02c8..cf2c1544 100644 --- a/platform/ios/MuPDF.xcodeproj/project.pbxproj +++ b/platform/ios/MuPDF.xcodeproj/project.pbxproj @@ -38,11 +38,11 @@ DA300CA41847A64C004F92BB /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA300CA31847A64C004F92BB /* JavaScriptCore.framework */; }; DA442E2D183B796F008EF49B /* ic_pen.png in Resources */ = {isa = PBXBuildFile; fileRef = DA442E2C183B796F008EF49B /* ic_pen.png */; }; DA442E30183B9F13008EF49B /* MuInkView.m in Sources */ = {isa = PBXBuildFile; fileRef = DA442E2F183B9F13008EF49B /* MuInkView.m */; }; + DA4C0622187B1EA200755D0D /* MuTextFieldController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4C0620187B1EA200755D0D /* MuTextFieldController.m */; }; + DA4C0623187B1EA200755D0D /* MuTextFieldController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA4C0621187B1EA200755D0D /* MuTextFieldController.xib */; }; DAA6E56F17F03F96002B1E4E /* MuPageViewReflow.m in Sources */ = {isa = PBXBuildFile; fileRef = DAA6E56E17F03AAE002B1E4E /* MuPageViewReflow.m */; }; DAAC6A2E17FC6E4A00A0E83A /* MuTapResult.m in Sources */ = {isa = PBXBuildFile; fileRef = DAAC6A2D17FC6E4A00A0E83A /* MuTapResult.m */; }; DAB067A61831225D00DDA774 /* MuWord.m in Sources */ = {isa = PBXBuildFile; fileRef = DAB067A51831225D00DDA774 /* MuWord.m */; }; - DAB20D4518042D830030623F /* MuTextFieldController.m in Sources */ = {isa = PBXBuildFile; fileRef = DAB20D4318042D830030623F /* MuTextFieldController.m */; }; - DAB20D4618042D830030623F /* MuTextFieldController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DAB20D4418042D830030623F /* MuTextFieldController.xib */; }; DAB9F4BB17F1B24000117D2E /* ic_arrow_left.png in Resources */ = {isa = PBXBuildFile; fileRef = DAB9F4B517F1B24000117D2E /* ic_arrow_left.png */; }; DAB9F4BC17F1B24000117D2E /* ic_arrow_right.png in Resources */ = {isa = PBXBuildFile; fileRef = DAB9F4B617F1B24000117D2E /* ic_arrow_right.png */; }; DAB9F4BD17F1B24000117D2E /* ic_cancel.png in Resources */ = {isa = PBXBuildFile; fileRef = DAB9F4B717F1B24000117D2E /* ic_cancel.png */; }; @@ -51,8 +51,6 @@ DAB9F4C017F1B24000117D2E /* ic_magnifying_glass.png in Resources */ = {isa = PBXBuildFile; fileRef = DAB9F4BA17F1B24000117D2E /* ic_magnifying_glass.png */; }; DAB9F4C217F1CB6D00117D2E /* ic_reflow.png in Resources */ = {isa = PBXBuildFile; fileRef = DAB9F4C117F1CB6D00117D2E /* ic_reflow.png */; }; DABDEF5A17EC484A00AC35F1 /* MuDocRef.m in Sources */ = {isa = PBXBuildFile; fileRef = DABDEF5917EC484A00AC35F1 /* MuDocRef.m */; }; - DABF8CC3180C28E60069CB6D /* MuChoiceFieldController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DABF8CC2180C28E60069CB6D /* MuChoiceFieldController.xib */; }; - DABF8CC6180C2C650069CB6D /* MuChoiceFieldController.m in Sources */ = {isa = PBXBuildFile; fileRef = DABF8CC5180C2C640069CB6D /* MuChoiceFieldController.m */; }; DACD12271833CDA600D4B9C5 /* ic_check.png in Resources */ = {isa = PBXBuildFile; fileRef = DACD12261833CDA600D4B9C5 /* ic_check.png */; }; DAD10489183D0A2900960F4C /* MuAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = DAD10488183D0A2900960F4C /* MuAnnotation.m */; }; DAD2BA821835064E00E7C49D /* MuTextSelectView.m in Sources */ = {isa = PBXBuildFile; fileRef = DAD2BA811835064E00E7C49D /* MuTextSelectView.m */; }; @@ -62,6 +60,8 @@ DAD47D301832615900E173A0 /* ic_underline.png in Resources */ = {isa = PBXBuildFile; fileRef = DAD47D2D1832615900E173A0 /* ic_underline.png */; }; DAD72802183E53F0005C14FA /* MuAnnotSelectView.m in Sources */ = {isa = PBXBuildFile; fileRef = DAD72801183E53F0005C14FA /* MuAnnotSelectView.m */; }; DAD72804183E6F33005C14FA /* ic_trash.png in Resources */ = {isa = PBXBuildFile; fileRef = DAD72803183E6F33005C14FA /* ic_trash.png */; }; + DAFF997B187C12430081C756 /* MuChoiceFieldController.m in Sources */ = {isa = PBXBuildFile; fileRef = DAFF9979187C12430081C756 /* MuChoiceFieldController.m */; }; + DAFF997C187C12430081C756 /* MuChoiceFieldController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DAFF997A187C12430081C756 /* MuChoiceFieldController.xib */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -116,15 +116,15 @@ DA442E2C183B796F008EF49B /* ic_pen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ic_pen.png; path = "../android/res/drawable-ldpi/ic_pen.png"; sourceTree = "<group>"; }; DA442E2E183B9F13008EF49B /* MuInkView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuInkView.h; path = Classes/MuInkView.h; sourceTree = "<group>"; }; DA442E2F183B9F13008EF49B /* MuInkView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MuInkView.m; path = Classes/MuInkView.m; sourceTree = "<group>"; }; + DA4C061F187B1EA200755D0D /* MuTextFieldController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuTextFieldController.h; path = Classes/MuTextFieldController.h; sourceTree = "<group>"; }; + DA4C0620187B1EA200755D0D /* MuTextFieldController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MuTextFieldController.m; path = Classes/MuTextFieldController.m; sourceTree = "<group>"; }; + DA4C0621187B1EA200755D0D /* MuTextFieldController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MuTextFieldController.xib; path = Classes/MuTextFieldController.xib; sourceTree = "<group>"; }; DAA6E56D17F03AAE002B1E4E /* MuPageViewReflow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuPageViewReflow.h; path = Classes/MuPageViewReflow.h; sourceTree = "<group>"; }; DAA6E56E17F03AAE002B1E4E /* MuPageViewReflow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MuPageViewReflow.m; path = Classes/MuPageViewReflow.m; sourceTree = "<group>"; }; DAAC6A2C17FC6E4A00A0E83A /* MuTapResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuTapResult.h; path = Classes/MuTapResult.h; sourceTree = "<group>"; }; DAAC6A2D17FC6E4A00A0E83A /* MuTapResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MuTapResult.m; path = Classes/MuTapResult.m; sourceTree = "<group>"; }; DAB067A41831225D00DDA774 /* MuWord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuWord.h; path = Classes/MuWord.h; sourceTree = "<group>"; }; DAB067A51831225D00DDA774 /* MuWord.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MuWord.m; path = Classes/MuWord.m; sourceTree = "<group>"; }; - DAB20D4218042D830030623F /* MuTextFieldController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuTextFieldController.h; path = Classes/MuTextFieldController.h; sourceTree = "<group>"; }; - DAB20D4318042D830030623F /* MuTextFieldController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MuTextFieldController.m; path = Classes/MuTextFieldController.m; sourceTree = "<group>"; }; - DAB20D4418042D830030623F /* MuTextFieldController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MuTextFieldController.xib; path = Classes/MuTextFieldController.xib; sourceTree = "<group>"; }; DAB20D4718045AC40030623F /* MuDialogCreator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuDialogCreator.h; path = Classes/MuDialogCreator.h; sourceTree = "<group>"; }; DAB9F4B517F1B24000117D2E /* ic_arrow_left.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ic_arrow_left.png; path = "../android/res/drawable-ldpi/ic_arrow_left.png"; sourceTree = "<group>"; }; DAB9F4B617F1B24000117D2E /* ic_arrow_right.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ic_arrow_right.png; path = "../android/res/drawable-ldpi/ic_arrow_right.png"; sourceTree = "<group>"; }; @@ -135,9 +135,6 @@ DAB9F4C117F1CB6D00117D2E /* ic_reflow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ic_reflow.png; path = "../android/res/drawable-ldpi/ic_reflow.png"; sourceTree = "<group>"; }; DABDEF5817EC484A00AC35F1 /* MuDocRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuDocRef.h; path = Classes/MuDocRef.h; sourceTree = "<group>"; }; DABDEF5917EC484A00AC35F1 /* MuDocRef.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MuDocRef.m; path = Classes/MuDocRef.m; sourceTree = "<group>"; }; - DABF8CC2180C28E60069CB6D /* MuChoiceFieldController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MuChoiceFieldController.xib; path = Classes/MuChoiceFieldController.xib; sourceTree = "<group>"; }; - DABF8CC4180C2C640069CB6D /* MuChoiceFieldController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuChoiceFieldController.h; path = Classes/MuChoiceFieldController.h; sourceTree = "<group>"; }; - DABF8CC5180C2C640069CB6D /* MuChoiceFieldController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MuChoiceFieldController.m; path = Classes/MuChoiceFieldController.m; sourceTree = "<group>"; }; DACD12261833CDA600D4B9C5 /* ic_check.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ic_check.png; path = "../android/res/drawable-ldpi/ic_check.png"; sourceTree = "<group>"; }; DAD10487183D0A2900960F4C /* MuAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuAnnotation.h; path = Classes/MuAnnotation.h; sourceTree = "<group>"; }; DAD10488183D0A2900960F4C /* MuAnnotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MuAnnotation.m; path = Classes/MuAnnotation.m; sourceTree = "<group>"; }; @@ -151,6 +148,9 @@ DAD72801183E53F0005C14FA /* MuAnnotSelectView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MuAnnotSelectView.m; path = Classes/MuAnnotSelectView.m; sourceTree = "<group>"; }; DAD72803183E6F33005C14FA /* ic_trash.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ic_trash.png; path = "../android/res/drawable-ldpi/ic_trash.png"; sourceTree = "<group>"; }; DADD8D6917EB24C000C49E0B /* MuPageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuPageView.h; path = Classes/MuPageView.h; sourceTree = "<group>"; }; + DAFF9978187C12430081C756 /* MuChoiceFieldController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuChoiceFieldController.h; path = Classes/MuChoiceFieldController.h; sourceTree = "<group>"; }; + DAFF9979187C12430081C756 /* MuChoiceFieldController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MuChoiceFieldController.m; path = Classes/MuChoiceFieldController.m; sourceTree = "<group>"; }; + DAFF997A187C12430081C756 /* MuChoiceFieldController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MuChoiceFieldController.xib; path = Classes/MuChoiceFieldController.xib; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -278,13 +278,13 @@ DAA6E56E17F03AAE002B1E4E /* MuPageViewReflow.m */, DAAC6A2C17FC6E4A00A0E83A /* MuTapResult.h */, DAAC6A2D17FC6E4A00A0E83A /* MuTapResult.m */, - DAB20D4218042D830030623F /* MuTextFieldController.h */, - DAB20D4318042D830030623F /* MuTextFieldController.m */, - DAB20D4418042D830030623F /* MuTextFieldController.xib */, DAB20D4718045AC40030623F /* MuDialogCreator.h */, - DABF8CC4180C2C640069CB6D /* MuChoiceFieldController.h */, - DABF8CC5180C2C640069CB6D /* MuChoiceFieldController.m */, - DABF8CC2180C28E60069CB6D /* MuChoiceFieldController.xib */, + DA4C061F187B1EA200755D0D /* MuTextFieldController.h */, + DA4C0620187B1EA200755D0D /* MuTextFieldController.m */, + DA4C0621187B1EA200755D0D /* MuTextFieldController.xib */, + DAFF9978187C12430081C756 /* MuChoiceFieldController.h */, + DAFF9979187C12430081C756 /* MuChoiceFieldController.m */, + DAFF997A187C12430081C756 /* MuChoiceFieldController.xib */, ); name = Classes; sourceTree = "<group>"; @@ -371,7 +371,9 @@ 968E1E571779A54F0050CEA3 /* Default-568h@2x.png in Resources */, 96E1CDEE1779A60700FCF717 /* Icon-72.png in Resources */, 96E1CDEF1779A60700FCF717 /* Icon-72@2x.png in Resources */, + DA4C0623187B1EA200755D0D /* MuTextFieldController.xib in Resources */, 96E1CDF01779A60700FCF717 /* Icon.png in Resources */, + DAFF997C187C12430081C756 /* MuChoiceFieldController.xib in Resources */, 96E1CDF11779A60700FCF717 /* Icon@2x.png in Resources */, 96E1CDF21779A60700FCF717 /* iTunesArtwork.png in Resources */, 96E1CDF31779A60700FCF717 /* x_alt_blue.png in Resources */, @@ -383,8 +385,6 @@ DAB9F4BF17F1B24000117D2E /* ic_list.png in Resources */, DAB9F4C017F1B24000117D2E /* ic_magnifying_glass.png in Resources */, DAB9F4C217F1CB6D00117D2E /* ic_reflow.png in Resources */, - DAB20D4618042D830030623F /* MuTextFieldController.xib in Resources */, - DABF8CC3180C28E60069CB6D /* MuChoiceFieldController.xib in Resources */, DAD47D2A1832475C00E173A0 /* ic_more.png in Resources */, DAD47D2E1832615900E173A0 /* ic_highlight.png in Resources */, DAD47D2F1832615900E173A0 /* ic_strike.png in Resources */, @@ -436,13 +436,13 @@ DA1C68C417E8969C0061F586 /* common.m in Sources */, DABDEF5A17EC484A00AC35F1 /* MuDocRef.m in Sources */, DAAC6A2E17FC6E4A00A0E83A /* MuTapResult.m in Sources */, - DAB20D4518042D830030623F /* MuTextFieldController.m in Sources */, - DABF8CC6180C2C650069CB6D /* MuChoiceFieldController.m in Sources */, + DAFF997B187C12430081C756 /* MuChoiceFieldController.m in Sources */, DAB067A61831225D00DDA774 /* MuWord.m in Sources */, DAD2BA821835064E00E7C49D /* MuTextSelectView.m in Sources */, DA442E30183B9F13008EF49B /* MuInkView.m in Sources */, DAD10489183D0A2900960F4C /* MuAnnotation.m in Sources */, DAD72802183E53F0005C14FA /* MuAnnotSelectView.m in Sources */, + DA4C0622187B1EA200755D0D /* MuTextFieldController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; |