coding

Cartfile

@@ -19,7 +19,7 @@ github "scenee/FloatingPanel"
 github "ivanbruel/MarkdownKit"
 github "getsentry/sentry-cocoa"
 github "FabrizioBrancati/Queuer"
+github "xmartlabs/XLForm" ~> 4.1
 
 github "https://github.com/marinofaggiana/KTVHTTPCache" "2.0.2"
-github "https://github.com/marinofaggiana/XLForm" "master"
 github "https://github.com/marinofaggiana/TOPasscodeViewController" "0.0.7"

Cartfile.resolved

@@ -3,7 +3,7 @@ github "AssistoLab/DropDown" "v2.3.13"
 github "CocoaLumberjack/CocoaLumberjack" "3.6.1"
 github "FabrizioBrancati/Queuer" "2.1.1"
 github "MortimerGoro/MGSwipeTableCell" "1.6.8"
-github "SVGKit/SVGKit" "2a4068f0ea546dcd82f7e4dd9aa9026c0a0a2235"
+github "SVGKit/SVGKit" "af9fa17df2ecb235a7f1f3966c610e4fb8404114"
 github "SwiftyJSON/SwiftyJSON" "5.0.0"
 github "WeTransfer/WeScan" "1.2.0"
 github "WenchaoD/FSCalendar" "2.8.0"
@@ -18,12 +18,12 @@ github "krzyzanowskim/OpenSSL" "1.0.218"
 github "malcommac/SwiftRichString" "3.7.2"
 github "marinofaggiana/KTVHTTPCache" "2.0.2"
 github "marinofaggiana/TOPasscodeViewController" "0.0.7"
-github "marinofaggiana/XLForm" "eb9381ad8129f60402bf412250fb31b95a628a08"
-github "nextcloud/ios-communication-library" "70a45ebd4d0acbcce559587e332abd775635a643"
+github "nextcloud/ios-communication-library" "b6dd294d72ee87b6c12ed6fefe6e70458a9e7f5e"
 github "realm/realm-cocoa" "v5.2.0"
 github "rechsteiner/Parchment" "v1.7.0"
 github "scenee/FloatingPanel" "v1.7.5"
 github "tilltue/TLPhotoPicker" "2.0.11"
 github "weichsel/ZIPFoundation" "0.9.10"
+github "xmartlabs/XLForm" "4.1.0"
 github "yahoojapan/SwiftyXMLParser" "5.2.0"
 github "yannickl/QRCodeReader.swift" "10.1.1"

Carthage/Checkouts/SVGKit/SVGKitLibrary/SVGKit-iOS/SVGKit-Prefix.pch

@@ -1,31 +0,0 @@
-//
-// Prefix header for all source files of the 'SVGKit-iOS' target in the 'SVGKit-iOS' project
-//
-
-#ifdef __OBJC__
-#import <Foundation/Foundation.h>
-#import <CocoaLumberjack/CocoaLumberjack.h>
-#import "SVGKDefine.h"
-
-// These macro is only used inside framework project, does not expose to public header and effect user's define
-
-#define SVGKIT_LOG_CONTEXT 556
-
-#define SVGKitLogError(frmt, ...)   LOG_MAYBE(NO,                LOG_LEVEL_DEF, DDLogFlagError,   SVGKIT_LOG_CONTEXT, nil, __PRETTY_FUNCTION__, frmt, ##__VA_ARGS__)
-#define SVGKitLogWarn(frmt, ...)    LOG_MAYBE(LOG_ASYNC_ENABLED, LOG_LEVEL_DEF, DDLogFlagWarning, SVGKIT_LOG_CONTEXT, nil, __PRETTY_FUNCTION__, frmt, ##__VA_ARGS__)
-#define SVGKitLogInfo(frmt, ...)    LOG_MAYBE(LOG_ASYNC_ENABLED, LOG_LEVEL_DEF, DDLogFlagInfo,    SVGKIT_LOG_CONTEXT, nil, __PRETTY_FUNCTION__, frmt, ##__VA_ARGS__)
-#define SVGKitLogDebug(frmt, ...)   LOG_MAYBE(LOG_ASYNC_ENABLED, LOG_LEVEL_DEF, DDLogFlagDebug,   SVGKIT_LOG_CONTEXT, nil, __PRETTY_FUNCTION__, frmt, ##__VA_ARGS__)
-#define SVGKitLogVerbose(frmt, ...) LOG_MAYBE(LOG_ASYNC_ENABLED, LOG_LEVEL_DEF, DDLogFlagVerbose, SVGKIT_LOG_CONTEXT, nil, __PRETTY_FUNCTION__, frmt, ##__VA_ARGS__)
-
-#if DEBUG
-static const int ddLogLevel = DDLogLevelVerbose;
-#else
-static const int ddLogLevel = DDLogLevelWarning;
-#endif
-
-#if SVGKIT_MAC
-#define NSStringFromCGRect(rect) NSStringFromRect(rect)
-#define NSStringFromCGSize(size) NSStringFromSize(size)
-#define NSStringFromCGPoint(point) NSStringFromPoint(point)
-#endif
-#endif

Carthage/Checkouts/SVGKit/Source/AppKit additions/SVGKImageRep.h

@@ -6,6 +6,9 @@
 //
 //
 
+#import "SVGKDefine.h"
+
+#if SVGKIT_MAC
 #import <Cocoa/Cocoa.h>
 @class SVGKImage;
 @class SVGKSource;
@@ -36,3 +39,5 @@
 + (void)unloadSVGKImageRep;
 
 @end
+
+#endif /* SVGKIT_MAC */

Carthage/Checkouts/SVGKit/Source/AppKit additions/SVGKImageRep.m

@@ -7,11 +7,12 @@
 //
 
 #import "SVGKit.h"
+
+#if SVGKIT_MAC
 #import "SVGKSourceNSData.h"
 #import "SVGKSourceLocalFile.h"
 #import "SVGKSourceURL.h"
 #import "SVGKSourceString.h"
-#import "SVGKFastImageView.h"
 #import "SVGKImageRep.h"
 #import "SVGKImage+CGContext.h"
 #include <tgmath.h>
@@ -288,3 +289,5 @@
 }
 
 @end
+
+#endif /* SVGKIT_MAC */

Carthage/Checkouts/SVGKit/Source/DOM classes/Core DOM/CSSStyleDeclaration.m

@@ -5,6 +5,8 @@
 #import "CSSPrimitiveValue.h"
 #import "CocoaLumberjack/DDFileLogger.h"
 
+#import "SVGKDefine_Private.h"
+
 @interface CSSStyleDeclaration()
 
 @property(nonatomic,strong) NSMutableDictionary* internalDictionaryOfStylesByCSSClass;

Carthage/Checkouts/SVGKit/Source/DOM classes/Core DOM/CSSValueList.m

@@ -1,5 +1,6 @@
 #import "CSSValueList.h"
 #import "CSSValue_ForSubclasses.h"
+#import "SVGKDefine_Private.h"
 
 @interface CSSValueList()
 

Carthage/Checkouts/SVGKit/Source/DOM classes/Core DOM/Document.m

@@ -5,6 +5,8 @@
 
 #import "NodeList+Mutable.h" // needed for access to underlying array, because SVG doesnt specify how lists are made mutable
 
+#import "SVGKDefine_Private.h"
+
 @implementation Document
 
 @synthesize doctype;

Carthage/Checkouts/SVGKit/Source/DOM classes/SVG-DOM/SVGClipPathElement.m

@@ -4,6 +4,8 @@
 
 #import "SVGHelperUtilities.h"
 
+#import "SVGKDefine_Private.h"
+
 @implementation SVGClipPathElement
 
 @synthesize clipPathUnits;

Carthage/Checkouts/SVGKit/Source/DOM classes/SVG-DOM/SVGDocument.m

@@ -13,6 +13,8 @@
 
 #import "NamedNodeMap_Iterable.h" // needed for the allPrefixesByNamespace implementation
 
+#import "SVGKDefine_Private.h"
+
 @implementation SVGDocument
 
 

Carthage/Checkouts/SVGKit/Source/DOM classes/SVG-DOM/SVGHelperUtilities.m

@@ -9,6 +9,8 @@
 #import "SVGSVGElement.h"
 #import "SVGGradientLayer.h"
 
+#import "SVGKDefine_Private.h"
+
 @implementation SVGHelperUtilities
 
 

Carthage/Checkouts/SVGKit/Source/DOM classes/SVG-DOM/SVGLength.m

@@ -4,6 +4,7 @@
 #import "CSSPrimitiveValue_ConfigurablePixelsPerInch.h"
 
 #import "SVGUtils.h"
+#import "SVGKDefine_Private.h"
 
 #include <sys/types.h>
 #include <sys/sysctl.h>

Carthage/Checkouts/SVGKit/Source/DOM classes/SVG-DOM/SVGRect.m

@@ -1,4 +1,5 @@
 #import "SVGRect.h"
+#import "SVGKDefine_Private.h"
 
 BOOL SVGRectIsInitialized( SVGRect rect )
 {

Carthage/Checkouts/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGCircleElement.m

@@ -6,6 +6,7 @@
 //
 
 #import "SVGCircleElement.h"
+#import "SVGKDefine_Private.h"
 
 @implementation SVGCircleElement
 

Carthage/Checkouts/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGElement.m

@@ -20,6 +20,8 @@
 
 #import "SVGTransformable.h"
 
+#import "SVGKDefine_Private.h"
+
 @interface SVGElement ()
 
 @property (nonatomic, copy) NSString *stringValue;

Carthage/Checkouts/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGGradientElement.m

@@ -5,6 +5,7 @@
 #import "SVGGElement.h"
 #import "SVGLinearGradientElement.h"
 #import "SVGRadialGradientElement.h"
+#import "SVGKDefine_Private.h"
 
 @implementation SVGGradientElement
 

Carthage/Checkouts/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGImageElement.m

@@ -9,6 +9,8 @@
 #import "SVGKSourceNSData.h"
 #import "SVGKInlineResource.h"
 
+#import "SVGKDefine_Private.h"
+
 CGImageRef SVGImageCGImage(UIImage *img)
 {
 #if SVGKIT_UIKIT

Carthage/Checkouts/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGLinearGradientElement.m

@@ -9,6 +9,7 @@
 #import "SVGLinearGradientElement.h"
 #import "SVGElement_ForParser.h"
 #import "SVGGradientLayer.h"
+#import "SVGKDefine_Private.h"
 
 @interface SVGLinearGradientElement ()
 

Carthage/Checkouts/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGPathElement.m

@@ -12,6 +12,8 @@
 
 #import "SVGElement_ForParser.h" // to resolve Xcode circular dependencies; in long term, parsing SHOULD NOT HAPPEN inside any class whose name starts "SVG" (because those are reserved classes for the SVG Spec)
 
+#import "SVGKDefine_Private.h"
+
 @interface SVGPathElement ()
 
 - (void) parseData:(NSString *)data;

Carthage/Checkouts/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGRadialGradientElement.m

@@ -10,6 +10,7 @@
 #import "SVGElement_ForParser.h"
 #import "SVGUtils.h"
 #import "SVGGradientLayer.h"
+#import "SVGKDefine_Private.h"
 
 // `kCAGradientLayerRadial` this symbol is available since iOS 3.2/tvOS 9.0/macOS 10.6, but it's not externed to public header until Xcode 10 with iOS 12 SDK, so we define it for user who still use old SDK version.
 #define kCAGradientLayerRadial @"radial"

Carthage/Checkouts/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGSVGElement.m

@@ -7,6 +7,8 @@
 
 #import "SVGElement_ForParser.h" // to resolve Xcode circular dependencies; in long term, parsing SHOULD NOT HAPPEN inside any class whose name starts "SVG" (because those are reserved classes for the SVG Spec)
 
+#import "SVGKDefine_Private.h"
+
 @interface SVGSVGElement()
 #pragma mark - elements REQUIRED to implement the spec but not included in SVG Spec due to bugs in the spec writing!
 @property(nonatomic,readwrite) SVGRect requestedViewport;

Carthage/Checkouts/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGTextElement.m

@@ -6,6 +6,7 @@
 #import "SVGHelperUtilities.h"
 #import "SVGUtils.h"
 #import "SVGTextLayer.h"
+#import "SVGKDefine_Private.h"
 
 @implementation SVGTextElement
 

Carthage/Checkouts/SVGKit/Source/Exporters/SVGKExporterNSImage.h

@@ -3,6 +3,10 @@
  
  Uses the default color format from UIGraphicsBeginImageContextWithOptions(...)
  */
+
+#import "SVGKDefine.h"
+
+#if SVGKIT_MAC
 #import <Foundation/Foundation.h>
 #import "SVGKImage.h"
 
@@ -29,3 +33,5 @@
 +(NSImage*) exportAsNSImage:(SVGKImage*) image antiAliased:(BOOL) shouldAntialias curveFlatnessFactor:(CGFloat) multiplyFlatness interpolationQuality:(CGInterpolationQuality) interpolationQuality;
 
 @end
+
+#endif /* SVGKIT_MAC */

Carthage/Checkouts/SVGKit/Source/Exporters/SVGKExporterNSImage.m

@@ -1,7 +1,10 @@
 #import "SVGKExporterNSImage.h"
+
+#if SVGKIT_MAC
 #import "SVGUtils.h"
 #import "SVGKImage+CGContext.h" // needed for Context calls
 #import <objc/runtime.h>
+#import "SVGKDefine_Private.h"
 
 @implementation SVGKExporterNSImage
 
@@ -133,3 +136,5 @@ static NSImage * SVGKGraphicsGetImageFromCurrentImageContext(void) {
 }
 
 @end
+
+#endif /* SVGKIT_MAC */

Carthage/Checkouts/SVGKit/Source/Exporters/SVGKExporterUIImage.m

@@ -1,5 +1,7 @@
 #import "SVGKExporterUIImage.h"
+#import "SVGKDefine_Private.h"
 
+#if SVGKIT_UIKIT
 #import "SVGKImage+CGContext.h" // needed for Context calls
 
 @implementation SVGKExporterUIImage
@@ -35,3 +37,5 @@
 }
 
 @end
+
+#endif /* SVGKIT_UIKIT */

Carthage/Checkouts/SVGKit/Source/Exporters/SVGKImage+CGContext.m

@@ -11,6 +11,8 @@
 #import "SVGRect.h"
 #import "SVGSVGElement.h"
 
+#import "SVGKDefine_Private.h"
+
 @implementation SVGKImage (CGContext)
 
 -(CGContextRef) newCGContextAutosizedToFit

Carthage/Checkouts/SVGKit/Source/Foundation additions/NSCharacterSet+SVGKExtensions.m

@@ -7,6 +7,7 @@
 //
 
 #import "NSCharacterSet+SVGKExtensions.h"
+#import "SVGKDefine_Private.h"
 
 @implementation NSCharacterSet (SVGKExtensions)
 

Carthage/Checkouts/SVGKit/Source/Foundation additions/NSData+NSInputStream.m

@@ -7,7 +7,7 @@
 //
 
 #import "NSData+NSInputStream.h"
-
+#import "SVGKDefine_Private.h"
 
 #define BUFSIZE 65536U
 

Carthage/Checkouts/SVGKit/Source/Parsers/Parser Extensions/SVGKParserSVG.m

@@ -21,6 +21,8 @@
 
 #import "SVGDocument_Mutable.h"
 
+#import "SVGKDefine_Private.h"
+
 @interface SVGKParserSVG ()
 @property (nonatomic) NSArray *supportedNamespaces;
 @property (nonatomic) NSDictionary *elementMap;

Carthage/Checkouts/SVGKit/Source/Parsers/SVGKParseResult.m

@@ -1,4 +1,5 @@
 #import "SVGKParseResult.h"
+#import "SVGKDefine_Private.h"
 
 @implementation SVGKParseResult
 

Carthage/Checkouts/SVGKit/Source/Parsers/SVGKParser.m

@@ -31,6 +31,8 @@
 #import "StyleSheetList+Mutable.h"
 #import "NSData+NSInputStream.h"
 
+#import "SVGKDefine_Private.h"
+
 @interface SVGKParser()
 @property(nonatomic,strong, readwrite) SVGKSource* source;
 @property(nonatomic,strong, readwrite) NSMutableArray* externalStylesheets;

Carthage/Checkouts/SVGKit/Source/QuartzCore additions/CALayerWithClipRender.m

@@ -7,6 +7,11 @@
 //
 
 #import "CALayerWithClipRender.h"
+#import "SVGKDefine.h"
+
+#if SVGKIT_UIKIT
+#import <UIKit/UIKit.h>
+#endif
 
 @interface CALayer (ContentsTransform)
 

Carthage/Checkouts/SVGKit/Source/QuartzCore additions/CAShapeLayerWithHitTest.m

@@ -1,4 +1,5 @@
 #import "CAShapeLayerWithHitTest.h"
+#import "SVGKDefine_Private.h"
 
 /*! Used by the main ShapeElement (and all subclasses) to do perfect "containsPoint" calculations via Apple's API calls
  

Carthage/Checkouts/SVGKit/Source/QuartzCore additions/CGPathAdditions.m

@@ -6,6 +6,7 @@
 //
 
 #import "CGPathAdditions.h"
+#import <stdlib.h>
 
 void applier (void *info, const CGPathElement *element);
 

Carthage/Checkouts/SVGKit/Source/QuartzCore additions/SVGGradientLayer.m

@@ -10,6 +10,7 @@
 #import "SVGRadialGradientElement.h"
 #import "SVGLinearGradientElement.h"
 #import "CALayerWithClipRender.h"
+#import "SVGKDefine_Private.h"
 
 @implementation SVGGradientLayer
 

Carthage/Checkouts/SVGKit/Source/SVGKImage.m

@@ -25,6 +25,8 @@
 #import "SVGKExporterUIImage.h" // needed for .UIImage property
 #endif
 
+#import "SVGKDefine_Private.h"
+
 #if ENABLE_GLOBAL_IMAGE_CACHE_FOR_SVGKIMAGE_IMAGE_NAMED
 @interface SVGKImageCacheLine : NSObject
 @property(nonatomic) int numberOfInstances;

Carthage/Checkouts/SVGKit/Source/SVGKit.h

@@ -163,9 +163,11 @@ FOUNDATION_EXPORT const unsigned char SVGKitFramework_VersionString[];
 #import "SVGKImage.h"
 #import "SVGKSource.h"
 #import "NSCharacterSet+SVGKExtensions.h"
+#if SVGKIT_UIKIT
 #import "SVGKFastImageView.h"
 #import "SVGKImageView.h"
 #import "SVGKLayeredImageView.h"
+#endif
 #import "SVGKPattern.h"
 #import "SVGUtils.h"
 #if SVGKIT_MAC

Carthage/Checkouts/SVGKit/Source/Sources/SVGKSourceLocalFile.m

@@ -1,4 +1,5 @@
 #import "SVGKSourceLocalFile.h"
+#import "SVGKDefine_Private.h"
 
 @interface SVGKSourceLocalFile()
 @property (nonatomic, readwrite) BOOL wasRelative;

Carthage/Checkouts/SVGKit/Source/Sources/SVGKSourceNSData.m

@@ -1,6 +1,7 @@
 #import "SVGKSourceNSData.h"
 
 #import "SVGKSourceURL.h" // used for delegating when asked to construct relative links
+#import "SVGKDefine_Private.h"
 
 @implementation SVGKSourceNSData
 

Carthage/Checkouts/SVGKit/Source/Sources/SVGKSourceURL.m

@@ -1,4 +1,5 @@
 #import "SVGKSourceURL.h"
+#import "SVGKDefine_Private.h"
 
 @implementation SVGKSourceURL
 

Carthage/Checkouts/SVGKit/Source/UIKit additions/SVGKFastImageView.m

@@ -1,4 +1,5 @@
 #import "SVGKFastImageView.h"
+#import "SVGKDefine_Private.h"
 
 @interface SVGKFastImageView ()
 @property(nonatomic,readwrite) NSTimeInterval timeIntervalForLastReRenderOfSVGFromMemory;

Carthage/Checkouts/SVGKit/Source/UIKit additions/SVGKLayeredImageView.m

@@ -5,6 +5,8 @@
 #import "SVGKSourceString.h"
 #import "SVGKInlineResource.h"
 
+#import "SVGKDefine_Private.h"
+
 @interface SVGKLayeredImageView()
 @property(nonatomic,strong) CAShapeLayer* internalBorderLayer;
 @end

Carthage/Checkouts/SVGKit/Source/Utils/SVGUtils.h

@@ -5,6 +5,7 @@
 //  Copyright Matt Rajca 2010-2011. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
 #import <CoreFoundation/CoreFoundation.h>
 #import <CoreGraphics/CoreGraphics.h>
 

Carthage/Checkouts/SVGKit/Source/Utils/SVGUtils.m

@@ -6,6 +6,7 @@
 //
 
 #import "SVGUtils.h"
+#import "SVGKDefine_Private.h"
 
 #define MAX_ACCUM 64
 #define NUM_COLORS 148

iOSClient/Settings/CCManageAccount.m

@@ -75,7 +75,7 @@
         }
         
         row.cellConfigAtConfigure[@"backgroundColor"] = NCBrandColor.sharedInstance.backgroundCell;
-        [row.cellConfig setObject:[UIFont systemFontOfSize:15.0] forKey:@"textLabel.font"];
+        [row.cellConfig setObject:[UIFont systemFontOfSize:13.0] forKey:@"textLabel.font"];
         [row.cellConfig setObject:avatar forKey:@"imageView.image"];
         if (account.active) {
             row.value = @"YES";
@@ -341,16 +341,13 @@
 {
     [super formRowDescriptorValueHasChanged:rowDescriptor oldValue:oldValue newValue:newValue];
     
-    if ([rowDescriptor.tag isEqualToString:@"pickerAccount"] && oldValue && newValue) {
-        
-        if (![newValue isEqualToString:oldValue] && ![newValue isEqualToString:@""] && ![newValue isEqualToString:appDelegate.activeAccount]) {
-            [self ChangeDefaultAccount:newValue];
-        }
-        
-        if ([newValue isEqualToString:@""]) {
-            NSArray *listAccount = [[NCManageDatabase sharedInstance] getAccounts];
-            if ([listAccount count] > 0) {
-                [self ChangeDefaultAccount:listAccount[0]];
+    NSArray *accounts = [[NCManageDatabase sharedInstance] getAllAccount];
+    tableAccount *accountActive = [[NCManageDatabase sharedInstance] getAccountActive];
+
+    for (tableAccount *account in accounts) {
+        if ([rowDescriptor.tag isEqualToString:account.account]) {
+            if (![account.account isEqualToString:accountActive.account]) {
+                [self ChangeDefaultAccount:account.account];
             }
         }
     }
@@ -379,10 +376,8 @@
     
     [alertController addAction: [UIAlertAction actionWithTitle:NSLocalizedString(@"_delete_", nil) style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
         
-        XLFormPickerCell *pickerAccount = (XLFormPickerCell *)[[self.form formRowWithTag:@"pickerAccount"] cellForFormController:self];
-        
-        tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountWithPredicate:[NSPredicate predicateWithFormat:@"account == %@", pickerAccount.rowDescriptor.value]];
-        NSString *account = tableAccount.account;
+        tableAccount *accountActive = [[NCManageDatabase sharedInstance] getAccountActive];
+        NSString *account = accountActive.account;
         
         if (account) {
             [appDelegate deleteAccount:account wipe:false];