From 642804ba0e1cf7ca90f701d4a0f9de2841ef000f Mon Sep 17 00:00:00 2001 From: giomfo Date: Thu, 12 Feb 2015 14:57:24 +0100 Subject: [PATCH] Console: Rename RageShakableTableViewController to MXCTableViewController, and RageShakableViewController to MXCViewController. --- matrixConsole.xcodeproj/project.pbxproj | 24 +++++++++---------- .../AuthenticationViewController.h | 4 ++-- .../ContactDetailsViewController.h | 4 ++-- .../ViewController/ContactsViewController.h | 4 ++-- .../ViewController/HomeViewController.h | 4 ++-- ...wController.h => MXCTableViewController.h} | 8 ++++++- ...wController.m => MXCTableViewController.m} | 9 +++---- ...leViewController.h => MXCViewController.h} | 8 ++++++- ...leViewController.m => MXCViewController.m} | 9 +++---- .../ViewController/MemberViewController.h | 4 ++-- .../ViewController/RecentsViewController.h | 4 ++-- .../ViewController/RoomViewController.h | 4 ++-- .../ViewController/SettingsViewController.h | 4 ++-- 13 files changed, 52 insertions(+), 38 deletions(-) rename matrixConsole/ViewController/{RageShakableViewController.h => MXCTableViewController.h} (71%) rename matrixConsole/ViewController/{RageShakableViewController.m => MXCTableViewController.m} (95%) rename matrixConsole/ViewController/{RageShakableTableViewController.h => MXCViewController.h} (73%) rename matrixConsole/ViewController/{RageShakableTableViewController.m => MXCViewController.m} (95%) diff --git a/matrixConsole.xcodeproj/project.pbxproj b/matrixConsole.xcodeproj/project.pbxproj index a652b43df..0add2a161 100644 --- a/matrixConsole.xcodeproj/project.pbxproj +++ b/matrixConsole.xcodeproj/project.pbxproj @@ -8,9 +8,9 @@ /* Begin PBXBuildFile section */ 3198D9E11A68338B00556695 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3198D9E31A68338B00556695 /* Localizable.strings */; }; - 710CA4BF1A7FBEDB00EEFB96 /* RageShakableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 710CA4BE1A7FBEDB00EEFB96 /* RageShakableViewController.m */; }; + 710CA4BF1A7FBEDB00EEFB96 /* MXCViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 710CA4BE1A7FBEDB00EEFB96 /* MXCViewController.m */; }; 710CA4C21A7FBFED00EEFB96 /* RageShakableUIResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = 710CA4C11A7FBFED00EEFB96 /* RageShakableUIResponder.m */; }; - 710CA4C51A7FC27100EEFB96 /* RageShakableTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 710CA4C41A7FC27100EEFB96 /* RageShakableTableViewController.m */; }; + 710CA4C51A7FC27100EEFB96 /* MXCTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 710CA4C41A7FC27100EEFB96 /* MXCTableViewController.m */; }; 710CC3BF1A6E9F14006EE973 /* matrixUser.png in Resources */ = {isa = PBXBuildFile; fileRef = 710CC3BE1A6E9F14006EE973 /* matrixUser.png */; }; 710CC3C21A70F28F006EE973 /* MXCContactField.m in Sources */ = {isa = PBXBuildFile; fileRef = 710CC3C11A70F28F006EE973 /* MXCContactField.m */; }; 71193D241A6D64F900E59A9E /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71193D231A6D64F900E59A9E /* AddressBook.framework */; }; @@ -91,12 +91,12 @@ /* Begin PBXFileReference section */ 13057A57E74FD5504196F47F /* Pods-matrixConsole.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-matrixConsole.release.xcconfig"; path = "Pods/Target Support Files/Pods-matrixConsole/Pods-matrixConsole.release.xcconfig"; sourceTree = ""; }; 3198D9E21A68338B00556695 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; - 710CA4BD1A7FBEDB00EEFB96 /* RageShakableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RageShakableViewController.h; sourceTree = ""; }; - 710CA4BE1A7FBEDB00EEFB96 /* RageShakableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RageShakableViewController.m; sourceTree = ""; }; + 710CA4BD1A7FBEDB00EEFB96 /* MXCViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXCViewController.h; sourceTree = ""; }; + 710CA4BE1A7FBEDB00EEFB96 /* MXCViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXCViewController.m; sourceTree = ""; }; 710CA4C01A7FBFED00EEFB96 /* RageShakableUIResponder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RageShakableUIResponder.h; sourceTree = ""; }; 710CA4C11A7FBFED00EEFB96 /* RageShakableUIResponder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RageShakableUIResponder.m; sourceTree = ""; }; - 710CA4C31A7FC27100EEFB96 /* RageShakableTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RageShakableTableViewController.h; sourceTree = ""; }; - 710CA4C41A7FC27100EEFB96 /* RageShakableTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RageShakableTableViewController.m; sourceTree = ""; }; + 710CA4C31A7FC27100EEFB96 /* MXCTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXCTableViewController.h; sourceTree = ""; }; + 710CA4C41A7FC27100EEFB96 /* MXCTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXCTableViewController.m; sourceTree = ""; }; 710CC3BE1A6E9F14006EE973 /* matrixUser.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = matrixUser.png; sourceTree = ""; }; 710CC3C01A70F28F006EE973 /* MXCContactField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXCContactField.h; sourceTree = ""; }; 710CC3C11A70F28F006EE973 /* MXCContactField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXCContactField.m; sourceTree = ""; }; @@ -314,10 +314,10 @@ F03EF5EF19F171EB00A0EE52 /* MasterTabBarController.m */, 71DB9DBF1A495B6400504A09 /* MemberViewController.h */, 71DB9DC01A495B6400504A09 /* MemberViewController.m */, - 710CA4C31A7FC27100EEFB96 /* RageShakableTableViewController.h */, - 710CA4C41A7FC27100EEFB96 /* RageShakableTableViewController.m */, - 710CA4BD1A7FBEDB00EEFB96 /* RageShakableViewController.h */, - 710CA4BE1A7FBEDB00EEFB96 /* RageShakableViewController.m */, + 710CA4C31A7FC27100EEFB96 /* MXCTableViewController.h */, + 710CA4C41A7FC27100EEFB96 /* MXCTableViewController.m */, + 710CA4BD1A7FBEDB00EEFB96 /* MXCViewController.h */, + 710CA4BE1A7FBEDB00EEFB96 /* MXCViewController.m */, F03EF5F019F171EB00A0EE52 /* RecentsViewController.h */, F03EF5F119F171EB00A0EE52 /* RecentsViewController.m */, F03EF5F219F171EB00A0EE52 /* RoomViewController.h */, @@ -611,7 +611,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 710CA4BF1A7FBEDB00EEFB96 /* RageShakableViewController.m in Sources */, + 710CA4BF1A7FBEDB00EEFB96 /* MXCViewController.m in Sources */, 7176294F1A77FED800927125 /* ContactDetailsTableCell.m in Sources */, F04A8AD81A3B3DF4008AC915 /* RoomTitleView.m in Sources */, F07A80DB19DD9DE700B621A1 /* AppDelegate.m in Sources */, @@ -630,7 +630,7 @@ F03EF5FA19F171EB00A0EE52 /* RoomViewController.m in Sources */, F03EF5F819F171EB00A0EE52 /* MasterTabBarController.m in Sources */, 710CA4C21A7FBFED00EEFB96 /* RageShakableUIResponder.m in Sources */, - 710CA4C51A7FC27100EEFB96 /* RageShakableTableViewController.m in Sources */, + 710CA4C51A7FC27100EEFB96 /* MXCTableViewController.m in Sources */, F03EF5F619F171EB00A0EE52 /* HomeViewController.m in Sources */, 71DB9DC11A495B6400504A09 /* MemberViewController.m in Sources */, F0CA8D3D1A80DE08004320A4 /* EventDetailsView.m in Sources */, diff --git a/matrixConsole/ViewController/AuthenticationViewController.h b/matrixConsole/ViewController/AuthenticationViewController.h index db16ab24b..ab8527797 100644 --- a/matrixConsole/ViewController/AuthenticationViewController.h +++ b/matrixConsole/ViewController/AuthenticationViewController.h @@ -14,11 +14,11 @@ limitations under the License. */ -#import "RageShakableViewController.h" +#import "MXCViewController.h" #import "AuthInputsView.h" -@interface AuthenticationViewController : RageShakableViewController +@interface AuthenticationViewController : MXCViewController @end diff --git a/matrixConsole/ViewController/ContactDetailsViewController.h b/matrixConsole/ViewController/ContactDetailsViewController.h index 2e95563f9..735b75bc0 100644 --- a/matrixConsole/ViewController/ContactDetailsViewController.h +++ b/matrixConsole/ViewController/ContactDetailsViewController.h @@ -14,11 +14,11 @@ limitations under the License. */ -#import "RageShakableTableViewController.h" +#import "MXCTableViewController.h" #import "MXCContact.h" -@interface ContactDetailsViewController : RageShakableTableViewController +@interface ContactDetailsViewController : MXCTableViewController @property (strong, nonatomic) MXCContact* contact; @end diff --git a/matrixConsole/ViewController/ContactsViewController.h b/matrixConsole/ViewController/ContactsViewController.h index 507b661e9..aebb0e937 100644 --- a/matrixConsole/ViewController/ContactsViewController.h +++ b/matrixConsole/ViewController/ContactsViewController.h @@ -14,7 +14,7 @@ limitations under the License. */ -#import "RageShakableViewController.h" +#import "MXCViewController.h" // SMS #import @@ -22,7 +22,7 @@ #import "SectionedContacts.h" -@interface ContactsViewController : RageShakableViewController { +@interface ContactsViewController : MXCViewController { NSArray* collationTitles; } diff --git a/matrixConsole/ViewController/HomeViewController.h b/matrixConsole/ViewController/HomeViewController.h index 086f1d50e..fc11f089c 100644 --- a/matrixConsole/ViewController/HomeViewController.h +++ b/matrixConsole/ViewController/HomeViewController.h @@ -14,9 +14,9 @@ limitations under the License. */ -#import "RageShakableTableViewController.h" +#import "MXCTableViewController.h" -@interface HomeViewController : RageShakableTableViewController +@interface HomeViewController : MXCTableViewController @end diff --git a/matrixConsole/ViewController/RageShakableViewController.h b/matrixConsole/ViewController/MXCTableViewController.h similarity index 71% rename from matrixConsole/ViewController/RageShakableViewController.h rename to matrixConsole/ViewController/MXCTableViewController.h index e822dc0ec..149c2d6ac 100644 --- a/matrixConsole/ViewController/RageShakableViewController.h +++ b/matrixConsole/ViewController/MXCTableViewController.h @@ -18,7 +18,13 @@ #import "AFNetworkReachabilityManager.h" -@interface RageShakableViewController : UIViewController +/** + * MXCTableViewController extends UITableViewController for the following points: + * - support rage shake mechanism + * - update navigation bar tintColor according to network reachability + */ + +@interface MXCTableViewController : UITableViewController @end diff --git a/matrixConsole/ViewController/RageShakableViewController.m b/matrixConsole/ViewController/MXCTableViewController.m similarity index 95% rename from matrixConsole/ViewController/RageShakableViewController.m rename to matrixConsole/ViewController/MXCTableViewController.m index 2dd356435..9ac407b41 100644 --- a/matrixConsole/ViewController/RageShakableViewController.m +++ b/matrixConsole/ViewController/MXCTableViewController.m @@ -13,16 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. */ -#import "RageShakableViewController.h" +#import "MXCTableViewController.h" #import "RageShakableUIResponder.h" -@interface RageShakableViewController () { +@interface MXCTableViewController () { id reachabilityObserver; } @end -@implementation RageShakableViewController +@implementation MXCTableViewController - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; @@ -82,7 +82,8 @@ } } -#pragma mark - rageshake : screenshot +#pragma mark - Rage shake handling + - (void)motionBegan:(UIEventSubtype)motion withEvent:(UIEvent *)event { if (motion == UIEventSubtypeMotionShake) { [RageShakableUIResponder startShaking:self]; diff --git a/matrixConsole/ViewController/RageShakableTableViewController.h b/matrixConsole/ViewController/MXCViewController.h similarity index 73% rename from matrixConsole/ViewController/RageShakableTableViewController.h rename to matrixConsole/ViewController/MXCViewController.h index 839b9f225..2d985ae62 100644 --- a/matrixConsole/ViewController/RageShakableTableViewController.h +++ b/matrixConsole/ViewController/MXCViewController.h @@ -18,7 +18,13 @@ #import "AFNetworkReachabilityManager.h" -@interface RageShakableTableViewController : UITableViewController +/** + * MXCViewController extends UIViewController for the following points: + * - support rage shake mechanism + * - update navigation bar tintColor according to network reachability + */ + +@interface MXCViewController : UIViewController @end diff --git a/matrixConsole/ViewController/RageShakableTableViewController.m b/matrixConsole/ViewController/MXCViewController.m similarity index 95% rename from matrixConsole/ViewController/RageShakableTableViewController.m rename to matrixConsole/ViewController/MXCViewController.m index b64cb3dc5..42a4cbd75 100644 --- a/matrixConsole/ViewController/RageShakableTableViewController.m +++ b/matrixConsole/ViewController/MXCViewController.m @@ -13,16 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. */ -#import "RageShakableTableViewController.h" +#import "MXCViewController.h" #import "RageShakableUIResponder.h" -@interface RageShakableTableViewController () { +@interface MXCViewController () { id reachabilityObserver; } @end -@implementation RageShakableTableViewController +@implementation MXCViewController - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; @@ -82,7 +82,8 @@ } } -#pragma mark - rageshake : screenshot +#pragma mark - Rage shake handling + - (void)motionBegan:(UIEventSubtype)motion withEvent:(UIEvent *)event { if (motion == UIEventSubtypeMotionShake) { [RageShakableUIResponder startShaking:self]; diff --git a/matrixConsole/ViewController/MemberViewController.h b/matrixConsole/ViewController/MemberViewController.h index 140718291..0e5b3c700 100644 --- a/matrixConsole/ViewController/MemberViewController.h +++ b/matrixConsole/ViewController/MemberViewController.h @@ -14,11 +14,11 @@ limitations under the License. */ -#import "RageShakableTableViewController.h" +#import "MXCTableViewController.h" #import "MatrixSDKHandler.h" -@interface MemberViewController : RageShakableTableViewController +@interface MemberViewController : MXCTableViewController @property (strong, nonatomic) MXRoomMember *mxRoomMember; @property (strong, nonatomic) MXRoom *mxRoom; diff --git a/matrixConsole/ViewController/RecentsViewController.h b/matrixConsole/ViewController/RecentsViewController.h index dbb7523db..b05a5187e 100644 --- a/matrixConsole/ViewController/RecentsViewController.h +++ b/matrixConsole/ViewController/RecentsViewController.h @@ -14,11 +14,11 @@ limitations under the License. */ -#import "RageShakableTableViewController.h" +#import "MXCTableViewController.h" @class RoomViewController; -@interface RecentsViewController : RageShakableTableViewController +@interface RecentsViewController : MXCTableViewController @property (strong, nonatomic) NSString *preSelectedRoomId; // set a non-nil value to this property will open room details diff --git a/matrixConsole/ViewController/RoomViewController.h b/matrixConsole/ViewController/RoomViewController.h index ef99d3f66..08059ef62 100644 --- a/matrixConsole/ViewController/RoomViewController.h +++ b/matrixConsole/ViewController/RoomViewController.h @@ -14,11 +14,11 @@ limitations under the License. */ -#import "RageShakableViewController.h" +#import "MXCViewController.h" #import "HPGrowingTextView.h" -@interface RoomViewController : RageShakableViewController +@interface RoomViewController : MXCViewController @property (strong, nonatomic) NSString *roomId; diff --git a/matrixConsole/ViewController/SettingsViewController.h b/matrixConsole/ViewController/SettingsViewController.h index 24cc5eaef..43da1bda9 100644 --- a/matrixConsole/ViewController/SettingsViewController.h +++ b/matrixConsole/ViewController/SettingsViewController.h @@ -14,9 +14,9 @@ limitations under the License. */ -#import "RageShakableTableViewController.h" +#import "MXCTableViewController.h" -@interface SettingsViewController : RageShakableTableViewController +@interface SettingsViewController : MXCTableViewController typedef void (^blockSettings_onReadyToLeave)();