Merge branch 'Coherence' into new-design-bugfix

Cartfile

@@ -21,3 +21,4 @@ github "ivanbruel/MarkdownKit"
 github "https://github.com/marinofaggiana/AFNetworking" "master"
 github "https://github.com/marinofaggiana/KTVHTTPCache" "2.0.2"
 github "https://github.com/marinofaggiana/XLForm" "master"
+github "https://github.com/marinofaggiana/TOPasscodeViewController" "0.0.6"

Cartfile.resolved

@@ -2,7 +2,7 @@ github "Alamofire/Alamofire" "5.1.0"
 github "AssistoLab/DropDown" "v2.3.13"
 github "CocoaLumberjack/CocoaLumberjack" "3.6.1"
 github "MortimerGoro/MGSwipeTableCell" "1.6.8"
-github "SVGKit/SVGKit" "8560ef56bd61e34d5cd8d9739954f9765e3ac794"
+github "SVGKit/SVGKit" "d9432035c6e2587358a0b838d00c2658ce16e7a2"
 github "SwiftyJSON/SwiftyJSON" "5.0.0"
 github "WeTransfer/WeScan" "1.2.0"
 github "WenchaoD/FSCalendar" "2.8.0"
@@ -16,8 +16,9 @@ github "krzyzanowskim/OpenSSL" "1.0.218"
 github "malcommac/SwiftRichString" "3.7.1"
 github "marinofaggiana/AFNetworking" "2967678c3e0e98c9b8d7e06222ad12d1f49c26f2"
 github "marinofaggiana/KTVHTTPCache" "2.0.2"
+github "marinofaggiana/TOPasscodeViewController" "0.0.6"
 github "marinofaggiana/XLForm" "eb9381ad8129f60402bf412250fb31b95a628a08"
-github "nextcloud/ios-communication-library" "229049eb830d2a4789d9e31f61b740f9cbe4d505"
+github "nextcloud/ios-communication-library" "52a8400313f053f1a8f082fe56d4082f7c0cfb81"
 github "realm/realm-cocoa" "v4.4.1"
 github "rechsteiner/Parchment" "v1.7.0"
 github "scenee/FloatingPanel" "v1.7.4"

Carthage/Checkouts/SVGKit/SVGKit.podspec

@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.prefix_header_file = 'SVGKitLibrary/SVGKit-iOS/SVGKit-Prefix.pch'
   s.module_map = 'SVGKitLibrary/SVGKit-iOS/SVGKit.modulemap'
   s.requires_arc = true
-  s.xcconfig = {
+  s.pod_target_xcconfig = {
     'CLANG_CXX_LANGUAGE_STANDARD' => 'gnu++11',
     'CLANG_CXX_LIBRARY' => 'libc++',
     'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2'

Libraries external/AFViewShaker/AFViewShaker.h

@@ -1,19 +0,0 @@
-//
-//  AFViewShaker
-//  AFViewShaker
-//
-//  Created by Philip Vasilchenko on 03.12.13.
-//  Copyright (c) 2014 okolodev. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface AFViewShaker : NSObject <CAAnimationDelegate>
-
-- (instancetype)initWithView:(UIView *)view;
-- (instancetype)initWithViewsArray:(NSArray *)viewsArray;
-
-- (void)shake;
-- (void)shakeWithDuration:(NSTimeInterval)duration completion:(void (^)())completion;
-
-@end

Libraries external/AFViewShaker/AFViewShaker.m

@@ -1,81 +0,0 @@
-//
-//  AFViewShaker
-//  AFViewShaker
-//
-//  Created by Philip Vasilchenko on 03.12.13.
-//  Copyright (c) 2014 okolodev. All rights reserved.
-//
-
-#import "AFViewShaker.h"
-
-static NSTimeInterval const kAFViewShakerDefaultDuration = 0.5;
-static NSString * const kAFViewShakerAnimationKey = @"kAFViewShakerAnimationKey";
-
-
-@interface AFViewShaker ()
-@property (nonatomic, strong) NSArray * views;
-@property (nonatomic, assign) NSUInteger completedAnimations;
-@property (nonatomic, copy) void (^completionBlock)();
-@end
-
-
-@implementation AFViewShaker
-
-- (instancetype)initWithView:(UIView *)view {
-    return [self initWithViewsArray:@[ view ]];
-}
-
-
-- (instancetype)initWithViewsArray:(NSArray *)viewsArray {
-    self = [super init];
-    if ( self ) {
-        self.views = viewsArray;
-    }
-    return self;
-}
-
-
-#pragma mark - Public methods
-
-- (void)shake {
-    [self shakeWithDuration:kAFViewShakerDefaultDuration completion:nil];
-}
-
-
-- (void)shakeWithDuration:(NSTimeInterval)duration completion:(void (^)())completion {
-    self.completionBlock = completion;
-    for (UIView * view in self.views) {
-        [self addShakeAnimationForView:view withDuration:duration];
-    }
-}
-
-
-#pragma mark - Shake Animation
-
-- (void)addShakeAnimationForView:(UIView *)view withDuration:(NSTimeInterval)duration {
-    CAKeyframeAnimation * animation = [CAKeyframeAnimation animationWithKeyPath:@"transform.translation.x"];
-    CGFloat currentTx = view.transform.tx;
-    
-    animation.delegate = self;
-    animation.duration = duration;
-    animation.values = @[ @(currentTx), @(currentTx + 10), @(currentTx-8), @(currentTx + 8), @(currentTx -5), @(currentTx + 5), @(currentTx) ];
-    animation.keyTimes = @[ @(0), @(0.225), @(0.425), @(0.6), @(0.75), @(0.875), @(1) ];
-    animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
-    [view.layer addAnimation:animation forKey:kAFViewShakerAnimationKey];
-}
-
-
-#pragma mark - CAAnimation Delegate
-
-- (void)animationDidStop:(CAAnimation *)animation finished:(BOOL)flag {
-    self.completedAnimations += 1;
-    if ( self.completedAnimations >= self.views.count ) {
-        self.completedAnimations = 0;
-        if ( self.completionBlock ) {
-            self.completionBlock();
-        }
-    }
-}
-
-
-@end