witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

UI fixes

Browse source
This commit is contained in:
Benjamin Reis 2017-11-13 14:07:05 +01:00
parent 8bfc48ea0f
commit 5e989bbb28
3 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Classes/ChatConversationCreateView.m
View file

@ -85,6 +85,7 @@ void create_chat_room_state_changed(LinphoneChatRoom *cr, LinphoneChatRoomState
break;
case LinphoneChatRoomStateCreationFailed:
view.waitView.hidden = YES;
[ChatConversationInfoView displayCreationError];
LOGE(@"Chat room [%p] could not be created on server.", cr);
break;
default:
@ -116,7 +117,10 @@ void create_chat_room_state_changed(LinphoneChatRoom *cr, LinphoneChatRoomState
- (IBAction)onBackClick:(id)sender {
[_tableController.contactsGroup removeAllObjects];
[PhoneMainView.instance popToView:ChatsListView.compositeViewDescription];
if (_tableController.notFirstTime)
[PhoneMainView.instance popToView:ChatConversationInfoView.compositeViewDescription];
else
[PhoneMainView.instance popToView:ChatsListView.compositeViewDescription];
}
- (IBAction)onNextClick:(id)sender {

2
Classes/ChatConversationInfoView.h
View file

@ -29,6 +29,8 @@
@property (weak, nonatomic) IBOutlet UITableView *tableView;
@property (weak, nonatomic) IBOutlet UIView *waitView;
+ (void)displayCreationError;
- (IBAction)onNextClick:(id)sender;
- (IBAction)onBackClick:(id)sender;
- (IBAction)onQuitClick:(id)sender;

18
Classes/ChatConversationInfoView.m
View file

@ -36,6 +36,21 @@ static UICompositeViewDescription *compositeDescription = nil;
return self.class.compositeViewDescription;
}
+ (void)displayCreationError {
static UIAlertController *errorView = nil;
// avoid having multiple popups
[PhoneMainView.instance dismissViewControllerAnimated:YES completion:nil];
errorView = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Chat room creation error", nil)
message:NSLocalizedString(@"Chat room could not be created on server", nil)
preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction* defaultAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"OK", nil)
style:UIAlertActionStyleDefault
handler:^(UIAlertAction * action) {}];
[errorView addAction:defaultAction];
[PhoneMainView.instance presentViewController:errorView animated:YES completion:nil];
}
- (void)viewDidLoad {
[super viewDidLoad];
// if we use fragments, remove back button
@ -299,7 +314,7 @@ static UICompositeViewDescription *compositeDescription = nil;
? NSLocalizedString(@"You are now an admin of the chat room", nil)
: NSLocalizedString(@"You are no longer an admin of the chat room", nil);
static UIAlertController *alertView;
static UIAlertController *alertView = nil;
// avoid having multiple popups
[PhoneMainView.instance dismissViewControllerAnimated:YES completion:nil];
alertView = [UIAlertController alertControllerWithTitle:[NSString stringWithFormat:@"%@", message]
@ -322,6 +337,7 @@ void chat_room_state_changed(LinphoneChatRoom *cr, LinphoneChatRoomState newStat
break;
case LinphoneChatRoomStateCreationFailed:
view.waitView.hidden = YES;
[ChatConversationInfoView displayCreationError];
LOGE(@"Chat room [%p] could not be created on server.", cr);
break;
case LinphoneChatRoomStateTerminated: