From b6d90afa62a54f8becf8c9d83c2a84a2d71c0146 Mon Sep 17 00:00:00 2001 From: JayAustria Date: Mon, 6 Jul 2015 16:35:09 -0700 Subject: [PATCH 1/4] Committing progress with using nsnotification vs uitextview delgates --- src/MOAIKeyboardIOSListener.h | 13 +++ src/MOAIKeyboardIOSListener.m | 17 +++ src/moaiext-iphone/MOAIKeyboardIOS.h | 6 + src/moaiext-iphone/MOAIKeyboardIOS.mm | 103 +++++++++--------- .../libmoai/libmoai.xcodeproj/project.pbxproj | 8 ++ 5 files changed, 95 insertions(+), 52 deletions(-) create mode 100644 src/MOAIKeyboardIOSListener.h create mode 100644 src/MOAIKeyboardIOSListener.m diff --git a/src/MOAIKeyboardIOSListener.h b/src/MOAIKeyboardIOSListener.h new file mode 100644 index 0000000000..97b0ca49f0 --- /dev/null +++ b/src/MOAIKeyboardIOSListener.h @@ -0,0 +1,13 @@ +// +// MOAIKeyboardIOSListener.h +// libmoai +// +// Created by Jay Austria on 7/6/15. +// +// + +#import + +@interface MOAIKeyboardIOSListener : NSObject + +@end diff --git a/src/MOAIKeyboardIOSListener.m b/src/MOAIKeyboardIOSListener.m new file mode 100644 index 0000000000..8c04483ef1 --- /dev/null +++ b/src/MOAIKeyboardIOSListener.m @@ -0,0 +1,17 @@ +// +// MOAIKeyboardIOSListener.m +// libmoai +// +// Created by Jay Austria on 7/6/15. +// +// + +#import "MOAIKeyboardIOSListener.h" + +@implementation MOAIKeyboardIOSListener +- (void) onChanged:(NSNotification*)notification { + UNUSED (notification); + NSLog(@"Tits"); + +} +@end diff --git a/src/moaiext-iphone/MOAIKeyboardIOS.h b/src/moaiext-iphone/MOAIKeyboardIOS.h index 46f4a63e1f..8a4afcdae5 100644 --- a/src/moaiext-iphone/MOAIKeyboardIOS.h +++ b/src/moaiext-iphone/MOAIKeyboardIOS.h @@ -8,6 +8,10 @@ #import #import +@interface MOAITextFieldDelegate : NSObject < UITextFieldDelegate > +-( void ) onChanged :( NSNotification* )notification; +@end + //================================================================// // MOAIKeyboardIOS //================================================================// @@ -108,6 +112,8 @@ class MOAIKeyboardIOS : }; UITextField* mTextField; + MOAITextFieldDelegate* mListenerDelegate; + //----------------------------------------------------------------// static int _getText ( lua_State* L ); diff --git a/src/moaiext-iphone/MOAIKeyboardIOS.mm b/src/moaiext-iphone/MOAIKeyboardIOS.mm index f5c8ee2937..e9a1d6bddf 100644 --- a/src/moaiext-iphone/MOAIKeyboardIOS.mm +++ b/src/moaiext-iphone/MOAIKeyboardIOS.mm @@ -4,68 +4,65 @@ #include "pch.h" #import -//================================================================// -// MOAIGameCenterIOSLeaderboardDelegate -//================================================================// -@interface MOAITextFieldDelegate : NSObject < UITextFieldDelegate > { -@private - - NSRange mRange; -} - - //----------------------------------------------------------------// - -( void ) onChanged :( NSString* )string; - -( BOOL ) textField :( UITextField* )textField shouldChangeCharactersInRange:( NSRange )range replacementString:( NSString* )string; - -( BOOL ) textFieldShouldReturn :( UITextField* )textField; - -@end +//@interface MOAITextFieldDelegate : NSObject < UITextFieldDelegate > { +//@private +// +// //NSRange mRange; +//} +// +// //----------------------------------------------------------------// +// -( void ) onChanged :( NSNotification* )notification; +//// -( BOOL ) textField :( UITextField* )textField shouldChangeCharactersInRange:( NSRange )range replacementString:( NSString* )string; +//// -( BOOL ) textFieldShouldReturn :( UITextField* )textField; +// +//@end @implementation MOAITextFieldDelegate //----------------------------------------------------------------// - -( void ) onChanged :( NSString* )string { + -( void ) onChanged :( NSNotification* )notification { MOAILuaStateHandle state = MOAILuaRuntime::Get ().State (); MOAIKeyboardIOS& keyboard = MOAIKeyboardIOS::Get (); + UITextField* textField = (UITextField*)notification.object; + if ( keyboard.PushListener ( MOAIKeyboardIOS::EVENT_INPUT, state )) { - state.Push ( mRange.location ); - state.Push ( mRange.length ); - state.Push ([ string UTF8String ]); - state.DebugCall ( 3, 0 ); + state.Push ([ [ textField text ] UTF8String ]); + state.DebugCall ( 1, 0 ); } } - //----------------------------------------------------------------// - -( BOOL ) textField :( UITextField* )textField shouldChangeCharactersInRange:( NSRange )range replacementString:( NSString* )string { - UNUSED ( textField ); - - mRange = range; - [ self performSelector:@selector(onChanged:) withObject:string afterDelay:0.0f ]; - - return YES; - } - - //----------------------------------------------------------------// - -( BOOL ) textFieldShouldReturn :( UITextField* )textField { - UNUSED ( textField ); - - BOOL result = YES; - - MOAILuaStateHandle state = MOAILuaRuntime::Get ().State (); - MOAIKeyboardIOS& keyboard = MOAIKeyboardIOS::Get (); - - if ( keyboard.PushListener ( MOAIKeyboardIOS::EVENT_RETURN, state )) { - state.DebugCall ( 0, 1 ); - result = state.GetValue < bool >( -1, true ); - } - - if ( result ) { - keyboard.Finish (); - } - - return result; - } +// //----------------------------------------------------------------// +// -( BOOL ) textField :( UITextField* )textField shouldChangeCharactersInRange:( NSRange )range replacementString:( NSString* )string { +// UNUSED ( textField ); +// +// mRange = range; +// [ self performSelector:@selector(onChanged:) withObject:string afterDelay:0.0f ]; +// +// return YES; +// } +// +// //----------------------------------------------------------------// +// -( BOOL ) textFieldShouldReturn :( UITextField* )textField { +// UNUSED ( textField ); +// +// BOOL result = YES; +// +// MOAILuaStateHandle state = MOAILuaRuntime::Get ().State (); +// MOAIKeyboardIOS& keyboard = MOAIKeyboardIOS::Get (); +// +// if ( keyboard.PushListener ( MOAIKeyboardIOS::EVENT_RETURN, state )) { +// state.DebugCall ( 0, 1 ); +// result = state.GetValue < bool >( -1, true ); +// } +// +// if ( result ) { +// keyboard.Finish (); +// } +// +// return result; +// } @end @@ -213,12 +210,14 @@ -( BOOL ) textFieldShouldReturn :( UITextField* )textField { CGRect frame = CGRectMake ( 0, 0, 320, 24 ); this->mTextField = [[ UITextField alloc ] initWithFrame:frame ]; - [ this->mTextField setDelegate:[[ MOAITextFieldDelegate alloc ] init ]]; + //[ this->mTextField setDelegate:[[ MOAITextFieldDelegate alloc ] init ]]; + this->mListenerDelegate = [[ MOAITextFieldDelegate alloc ] init ]; + [[NSNotificationCenter defaultCenter] addObserver:this->mListenerDelegate selector:@selector(onChanged:) name:UITextFieldTextDidChangeNotification object:this->mTextField]; [ window addSubview:this->mTextField ]; } - [ this->mTextField setHidden:YES ]; + //[ this->mTextField setHidden:YES ]; [ this->mTextField setText:[ NSString stringWithUTF8String:text ]]; [ this->mTextField setAutocapitalizationType:( UITextAutocapitalizationType )autocap ]; diff --git a/xcode/libmoai/libmoai.xcodeproj/project.pbxproj b/xcode/libmoai/libmoai.xcodeproj/project.pbxproj index 8725347e4c..5bd7319a1e 100644 --- a/xcode/libmoai/libmoai.xcodeproj/project.pbxproj +++ b/xcode/libmoai/libmoai.xcodeproj/project.pbxproj @@ -937,6 +937,8 @@ 66459FBB1511641F0075BF13 /* MOAIAudioSampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66459FB81511641F0075BF13 /* MOAIAudioSampler.cpp */; }; 66459FBC1511641F0075BF13 /* MOAIAudioSampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 66459FB91511641F0075BF13 /* MOAIAudioSampler.h */; }; 66459FBD1511641F0075BF13 /* MOAIAudioSampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 66459FB91511641F0075BF13 /* MOAIAudioSampler.h */; }; + 665A0DEB1B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 665A0DE91B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.h */; }; + 665A0DEC1B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 665A0DEA1B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.m */; }; 667AE73A154A09CA00CCE42D /* MOAIFoo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 667AE739154A09CA00CCE42D /* MOAIFoo.cpp */; }; 667AE73B154A09CA00CCE42D /* MOAIFoo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 667AE739154A09CA00CCE42D /* MOAIFoo.cpp */; }; 667AE73D154A0CAD00CCE42D /* MOAIFooMgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 667AE73C154A0CAD00CCE42D /* MOAIFooMgr.cpp */; }; @@ -2669,6 +2671,8 @@ 66459FB31511638B0075BF13 /* AKU-audiosampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "AKU-audiosampler.cpp"; sourceTree = ""; }; 66459FB81511641F0075BF13 /* MOAIAudioSampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MOAIAudioSampler.cpp; sourceTree = ""; }; 66459FB91511641F0075BF13 /* MOAIAudioSampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MOAIAudioSampler.h; sourceTree = ""; }; + 665A0DE91B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MOAIKeyboardIOSListener.h; sourceTree = ""; }; + 665A0DEA1B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MOAIKeyboardIOSListener.m; sourceTree = ""; }; 667AE739154A09CA00CCE42D /* MOAIFoo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MOAIFoo.cpp; sourceTree = ""; }; 667AE73C154A0CAD00CCE42D /* MOAIFooMgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MOAIFooMgr.cpp; sourceTree = ""; }; 668E165714887A0A00897ED6 /* MOAIWheelSensor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MOAIWheelSensor.cpp; sourceTree = ""; }; @@ -4960,6 +4964,8 @@ E9CA1E58151C8578005F39B7 /* MOAIWebViewIOS.h */, E9CA1E59151C8578005F39B7 /* MOAIWebViewIOS.mm */, CDD06ECA1398BA6200AB0420 /* moaiext-iphone.h */, + 665A0DE91B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.h */, + 665A0DEA1B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.m */, ); name = "moaiext-iphone"; sourceTree = ""; @@ -6008,6 +6014,7 @@ F055A97F1846AD470031F295 /* ldo.h in Headers */, F055A9651846ACA90031F295 /* sha_locl.h in Headers */, F055A94B1846ABF40031F295 /* sha.h in Headers */, + 665A0DEB1B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.h in Headers */, 0324E69513564BC8000ADC60 /* AKU.h in Headers */, E9A41A95151A61A200650276 /* USRhombus.h in Headers */, 0324E69913564BC8000ADC60 /* pch.h in Headers */, @@ -7412,6 +7419,7 @@ E9C4062D151861A700C7AB04 /* MOAIGlyphCacheBase.cpp in Sources */, E9C4062E151861A700C7AB04 /* MOAIGlyphCachePage.cpp in Sources */, E9C4062B1518616F00C7AB04 /* MOAITextDesigner.cpp in Sources */, + 665A0DEC1B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.m in Sources */, E9C4062A1518615A00C7AB04 /* MOAIGlyphSet.cpp in Sources */, E9C406281518614200C7AB04 /* MOAITextureBase.cpp in Sources */, 0324E69413564BC8000ADC60 /* AKU.cpp in Sources */, From bf795db59fd21dd002370bb1360c84212852b9cc Mon Sep 17 00:00:00 2001 From: JayAustria Date: Thu, 9 Jul 2015 11:30:38 -0700 Subject: [PATCH 2/4] Checking in progress on keyboard research --- src/moaiext-iphone/MOAIKeyboardIOS.h | 35 +++++- src/moaiext-iphone/MOAIKeyboardIOS.mm | 152 +++++++++++++++++--------- 2 files changed, 130 insertions(+), 57 deletions(-) diff --git a/src/moaiext-iphone/MOAIKeyboardIOS.h b/src/moaiext-iphone/MOAIKeyboardIOS.h index 8a4afcdae5..31eaea07ea 100644 --- a/src/moaiext-iphone/MOAIKeyboardIOS.h +++ b/src/moaiext-iphone/MOAIKeyboardIOS.h @@ -8,8 +8,27 @@ #import #import -@interface MOAITextFieldDelegate : NSObject < UITextFieldDelegate > --( void ) onChanged :( NSNotification* )notification; +@interface MOAIKeyboardIOSEventListener : NSObject { + +} +- ( void ) keyboardDidShow :(NSNotification*)notification; +@end + +//================================================================// +// MOAITextFieldDelegate +//================================================================// +@interface MOAITextFieldDelegate : NSObject < UITextFieldDelegate > { +@private + + NSRange mRange; +} + +//----------------------------------------------------------------// +-( void ) onChanged :( NSString* )string; +-( BOOL ) textField :( UITextField* )textField shouldChangeCharactersInRange:( NSRange )range replacementString:( NSString* )string; +-( BOOL ) textFieldShouldReturn :( UITextField* )textField; +-( BOOL ) textFieldShouldEndEditing :(UITextField *)textField; + @end //================================================================// @@ -50,6 +69,7 @@ @const EVENT_INPUT @const EVENT_RETURN + @const EVENT_SHOW @const AUTOCAP_ALL @const AUTOCAP_NONE @@ -111,16 +131,20 @@ class MOAIKeyboardIOS : RETURN_KEY_SEND = UIReturnKeySend, }; - UITextField* mTextField; - MOAITextFieldDelegate* mListenerDelegate; - + UITextField* mTextField; + MOAITextFieldDelegate* mDelegate; + MOAIKeyboardIOSEventListener* mListener; //----------------------------------------------------------------// static int _getText ( lua_State* L ); static int _showKeyboard ( lua_State* L ); + static int _hideKeyboard ( lua_State* L ); + static int _resetText ( lua_State* L ); //----------------------------------------------------------------// void ShowKeyboard ( cc8* text, int type, int returnKey, bool secure, int autocap, int appearance ); + void ResetText (); + void KeyboardDidShow (NSNotification* notification); public: @@ -129,6 +153,7 @@ class MOAIKeyboardIOS : enum { EVENT_INPUT, EVENT_RETURN, + EVENT_SHOW }; //----------------------------------------------------------------// diff --git a/src/moaiext-iphone/MOAIKeyboardIOS.mm b/src/moaiext-iphone/MOAIKeyboardIOS.mm index e9a1d6bddf..ca869279a0 100644 --- a/src/moaiext-iphone/MOAIKeyboardIOS.mm +++ b/src/moaiext-iphone/MOAIKeyboardIOS.mm @@ -4,66 +4,73 @@ #include "pch.h" #import -//@interface MOAITextFieldDelegate : NSObject < UITextFieldDelegate > { -//@private -// -// //NSRange mRange; -//} -// -// //----------------------------------------------------------------// -// -( void ) onChanged :( NSNotification* )notification; -//// -( BOOL ) textField :( UITextField* )textField shouldChangeCharactersInRange:( NSRange )range replacementString:( NSString* )string; -//// -( BOOL ) textFieldShouldReturn :( UITextField* )textField; -// -//@end +@implementation MOAIKeyboardIOSEventListener + - (void) keyboardDidShow:(NSNotification*)notification { + CGFloat height = [[notification.userInfo objectForKey:UIKeyboardFrameBeginUserInfoKey] CGRectValue].size.height; + + MOAILuaStateHandle state = MOAILuaRuntime::Get ().State (); + MOAIKeyboardIOS& keyboard = MOAIKeyboardIOS::Get (); + + if ( keyboard.PushListener ( MOAIKeyboardIOS::EVENT_SHOW, state )) { + state.Push ( height ); + state.DebugCall ( 1, 0 ); + } + + } +@end @implementation MOAITextFieldDelegate //----------------------------------------------------------------// - -( void ) onChanged :( NSNotification* )notification { + -( void ) onChanged :( NSString* )string { MOAILuaStateHandle state = MOAILuaRuntime::Get ().State (); MOAIKeyboardIOS& keyboard = MOAIKeyboardIOS::Get (); - UITextField* textField = (UITextField*)notification.object; - if ( keyboard.PushListener ( MOAIKeyboardIOS::EVENT_INPUT, state )) { - state.Push ([ [ textField text ] UTF8String ]); - state.DebugCall ( 1, 0 ); + state.Push ( mRange.location ); + state.Push ( mRange.length ); + state.Push ([ string UTF8String ]); + state.DebugCall ( 3, 0 ); } } -// //----------------------------------------------------------------// -// -( BOOL ) textField :( UITextField* )textField shouldChangeCharactersInRange:( NSRange )range replacementString:( NSString* )string { -// UNUSED ( textField ); -// -// mRange = range; -// [ self performSelector:@selector(onChanged:) withObject:string afterDelay:0.0f ]; -// -// return YES; -// } -// -// //----------------------------------------------------------------// -// -( BOOL ) textFieldShouldReturn :( UITextField* )textField { -// UNUSED ( textField ); -// -// BOOL result = YES; -// -// MOAILuaStateHandle state = MOAILuaRuntime::Get ().State (); -// MOAIKeyboardIOS& keyboard = MOAIKeyboardIOS::Get (); -// -// if ( keyboard.PushListener ( MOAIKeyboardIOS::EVENT_RETURN, state )) { -// state.DebugCall ( 0, 1 ); -// result = state.GetValue < bool >( -1, true ); -// } -// -// if ( result ) { -// keyboard.Finish (); -// } -// -// return result; -// } + //----------------------------------------------------------------// + -( BOOL ) textField :( UITextField* )textField shouldChangeCharactersInRange:( NSRange )range replacementString:( NSString* )string { + UNUSED ( textField ); + + mRange = range; + [ self performSelector:@selector(onChanged:) withObject:string afterDelay:0.0f ]; + + return YES; + } + + //----------------------------------------------------------------// + -( BOOL ) textFieldShouldReturn :( UITextField* )textField { + UNUSED ( textField ); + + BOOL result = YES; + + MOAILuaStateHandle state = MOAILuaRuntime::Get ().State (); + MOAIKeyboardIOS& keyboard = MOAIKeyboardIOS::Get (); + + if ( keyboard.PushListener ( MOAIKeyboardIOS::EVENT_RETURN, state )) { + state.DebugCall ( 0, 1 ); + result = state.GetValue < bool >( -1, true ); + } + + if ( result ) { + keyboard.Finish (); + } + + return result; + } + + -( BOOL ) textFieldShouldEndEditing:(UITextField *)textField { + UNUSED (textField); + return NO; + } @end //================================================================// @@ -118,6 +125,27 @@ -( void ) onChanged :( NSNotification* )notification { return 0; } +//----------------------------------------------------------------// +/** @name hideKeyboard + @text Hide the native software keyboard. + + @out nil + */ +int MOAIKeyboardIOS::_hideKeyboard ( lua_State* L ) { + UNUSED (L); + + MOAIKeyboardIOS::Get ().Finish(); + return 0; +} + +int MOAIKeyboardIOS::_resetText ( lua_State* L ) { + UNUSED (L); + + MOAIKeyboardIOS::Get ().ResetText (); + + return 0; +} + //================================================================// // MOAIKeyboardIOS //================================================================// @@ -164,6 +192,7 @@ -( void ) onChanged :( NSNotification* )notification { state.SetField ( -1, "EVENT_INPUT", ( u32 )EVENT_INPUT ); state.SetField ( -1, "EVENT_RETURN", ( u32 )EVENT_RETURN ); + state.SetField ( -1, "EVENT_SHOW", ( u32 )EVENT_SHOW ); state.SetField ( -1, "AUTOCAP_ALL", ( u32 )AUTOCAP_ALL ); state.SetField ( -1, "AUTOCAP_NONE", ( u32 )AUTOCAP_NONE ); @@ -196,6 +225,8 @@ -( void ) onChanged :( NSNotification* )notification { { "getText", _getText }, { "setListener", &MOAIGlobalEventSource::_setListener < MOAIKeyboardIOS > }, { "showKeyboard", _showKeyboard }, + { "hideKeyboard", _hideKeyboard }, + { "resetText", _resetText }, { NULL, NULL } }; @@ -208,16 +239,20 @@ -( void ) onChanged :( NSNotification* )notification { if ( !this->mTextField ) { UIWindow* window = [[ UIApplication sharedApplication ] keyWindow ]; + this->mDelegate = [[ MOAITextFieldDelegate alloc ] init ]; + CGRect frame = CGRectMake ( 0, 0, 320, 24 ); this->mTextField = [[ UITextField alloc ] initWithFrame:frame ]; - //[ this->mTextField setDelegate:[[ MOAITextFieldDelegate alloc ] init ]]; - this->mListenerDelegate = [[ MOAITextFieldDelegate alloc ] init ]; - [[NSNotificationCenter defaultCenter] addObserver:this->mListenerDelegate selector:@selector(onChanged:) name:UITextFieldTextDidChangeNotification object:this->mTextField]; + [ this->mTextField setDelegate:this->mDelegate ]; [ window addSubview:this->mTextField ]; } - //[ this->mTextField setHidden:YES ]; + if ( !this->mListener) { + this->mListener = [[MOAIKeyboardIOSEventListener alloc] init]; + } + + [ this->mTextField setHidden:YES ]; [ this->mTextField setText:[ NSString stringWithUTF8String:text ]]; [ this->mTextField setAutocapitalizationType:( UITextAutocapitalizationType )autocap ]; @@ -230,4 +265,17 @@ -( void ) onChanged :( NSNotification* )notification { [ this->mTextField setSecureTextEntry:secure ]; [ this->mTextField becomeFirstResponder ]; -} \ No newline at end of file + + + [[NSNotificationCenter defaultCenter] addObserver:this->mListener selector:@selector(keyboardDidShow:) + name:UIKeyboardDidShowNotification object:nil]; +} + +void MOAIKeyboardIOS::ResetText () { + [this->mTextField setText:@""]; +} + +void MOAIKeyboardIOS::KeyboardDidShow (NSNotification* notification) +{ + UNUSED (notification); +} From 21f4e1f9e95f38c66c7a229887ddc384fe54045d Mon Sep 17 00:00:00 2001 From: JayAustria Date: Thu, 9 Jul 2015 11:39:24 -0700 Subject: [PATCH 3/4] Removing accidentally checked in files --- src/MOAIKeyboardIOSListener.h | 13 ------------- src/MOAIKeyboardIOSListener.m | 17 ----------------- 2 files changed, 30 deletions(-) delete mode 100644 src/MOAIKeyboardIOSListener.h delete mode 100644 src/MOAIKeyboardIOSListener.m diff --git a/src/MOAIKeyboardIOSListener.h b/src/MOAIKeyboardIOSListener.h deleted file mode 100644 index 97b0ca49f0..0000000000 --- a/src/MOAIKeyboardIOSListener.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// MOAIKeyboardIOSListener.h -// libmoai -// -// Created by Jay Austria on 7/6/15. -// -// - -#import - -@interface MOAIKeyboardIOSListener : NSObject - -@end diff --git a/src/MOAIKeyboardIOSListener.m b/src/MOAIKeyboardIOSListener.m deleted file mode 100644 index 8c04483ef1..0000000000 --- a/src/MOAIKeyboardIOSListener.m +++ /dev/null @@ -1,17 +0,0 @@ -// -// MOAIKeyboardIOSListener.m -// libmoai -// -// Created by Jay Austria on 7/6/15. -// -// - -#import "MOAIKeyboardIOSListener.h" - -@implementation MOAIKeyboardIOSListener -- (void) onChanged:(NSNotification*)notification { - UNUSED (notification); - NSLog(@"Tits"); - -} -@end From d844f0d7704c593886f9ed70b4bb260903d54ab4 Mon Sep 17 00:00:00 2001 From: JayAustria Date: Thu, 9 Jul 2015 11:41:33 -0700 Subject: [PATCH 4/4] Revering changed project file which included the addition of accidentally checked in files --- xcode/libmoai/libmoai.xcodeproj/project.pbxproj | 8 -------- 1 file changed, 8 deletions(-) diff --git a/xcode/libmoai/libmoai.xcodeproj/project.pbxproj b/xcode/libmoai/libmoai.xcodeproj/project.pbxproj index 5bd7319a1e..8725347e4c 100644 --- a/xcode/libmoai/libmoai.xcodeproj/project.pbxproj +++ b/xcode/libmoai/libmoai.xcodeproj/project.pbxproj @@ -937,8 +937,6 @@ 66459FBB1511641F0075BF13 /* MOAIAudioSampler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 66459FB81511641F0075BF13 /* MOAIAudioSampler.cpp */; }; 66459FBC1511641F0075BF13 /* MOAIAudioSampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 66459FB91511641F0075BF13 /* MOAIAudioSampler.h */; }; 66459FBD1511641F0075BF13 /* MOAIAudioSampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 66459FB91511641F0075BF13 /* MOAIAudioSampler.h */; }; - 665A0DEB1B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 665A0DE91B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.h */; }; - 665A0DEC1B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 665A0DEA1B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.m */; }; 667AE73A154A09CA00CCE42D /* MOAIFoo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 667AE739154A09CA00CCE42D /* MOAIFoo.cpp */; }; 667AE73B154A09CA00CCE42D /* MOAIFoo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 667AE739154A09CA00CCE42D /* MOAIFoo.cpp */; }; 667AE73D154A0CAD00CCE42D /* MOAIFooMgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 667AE73C154A0CAD00CCE42D /* MOAIFooMgr.cpp */; }; @@ -2671,8 +2669,6 @@ 66459FB31511638B0075BF13 /* AKU-audiosampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "AKU-audiosampler.cpp"; sourceTree = ""; }; 66459FB81511641F0075BF13 /* MOAIAudioSampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MOAIAudioSampler.cpp; sourceTree = ""; }; 66459FB91511641F0075BF13 /* MOAIAudioSampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MOAIAudioSampler.h; sourceTree = ""; }; - 665A0DE91B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MOAIKeyboardIOSListener.h; sourceTree = ""; }; - 665A0DEA1B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MOAIKeyboardIOSListener.m; sourceTree = ""; }; 667AE739154A09CA00CCE42D /* MOAIFoo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MOAIFoo.cpp; sourceTree = ""; }; 667AE73C154A0CAD00CCE42D /* MOAIFooMgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MOAIFooMgr.cpp; sourceTree = ""; }; 668E165714887A0A00897ED6 /* MOAIWheelSensor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MOAIWheelSensor.cpp; sourceTree = ""; }; @@ -4964,8 +4960,6 @@ E9CA1E58151C8578005F39B7 /* MOAIWebViewIOS.h */, E9CA1E59151C8578005F39B7 /* MOAIWebViewIOS.mm */, CDD06ECA1398BA6200AB0420 /* moaiext-iphone.h */, - 665A0DE91B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.h */, - 665A0DEA1B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.m */, ); name = "moaiext-iphone"; sourceTree = ""; @@ -6014,7 +6008,6 @@ F055A97F1846AD470031F295 /* ldo.h in Headers */, F055A9651846ACA90031F295 /* sha_locl.h in Headers */, F055A94B1846ABF40031F295 /* sha.h in Headers */, - 665A0DEB1B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.h in Headers */, 0324E69513564BC8000ADC60 /* AKU.h in Headers */, E9A41A95151A61A200650276 /* USRhombus.h in Headers */, 0324E69913564BC8000ADC60 /* pch.h in Headers */, @@ -7419,7 +7412,6 @@ E9C4062D151861A700C7AB04 /* MOAIGlyphCacheBase.cpp in Sources */, E9C4062E151861A700C7AB04 /* MOAIGlyphCachePage.cpp in Sources */, E9C4062B1518616F00C7AB04 /* MOAITextDesigner.cpp in Sources */, - 665A0DEC1B4B3F4B008ACFEE /* MOAIKeyboardIOSListener.m in Sources */, E9C4062A1518615A00C7AB04 /* MOAIGlyphSet.cpp in Sources */, E9C406281518614200C7AB04 /* MOAITextureBase.cpp in Sources */, 0324E69413564BC8000ADC60 /* AKU.cpp in Sources */,