Browse Source

fix UI/UX

Marino Faggiana 6 năm trước cách đây
mục cha
commit
483cbf1e13
2 tập tin đã thay đổi với 3 bổ sung4 xóa
  1. 0 1
      iOSClient/Main/CCMain.h
  2. 3 3
      iOSClient/Main/CCMain.m

+ 0 - 1
iOSClient/Main/CCMain.h

@@ -58,7 +58,6 @@
 @property (nonatomic, strong) UIRefreshControl *refreshControl;
 @property (nonatomic, strong) NSString *serverUrl;
 @property (nonatomic, strong) NSString *titleMain;
-@property (nonatomic, strong) NSString *textBackButton;
 @property (nonatomic, weak) CCShareOC *shareOC;
 @property (nonatomic, weak) CCDetail *detailViewController;
 @property (nonatomic, strong) UISearchController *searchController;

+ 3 - 3
iOSClient/Main/CCMain.m

@@ -600,11 +600,12 @@
                 shareUserAndGroup = [appDelegate.sharesUserAndGroup objectForKey:[serverUrl stringByAppendingString:_metadataFolder.fileName]];
             }
             
+            self.navigationItem.title = _titleMain;
+            
             if (self.imageTitle) {
                 [CCGraphics addImageToTitle:_titleMain colorTitle:[NCBrandColor sharedInstance].brandText imageTitle:[CCGraphics changeThemingColorImage:self.imageTitle multiplier:2 color:[NCBrandColor sharedInstance].brandText] navigationItem:self.navigationItem];
             } else {
                 self.navigationItem.titleView = nil;
-                self.navigationItem.title = _titleMain;
             }
         }
     }
@@ -4634,7 +4635,6 @@
             
             viewController.serverUrl = serverUrlPush;
             viewController.titleMain = _metadata.fileName;
-            viewController.textBackButton = _titleMain;
             viewController.imageTitle = imageTitleSegue;
             
             // save self
@@ -4646,7 +4646,7 @@
            
             if (viewController.isViewLoaded) {
                 
-                // Icon Title
+                viewController.titleMain = _metadata.fileName;
                 viewController.imageTitle = imageTitleSegue;
                 
                 // Fix : Application tried to present modally an active controller