summaryrefslogtreecommitdiff
path: root/Juick/ViewControllers
diff options
context:
space:
mode:
Diffstat (limited to 'Juick/ViewControllers')
-rw-r--r--Juick/ViewControllers/DialogsViewController.m1
-rw-r--r--Juick/ViewControllers/FeedViewController.h (renamed from Juick/ViewControllers/DiscoverViewController.h)2
-rw-r--r--Juick/ViewControllers/FeedViewController.m (renamed from Juick/ViewControllers/DiscoverViewController.m)11
3 files changed, 4 insertions, 10 deletions
diff --git a/Juick/ViewControllers/DialogsViewController.m b/Juick/ViewControllers/DialogsViewController.m
index c4ace7f..1f9f8e0 100644
--- a/Juick/ViewControllers/DialogsViewController.m
+++ b/Juick/ViewControllers/DialogsViewController.m
@@ -16,7 +16,6 @@
@implementation DialogsViewController
- (void)viewDidLoad {
[super viewDidLoad];
- [self.tabBarItem setTitle:@"Chats"];
self.navigationController.visibleViewController.navigationItem.title = @"Chats";
[self.view setBackgroundColor:[ColorScheme mainBackground]];
[self.tableView registerNib:[UINib nibWithNibName:@"ConversationCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"notificationCell"];
diff --git a/Juick/ViewControllers/DiscoverViewController.h b/Juick/ViewControllers/FeedViewController.h
index bb34d5e..76388aa 100644
--- a/Juick/ViewControllers/DiscoverViewController.h
+++ b/Juick/ViewControllers/FeedViewController.h
@@ -9,6 +9,6 @@
#import <UIKit/UIKit.h>
#import "MessagesViewController.h"
-@interface DiscoverViewController : MessagesViewController<MessagesDelegate, MessageCellDelegate>
+@interface FeedViewController : MessagesViewController<MessagesDelegate, MessageCellDelegate>
@end
diff --git a/Juick/ViewControllers/DiscoverViewController.m b/Juick/ViewControllers/FeedViewController.m
index 94e1d16..67d80e1 100644
--- a/Juick/ViewControllers/DiscoverViewController.m
+++ b/Juick/ViewControllers/FeedViewController.m
@@ -6,7 +6,7 @@
// Copyright © 2017 com.juick. All rights reserved.
//
-#import "DiscoverViewController.h"
+#import "FeedViewController.h"
#import "ThreadViewController.h"
#import "BlogViewController.h"
#import "MessageCell.h"
@@ -14,12 +14,12 @@
#import "AppDelegate.h"
#import "ColorScheme.h"
-@interface DiscoverViewController ()
+@interface FeedViewController ()
@property NSString *selectedUser;
@end
-@implementation DiscoverViewController
+@implementation FeedViewController
-(void) viewDidLoad {
self.messagesDelegate = self;
@@ -28,7 +28,6 @@
if (user) {
if ([self.path length] == 0) {
self.path = [APIClient feedUrl];
- [self.tabBarItem setTitle:@"My feed"];
self.navigationController.visibleViewController.navigationItem.title = @"My feed";
}
[self setShouldScrollToBottomOnRefresh:NO];
@@ -41,7 +40,6 @@
} else {
if ([self.path length] == 0) {
self.path = [APIClient messagesUrl];
- [self.tabBarItem setTitle:@"Discover"];
self.navigationController.visibleViewController.navigationItem.title = @"Discover";
}
[self setShouldScrollToBottomOnRefresh:NO];
@@ -107,7 +105,6 @@
[filterAlert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
[filterAlert addAction:[UIAlertAction actionWithTitle:@"My feed" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
self.path = [APIClient feedUrl];
- [self.tabBarItem setTitle:@"My feed"];
self.navigationController.visibleViewController.navigationItem.title = @"My feed";
self.params = nil;
[self.messages removeAllObjects];
@@ -116,7 +113,6 @@
}]];
[filterAlert addAction:[UIAlertAction actionWithTitle:@"Discover" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
self.path = [APIClient messagesUrl];
- [self.tabBarItem setTitle:@"Discover"];
self.navigationController.visibleViewController.navigationItem.title = @"Discover";
self.params = nil;
[self.messages removeAllObjects];
@@ -125,7 +121,6 @@
}]];
[filterAlert addAction:[UIAlertAction actionWithTitle:@"Discussions" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
self.path = [APIClient discussionsUrl];
- [self.tabBarItem setTitle:@"Discussions"];
self.navigationController.visibleViewController.navigationItem.title = @"Discussions";
self.params = nil;
[self.messages removeAllObjects];