Bladeren bron

improvements

Marino Faggiana 8 jaren geleden
bovenliggende
commit
f68b00cf3b
4 gewijzigde bestanden met toevoegingen van 32 en 3 verwijderingen
  1. 1 1
      iOSClient/Actions/CCActions.swift
  2. 6 2
      iOSClient/Main/CCMain.m
  3. 2 0
      iOSClient/Utility/CCGraphics.h
  4. 23 0
      iOSClient/Utility/CCGraphics.m

+ 1 - 1
iOSClient/Actions/CCActions.swift

@@ -241,7 +241,7 @@ class CCActions: NSObject {
             let directory = CCUtility.stringAppendServerUrl(metadataNet.serverUrl, addServerUrl: metadataNet.fileName)
             let directoryTo = CCUtility.stringAppendServerUrl(metadataNet.serverUrl, addServerUrl: metadataNet.fileNameTo)
 
-            CCCoreData.renameDirectory(directory, serverUrlTo: directory, activeAccount: directoryTo)
+            CCCoreData.renameDirectory(directory, serverUrlTo: directoryTo, activeAccount: appDelegate.activeAccount)
             
         } else {
             

+ 6 - 2
iOSClient/Main/CCMain.m

@@ -476,7 +476,6 @@
     else
         [self.navigationController.navigationBar setTitleTextAttributes:@{NSForegroundColorAttributeName : COLOR_GRAY}];
 
-    //if (self.tableView.isEditing) {
     if (_isSelectedMode) {
         
         NSUInteger totali = [_sectionDataSource.allRecordsDataSource count];
@@ -517,7 +516,12 @@
             
         } else {
         
-            self.navigationItem.title = _titleMain;
+            BOOL isOfflineDirectory = [CCCoreData isOfflineDirectoryServerUrl:_serverUrl activeAccount:app.activeAccount];
+            
+            if (isOfflineDirectory) {
+                self.navigationItem.titleView = [CCGraphics navigationBarTitle:_titleMain image:[UIImage imageNamed:image_offline]];
+            } else
+                self.navigationItem.title = _titleMain;
         }
     }
 }

+ 2 - 0
iOSClient/Utility/CCGraphics.h

@@ -39,4 +39,6 @@
 
 + (UIImage *)scaleImage:(UIImage *)image toSize:(CGSize)targetSize;
 
++ (UIView *)navigationBarTitle:(NSString *)title image:(UIImage *)image;
+
 @end

+ 23 - 0
iOSClient/Utility/CCGraphics.m

@@ -232,4 +232,27 @@
 #endif
 }
 
++ (UIView *)navigationBarTitle:(NSString *)title image:(UIImage *)image
+{
+    UIView *view = [UIView new];
+    UILabel *label = [UILabel new];
+    
+    label.text = title;
+    label.textAlignment = NSTextAlignmentCenter;
+    [label sizeToFit];
+    label.center = view.center;
+    
+    UIImageView *imageView = [[UIImageView alloc] initWithImage:image];
+    float imageAspect = imageView.image.size.width / imageView.image.size.height;
+    imageView.frame = CGRectMake(label.frame.origin.x-label.frame.size.height*imageAspect, label.frame.origin.y, label.frame.size.height*imageAspect, label.frame.size.height);
+    imageView.contentMode = UIViewContentModeScaleAspectFit;
+    
+    [view addSubview:label];
+    [view addSubview:imageView];
+    
+    [view sizeToFit];
+    
+    return view;
+}
+
 @end