marinofaggiana 5 vuotta sitten
vanhempi
commit
5954ff8637

+ 2 - 2
iOSClient/Favorites/CCFavorites.m

@@ -625,8 +625,8 @@
         // Share add Tap
         UITapGestureRecognizer *tapShare = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapActionShared:)];
         [tapShare setNumberOfTapsRequired:1];
-        ((CCCellMain *)cell).shared.userInteractionEnabled = YES;
-        [((CCCellMain *)cell).shared addGestureRecognizer:tapShare];
+        ((CCCellMain *)cell).viewShared.userInteractionEnabled = YES;
+        [((CCCellMain *)cell).viewShared addGestureRecognizer:tapShare];
         
         // More
         if ([self canOpenMenuAction:metadata]) {

+ 2 - 2
iOSClient/Main/CCMain.m

@@ -3744,8 +3744,8 @@
         // Share add Tap
         UITapGestureRecognizer *tapShare = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapActionShared:)];
         [tapShare setNumberOfTapsRequired:1];
-        ((CCCellMain *)cell).shared.userInteractionEnabled = YES;
-        [((CCCellMain *)cell).shared addGestureRecognizer:tapShare];
+        ((CCCellMain *)cell).viewShared.userInteractionEnabled = YES;
+        [((CCCellMain *)cell).viewShared addGestureRecognizer:tapShare];
         
         // More
         if ([self canOpenMenuAction:metadata]) {

+ 1 - 2
iOSClient/Main/Cell/CCCellMain.h

@@ -32,12 +32,11 @@
 @property(nonatomic, weak) IBOutlet UIImageView *local;
 @property(nonatomic, weak) IBOutlet UIImageView *comment;
 @property(nonatomic, weak) IBOutlet UIImageView *shared;
+@property(nonatomic, weak) IBOutlet UIView *viewShared;
 @property(nonatomic, weak) IBOutlet UIImageView *more;
-
 @property(nonatomic, weak) IBOutlet UILabel *labelTitle;
 @property(nonatomic, weak) IBOutlet UILabel *labelInfoFile;
 
-@property(nonatomic, weak) IBOutlet UIButton *sharedButton;
 
 @property(nonatomic, weak) IBOutlet NSLayoutConstraint *labelTitleTrailingConstraint;
 

+ 12 - 11
iOSClient/Main/Cell/CCCellMain.xib

@@ -30,14 +30,6 @@
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HRe-1g-6Q1">
-                        <rect key="frame" x="500" y="-0.5" width="50" height="60.5"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <constraints>
-                            <constraint firstAttribute="height" constant="60" id="0wA-tf-66c"/>
-                            <constraint firstAttribute="width" constant="50" id="qwf-D7-GQV"/>
-                        </constraints>
-                    </view>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="5">
                         <rect key="frame" x="15" y="10" width="40" height="40"/>
                         <constraints>
@@ -67,12 +59,20 @@
                         </constraints>
                     </imageView>
                     <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="avatar" translatesAutoresizingMaskIntoConstraints="NO" id="qhJ-el-R92" userLabel="Shared">
-                        <rect key="frame" x="512.5" y="17.5" width="25" height="25"/>
+                        <rect key="frame" x="513" y="18" width="24" height="24"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="25" id="3Kr-Hv-AdZ"/>
-                            <constraint firstAttribute="width" constant="25" id="Ijp-se-6KO"/>
+                            <constraint firstAttribute="height" constant="24" id="3Kr-Hv-AdZ"/>
+                            <constraint firstAttribute="width" constant="24" id="Ijp-se-6KO"/>
                         </constraints>
                     </imageView>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HRe-1g-6Q1" userLabel="ViewShared">
+                        <rect key="frame" x="500" y="-0.5" width="50" height="60.5"/>
+                        <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="60" id="0wA-tf-66c"/>
+                            <constraint firstAttribute="width" constant="50" id="qwf-D7-GQV"/>
+                        </constraints>
+                    </view>
                     <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="aRp-Ql-cyA" userLabel="More">
                         <rect key="frame" x="550" y="-0.5" width="50" height="60.5"/>
                         <constraints>
@@ -126,6 +126,7 @@
                 <outlet property="more" destination="aRp-Ql-cyA" id="vbC-Za-UhD"/>
                 <outlet property="shared" destination="qhJ-el-R92" id="P3Z-pt-baO"/>
                 <outlet property="status" destination="Fw2-NW-hsK" id="PjC-tV-ROx"/>
+                <outlet property="viewShared" destination="HRe-1g-6Q1" id="32S-Ee-2cG"/>
             </connections>
             <point key="canvasLocation" x="664" y="152.02398800599701"/>
         </tableViewCell>

+ 8 - 8
iOSClient/Main/NCMainCommon.swift

@@ -326,13 +326,13 @@ class NCMainCommon: NSObject, PhotoEditorDelegate, NCAudioRecorderViewController
             
             // Share image
             if (isShare) {
-                cell.shared.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "share"), width: 30, height: 30, color: .black)
+                cell.shared.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "share"), width: 100, height: 100, color: .black)
             } else if (tableShare != nil && tableShare!.shareType == Int(shareTypeLink.rawValue)) {
-                cell.shared.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "sharebylink"), width: 30, height: 30, color: .black)
+                cell.shared.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "sharebylink"), width: 100, height: 100, color: .black)
             } else if (tableShare != nil && tableShare!.shareType != Int(shareTypeLink.rawValue)) {
-                cell.shared.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "share"), width: 30, height: 30, color: .black)
+                cell.shared.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "share"), width: 100, height: 100, color: .black)
             } else {
-                cell.shared.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "share"), width: 30, height: 30, color: NCBrandColor.sharedInstance.graySoft)
+                cell.shared.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "share"), width: 100, height: 100, color: NCBrandColor.sharedInstance.graySoft)
             }
             if metadata.ownerId != appDelegate.activeUserID {
                 // Load avatar
@@ -629,13 +629,13 @@ class NCMainCommon: NSObject, PhotoEditorDelegate, NCAudioRecorderViewController
             
             // Share image
             if (isShare) {
-                cell.shared.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "share"), width: 30, height: 30, color: .black)
+                cell.shared.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "share"), width: 100, height: 100, color: .black)
             } else if (tableShare != nil && tableShare!.shareType == Int(shareTypeLink.rawValue)) {
-                cell.shared.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "sharebylink"), width: 30, height: 30, color: .black)
+                cell.shared.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "sharebylink"), width: 100, height: 100, color: .black)
             } else if (tableShare != nil && tableShare!.shareType != Int(shareTypeLink.rawValue)) {
-                cell.shared.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "share"), width: 30, height: 30, color: .black)
+                cell.shared.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "share"), width: 100, height: 100, color: .black)
             } else {
-                cell.shared.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "share"), width: 30, height: 30, color: NCBrandColor.sharedInstance.graySoft)
+                cell.shared.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "share"), width: 100, height: 100, color: NCBrandColor.sharedInstance.graySoft)
             }
             if metadata.ownerId != appDelegate.activeUserID {
                 // Load avatar