Managed account from touch logo image on More tab

iOSClient/Main/CCMore.swift

@@ -54,9 +54,15 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         
         imageLogo.image = UIImage.init(named: image_brandMenuMoreBackground)
         
-        let tap = UITapGestureRecognizer(target: self, action: #selector(tapLabelQuotaExternalSite))
+        // create tap gesture recognizer
+
+        let tapQuota = UITapGestureRecognizer(target: self, action: #selector(tapLabelQuotaExternalSite))
         labelQuotaExternalSite.isUserInteractionEnabled = true
-        labelQuotaExternalSite.addGestureRecognizer(tap)
+        labelQuotaExternalSite.addGestureRecognizer(tapQuota)
+        
+        let tapImageLogo = UITapGestureRecognizer(target: self, action: #selector(tapImageLogoManageAccount))
+        imageLogo.isUserInteractionEnabled = true
+        imageLogo.addGestureRecognizer(tapImageLogo)
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -310,6 +316,14 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
             }
         }
     }
+    
+    func tapImageLogoManageAccount() {
+        
+        let controller = CCManageAccount.init()
+        
+        self.navigationController?.pushViewController(controller, animated: true)
+    }
+
 }
 
 class CCCellMore: UITableViewCell {

iOSClient/Nextcloud-Bridging-Header.h

@@ -6,6 +6,7 @@
 #import "AppDelegate.h"
 #import "OCNetworking.h"
 #import "TWMessageBarManager.h"
+#import "CCManageAccount.h"
 
 #import <OCCommunicationLib/OCNotifications.h>
 #import <OCCommunicationLib/OCNotificationsAction.h>

iOSClient/Settings/CCManageAccount.m

@@ -35,6 +35,8 @@
 
 @interface CCManageAccount ()
 {
+    TableAccount *_tableAccount;
+
     CCLoginWeb *_loginWeb;
     CCLogin *_loginVC;
 }
@@ -49,17 +51,62 @@
     XLFormRowDescriptor *row;
     
     NSArray *listAccount = [CCCoreData getAllAccount];
+
+    // Section : USER INFORMATION -------------------------------------------
+    
+    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_user_information_", nil)];
+    [form addFormSection:section];
+    
+    // Full Name
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"userfullname" rowType:XLFormRowDescriptorTypeInfo title:NSLocalizedString(@"_user_full_name_", nil)];
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"detailTextLabel.font"];
+    [section addFormRow:row];
+    
+    // Address
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"useraddress" rowType:XLFormRowDescriptorTypeInfo title:NSLocalizedString(@"_user_address_", nil)];
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"detailTextLabel.font"];
+    [section addFormRow:row];
+    
+    // Phone
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"userphone" rowType:XLFormRowDescriptorTypeInfo title:NSLocalizedString(@"_user_phone_", nil)];
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"detailTextLabel.font"];
+    [section addFormRow:row];
+    
+    // Email
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"useremail" rowType:XLFormRowDescriptorTypeInfo title:NSLocalizedString(@"_user_email_", nil)];
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"detailTextLabel.font"];
+    [section addFormRow:row];
+    
+    // Web
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"userweb" rowType:XLFormRowDescriptorTypeInfo title:NSLocalizedString(@"_user_web_", nil)];
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"detailTextLabel.font"];
+    [section addFormRow:row];
+    
+    // Twitter
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"usertwitter" rowType:XLFormRowDescriptorTypeInfo title:NSLocalizedString(@"_user_twitter_", nil)];
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"detailTextLabel.font"];
+    [section addFormRow:row];
+
+    // Section : PICKER ACCOUNT -------------------------------------------
     
     section = [XLFormSectionDescriptor formSectionWithTitle:@"cloud account"];
     [form addFormSection:section];
     form.rowNavigationOptions = XLFormRowNavigationOptionNone;
     
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"pickerAccount" rowType:XLFormRowDescriptorTypePicker];
-        
+    row.height = 90;
     row.selectorOptions = listAccount;
     row.value = app.activeAccount;
     [section addFormRow:row];
     
+    // Section : MANAGE ACCOUNT -------------------------------------------
+    
     section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_manage_account_", nil)];
     [form addFormSection:section];
     
@@ -326,6 +373,41 @@
     pickerAccount.rowDescriptor.selectorOptions = listAccount;
     pickerAccount.rowDescriptor.value = app.activeAccount;
     
+     _tableAccount = [CCCoreData getActiveAccount];
+    
+    XLFormRowDescriptor *rowUserFullName = [self.form formRowWithTag:@"userfullname"];
+    XLFormRowDescriptor *rowUserAddress = [self.form formRowWithTag:@"useraddress"];
+    XLFormRowDescriptor *rowUserPhone = [self.form formRowWithTag:@"userphone"];
+    XLFormRowDescriptor *rowUserEmail = [self.form formRowWithTag:@"useremail"];
+    XLFormRowDescriptor *rowUserWeb = [self.form formRowWithTag:@"userweb"];
+    XLFormRowDescriptor *rowUserTwitter = [self.form formRowWithTag:@"usertwitter"];
+
+    rowUserFullName.value = _tableAccount.displayName;
+    if ([_tableAccount.displayName isEqualToString:@""]) rowUserFullName.hidden = @YES;
+    else rowUserFullName.hidden = @NO;
+    
+    rowUserAddress.value = _tableAccount.address;
+    if ([_tableAccount.address isEqualToString:@""]) rowUserAddress.hidden = @YES;
+    else rowUserAddress.hidden = @NO;
+    
+    rowUserPhone.value = _tableAccount.phone;
+    if ([_tableAccount.phone isEqualToString:@""]) rowUserPhone.hidden = @YES;
+    else rowUserPhone.hidden = @NO;
+    
+    rowUserEmail.value = _tableAccount.email;
+    if ([_tableAccount.email isEqualToString:@""]) rowUserEmail.hidden = @YES;
+    else rowUserEmail.hidden = @NO;
+    
+    rowUserWeb.value = _tableAccount.webpage;
+    if ([_tableAccount.webpage isEqualToString:@""]) rowUserWeb.hidden = @YES;
+    else rowUserWeb.hidden = @NO;
+    
+    rowUserTwitter.value = _tableAccount.twitter;
+    if ([_tableAccount.twitter isEqualToString:@""]) rowUserTwitter.hidden = @YES;
+    else rowUserTwitter.hidden = @NO;
+    
+    // -----------------------------------------------------------------
+    
     [self.tableView reloadData];
     
     [self performSelector:@selector(reloadData) withObject:nil afterDelay:1];

iOSClient/Settings/CCSettings.m

@@ -113,47 +113,6 @@
     row.action.viewControllerClass = [CCManageAccount class];
     [section addFormRow:row];
     
-    // Section : USER INFORMATION -------------------------------------------
-    
-    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_user_information_", nil)];
-    [form addFormSection:section];
-    
-    // Full Name
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"userfullname" rowType:XLFormRowDescriptorTypeInfo title:NSLocalizedString(@"_user_full_name_", nil)];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"detailTextLabel.font"];
-    [section addFormRow:row];
-    
-    // Address
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"useraddress" rowType:XLFormRowDescriptorTypeInfo title:NSLocalizedString(@"_user_address_", nil)];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"detailTextLabel.font"];
-    [section addFormRow:row];
-
-    // Phone
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"userphone" rowType:XLFormRowDescriptorTypeInfo title:NSLocalizedString(@"_user_phone_", nil)];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"detailTextLabel.font"];
-    [section addFormRow:row];
-
-    // Email
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"useremail" rowType:XLFormRowDescriptorTypeInfo title:NSLocalizedString(@"_user_email_", nil)];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"detailTextLabel.font"];
-    [section addFormRow:row];
-
-    // Web
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"userweb" rowType:XLFormRowDescriptorTypeInfo title:NSLocalizedString(@"_user_web_", nil)];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"detailTextLabel.font"];
-    [section addFormRow:row];
-    
-    // Twitter
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"usertwitter" rowType:XLFormRowDescriptorTypeInfo title:NSLocalizedString(@"_user_twitter_", nil)];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"detailTextLabel.font"];
-    [section addFormRow:row];
-
     // Section AUTOMATIC UPLOAD OF CAMERA IMAGES ----------------------------
     
     section = [XLFormSectionDescriptor formSection];
@@ -273,13 +232,6 @@
     XLFormRowDescriptor *rowUrlCloud = [self.form formRowWithTag:@"urlcloud"];
     XLFormRowDescriptor *rowUserNameCloud = [self.form formRowWithTag:@"usernamecloud"];
 
-    XLFormRowDescriptor *rowUserFullName = [self.form formRowWithTag:@"userfullname"];
-    XLFormRowDescriptor *rowUserAddress = [self.form formRowWithTag:@"useraddress"];
-    XLFormRowDescriptor *rowUserPhone = [self.form formRowWithTag:@"userphone"];
-    XLFormRowDescriptor *rowUserEmail = [self.form formRowWithTag:@"useremail"];
-    XLFormRowDescriptor *rowUserWeb = [self.form formRowWithTag:@"userweb"];
-    XLFormRowDescriptor *rowUserTwitter = [self.form formRowWithTag:@"usertwitter"];
-
     
     //XLFormRowDescriptor *rowChangeCredentials = [self.form formRowWithTag:@"changecredentials"];
 
@@ -303,23 +255,6 @@
     rowUrlCloud.value = app.activeUrl;
     rowUserNameCloud.value = app.activeUser;
     
-    rowUserFullName.value = _tableAccount.displayName;
-    if ([_tableAccount.displayName isEqualToString:@""]) rowUserFullName.hidden = @YES;
-    
-    rowUserAddress.value = _tableAccount.address;
-    if ([_tableAccount.address isEqualToString:@""]) rowUserAddress.hidden = @YES;
-    
-    rowUserPhone.value = _tableAccount.phone;
-    if ([_tableAccount.phone isEqualToString:@""]) rowUserPhone.hidden = @YES;
-    
-    rowUserEmail.value = _tableAccount.email;
-    if ([_tableAccount.email isEqualToString:@""]) rowUserEmail.hidden = @YES;
-    
-    rowUserWeb.value = _tableAccount.webpage;
-    if ([_tableAccount.webpage isEqualToString:@""]) rowUserWeb.hidden = @YES;
-    
-    rowUserTwitter.value = _tableAccount.twitter;
-    if ([_tableAccount.twitter isEqualToString:@""]) rowUserTwitter.hidden = @YES;
     
     // -----------------------------------------------------------------