summaryrefslogtreecommitdiff
path: root/Juick/ViewControllers
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2019-10-03 15:16:18 +0300
committerGravatar Vitaly Takmazov2019-10-03 15:16:18 +0300
commita5c35479e144eef8bea9f80a10dfeb7a860763f1 (patch)
tree1fa25fd810b07cd72ffd93880206fb08c78da96d /Juick/ViewControllers
parent19675633bce3dc7f7e4ff9712eff3938065e868c (diff)
Drop PHFComposeBarView
Diffstat (limited to 'Juick/ViewControllers')
-rw-r--r--Juick/ViewControllers/ChatViewController.h3
-rw-r--r--Juick/ViewControllers/ChatViewController.m27
2 files changed, 17 insertions, 13 deletions
diff --git a/Juick/ViewControllers/ChatViewController.h b/Juick/ViewControllers/ChatViewController.h
index 4a5133a..bfd63e7 100644
--- a/Juick/ViewControllers/ChatViewController.h
+++ b/Juick/ViewControllers/ChatViewController.h
@@ -8,8 +8,9 @@
#import <UIKit/UIKit.h>
#import "User.h"
+#import "MessageInputView.h"
-@interface ChatViewController : UITableViewController<PHFComposeBarViewDelegate>
+@interface ChatViewController : UITableViewController<MessageInputDelegate>
@property(nonatomic, strong) NSMutableArray *messages;
@property(nonatomic, strong) NSString *uname;
diff --git a/Juick/ViewControllers/ChatViewController.m b/Juick/ViewControllers/ChatViewController.m
index 989b531..2612719 100644
--- a/Juick/ViewControllers/ChatViewController.m
+++ b/Juick/ViewControllers/ChatViewController.m
@@ -10,9 +10,11 @@
#import "BubbleMessageCell.h"
#import "APIClient.h"
+#import "MessageInputView.h"
+
@interface ChatViewController ()
-@property (nonatomic, readwrite, retain) UIView *inputAccessoryView;
+@property (nonatomic, readwrite, retain) MessageInputView *accessoryView;
@property (nonatomic, strong) NSString *me;
@end
@@ -26,6 +28,7 @@
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
self.tableView.keyboardDismissMode = UIScrollViewKeyboardDismissModeInteractive;
self.tableView.allowsSelection = NO;
+ self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentAutomatic;
self.me = [APIClient sharedClient].credential.user;
[self reloadChat];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillChangeFrame:) name:UIKeyboardWillChangeFrameNotification object:nil];
@@ -77,15 +80,16 @@
return YES;
}
+- (BOOL)canResignFirstResponder {
+ return YES;
+}
+
- (UIView *) inputAccessoryView {
- if (!_inputAccessoryView) {
- PHFComposeBarView *composeView = [[PHFComposeBarView alloc] initWithFrame:CGRectMake(0, self.view.bounds.size.height - PHFComposeBarViewInitialHeight, self.view.bounds.size.width, PHFComposeBarViewInitialHeight)];
- composeView.delegate = self;
- [composeView.bottomAnchor constraintEqualToSystemSpacingBelowAnchor:self.view.safeAreaLayoutGuide.bottomAnchor multiplier:1.0f];
- composeView.maxLinesCount = 4;
- _inputAccessoryView = composeView;
+ if (!_accessoryView) {
+ _accessoryView = [[[NSBundle mainBundle] loadNibNamed:@"MessageInputView" owner:self options:nil] firstObject];
+ _accessoryView.delegate = self;
}
- return _inputAccessoryView;
+ return _accessoryView;
}
-(void) keyboardWillChangeFrame:(NSNotification *)notification {
@@ -102,12 +106,11 @@
}
}
--(void) composeBarViewDidPressButton:(PHFComposeBarView *)composeBarView {
- [[APIClient sharedClient] postPMToUser:self.uname text:composeBarView.text result:^(NSError *err) {
+-(void) textSent:(NSString *)text {
+ [[APIClient sharedClient] postPMToUser:self.uname text:text result:^(NSError *err) {
if (!err) {
NSLog(@"Success!");
- [composeBarView becomeFirstResponder];
- [composeBarView setText:nil animated:NO];
+ [self.accessoryView becomeFirstResponder];
[self reloadChat];
}
}];