marinofaggiana 4 gadi atpakaļ
vecāks
revīzija
15e8fd9f3a
2 mainītis faili ar 9 papildinājumiem un 18 dzēšanām
  1. 0 14
      iOSClient/Main/CCMain.m
  2. 9 4
      iOSClient/RichWorkspace/NCRichWorkspace.xib

+ 0 - 14
iOSClient/Main/CCMain.m

@@ -2343,20 +2343,6 @@
         
     } else {
         
-        /*
-         self.viewRichWorkspace.translatesAutoresizingMaskIntoConstraints = false;
-         self.viewRichWorkspace.backgroundColor = [UIColor redColor];
-         
-         //[[self.viewRichWorkspace.leftAnchor constraintEqualToAnchor:self.tableView.leftAnchor] setActive:true];
-         //[[self.viewRichWorkspace.rightAnchor constraintEqualToAnchor:self.tableView.rightAnchor] setActive:true];
-         [[self.viewRichWorkspace.widthAnchor constraintEqualToAnchor:self.tableView.widthAnchor] setActive:true];
-         [[self.viewRichWorkspace.centerXAnchor constraintEqualToAnchor:self.tableView.centerXAnchor] setActive:true];
-         [[self.viewRichWorkspace.topAnchor constraintEqualToAnchor:self.tableView.topAnchor] setActive:true];
-         [[self.viewRichWorkspace.heightAnchor constraintEqualToConstant:200] setActive:true];
-         */
-        
-        self.viewRichWorkspace.backgroundColor = [UIColor redColor];
-
         [self.viewRichWorkspace setFrame:CGRectMake(self.tableView.tableHeaderView.frame.origin.x, self.tableView.tableHeaderView.frame.origin.y, self.tableView.frame.size.width, heightRichWorkspace)];
     }
     

+ 9 - 4
iOSClient/RichWorkspace/NCRichWorkspace.xib

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina5_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment version="4368" identifier="iOS"/>
@@ -48,9 +48,8 @@
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="orF-i7-sVP">
                     <rect key="frame" x="0.0" y="40.666666666666686" width="414" height="695.33333333333326"/>
                     <subviews>
-                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="scaleToFill" fixedFrame="YES" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="wri-16-tQY">
-                            <rect key="frame" x="8" y="8" width="304" height="379"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" userInteractionEnabled="NO" contentMode="scaleToFill" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="wri-16-tQY">
+                            <rect key="frame" x="0.0" y="0.0" width="414" height="695.33333333333337"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <color key="textColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -58,6 +57,12 @@
                         </textView>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstItem="wri-16-tQY" firstAttribute="top" secondItem="orF-i7-sVP" secondAttribute="top" id="7js-7b-K16"/>
+                        <constraint firstAttribute="bottom" secondItem="wri-16-tQY" secondAttribute="bottom" id="a18-oE-B43"/>
+                        <constraint firstAttribute="trailing" secondItem="wri-16-tQY" secondAttribute="trailing" id="fLE-9r-zk7"/>
+                        <constraint firstItem="wri-16-tQY" firstAttribute="leading" secondItem="orF-i7-sVP" secondAttribute="leading" id="sHh-SV-ESA"/>
+                    </constraints>
                 </view>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>