소스 검색

Avatar Profile

Marino Faggiana 8 년 전
부모
커밋
fd24779a9f
2개의 변경된 파일7개의 추가작업 그리고 19개의 파일을 삭제
  1. 1 1
      iOSClient/Main/CCMain.m
  2. 6 18
      iOSClient/Settings/CCSettings.m

+ 1 - 1
iOSClient/Main/CCMain.m

@@ -1119,7 +1119,7 @@
 {
     [CCCoreData setUserProfileActiveAccount:metadataNet.account userProfile:userProfile];
 
-    NSString *address = [NSString stringWithFormat:@"%@/index.php/avatar/%@/64", app.activeUrl, app.activeUser];
+    NSString *address = [NSString stringWithFormat:@"%@/index.php/avatar/%@/128", app.activeUrl, app.activeUser];
     UIImage *avatar = [UIImage imageWithData:[NSData dataWithContentsOfURL:[NSURL URLWithString:[address stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]]];
     if (avatar)
         [UIImagePNGRepresentation(avatar) writeToFile:[NSString stringWithFormat:@"%@/avatar.png", app.directoryUser] atomically:YES];

+ 6 - 18
iOSClient/Settings/CCSettings.m

@@ -277,7 +277,6 @@
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
     
     [self reloadForm];
-    [self recalculateSize];
 }
 
 // E' apparsa
@@ -332,7 +331,7 @@
     XLFormRowDescriptor *rowUserEmail = [self.form formRowWithTag:@"useremail"];
     XLFormRowDescriptor *rowQuota = [self.form formRowWithTag:@"quota"];
     
-    XLFormRowDescriptor *rowChangeCredentials = [self.form formRowWithTag:@"changecredentials"];
+    //XLFormRowDescriptor *rowChangeCredentials = [self.form formRowWithTag:@"changecredentials"];
 
     // ------------------------------------------------------------------
     
@@ -351,6 +350,7 @@
     UIImage *avatar = [[UIImage alloc] initWithContentsOfFile:[NSString stringWithFormat:@"%@/avatar.png", app.directoryUser]];
     if (avatar) {
         
+        avatar =  [CCGraphics scaleImage:avatar toSize:CGSizeMake(50, 50)];
         APAvatarImageView *avatarImageView = [[APAvatarImageView alloc] initWithImage:avatar borderColor:[UIColor lightGrayColor] borderWidth:0.5];
         
         CGSize imageSize = avatarImageView.bounds.size;
@@ -367,13 +367,13 @@
     rowUrlCloud.value = app.activeUrl;
     rowUserNameCloud.value = app.activeUser;
     
-    if (tableAccount.displayName.length > 0 || tableAccount.address.length > 0 || tableAccount.phone.length > 0) {
+    if (avatar || tableAccount.displayName.length > 0 || tableAccount.address.length > 0 || tableAccount.phone.length > 0) {
         
         rowUserInformation.title = [NSString stringWithFormat:@"%@ %@ %@", tableAccount.displayName, tableAccount.address, tableAccount.phone];
         rowUserInformation.disabled = @YES;
-        [rowUserInformation.cellConfig setObject:avatar forKey:@"imageView.image"];
-        rowUserInformation.height = 100;
-        
+        if (avatar)
+            [rowUserInformation.cellConfig setObject:avatar forKey:@"imageView.image"];
+
     } else {
         
         rowUserInformation.title = NSLocalizedString(@"_information_", nil);
@@ -387,18 +387,6 @@
     
     rowQuota.value = [NSString stringWithFormat:@"%@ / %@ %@", quota, quotaAvailable, NSLocalizedString(@"_available_", nil)];
     
-    /*
-        [rowChangeCredentials.cellConfig setObject:avatarViewImage forKey:@"imageView.image"];
-        rowChangeCredentials.height = 50;
-        
-    } else {
-        
-        [rowChangeCredentials.cellConfig setObject:[UIImage imageNamed:image_settingsCredentials] forKey:@"imageView.image"];
-    }
-    */
-    
-    
-    
     // -----------------------------------------------------------------
     
     [self.tableView reloadData];