Browse Source

graphics search

Marino Faggiana 8 years ago
parent
commit
27749820dd
2 changed files with 7 additions and 14 deletions
  1. 3 9
      iOSClient/Main/CCMain.m
  2. 4 5
      iOSClient/Main/Main.storyboard

+ 3 - 9
iOSClient/Main/CCMain.m

@@ -117,7 +117,6 @@
     [super viewDidLoad];
     
     // init object
-    //_actions = [CCActions new];
     _metadata = [[CCMetadata alloc] init];
     _metadataSegue = [[CCMetadata alloc] init];
     _hud = [[CCHud alloc] initWithView:[[[UIApplication sharedApplication] delegate] window]];
@@ -185,20 +184,15 @@
     // Search
     
     self.definesPresentationContext = YES;
-    
     self.searchController.searchResultsUpdater = self;
     self.searchController.dimsBackgroundDuringPresentation = NO;
     self.tableView.tableHeaderView = self.searchController.searchBar;
-    
+    self.searchController.searchBar.barTintColor = COLOR_SEPARATOR_TABLE;
+    [self.searchController.searchBar sizeToFit];
+
     if (_isRoot) self.searchController.searchBar.placeholder = NSLocalizedString(@"_search_all_folders_",nil);
     else self.searchController.searchBar.placeholder = NSLocalizedString(@"_search_this_folder_",nil);
-    
     //self.searchController.searchBar.scopeButtonTitles = @[NSLocalizedString(@"_search_this_folder_",nil),NSLocalizedString(@"_search_all_folders_",nil)];
-    self.searchController.searchBar.barTintColor = COLOR_SEPARATOR_TABLE;
-    
-    //self.searchController.hidesNavigationBarDuringPresentation = NO;
-    
-    [self.searchController.searchBar sizeToFit];    
 }
 
 // Apparirà

+ 4 - 5
iOSClient/Main/Main.storyboard

@@ -405,8 +405,8 @@
         <scene sceneID="OEe-6n-ARk">
             <objects>
                 <tableViewController storyboardIdentifier="CCMainVC" extendedLayoutIncludesOpaqueBars="YES" id="YJg-Xa-VYf" customClass="CCMain" sceneMemberID="viewController">
-                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" allowsSelectionDuringEditing="YES" rowHeight="60" sectionHeaderHeight="22" sectionFooterHeight="22" id="7sT-6b-Pnh">
-                        <rect key="frame" x="0.0" y="64" width="375" height="603"/>
+                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" misplaced="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" allowsSelectionDuringEditing="YES" rowHeight="60" sectionHeaderHeight="22" sectionFooterHeight="22" id="7sT-6b-Pnh">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <searchBar key="tableFooterView" contentMode="redraw" id="tgI-f2-wma">
@@ -423,7 +423,6 @@
                             <outlet property="delegate" destination="YJg-Xa-VYf" id="Pwe-im-Vzk"/>
                         </connections>
                     </tableView>
-                    <extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
                     <navigationItem key="navigationItem" id="TXe-bF-Uwk"/>
                     <connections>
                         <outlet property="searchDisplayController" destination="xcf-VI-FqA" id="nZk-CY-UUL"/>
@@ -448,7 +447,7 @@
             <objects>
                 <navigationController storyboardIdentifier="CCDetailNC" extendedLayoutIncludesOpaqueBars="YES" automaticallyAdjustsScrollViewInsets="NO" id="mtc-lf-PRo" sceneMemberID="viewController">
                     <toolbarItems/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" misplaced="YES" id="vxw-dW-rgx">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="vxw-dW-rgx">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
@@ -659,6 +658,6 @@
         <image name="tabBarSettings" width="25" height="25"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="YTW-Kz-l02"/>
+        <segue reference="op6-ow-K8v"/>
     </inferredMetricsTieBreakers>
 </document>