Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 08:12:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Console: Rename RageShakableTableViewController to MXCTableViewController, and RageShakableViewController to MXCViewController.

Browse source
This commit is contained in:
giomfo 2015-02-12 14:57:24 +01:00
parent f5c1aa40e6
commit 366340d8a1
13 changed files with 52 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
matrixConsole/matrixConsole.xcodeproj/project.pbxproj
View file

@ -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 = "<group>"; };
3198D9E21A68338B00556695 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
710CA4BD1A7FBEDB00EEFB96 /* RageShakableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RageShakableViewController.h; sourceTree = "<group>"; };
710CA4BE1A7FBEDB00EEFB96 /* RageShakableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RageShakableViewController.m; sourceTree = "<group>"; };
710CA4BD1A7FBEDB00EEFB96 /* MXCViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXCViewController.h; sourceTree = "<group>"; };
710CA4BE1A7FBEDB00EEFB96 /* MXCViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXCViewController.m; sourceTree = "<group>"; };
710CA4C01A7FBFED00EEFB96 /* RageShakableUIResponder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RageShakableUIResponder.h; sourceTree = "<group>"; };
710CA4C11A7FBFED00EEFB96 /* RageShakableUIResponder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RageShakableUIResponder.m; sourceTree = "<group>"; };
710CA4C31A7FC27100EEFB96 /* RageShakableTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RageShakableTableViewController.h; sourceTree = "<group>"; };
710CA4C41A7FC27100EEFB96 /* RageShakableTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RageShakableTableViewController.m; sourceTree = "<group>"; };
710CA4C31A7FC27100EEFB96 /* MXCTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXCTableViewController.h; sourceTree = "<group>"; };
710CA4C41A7FC27100EEFB96 /* MXCTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXCTableViewController.m; sourceTree = "<group>"; };
710CC3BE1A6E9F14006EE973 /* matrixUser.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = matrixUser.png; sourceTree = "<group>"; };
710CC3C01A70F28F006EE973 /* MXCContactField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXCContactField.h; sourceTree = "<group>"; };
710CC3C11A70F28F006EE973 /* MXCContactField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXCContactField.m; sourceTree = "<group>"; };
@ -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 */,

4
matrixConsole/matrixConsole/ViewController/AuthenticationViewController.h
View file

@ -14,11 +14,11 @@
limitations under the License.
*/
#import "RageShakableViewController.h"
#import "MXCViewController.h"
#import "AuthInputsView.h"
@interface AuthenticationViewController : RageShakableViewController <UITextFieldDelegate, AuthInputsViewDelegate>
@interface AuthenticationViewController : MXCViewController <UITextFieldDelegate, AuthInputsViewDelegate>
@end

4
matrixConsole/matrixConsole/ViewController/ContactDetailsViewController.h
View file

@ -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

4
matrixConsole/matrixConsole/ViewController/ContactsViewController.h
View file

@ -14,7 +14,7 @@
limitations under the License.
*/
#import "RageShakableViewController.h"
#import "MXCViewController.h"
// SMS
#import <MessageUI/MessageUI.h>
@ -22,7 +22,7 @@
#import "SectionedContacts.h"
@interface ContactsViewController : RageShakableViewController <UITableViewDataSource, UITableViewDelegate, UINavigationControllerDelegate, MFMessageComposeViewControllerDelegate, UISearchBarDelegate, UIGestureRecognizerDelegate> {
@interface ContactsViewController : MXCViewController <UITableViewDataSource, UITableViewDelegate, UINavigationControllerDelegate, MFMessageComposeViewControllerDelegate, UISearchBarDelegate, UIGestureRecognizerDelegate> {
NSArray* collationTitles;
}

4
matrixConsole/matrixConsole/ViewController/HomeViewController.h
View file

@ -14,9 +14,9 @@
limitations under the License.
*/
#import "RageShakableTableViewController.h"
#import "MXCTableViewController.h"
@interface HomeViewController : RageShakableTableViewController <UITextFieldDelegate, UISearchBarDelegate>
@interface HomeViewController : MXCTableViewController <UITextFieldDelegate, UISearchBarDelegate>
@end

8
matrixConsole/matrixConsole/ViewController/RageShakableViewController.h → matrixConsole/matrixConsole/ViewController/MXCTableViewController.h
View file

@ -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

9
matrixConsole/matrixConsole/ViewController/RageShakableViewController.m → matrixConsole/matrixConsole/ViewController/MXCTableViewController.m
View file

@ -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];

8
matrixConsole/matrixConsole/ViewController/RageShakableTableViewController.h → matrixConsole/matrixConsole/ViewController/MXCViewController.h
View file

@ -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

9
matrixConsole/matrixConsole/ViewController/RageShakableTableViewController.m → matrixConsole/matrixConsole/ViewController/MXCViewController.m
View file

@ -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];

4
matrixConsole/matrixConsole/ViewController/MemberViewController.h
View file

@ -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;

4
matrixConsole/matrixConsole/ViewController/RecentsViewController.h
View file

@ -14,11 +14,11 @@
limitations under the License.
*/
#import "RageShakableTableViewController.h"
#import "MXCTableViewController.h"
@class RoomViewController;
@interface RecentsViewController : RageShakableTableViewController <UISearchBarDelegate>
@interface RecentsViewController : MXCTableViewController <UISearchBarDelegate>
@property (strong, nonatomic) NSString *preSelectedRoomId; // set a non-nil value to this property will open room details

4
matrixConsole/matrixConsole/ViewController/RoomViewController.h
View file

@ -14,11 +14,11 @@
limitations under the License.
*/
#import "RageShakableViewController.h"
#import "MXCViewController.h"
#import "HPGrowingTextView.h"
@interface RoomViewController : RageShakableViewController <UITableViewDataSource, UITableViewDelegate, UITextFieldDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate, UIGestureRecognizerDelegate, HPGrowingTextViewDelegate>
@interface RoomViewController : MXCViewController <UITableViewDataSource, UITableViewDelegate, UITextFieldDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate, UIGestureRecognizerDelegate, HPGrowingTextViewDelegate>
@property (strong, nonatomic) NSString *roomId;

4
matrixConsole/matrixConsole/ViewController/SettingsViewController.h
View file

@ -14,9 +14,9 @@
limitations under the License.
*/
#import "RageShakableTableViewController.h"
#import "MXCTableViewController.h"
@interface SettingsViewController : RageShakableTableViewController <UITextFieldDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate, UIPickerViewDataSource, UIPickerViewDelegate>
@interface SettingsViewController : MXCTableViewController <UITextFieldDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate, UIPickerViewDataSource, UIPickerViewDelegate>
typedef void (^blockSettings_onReadyToLeave)();