Add active account indicator in popover menu.

Signed-off-by: Ivan Sein <ivan@nextcloud.com>
This commit is contained in:
Ivan Sein 2019-10-30 09:29:01 +01:00
Родитель b51157a5b6
Коммит 9180f555a9
2 изменённых файлов: 14 добавлений и 9 удалений

2
ThirdParty/FTPopOverMenu поставляемый

@ -1 +1 @@
Subproject commit 07c69522da7a879ec53101f859f3fa490ce21525
Subproject commit 5e030873726d1be969952092f13d686408dcf627

Просмотреть файл

@ -253,26 +253,31 @@ typedef void (^FetchRoomsCompletionBlock)(BOOL success);
NSMutableArray *actionsArray = [NSMutableArray new];
for (TalkAccount *account in [TalkAccount allObjects]) {
NSString *accountName = [NSString stringWithFormat:@"%@ (%@)", account.userDisplayName, [[NSURL URLWithString:account.server] host]];
UIImage *accountImage = [[NCAPIController sharedInstance] userProfileImageForAccount:account withSize:CGSizeMake(90, 90)];
FTPopOverMenuModel *accountModel = [[FTPopOverMenuModel alloc] initWithTitle:accountName image:accountImage selected:NO];
UIImage *accountImage = [[NCAPIController sharedInstance] userProfileImageForAccount:account withSize:CGSizeMake(72, 72)];
UIImageView *accessoryImageView = (account.active) ? [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"checkbox-checked"]] : nil;
FTPopOverMenuModel *accountModel = [[FTPopOverMenuModel alloc] initWithTitle:accountName image:accountImage selected:NO accessoryView:accessoryImageView];
[menuArray addObject:accountModel];
[actionsArray addObject:account];
}
FTPopOverMenuModel *addAccountModel = [[FTPopOverMenuModel alloc] initWithTitle:@"Add account" image:[UIImage imageNamed:@"add-settings"] selected:NO];
FTPopOverMenuModel *addAccountModel = [[FTPopOverMenuModel alloc] initWithTitle:@"Add account" image:[UIImage imageNamed:@"add-settings"] selected:NO accessoryView:nil];
FTPopOverMenuConfiguration *menuConfiguration = [[FTPopOverMenuConfiguration alloc] init];
[menuArray addObject:addAccountModel];
[actionsArray addObject:@"AddAccountAction"];
menuConfiguration.menuIconMargin = 12;
menuConfiguration.menuTextMargin = 12;
menuConfiguration.imageSize = CGSizeMake(24, 24);
menuConfiguration.separatorInset = UIEdgeInsetsMake(0, 48, 0, 0);
menuConfiguration.menuRowHeight = 44;
menuConfiguration.menuWidth = 250;
menuConfiguration.textColor = [UIColor darkGrayColor];
menuConfiguration.textFont = [UIFont systemFontOfSize:14];
menuConfiguration.backgroundColor = [UIColor colorWithWhite:1 alpha:1];
menuConfiguration.textColor = [UIColor darkTextColor];
menuConfiguration.textFont = [UIFont systemFontOfSize:15];
menuConfiguration.backgroundColor = [UIColor whiteColor];
menuConfiguration.borderWidth = 0;
menuConfiguration.ignoreImageOriginalColor = NO;
menuConfiguration.allowRoundedArrow = NO;
menuConfiguration.selectedTextColor = [UIColor blackColor];
menuConfiguration.selectedCellBackgroundColor = [UIColor darkGrayColor];
menuConfiguration.selectedTextColor = [UIColor darkTextColor];
menuConfiguration.selectedCellBackgroundColor = [UIColor colorWithWhite:0.8 alpha:1];
menuConfiguration.separatorColor = [UIColor colorWithWhite:0.85 alpha:1];
menuConfiguration.shadowOpacity = 0.8;
menuConfiguration.roundedImage = YES;