Permalink
Browse files

Cosmetic changes

  • Loading branch information...
1 parent 202dd3a commit 6a5a8b6b6730ae3e99ad5a441cd641dc32a0d26d @jovhenni19 committed Dec 10, 2013
@@ -10,6 +10,7 @@
6E0D48FE183B66FD000EEC9D /* ABridge_AgentNetworkViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E0D48FD183B66FC000EEC9D /* ABridge_AgentNetworkViewController.m */; };
6E0D4902183B6731000EEC9D /* ABridge_AgentNetworkPagesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E0D4900183B6731000EEC9D /* ABridge_AgentNetworkPagesViewController.m */; };
6E28ACBA1835ED2D007E0C63 /* LoginDetails.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E28ACB71835ED2D007E0C63 /* LoginDetails.m */; };
+ 6E40004F1856C8D6000B78E6 /* ABridge_AgentInvitesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E40004E1856C8D5000B78E6 /* ABridge_AgentInvitesViewController.m */; };
6E5AEF8D184C7C2800FE7B9E /* RequestAccess.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E5AEF8C184C7C2700FE7B9E /* RequestAccess.m */; };
6E5AEF90184C7C2900FE7B9E /* RequestNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E5AEF8F184C7C2900FE7B9E /* RequestNetwork.m */; };
6E5AEF93184CA8AF00FE7B9E /* Buyer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E5AEF92184CA8AF00FE7B9E /* Buyer.m */; };
@@ -95,6 +96,8 @@
6E0D4900183B6731000EEC9D /* ABridge_AgentNetworkPagesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ABridge_AgentNetworkPagesViewController.m; sourceTree = "<group>"; };
6E28ACB61835ED2D007E0C63 /* LoginDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginDetails.h; sourceTree = "<group>"; };
6E28ACB71835ED2D007E0C63 /* LoginDetails.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginDetails.m; sourceTree = "<group>"; };
+ 6E40004D1856C8D5000B78E6 /* ABridge_AgentInvitesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ABridge_AgentInvitesViewController.h; sourceTree = "<group>"; };
+ 6E40004E1856C8D5000B78E6 /* ABridge_AgentInvitesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ABridge_AgentInvitesViewController.m; sourceTree = "<group>"; };
6E5AEF8B184C7C2700FE7B9E /* RequestAccess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RequestAccess.h; sourceTree = "<group>"; };
6E5AEF8C184C7C2700FE7B9E /* RequestAccess.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RequestAccess.m; sourceTree = "<group>"; };
6E5AEF8E184C7C2900FE7B9E /* RequestNetwork.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RequestNetwork.h; sourceTree = "<group>"; };
@@ -254,6 +257,15 @@
name = "AgentNetwork Controller";
sourceTree = "<group>";
};
+ 6E4000501856C8DF000B78E6 /* AgentInvites Controller */ = {
+ isa = PBXGroup;
+ children = (
+ 6E40004D1856C8D5000B78E6 /* ABridge_AgentInvitesViewController.h */,
+ 6E40004E1856C8D5000B78E6 /* ABridge_AgentInvitesViewController.m */,
+ );
+ name = "AgentInvites Controller";
+ sourceTree = "<group>";
+ };
6EBBD7541834823F00166D63 /* CoreData Objects */ = {
isa = PBXGroup;
children = (
@@ -377,6 +389,7 @@
6E0D4904183B683E000EEC9D /* AgentNetwork Controller */,
6EFCFC78184749A5004EB0B7 /* AccountSettings Security */,
6EFCFC6E184703B4004EB0B7 /* AccountSettings About */,
+ 6E4000501856C8DF000B78E6 /* AgentInvites Controller */,
6EEF584B18337E4000C3214E /* Images.xcassets */,
6EEF587A1833837600C3214E /* ABridge_ParentViewController.h */,
6EEF587B1833837600C3214E /* ABridge_ParentViewController.m */,
@@ -688,6 +701,7 @@
6EFCFC741847183C004EB0B7 /* Country.m in Sources */,
6EBBD7671834A71D00166D63 /* ABridge_ReferralPagesViewController.m in Sources */,
6EBBD7701834B48A00166D63 /* ABridge_ActivityPagesViewController.m in Sources */,
+ 6E40004F1856C8D6000B78E6 /* ABridge_AgentInvitesViewController.m in Sources */,
6EDF11B91845D5FA001BFC6B /* AgentProfile.m in Sources */,
6E5AEF8D184C7C2800FE7B9E /* RequestAccess.m in Sources */,
6EFF613E1851BB5700A5A86A /* ASIDataCompressor.m in Sources */,
@@ -39,7 +39,7 @@ - (void)viewDidLoad
self.aboutMeTitle.font = FONT_OPENSANS_REGULAR(FONT_SIZE_TITLE);
self.aboutHeader.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
self.textViewAbout.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
- self.buttonSave.titleLabel.font = FONT_OPENSANS_REGULAR(FONT_SIZE_SMALL);
+ self.buttonSave.titleLabel.font = FONT_OPENSANS_BOLD(FONT_SIZE_SMALL);
self.textViewAbout.layer.borderColor = [UIColor colorWithRed:178.0f/255.0f green:178.0f/255.0f blue:178.0f/255.0f alpha:1.0f].CGColor;
self.textViewAbout.layer.borderWidth = 1.0f;
@@ -57,7 +57,7 @@ - (void)viewDidLoad
self.labelDateTime.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
- self.buttonDescription.titleLabel.font = FONT_OPENSANS_REGULAR(FONT_SIZE_SMALL);
+ self.buttonDescription.titleLabel.font = FONT_OPENSANS_BOLD(FONT_SIZE_SMALL);
self.labelDescription.font = FONT_OPENSANS_REGULAR(FONT_SIZE_SMALL);
// self.textViewMessage.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
@@ -201,7 +201,7 @@ - (void)viewDidLoad
// NSLog(@"listing:%@",self.activityDetail.listing_id);
dispatch_async(dispatch_get_main_queue(), ^{
- self.labelActivityName.text = @"Request to View Private POPs";
+ self.labelActivityName.text = @"Request to View Private POPs";
self.labelDateTime.text = self.activityDetail.date;
if ([self.activityDetail.permission integerValue]) {
self.labelDescription.text = @"";
@@ -218,7 +218,7 @@ - (void)viewDidLoad
NSString *pops_link = [NSString stringWithFormat:@"<a href='http://pops/%@'>%@</a>",self.activityDetail.listing_id, self.activityDetail.property_name];
- message = [NSString stringWithFormat:@"%@ is requesting to view your private POPs(TM), %@.",self.activityDetail.user_name, pops_link];
+ message = [NSString stringWithFormat:@"%@ is requesting to view your private POPs, %@.",self.activityDetail.user_name, pops_link];
}
else if ([self.activityDetail.activity_type integerValue] == 28 || [self.activityDetail.activity_type integerValue] == 8) {
@@ -241,7 +241,7 @@ - (void)viewDidLoad
});
- message = [NSString stringWithFormat:@"%@ is requesting to join your Network. If you accept this request, %@ will be able to view your public POPs.",self.activityDetail.user_name,self.activityDetail.user_name];
+ message = [NSString stringWithFormat:@"%@ is requesting to join your Network. If you accept this request, %@ will be able to view your public POPs.",self.activityDetail.user_name,self.activityDetail.user_name];
}
@@ -80,7 +80,7 @@ - (void)viewDidLoad
self.textFieldAddress2.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
self.textFieldZipCode.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
self.textFieldCity.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
- self.buttonSave.titleLabel.font = FONT_OPENSANS_REGULAR(FONT_SIZE_SMALL);
+ self.buttonSave.titleLabel.font = FONT_OPENSANS_BOLD(FONT_SIZE_SMALL);
self.buttonState.titleLabel.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
self.buttonCountry.titleLabel.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
@@ -0,0 +1,13 @@
+//
+// ABridge_AgentInvitesViewController.h
+// AgentBridge
+//
+// Created by host24_iOS Dev on 12/10/13.
+// Copyright (c) 2013 host24_iOS Dev. All rights reserved.
+//
+
+#import "ABridge_ParentViewController.h"
+
+@interface ABridge_AgentInvitesViewController : ABridge_ParentViewController
+
+@end
@@ -0,0 +1,74 @@
+//
+// ABridge_AgentInvitesViewController.m
+// AgentBridge
+//
+// Created by host24_iOS Dev on 12/10/13.
+// Copyright (c) 2013 host24_iOS Dev. All rights reserved.
+//
+
+#import "ABridge_AgentInvitesViewController.h"
+
+@interface ABridge_AgentInvitesViewController ()
+@property (weak, nonatomic) IBOutlet UILabel *labelInviteTitle;
+@property (weak, nonatomic) IBOutlet UITextField *textFieldFirstname;
+@property (weak, nonatomic) IBOutlet UITextField *textFieldLastname;
+@property (weak, nonatomic) IBOutlet UITextField *textFieldEmail;
+@property (weak, nonatomic) IBOutlet UITextField *textFieldZipcode;
+@property (weak, nonatomic) IBOutlet UIButton *buttonSend;
+- (IBAction)sendInvite:(id)sender;
+
+@end
+
+@implementation ABridge_AgentInvitesViewController
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+ self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+ if (self) {
+ // Custom initialization
+ }
+ return self;
+}
+
+- (void)viewDidLoad
+{
+ [super viewDidLoad];
+ // Do any additional setup after loading the view.
+
+ self.slidingViewController.underRightViewController = nil;
+
+ self.labelInviteTitle.font = FONT_OPENSANS_REGULAR(FONT_SIZE_TITLE);
+ self.textFieldFirstname.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
+ self.textFieldLastname.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
+ self.textFieldEmail.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
+ self.textFieldZipcode.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
+ self.buttonSend.titleLabel.font = FONT_OPENSANS_BOLD(FONT_SIZE_REGULAR);
+
+ [self addPaddingAndBorder:self.textFieldEmail color:[UIColor colorWithRed:178.0f/255.0f green:178.0f/255.0f blue:178.0f/255.0f alpha:1.0f]];
+
+ [self addPaddingAndBorder:self.textFieldFirstname color:[UIColor colorWithRed:178.0f/255.0f green:178.0f/255.0f blue:178.0f/255.0f alpha:1.0f]];
+
+ [self addPaddingAndBorder:self.textFieldLastname color:[UIColor colorWithRed:178.0f/255.0f green:178.0f/255.0f blue:178.0f/255.0f alpha:1.0f]];
+
+ [self addPaddingAndBorder:self.textFieldZipcode color:[UIColor colorWithRed:178.0f/255.0f green:178.0f/255.0f blue:178.0f/255.0f alpha:1.0f]];
+}
+
+- (void)didReceiveMemoryWarning
+{
+ [super didReceiveMemoryWarning];
+ // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)sendInvite:(id)sender {
+}
+
+
+- (void) addPaddingAndBorder:(UITextField*)textField color:(UIColor*)color {
+ UIView *paddingView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 15, 20)];
+ textField.leftView = paddingView;
+ textField.leftViewMode = UITextFieldViewModeAlways;
+
+ textField.layer.borderColor = color.CGColor;
+ textField.layer.borderWidth = 1.0f;
+}
+@end
@@ -169,6 +169,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath;
{
NSString *text = @"";
+ CGFloat decreaseHeight = 0.0f;
if ([[self.arrayKTableKeys objectAtIndex:[indexPath row]] isEqualToString:@"brokerage"]) {
text = self.profileData.broker_name;
}
@@ -211,6 +212,9 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
NSInteger array_index = [[key substringFromIndex:[key rangeOfString:@"mobile"].length] integerValue];
text = [array objectAtIndex:array_index - 1];
+ if (array_index == 2) {
+ decreaseHeight = FONT_SIZE_FOR_PROFILE * array_index;
+ }
if ([self isNull:text]) {
text = [array objectAtIndex:array_index];
}
@@ -231,7 +235,7 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
CGFloat height = MAX(size.height, 44.0f);
- return height + 5.0f;
+ return height + 5.0f - decreaseHeight;
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
@@ -45,7 +45,7 @@ - (void)viewDidLoad
// Do any additional setup after loading the view.
self.labelNumberOfAgentNetwork.font = FONT_OPENSANS_REGULAR(FONT_SIZE_TITLE);
- self.buttonRefer.titleLabel.font = FONT_OPENSANS_REGULAR(FONT_SIZE_SMALL);
+ self.buttonRefer.titleLabel.font = FONT_OPENSANS_BOLD(FONT_SIZE_SMALL);
self.labelNumberOfAgentNetwork.text = @"My Network";
[self.labelNumberOfAgentNetwork sizeToFit];
@@ -114,6 +114,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath;
{
NSString *text = @"";
+ CGFloat decreaseHeight = 0.0f;
if ([[self.arrayKTableKeys objectAtIndex:[indexPath row]] isEqualToString:@"brokerage"]) {
text = self.profileData.broker_name;
}
@@ -156,6 +157,9 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
NSInteger array_index = [[key substringFromIndex:[key rangeOfString:@"mobile"].length] integerValue];
text = [array objectAtIndex:array_index - 1];
+ if (array_index == 2) {
+ decreaseHeight = FONT_SIZE_FOR_PROFILE * array_index;
+ }
if ([self isNull:text]) {
text = [array objectAtIndex:array_index];
}
@@ -176,7 +180,7 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
CGFloat height = MAX(size.height, 44.0f);
- return height + 5.0f;
+ return height + 5.0f - decreaseHeight;
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
@@ -49,7 +49,7 @@ - (void)viewDidLoad
self.brokerageHeader.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
self.designationHeader.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
self.textFieldBrokerage.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
- self.buttonSave.titleLabel.font = FONT_OPENSANS_REGULAR(FONT_SIZE_SMALL);
+ self.buttonSave.titleLabel.font = FONT_OPENSANS_BOLD(FONT_SIZE_SMALL);
[self addPaddingAndBorder:self.textFieldBrokerage color:[UIColor colorWithRed:178.0f/255.0f green:178.0f/255.0f blue:178.0f/255.0f alpha:1.0f]];
@@ -187,6 +187,15 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection
dispatch_async(dispatch_get_main_queue(), ^{
CGFloat yOffset = 0.0f;
+ if ([self.arrayOfDesignation count] > 2) {
+ CGRect frame = self.scrollViewDesignations.frame;
+ frame.size.height += 30.0f;
+ self.scrollViewDesignations.frame = frame;
+
+ frame = self.buttonSave.frame;
+ frame.origin.y += 30.0f;
+ self.buttonSave.frame = frame;
+ }
for (NSString *designation in self.arrayOfDesignation) {
UITextField *textField = [[UITextField alloc] initWithFrame:CGRectMake(0.0f, yOffset, 280.0f, 30.0f)];
textField.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
@@ -217,6 +226,8 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection
[self.scrollViewDesignations addSubview:textField];
+ self.scrollViewDesignations.contentSize = CGSizeMake(self.scrollViewDesignations.contentSize.width, self.scrollViewDesignations.contentSize.height + 35.0f);
+
[UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
[[UIApplication sharedApplication] setStatusBarHidden:YES withAnimation:UIStatusBarAnimationFade];
});
@@ -226,5 +237,8 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection
[self.activityIndicator stopAnimating];
self.activityIndicator.hidden = YES;
+
+ [UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
+ [[UIApplication sharedApplication] setStatusBarHidden:YES withAnimation:UIStatusBarAnimationFade];
}
@end
@@ -281,9 +281,11 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection
if (is_saved) {
self.labelNumberOfProperty.text = [NSString stringWithFormat:@"Saved POPs™ (%li)",(long)self.numberOfProperty];
+ self.buttonSave.hidden = YES;
}
else {
self.labelNumberOfProperty.text = [NSString stringWithFormat:@"New POPs™ (%li)",(long)self.numberOfProperty];
+ self.buttonSave.hidden = NO;
}
ABridge_PropertyPagesViewController *initialViewController = [self viewControllerAtIndex:0];
@@ -47,7 +47,7 @@ - (void)viewDidLoad
self.textFieldMobileNumber.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
self.textFieldWorkNumber.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
self.textFieldFaxNumber.font = FONT_OPENSANS_REGULAR(FONT_SIZE_REGULAR);
- self.buttonSave.titleLabel.font = FONT_OPENSANS_REGULAR(FONT_SIZE_SMALL);
+ self.buttonSave.titleLabel.font = FONT_OPENSANS_BOLD(FONT_SIZE_SMALL);
[self addPaddingAndBorder:self.textFieldMobileNumber color:[UIColor colorWithRed:178.0f/255.0f green:178.0f/255.0f blue:178.0f/255.0f alpha:1.0f]];
@@ -69,7 +69,7 @@ - (void)viewDidLoad
self.textEmail.font = FONT_OPENSANS_REGULAR(15.0f);
self.textPassword.font = FONT_OPENSANS_REGULAR(15.0f);
- self.buttonSignIn.titleLabel.font = FONT_OPENSANS_REGULAR(19.0f);
+ self.buttonSignIn.titleLabel.font = FONT_OPENSANS_BOLD(17.0f);
self.buttonForgot.titleLabel.font = FONT_OPENSANS_REGULAR(15.0f);
UIView *paddingView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 15, 20)];
self.textEmail.leftView = paddingView;
Oops, something went wrong.

0 comments on commit 6a5a8b6

Please sign in to comment.