소스 검색

Merge remote-tracking branch 'refs/remotes/origin/Coherence'

marinofaggiana 4 년 전
부모
커밋
6b45bbec54
2개의 변경된 파일1개의 추가작업 그리고 16개의 파일을 삭제
  1. 1 1
      iOSClient/Main/CCMain.m
  2. 0 15
      iOSClient/Main/NCMainTabBar.swift

+ 1 - 1
iOSClient/Main/CCMain.m

@@ -1425,7 +1425,7 @@
         
         UITextField *fileName = alertController.textFields.firstObject;
         
-        [[NCNetworking shared] createFolderWithFileName:fileName.text serverUrl:serverUrl account:appDelegate.activeAccount url:appDelegate.activeUrl overwrite:false completion:^(NSInteger errorCode, NSString *errorDescription) { }];
+        [[NCNetworking shared] createFolderWithFileName:[fileName.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] serverUrl:serverUrl account:appDelegate.activeAccount url:appDelegate.activeUrl overwrite:false completion:^(NSInteger errorCode, NSString *errorDescription) { }];
     }];
     
     okAction.enabled = NO;

+ 0 - 15
iOSClient/Main/NCMainTabBar.swift

@@ -97,21 +97,6 @@ import Foundation
         }
     }
 
-    func createPathCircle() -> CGPath {
-        let radius: CGFloat = 37.0
-        let path = UIBezierPath()
-        let centerWidth = self.frame.width / 2
-
-        path.move(to: CGPoint(x: 0, y: 0))
-        path.addLine(to: CGPoint(x: (centerWidth - radius * 2), y: 0))
-        path.addArc(withCenter: CGPoint(x: centerWidth, y: 0), radius: radius, startAngle: CGFloat(180).degreesToRadians, endAngle: CGFloat(0).degreesToRadians, clockwise: false)
-        path.addLine(to: CGPoint(x: self.frame.width, y: 0))
-        path.addLine(to: CGPoint(x: self.frame.width, y: self.frame.height))
-        path.addLine(to: CGPoint(x: 0, y: self.frame.height))
-        path.close()
-        return path.cgPath
-    }
-
 }
 extension CGFloat {
     var degreesToRadians: CGFloat { return self * .pi / 180 }