Skip to content

Commit

Permalink
WIP try to reproduce calabash/calabash-ios#259
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmoody
jmoody committed Dec 18, 2013
1 parent 0b44f24 commit c14845e
Show file tree
Hide file tree
Showing 42 changed files with 343 additions and 1,469 deletions.
32 changes: 0 additions & 32 deletions Briar/5-console.sh
View file

This file was deleted.

32 changes: 0 additions & 32 deletions Briar/6-console.sh
View file

This file was deleted.

33 changes: 0 additions & 33 deletions Briar/7-console.sh
View file

This file was deleted.

12 changes: 9 additions & 3 deletions Briar/Briar.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1043,7 +1043,8 @@
09608ca2daa71133ce45a388 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Developer: Joshua Moody (8QEQJFT59F)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Joshua Moody (8QEQJFT59F)";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)\"",
Expand All @@ -1068,7 +1069,7 @@
396afcd2026cd49222fd301b /* AdHoc */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_IDENTITY = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)\"",
Expand All @@ -1093,7 +1094,7 @@
5d879d55ad4f1a31440a147a /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Developer: Joshua Moody (8QEQJFT59F)";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)\"",
Expand Down Expand Up @@ -1222,6 +1223,7 @@
buildSettings = {
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: Joshua Moody (8QEQJFT59F)";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Briar/Briar-Prefix.pch";
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
Expand All @@ -1239,6 +1241,7 @@
buildSettings = {
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
CODE_SIGN_IDENTITY = "iPhone Developer: Joshua Moody (8QEQJFT59F)";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Briar/Briar-Prefix.pch";
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
Expand Down Expand Up @@ -1318,6 +1321,7 @@
buildSettings = {
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Briar/Briar-Prefix.pch";
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
Expand Down Expand Up @@ -1390,6 +1394,7 @@
buildSettings = {
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Briar/Briar-Prefix.pch";
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
Expand All @@ -1413,6 +1418,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)\"",
Expand Down
3 changes: 2 additions & 1 deletion Briar/Briar/Controllers/BrTextRelatedController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ - (void)viewDidLoad {
@(UISwipeGestureRecognizerDirectionRight)]) {
[self addSwipeRecognizerToTextField:tf
direction:dir.unsignedIntegerValue];
tf.keyboardType = UIKeyboardTypeEmailAddress;
}
}

Expand Down Expand Up @@ -245,7 +246,7 @@ - (CGRect) frameForView:(UIView *) aView
if ([kIdTopTv isEqualToString:aid] && (t == o || b == o)) { frame = CGRectMake(20, 160, 280, 30); }
if ([kIdBottomTv isEqualToString:aid] && (t == o || b == o)) { frame = CGRectMake(20, 196, 280, 30); }

if ([kIdButton isEqualToString:aid] && (t == o || b == o)) { frame = CGRectMake(95, 269, 230, 44); }
if ([kIdButton isEqualToString:aid] && (t == o || b == o)) { frame = CGRectMake(20, 269, 230, 44); }
if ([kIdButton isEqualToString:aid] && (l == o || r == o)) { frame = CGRectMake(330, 158 + ipadYAdj, 230, 44); }


Expand Down
84 changes: 75 additions & 9 deletions Briar/Briar/en.lproj/BrTextRelatedController.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1280</int>
<string key="IBDocument.SystemVersion">12F37</string>
<string key="IBDocument.InterfaceBuilderVersion">4510</string>
<string key="IBDocument.AppKitVersion">1187.39</string>
<string key="IBDocument.HIToolboxVersion">626.00</string>
<string key="IBDocument.SystemVersion">13B42</string>
<string key="IBDocument.InterfaceBuilderVersion">4514</string>
<string key="IBDocument.AppKitVersion">1265</string>
<string key="IBDocument.HIToolboxVersion">696.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">3742</string>
<string key="NS.object.0">3747</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBProxyObject</string>
Expand Down Expand Up @@ -42,6 +42,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 64}, {280, 30}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="333278913"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
Expand All @@ -62,6 +63,7 @@
<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
<float key="IBUIMinimumFontSize">17</float>
<object class="IBUITextInputTraits" key="IBUITextInputTraits">
<int key="IBUIAutocorrectionType">1</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="636322853">
Expand All @@ -79,6 +81,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 104}, {280, 30}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="67544275"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
Expand All @@ -96,6 +99,7 @@
<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
<float key="IBUIMinimumFontSize">17</float>
<object class="IBUITextInputTraits" key="IBUITextInputTraits">
<int key="IBUIAutocorrectionType">1</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<reference key="IBUIFontDescription" ref="636322853"/>
Expand All @@ -106,6 +110,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{40, 140}, {240, 30}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1052593444"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
Expand All @@ -128,6 +133,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{40, 178}, {240, 32}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="213579516"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
Expand All @@ -150,7 +156,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{330, 158}, {130, 44}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
Expand Down Expand Up @@ -183,6 +189,7 @@
</array>
<string key="NSFrame">{{0, 20}, {480, 251}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="710205788"/>
<reference key="IBUIBackgroundColor" ref="144198683"/>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
Expand Down Expand Up @@ -363,7 +370,66 @@
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes"/>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">BrController</string>
<string key="superclassName">UIViewController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/BrController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">BrTextRelatedController</string>
<string key="superclassName">BrController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">buttonTouched:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">buttonTouched:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">buttonTouched:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="button">UIButton</string>
<string key="textFieldBottom">UITextField</string>
<string key="textFieldTop">UITextField</string>
<string key="textViewBottom">UITextView</string>
<string key="textViewTop">UITextView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="button">
<string key="name">button</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="textFieldBottom">
<string key="name">textFieldBottom</string>
<string key="candidateClassName">UITextField</string>
</object>
<object class="IBToOneOutletInfo" key="textFieldTop">
<string key="name">textFieldTop</string>
<string key="candidateClassName">UITextField</string>
</object>
<object class="IBToOneOutletInfo" key="textViewBottom">
<string key="name">textViewBottom</string>
<string key="candidateClassName">UITextView</string>
</object>
<object class="IBToOneOutletInfo" key="textViewTop">
<string key="name">textViewTop</string>
<string key="candidateClassName">UITextView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/BrTextRelatedController.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
Expand All @@ -373,14 +439,14 @@
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<real value="1280" key="NS.object.0"/>
<real value="1296" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
<integer value="4600" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<string key="IBCocoaTouchPluginVersion">3742</string>
<string key="IBCocoaTouchPluginVersion">3747</string>
</data>
</archive>
Loading

0 comments on commit c14845e

Please sign in to comment.