Skip to content

Remove requirement to login, add a text field for title as well #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bnham wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove requirement to login, add a text field for title as well #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 1 addition & 34 deletions ios/HipsterChat/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#import "ChatViewController.h"
#import <Parse/Parse.h>

@interface AppDelegate()<PFLogInViewControllerDelegate, PFSignUpViewControllerDelegate> {
@interface AppDelegate() {
ChatViewController *_chatViewController;
UINavigationController *_navController;
}
Expand Down Expand Up @@ -43,42 +43,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(

self.window.rootViewController = _navController;

PFLogInViewController *logInController = [[PFLogInViewController alloc] init];
logInController.fields = PFLogInFieldsUsernameAndPassword|PFLogInFieldsLogInButton|PFLogInFieldsSignUpButton;
logInController.delegate = self;
logInController.signUpController.delegate = self;
[_navController presentViewController:logInController animated:YES completion:NULL];

return YES;
}

- (void)displayLoginFailureAlert {
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Failed to log in"
message:@"Failed to log in. You will post as Anonymous Coward."
delegate:nil
cancelButtonTitle:@"Okay"
otherButtonTitles:nil];
[alert show];
}

- (void)signUpViewController:(PFSignUpViewController *)signUpController didSignUpUser:(PFUser *)user {
[_navController dismissViewControllerAnimated:YES completion:NULL];
}

- (void)signUpViewController:(PFSignUpViewController *)signUpController didFailToSignUpWithError:(NSError *)error {
[_navController dismissViewControllerAnimated:YES completion:NULL];
[self displayLoginFailureAlert];
}

- (void)logInViewController:(PFLogInViewController *)controller didLogInUser:(PFUser *)user {
[_navController dismissViewControllerAnimated:YES completion:NULL];
}

- (void)logInViewController:(PFLogInViewController *)logInController didFailToLogInWithError:(NSError *)error {
[_navController dismissViewControllerAnimated:YES completion:NULL];
[self displayLoginFailureAlert];
}

- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
{
// Store the deviceToken in the current installation and save it to Parse.
Expand Down
2 changes: 1 addition & 1 deletion ios/HipsterChat/Chat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#import <Parse/Parse.h>

@interface Chat : PFObject<PFSubclassing>
@property (nonatomic, retain) PFUser *author;
@property (nonatomic, retain) NSString *title;
@property (nonatomic, retain) NSString *text;
+ (NSString*)parseClassName;
@end
2 changes: 1 addition & 1 deletion ios/HipsterChat/Chat.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#import <Parse/PFObject+Subclass.h>

@implementation Chat
@dynamic author;
@dynamic title;
@dynamic text;

+ (void)load {
Expand Down
208 changes: 138 additions & 70 deletions ios/HipsterChat/ChatViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
static CGFloat kVerticalPadding = 4;
static CGFloat kHorizontalPadding = 5;

static CGFloat kAuthorHeight = 15;
static CGFloat kAuthorSpacing = 2;
static CGFloat kTitleHeight = 15;
static CGFloat kTitleSpacing = 2;
static CGFloat kDateHeight = 15;
static CGFloat kDateSpacing = 2;

static CGFloat kTextFieldHeight = 35;
static CGFloat kTextFieldHeight = 25;

#pragma mark - ChatViewTableCell

@interface ChatTableViewCell : UITableViewCell {
UILabel *_authorLabel;
UILabel *_titleLabel;
UILabel *_textLabel;
UILabel *_dateLabel;
}
Expand All @@ -34,10 +34,10 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
if ((self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])) {
UIView *contentView = [self contentView];

_authorLabel = [[UILabel alloc] init];
_authorLabel.font = [UIFont boldSystemFontOfSize:14];
_authorLabel.textColor = [UIColor colorWithRed:87.0/255 green:107.0/255 blue:149.0/255 alpha:1.0];
[contentView addSubview:_authorLabel];
_titleLabel = [[UILabel alloc] init];
_titleLabel.font = [UIFont boldSystemFontOfSize:14];
_titleLabel.textColor = [UIColor colorWithRed:87.0/255 green:107.0/255 blue:149.0/255 alpha:1.0];
[contentView addSubview:_titleLabel];

_textLabel = [[UILabel alloc] init];
_textLabel.font = [UIFont systemFontOfSize:14];
Expand All @@ -60,13 +60,13 @@ - (void)layoutSubviews {

CGRect bounds = CGRectInset(self.bounds, kHorizontalPadding, kVerticalPadding);

CGRect authorFrame = bounds;
authorFrame.size.height = kAuthorHeight;
_authorLabel.frame = authorFrame;
CGRect titleFrame = bounds;
titleFrame.size.height = kTitleHeight;
_titleLabel.frame = titleFrame;

CGRect textLabelFrame = bounds;
textLabelFrame.origin.y = CGRectGetMaxY(authorFrame) + kAuthorSpacing;
textLabelFrame.size.height = bounds.size.height - kAuthorHeight - kAuthorSpacing - kDateHeight - kDateSpacing;
textLabelFrame.origin.y = CGRectGetMaxY(titleFrame) + kTitleSpacing;
textLabelFrame.size.height = bounds.size.height - kTitleHeight - kTitleSpacing - kDateHeight - kDateSpacing;
_textLabel.frame = textLabelFrame;

CGRect dateFrame = bounds;
Expand All @@ -75,7 +75,7 @@ - (void)layoutSubviews {
_dateLabel.frame = dateFrame;
}

- (void)setAuthor:(NSString *)author text:(NSString *)text date:(NSDate *)date {
- (void)setTitle:(NSString *)title text:(NSString *)text date:(NSDate *)date {
static NSDateFormatter *__formatter = nil;
if (__formatter == nil) {
__formatter = [[NSDateFormatter alloc] init];
Expand All @@ -84,7 +84,7 @@ - (void)setAuthor:(NSString *)author text:(NSString *)text date:(NSDate *)date {
[__formatter setDoesRelativeDateFormatting:YES];
}

_authorLabel.text = author;
_titleLabel.text = title;
_textLabel.text = text;
_dateLabel.text = [__formatter stringFromDate:date];
}
Expand All @@ -100,20 +100,110 @@ + (CGFloat)heightForText:(NSString *)text {
CGRect rect = CGRectInset([UIScreen mainScreen].bounds, kHorizontalPadding, 0);
__sizingLabel.text = text;

return [__sizingLabel sizeThatFits:rect.size].height + kAuthorHeight + kAuthorSpacing + kDateHeight + kDateSpacing + 2 * kVerticalPadding;
return [__sizingLabel sizeThatFits:rect.size].height + kTitleHeight + kTitleSpacing + kDateHeight + kDateSpacing + 2 * kVerticalPadding;
}

@end

#pragma mark - ChatEntryView

@protocol ChatEntryViewDelegate
- (void)didEnterTitle:(NSString *)title message:(NSString *)message;
@end

@interface ChatEntryView : UIView<UITextFieldDelegate> {
UIView *_topSeparatorView;
UITextField *_titleField;
UIView *_middleSeparatorView;
UITextField *_messageField;
}

@property (nonatomic, strong) UITextField *titleField;
@property (nonatomic, strong) UITextField *messageField;
@property (nonatomic, weak) id<ChatEntryViewDelegate> delegate;

@end

@implementation ChatEntryView

- (id)initWithFrame:(CGRect)frame {
if ((self = [super initWithFrame:frame])) {
UIColor *separatorColor = [UIColor colorWithRed:178.0/255 green:178.0/255 blue:178.0/255 alpha:1.0];
self.backgroundColor = [UIColor colorWithRed:248.0/255 green:248.0/255 blue:248.0/255 alpha:1.0];

_topSeparatorView = [[UIView alloc] initWithFrame:CGRectZero];
_topSeparatorView.backgroundColor = separatorColor;
[self addSubview:_topSeparatorView];

_titleField = [[UITextField alloc] initWithFrame:CGRectZero];
_titleField.font = [UIFont systemFontOfSize:14];
_titleField.placeholder = @"Title";
_titleField.returnKeyType = UIReturnKeySend;
_titleField.delegate = self;
[self addSubview:_titleField];

_middleSeparatorView = [[UIView alloc] initWithFrame:CGRectZero];
_middleSeparatorView.backgroundColor = separatorColor;
[self addSubview:_middleSeparatorView];

_messageField = [[UITextField alloc] initWithFrame:CGRectZero];
_messageField.font = [UIFont systemFontOfSize:14];
_messageField.placeholder = @"Message";
_messageField.returnKeyType = UIReturnKeySend;
_messageField.delegate = self;

[self addSubview:_messageField];
}

return self;
}

- (void)dealloc {
_titleField.delegate = nil;
_messageField.delegate = nil;
}

- (void)layoutSubviews {
CGRect bounds = self.bounds;

CGRect topSeparatorFrame = CGRectMake(0, 0, bounds.size.width, 0.5);
_topSeparatorView.frame = topSeparatorFrame;

CGRect insetBounds = CGRectInset(bounds, kHorizontalPadding, 0);
CGRect titleFieldFrame = CGRectMake(insetBounds.origin.x, kVerticalPadding, insetBounds.size.width, kTextFieldHeight);
_titleField.frame = titleFieldFrame;

CGRect middleSeparatorFrame = CGRectMake(insetBounds.origin.x, CGRectGetMaxY(titleFieldFrame) + kVerticalPadding / 2, insetBounds.size.width, 0.5);
_middleSeparatorView.frame = middleSeparatorFrame;

CGRect messageFieldFrame = CGRectMake(insetBounds.origin.x, CGRectGetMaxY(titleFieldFrame) + kVerticalPadding, insetBounds.size.width, kTextFieldHeight);
_messageField.frame = messageFieldFrame;
}

- (CGSize)sizeThatFits:(CGSize)boundingSize {
CGFloat width = boundingSize.width;
CGFloat height = kVerticalPadding + kTextFieldHeight + kVerticalPadding + kTextFieldHeight + kVerticalPadding;

return CGSizeMake(width, height);
}

- (BOOL)textFieldShouldReturn:(UITextField *)textField {
[_delegate didEnterTitle:_titleField.text message:_messageField.text];
_titleField.text = nil;
_messageField.text = nil;
[textField resignFirstResponder];

return NO;
}

@end

#pragma mark - ChatViewController

@interface ChatViewController()<UITableViewDataSource, UITableViewDelegate, UITextFieldDelegate> {
@interface ChatViewController()<UITableViewDataSource, UITableViewDelegate, ChatEntryViewDelegate> {
NSArray *_messages;
UITableView *_tableView;
UIView *_entryContainerView;
UIView *_separatorView;
UITextField *_entryField;
ChatEntryView *_entryView;
CGRect _keyboardFrame;
}
@end
Expand All @@ -125,7 +215,6 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
self.title = @"HipsterChat";


NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
[nc addObserver:self
selector:@selector(keyboardWillShow:)
Expand All @@ -140,6 +229,9 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
}

- (void)dealloc {
_tableView.dataSource = nil;
_tableView.delegate = nil;
_entryView.delegate = nil;
[[NSNotificationCenter defaultCenter] removeObserver:self];
}

Expand All @@ -157,43 +249,29 @@ - (void)loadView {
[_tableView setSeparatorInset:UIEdgeInsetsMake(0, kHorizontalPadding, 0, kHorizontalPadding)];
}

_entryField = [[UITextField alloc] initWithFrame:CGRectZero];
_entryField.delegate = self;
_entryField.placeholder = @"Message";
_entryField.font = [UIFont systemFontOfSize:14];
_entryField.returnKeyType = UIReturnKeySend;

_separatorView = [[UIView alloc] initWithFrame:CGRectZero];
_separatorView.backgroundColor = [UIColor colorWithRed:178.0/255 green:178.0/255 blue:178.0/255 alpha:1.0];

_entryContainerView = [[UIView alloc] initWithFrame:CGRectZero];
_entryContainerView.backgroundColor = [UIColor colorWithRed:248.0/255 green:248.0/255 blue:248.0/255 alpha:1.0f];
[_entryContainerView addSubview:_separatorView];
[_entryContainerView addSubview:_entryField];
_entryView = [[ChatEntryView alloc] initWithFrame:CGRectZero];
_entryView.delegate = self;

UIView *containerView = [[UIView alloc] initWithFrame:CGRectZero];
containerView.backgroundColor = [UIColor whiteColor];
[containerView addSubview:_tableView];
[containerView addSubview:_entryContainerView];
[containerView addSubview:_entryView];

self.view = containerView;
}

- (void)viewDidLayoutSubviews {
CGRect bounds = self.view.bounds;
bounds.size.height -= _keyboardFrame.size.height;
CGFloat entryViewHeight = [_entryView sizeThatFits:bounds.size].height;

CGRect tableViewFrame = bounds;
tableViewFrame.size.height -= kTextFieldHeight;
tableViewFrame.size.height -= entryViewHeight;
_tableView.frame = tableViewFrame;

CGRect textFieldFrame = bounds;
textFieldFrame.origin.y = CGRectGetMaxY(bounds) - kTextFieldHeight;
textFieldFrame.size.height = kTextFieldHeight;

[_tableView setFrame:tableViewFrame];
[_entryContainerView setFrame:textFieldFrame];
[_separatorView setFrame:CGRectMake(0, 0, bounds.size.width, 0.5)];
[_entryField setFrame:CGRectInset(_entryContainerView.bounds, kHorizontalPadding, kVerticalPadding)];
CGRect entryViewFrame = bounds;
entryViewFrame.origin.y = bounds.size.height - _keyboardFrame.size.height - entryViewHeight;
entryViewFrame.size.height = entryViewHeight;
_entryView.frame = entryViewFrame;
}

- (void)viewDidLoad
Expand All @@ -204,7 +282,6 @@ - (void)viewDidLoad

- (void)refreshWithBlock:(PFBooleanResultBlock)block {
PFQuery *query = [PFQuery queryWithClassName:@"Chat"];
[query includeKey:@"author"];
[query orderByDescending:@"createdAt"];
query.cachePolicy = kPFCachePolicyNetworkElseCache;

Expand Down Expand Up @@ -245,8 +322,9 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
}

Chat *chat = _messages[indexPath.row];
NSString *username = [chat author].username ?: @"Anonymous Coward";
[cell setAuthor:username text:chat.text date:chat.updatedAt];
NSString *title = chat.title ?: @"Untitled Masterwork";
NSString *text = chat.text ?: @"No text";
[cell setTitle:title text:text date:chat.updatedAt];

return cell;
}
Expand All @@ -258,30 +336,20 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
}

#pragma mark -
#pragma mark UITextFieldDelegate
#pragma mark ChatEntryViewDelegate

- (BOOL)textFieldShouldReturn:(UITextField *)textField {
[textField resignFirstResponder];
return NO;
}

- (BOOL)textFieldShouldEndEditing:(UITextField *)textField {
if ([textField.text length] != 0) {
Chat *chat = [[Chat alloc] init];
chat.author = [PFUser currentUser];
chat.text = textField.text;

[chat saveInBackgroundWithBlock:^(BOOL succeeded, NSError *error) {
if (succeeded) {
[self refreshWithBlock:NULL];
} else {
NSLog(@"Failed to save object: %@", error);
}
}];
}
- (void)didEnterTitle:(NSString *)title message:(NSString *)message {
Chat *chat = [[Chat alloc] init];
chat.title = title;
chat.text = message;

textField.text = nil;
return YES;
[chat saveInBackgroundWithBlock:^(BOOL succeeded, NSError *error) {
if (succeeded) {
[self refreshWithBlock:NULL];
} else {
NSLog(@"Failed to save object: %@", error);
}
}];
}

#pragma mark -
Expand Down