Răsfoiți Sursa

remove unused UICircularProgressRing dependency, update SwiftLint

cyberta 4 ani în urmă
părinte
comite
ff7aee1c4d
31 a modificat fișierele cu 965 adăugiri și 3262 ștergeri
  1. 0 1
      Podfile
  2. 3 7
      Podfile.lock
  3. 1 5
      Pods/Manifest.lock
  4. 947 991
      Pods/Pods.xcodeproj/project.pbxproj
  5. 0 11
      Pods/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios-acknowledgements.markdown
  6. 0 17
      Pods/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios-acknowledgements.plist
  7. 0 2
      Pods/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios-frameworks.sh
  8. 4 4
      Pods/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios.debug.xcconfig
  9. 4 4
      Pods/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios.release.xcconfig
  10. 3 3
      Pods/Target Support Files/Pods-deltachat-iosTests/Pods-deltachat-iosTests.debug.xcconfig
  11. 3 3
      Pods/Target Support Files/Pods-deltachat-iosTests/Pods-deltachat-iosTests.release.xcconfig
  12. 0 26
      Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing-Info.plist
  13. 0 5
      Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing-dummy.m
  14. 0 12
      Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing-prefix.pch
  15. 0 17
      Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing-umbrella.h
  16. 0 12
      Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing.debug.xcconfig
  17. 0 6
      Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing.modulemap
  18. 0 12
      Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing.release.xcconfig
  19. 0 10
      Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing.xcconfig
  20. 0 7
      Pods/UICircularProgressRing/LICENSE
  21. 0 152
      Pods/UICircularProgressRing/README.md
  22. 0 44
      Pods/UICircularProgressRing/src/UICircularProgressRing/Extensions.swift
  23. 0 18
      Pods/UICircularProgressRing/src/UICircularProgressRing/UICircularProgressRing.h
  24. 0 274
      Pods/UICircularProgressRing/src/UICircularProgressRing/UICircularProgressRing.swift
  25. 0 92
      Pods/UICircularProgressRing/src/UICircularProgressRing/UICircularProgressRingDelegate.swift
  26. 0 608
      Pods/UICircularProgressRing/src/UICircularProgressRing/UICircularRing.swift
  27. 0 400
      Pods/UICircularProgressRing/src/UICircularProgressRing/UICircularRingLayer.swift
  28. 0 197
      Pods/UICircularProgressRing/src/UICircularProgressRing/UICircularRingStyle.swift
  29. 0 167
      Pods/UICircularProgressRing/src/UICircularProgressRing/UICircularRingValueFormatter.swift
  30. 0 153
      Pods/UICircularProgressRing/src/UICircularProgressRing/UICircularTimerRing.swift
  31. 0 2
      deltachat-ios.xcodeproj/project.pbxproj

+ 0 - 1
Podfile

@@ -10,7 +10,6 @@ target 'deltachat-ios' do
   pod 'SwiftFormat/CLI'
   pod 'SwiftFormat/CLI'
   # pod 'openssl-ios-bitcode'
   # pod 'openssl-ios-bitcode'
   pod 'ReachabilitySwift'
   pod 'ReachabilitySwift'
-  pod 'UICircularProgressRing'
   pod 'SwiftyBeaver'
   pod 'SwiftyBeaver'
   pod 'DBDebugToolkit'
   pod 'DBDebugToolkit'
   pod 'InputBarAccessoryView'
   pod 'InputBarAccessoryView'

+ 3 - 7
Podfile.lock

@@ -9,9 +9,8 @@ PODS:
     - SDWebImage/Core (= 5.9.5)
     - SDWebImage/Core (= 5.9.5)
   - SDWebImage/Core (5.9.5)
   - SDWebImage/Core (5.9.5)
   - SwiftFormat/CLI (0.40.9)
   - SwiftFormat/CLI (0.40.9)
-  - SwiftLint (0.32.0)
+  - SwiftLint (0.43.1)
   - SwiftyBeaver (1.9.4)
   - SwiftyBeaver (1.9.4)
-  - UICircularProgressRing (6.2.0)
 
 
 DEPENDENCIES:
 DEPENDENCIES:
   - DBDebugToolkit
   - DBDebugToolkit
@@ -22,7 +21,6 @@ DEPENDENCIES:
   - SwiftFormat/CLI
   - SwiftFormat/CLI
   - SwiftLint
   - SwiftLint
   - SwiftyBeaver
   - SwiftyBeaver
-  - UICircularProgressRing
 
 
 SPEC REPOS:
 SPEC REPOS:
   trunk:
   trunk:
@@ -34,7 +32,6 @@ SPEC REPOS:
     - SwiftFormat
     - SwiftFormat
     - SwiftLint
     - SwiftLint
     - SwiftyBeaver
     - SwiftyBeaver
-    - UICircularProgressRing
 
 
 SPEC CHECKSUMS:
 SPEC CHECKSUMS:
   DBDebugToolkit: 03eb3483da4daf03b853b83ade5a8da9c8b7aff4
   DBDebugToolkit: 03eb3483da4daf03b853b83ade5a8da9c8b7aff4
@@ -43,10 +40,9 @@ SPEC CHECKSUMS:
   SCSiriWaveformView: 15b9dd6f94c7536e2032b34a35c6ff74d38c7411
   SCSiriWaveformView: 15b9dd6f94c7536e2032b34a35c6ff74d38c7411
   SDWebImage: 0b2ba0d56479bf6a45ecddbfd5558bea93150d25
   SDWebImage: 0b2ba0d56479bf6a45ecddbfd5558bea93150d25
   SwiftFormat: 6b67b6e7fe73d664f0cbb4f13721f130462c86a5
   SwiftFormat: 6b67b6e7fe73d664f0cbb4f13721f130462c86a5
-  SwiftLint: 009a898ef2a1c851f45e1b59349bf6ff2ddc990d
+  SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52
   SwiftyBeaver: 576177b2c5c94b3aedd5993914e91271a0524e88
   SwiftyBeaver: 576177b2c5c94b3aedd5993914e91271a0524e88
-  UICircularProgressRing: 0ff679b05a17f15ad6301a7886686837b8c301a9
 
 
-PODFILE CHECKSUM: 4e863566de36638ebd4957b31a34096ea6d924ff
+PODFILE CHECKSUM: aaa44e7abceaef2d4ae15d9cb45fc87e03f85e0f
 
 
 COCOAPODS: 1.10.1
 COCOAPODS: 1.10.1

+ 1 - 5
Pods/Manifest.lock

@@ -11,7 +11,6 @@ PODS:
   - SwiftFormat/CLI (0.40.9)
   - SwiftFormat/CLI (0.40.9)
   - SwiftLint (0.43.1)
   - SwiftLint (0.43.1)
   - SwiftyBeaver (1.9.4)
   - SwiftyBeaver (1.9.4)
-  - UICircularProgressRing (6.2.0)
 
 
 DEPENDENCIES:
 DEPENDENCIES:
   - DBDebugToolkit
   - DBDebugToolkit
@@ -22,7 +21,6 @@ DEPENDENCIES:
   - SwiftFormat/CLI
   - SwiftFormat/CLI
   - SwiftLint
   - SwiftLint
   - SwiftyBeaver
   - SwiftyBeaver
-  - UICircularProgressRing
 
 
 SPEC REPOS:
 SPEC REPOS:
   trunk:
   trunk:
@@ -34,7 +32,6 @@ SPEC REPOS:
     - SwiftFormat
     - SwiftFormat
     - SwiftLint
     - SwiftLint
     - SwiftyBeaver
     - SwiftyBeaver
-    - UICircularProgressRing
 
 
 SPEC CHECKSUMS:
 SPEC CHECKSUMS:
   DBDebugToolkit: 03eb3483da4daf03b853b83ade5a8da9c8b7aff4
   DBDebugToolkit: 03eb3483da4daf03b853b83ade5a8da9c8b7aff4
@@ -45,8 +42,7 @@ SPEC CHECKSUMS:
   SwiftFormat: 6b67b6e7fe73d664f0cbb4f13721f130462c86a5
   SwiftFormat: 6b67b6e7fe73d664f0cbb4f13721f130462c86a5
   SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52
   SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52
   SwiftyBeaver: 576177b2c5c94b3aedd5993914e91271a0524e88
   SwiftyBeaver: 576177b2c5c94b3aedd5993914e91271a0524e88
-  UICircularProgressRing: 0ff679b05a17f15ad6301a7886686837b8c301a9
 
 
-PODFILE CHECKSUM: 4e863566de36638ebd4957b31a34096ea6d924ff
+PODFILE CHECKSUM: aaa44e7abceaef2d4ae15d9cb45fc87e03f85e0f
 
 
 COCOAPODS: 1.10.1
 COCOAPODS: 1.10.1

Fișier diff suprimat deoarece este prea mare
+ 947 - 991
Pods/Pods.xcodeproj/project.pbxproj


+ 0 - 11
Pods/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios-acknowledgements.markdown

@@ -198,15 +198,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 SOFTWARE.
 
 
-
-## UICircularProgressRing
-
-Copyright (c) 2017 Luis Padron
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 Generated by CocoaPods - https://cocoapods.org
 Generated by CocoaPods - https://cocoapods.org

+ 0 - 17
Pods/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios-acknowledgements.plist

@@ -258,23 +258,6 @@ SOFTWARE.
 			<key>Type</key>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 			<string>PSGroupSpecifier</string>
 		</dict>
 		</dict>
-		<dict>
-			<key>FooterText</key>
-			<string>Copyright (c) 2017 Luis Padron
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</string>
-			<key>License</key>
-			<string>MIT</string>
-			<key>Title</key>
-			<string>UICircularProgressRing</string>
-			<key>Type</key>
-			<string>PSGroupSpecifier</string>
-		</dict>
 		<dict>
 		<dict>
 			<key>FooterText</key>
 			<key>FooterText</key>
 			<string>Generated by CocoaPods - https://cocoapods.org</string>
 			<string>Generated by CocoaPods - https://cocoapods.org</string>

+ 0 - 2
Pods/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios-frameworks.sh

@@ -181,7 +181,6 @@ if [[ "$CONFIGURATION" == "Debug" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SwiftyBeaver/SwiftyBeaver.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SwiftyBeaver/SwiftyBeaver.framework"
-  install_framework "${BUILT_PRODUCTS_DIR}/UICircularProgressRing/UICircularProgressRing.framework"
 fi
 fi
 if [[ "$CONFIGURATION" == "Release" ]]; then
 if [[ "$CONFIGURATION" == "Release" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/DBDebugToolkit/DBDebugToolkit.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/DBDebugToolkit/DBDebugToolkit.framework"
@@ -190,7 +189,6 @@ if [[ "$CONFIGURATION" == "Release" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SwiftyBeaver/SwiftyBeaver.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SwiftyBeaver/SwiftyBeaver.framework"
-  install_framework "${BUILT_PRODUCTS_DIR}/UICircularProgressRing/UICircularProgressRing.framework"
 fi
 fi
 if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
 if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
   wait
   wait

+ 4 - 4
Pods/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios.debug.xcconfig

@@ -1,11 +1,11 @@
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
 CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
 CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
-FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit" "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver" "${PODS_CONFIGURATION_BUILD_DIR}/UICircularProgressRing"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit" "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit/DBDebugToolkit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView/InputBarAccessoryView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver/SwiftyBeaver.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/UICircularProgressRing/UICircularProgressRing.framework/Headers"
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit/DBDebugToolkit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView/InputBarAccessoryView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver/SwiftyBeaver.framework/Headers"
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -isystem "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit/DBDebugToolkit.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView/InputBarAccessoryView.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver/SwiftyBeaver.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/UICircularProgressRing/UICircularProgressRing.framework/Headers" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/UICircularProgressRing"
-OTHER_LDFLAGS = $(inherited) -framework "AVFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "DBDebugToolkit" -framework "Foundation" -framework "ImageIO" -framework "InputBarAccessoryView" -framework "QuartzCore" -framework "Reachability" -framework "SCSiriWaveformView" -framework "SDWebImage" -framework "SwiftyBeaver" -framework "SystemConfiguration" -framework "UICircularProgressRing" -framework "UIKit"
+OTHER_CFLAGS = $(inherited) -isystem "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit/DBDebugToolkit.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView/InputBarAccessoryView.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver/SwiftyBeaver.framework/Headers" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver"
+OTHER_LDFLAGS = $(inherited) -framework "AVFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "DBDebugToolkit" -framework "Foundation" -framework "ImageIO" -framework "InputBarAccessoryView" -framework "QuartzCore" -framework "Reachability" -framework "SCSiriWaveformView" -framework "SDWebImage" -framework "SwiftyBeaver" -framework "SystemConfiguration" -framework "UIKit"
 OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
 OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)

+ 4 - 4
Pods/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios.release.xcconfig

@@ -1,11 +1,11 @@
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
 CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
 CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
-FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit" "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver" "${PODS_CONFIGURATION_BUILD_DIR}/UICircularProgressRing"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit" "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit/DBDebugToolkit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView/InputBarAccessoryView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver/SwiftyBeaver.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/UICircularProgressRing/UICircularProgressRing.framework/Headers"
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit/DBDebugToolkit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView/InputBarAccessoryView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver/SwiftyBeaver.framework/Headers"
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-OTHER_CFLAGS = $(inherited) -isystem "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit/DBDebugToolkit.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView/InputBarAccessoryView.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver/SwiftyBeaver.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/UICircularProgressRing/UICircularProgressRing.framework/Headers" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/UICircularProgressRing"
-OTHER_LDFLAGS = $(inherited) -framework "AVFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "DBDebugToolkit" -framework "Foundation" -framework "ImageIO" -framework "InputBarAccessoryView" -framework "QuartzCore" -framework "Reachability" -framework "SCSiriWaveformView" -framework "SDWebImage" -framework "SwiftyBeaver" -framework "SystemConfiguration" -framework "UICircularProgressRing" -framework "UIKit"
+OTHER_CFLAGS = $(inherited) -isystem "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit/DBDebugToolkit.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView/InputBarAccessoryView.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" -isystem "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver/SwiftyBeaver.framework/Headers" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" -iframework "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver"
+OTHER_LDFLAGS = $(inherited) -framework "AVFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "DBDebugToolkit" -framework "Foundation" -framework "ImageIO" -framework "InputBarAccessoryView" -framework "QuartzCore" -framework "Reachability" -framework "SCSiriWaveformView" -framework "SDWebImage" -framework "SwiftyBeaver" -framework "SystemConfiguration" -framework "UIKit"
 OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
 OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)

+ 3 - 3
Pods/Target Support Files/Pods-deltachat-iosTests/Pods-deltachat-iosTests.debug.xcconfig

@@ -1,8 +1,8 @@
 CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
 CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
-FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit" "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver" "${PODS_CONFIGURATION_BUILD_DIR}/UICircularProgressRing"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit" "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit/DBDebugToolkit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView/InputBarAccessoryView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver/SwiftyBeaver.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/UICircularProgressRing/UICircularProgressRing.framework/Headers"
-OTHER_LDFLAGS = $(inherited) -framework "AVFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "DBDebugToolkit" -framework "Foundation" -framework "ImageIO" -framework "InputBarAccessoryView" -framework "QuartzCore" -framework "Reachability" -framework "SCSiriWaveformView" -framework "SDWebImage" -framework "SwiftyBeaver" -framework "SystemConfiguration" -framework "UICircularProgressRing" -framework "UIKit"
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit/DBDebugToolkit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView/InputBarAccessoryView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver/SwiftyBeaver.framework/Headers"
+OTHER_LDFLAGS = $(inherited) -framework "AVFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "DBDebugToolkit" -framework "Foundation" -framework "ImageIO" -framework "InputBarAccessoryView" -framework "QuartzCore" -framework "Reachability" -framework "SCSiriWaveformView" -framework "SDWebImage" -framework "SwiftyBeaver" -framework "SystemConfiguration" -framework "UIKit"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.

+ 3 - 3
Pods/Target Support Files/Pods-deltachat-iosTests/Pods-deltachat-iosTests.release.xcconfig

@@ -1,8 +1,8 @@
 CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
 CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
-FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit" "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver" "${PODS_CONFIGURATION_BUILD_DIR}/UICircularProgressRing"
+FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit" "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift" "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit/DBDebugToolkit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView/InputBarAccessoryView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver/SwiftyBeaver.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/UICircularProgressRing/UICircularProgressRing.framework/Headers"
-OTHER_LDFLAGS = $(inherited) -framework "AVFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "DBDebugToolkit" -framework "Foundation" -framework "ImageIO" -framework "InputBarAccessoryView" -framework "QuartzCore" -framework "Reachability" -framework "SCSiriWaveformView" -framework "SDWebImage" -framework "SwiftyBeaver" -framework "SystemConfiguration" -framework "UICircularProgressRing" -framework "UIKit"
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/DBDebugToolkit/DBDebugToolkit.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/InputBarAccessoryView/InputBarAccessoryView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyBeaver/SwiftyBeaver.framework/Headers"
+OTHER_LDFLAGS = $(inherited) -framework "AVFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "DBDebugToolkit" -framework "Foundation" -framework "ImageIO" -framework "InputBarAccessoryView" -framework "QuartzCore" -framework "Reachability" -framework "SCSiriWaveformView" -framework "SDWebImage" -framework "SwiftyBeaver" -framework "SystemConfiguration" -framework "UIKit"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.

+ 0 - 26
Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing-Info.plist

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
-  <key>CFBundleExecutable</key>
-  <string>${EXECUTABLE_NAME}</string>
-  <key>CFBundleIdentifier</key>
-  <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>${PRODUCT_NAME}</string>
-  <key>CFBundlePackageType</key>
-  <string>FMWK</string>
-  <key>CFBundleShortVersionString</key>
-  <string>6.2.0</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>${CURRENT_PROJECT_VERSION}</string>
-  <key>NSPrincipalClass</key>
-  <string></string>
-</dict>
-</plist>

+ 0 - 5
Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing-dummy.m

@@ -1,5 +0,0 @@
-#import <Foundation/Foundation.h>
-@interface PodsDummy_UICircularProgressRing : NSObject
-@end
-@implementation PodsDummy_UICircularProgressRing
-@end

+ 0 - 12
Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing-prefix.pch

@@ -1,12 +0,0 @@
-#ifdef __OBJC__
-#import <UIKit/UIKit.h>
-#else
-#ifndef FOUNDATION_EXPORT
-#if defined(__cplusplus)
-#define FOUNDATION_EXPORT extern "C"
-#else
-#define FOUNDATION_EXPORT extern
-#endif
-#endif
-#endif
-

+ 0 - 17
Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing-umbrella.h

@@ -1,17 +0,0 @@
-#ifdef __OBJC__
-#import <UIKit/UIKit.h>
-#else
-#ifndef FOUNDATION_EXPORT
-#if defined(__cplusplus)
-#define FOUNDATION_EXPORT extern "C"
-#else
-#define FOUNDATION_EXPORT extern
-#endif
-#endif
-#endif
-
-#import "UICircularProgressRing.h"
-
-FOUNDATION_EXPORT double UICircularProgressRingVersionNumber;
-FOUNDATION_EXPORT const unsigned char UICircularProgressRingVersionString[];
-

+ 0 - 12
Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing.debug.xcconfig

@@ -1,12 +0,0 @@
-CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
-CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/UICircularProgressRing
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -suppress-warnings
-PODS_BUILD_DIR = ${BUILD_DIR}
-PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
-PODS_ROOT = ${SRCROOT}
-PODS_TARGET_SRCROOT = ${PODS_ROOT}/UICircularProgressRing
-PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
-PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
-SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 0 - 6
Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing.modulemap

@@ -1,6 +0,0 @@
-framework module UICircularProgressRing {
-  umbrella header "UICircularProgressRing-umbrella.h"
-
-  export *
-  module * { export * }
-}

+ 0 - 12
Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing.release.xcconfig

@@ -1,12 +0,0 @@
-CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
-CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/UICircularProgressRing
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -suppress-warnings
-PODS_BUILD_DIR = ${BUILD_DIR}
-PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
-PODS_ROOT = ${SRCROOT}
-PODS_TARGET_SRCROOT = ${PODS_ROOT}/UICircularProgressRing
-PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
-PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
-SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 0 - 10
Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing.xcconfig

@@ -1,10 +0,0 @@
-CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/UICircularProgressRing
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -suppress-warnings
-PODS_BUILD_DIR = ${BUILD_DIR}
-PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
-PODS_ROOT = ${SRCROOT}
-PODS_TARGET_SRCROOT = ${PODS_ROOT}/UICircularProgressRing
-PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
-SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 0 - 7
Pods/UICircularProgressRing/LICENSE

@@ -1,7 +0,0 @@
-Copyright (c) 2017 Luis Padron
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ 0 - 152
Pods/UICircularProgressRing/README.md

@@ -1,152 +0,0 @@
-<p align="center">
-	<img src="https://img.shields.io/github/license/luispadron/UICircularProgressRing.svg">
-	<img src="https://travis-ci.org/luispadron/UICircularProgressRing.svg?branch=master">
-	<img src="https://img.shields.io/github/issues/luispadron/UICircularProgressRing.svg">
-</p>
-
-![Banner](https://raw.githubusercontent.com/luispadron/UICircularProgressRing/master/.github/banner.png)
-
-<h3 align="center">A circular progress bar for iOS written in Swift</h3>
-
-<p align="center">
-<img src="https://raw.githubusercontent.com/luispadron/UICircularProgressRing/master/.github/demo.gif"/>
-</p>
-
-![Styles](https://raw.githubusercontent.com/luispadron/UICircularProgressRing/master/.github/styles-banner.png)
-
-## Features
-
-* 2 views, progress or timer
-* Interface builder designable
-* Highly customizable and flexible
-* Easy to use
-* Fluid and interruptible animations
-* Written in Swift
-* RTL language support
-
-## Apps Using UICircularProgressRing
-
-- [GradePoint](http://gradepoint.luispadron.com) by Luis Padron.
-
-- [UVI Mate](https://itunes.apple.com/us/app/uvi-mate-global-uv-index-now/id1207745216?mt=8) by Alexander Ershov.
-
-- [HotelTonight](https://itunes.apple.com/app/id407690035?mt=8) by Hotel Tonight Inc.
-
-- [הנתיב המהיר](https://itunes.apple.com/us/app/הנתיב-המהיר/id1320456872?mt=8) by Elad Hayun
-
-- [Nyx Nightclub Management](https://itunes.apple.com/dk/app/nyx-nightclub-management-ipad/id954874082?mt=8) by Nyx Systems IVS
-
-- [Barstool Sports](https://itunes.apple.com/us/app/barstool-sports/id456805313) by Barstool Sports
-
-- [88 Days](http://88-days.com) by Stijn Kramer
-
-- [Bookbot](https://www.bookbotkids.com) by Bookbot
-
-## Installation
-
-*NOTE: Objective-C support: Support for Objective-C has been dropped in version 5.0.0, use version 4 or lower if you are using Objective-C.*
-
-### CocoaPods (Recommended)
-
-1. Install [CocoaPods](https://cocoapods.org)
-2. Add this repo to your `Podfile`
-
-	```ruby
-	target 'Example' do
-	    # IMPORTANT: Make sure use_frameworks! is included at the top of the file
-	    use_frameworks!
-
-	    pod 'UICircularProgressRing'
-	end
-	```
-3. Run `pod install`
-4. Open up the `.xcworkspace` that CocoaPods created
-5. Done!
-
-### Carthage
-
-#### Important: Interface builder support with Carthage is either broken or extremely limted
-
-To use with [Carthage](https://github.com/Carthage/Carthage)
-
-1. Make sure Carthage is installed
-
-	`brew install carthage`
-2. Add this repo to your Cartfile
-
-	`github "luispadron/UICircularProgressRing"`
-3. Install dependencies
-	`carthage update --platform iOS`
-
-## Usage
-
-### UICircularProgressRing Example
-
-```swift
-override func viewDidLoad() {
-  // Create the view
-  let progressRing = UICircularProgressRing()
-  // Change any of the properties you'd like
-  progressRing.maxValue = 50
-  progressRing.style = .dashed(pattern: [7.0, 7.0])
-  // etc ...
-}
-```
-
-To set a value and animate the view
-
-```swift
-// Somewhere not in viewDidLoad (since the views have not set yet, thus cannot be animated)
-// Remember to use unowned or weak self if referencing self to avoid retain cycle
-progressRing.startProgress(to: 49, duration: 2.0) {
-  print("Done animating!")
-  // Do anything your heart desires...
-}
-
-// Pause at any time during a running animation
-progressRing.pauseProgress()
-
-// Continue where you left off after a pause
-progressRing.continueProgress()
-```
-
-### UICircularTimerRing Example
-
-```swift
-override func viewDidLoad() {
-	// create the view
-	let timerRing = UICircularTimerRing()
-}
-```
-
-Animate and set time
-
-```swift
-						// seconds
-timerRing.startTimer(to: 60) { state in
-    switch state {
-    case .finished:
-        print("finished")
-    case .continued(let time):
-        print("continued: \(time)")
-    case .paused(let time):
-        print("paused: \(time)")
-    }
-}
-
-timerRing.pauseTimer() // pauses the timer
-
-timerRing.continueTimer() // continues from where we paused
-
-timerRing.resetTimer() // resets and cancels animations previously running
-```
-
-## Documentation
-
-Please **read** this before creating an issue about how to use the library:
-
-[DOCUMENTATION](https://htmlpreview.github.io/?https://raw.githubusercontent.com/luispadron/UICircularProgressRing/master/docs/Classes/UICircularProgressRing.html)
-
-## Misc.
-
-Do you use this library? Want to be featured? Go [here.](https://github.com/luispadron/UICircularProgressRing/issues/54)

+ 0 - 44
Pods/UICircularProgressRing/src/UICircularProgressRing/Extensions.swift

@@ -1,44 +0,0 @@
-//
-//  Extensions.swift
-//  UICircularProgressRing
-//
-//  Created by Luis on 2/5/19.
-//  Copyright © 2019 Luis Padron. All rights reserved.
-//
-
-/**
- * This file includes internal extensions.
- */
-
-/// Helper extension to allow removing layer animation based on AnimationKeys enum
-extension CALayer {
-    func removeAnimation(forKey key: UICircularRing.AnimationKeys) {
-        removeAnimation(forKey: key.rawValue)
-    }
-
-    func animation(forKey key: UICircularRing.AnimationKeys) -> CAAnimation? {
-        return animation(forKey: key.rawValue)
-    }
-
-    func value(forKey key: UICircularRing.AnimationKeys) -> Any? {
-        return value(forKey: key.rawValue)
-    }
-}
-
-/**
- A private extension to CGFloat in order to provide simple
- conversion from degrees to radians, used when drawing the rings.
- */
-extension CGFloat {
-    var rads: CGFloat { return self * CGFloat.pi / 180 }
-}
-
-/// adds simple conversion to CGFloat
-extension TimeInterval {
-    var float: CGFloat { return CGFloat(self) }
-}
-
-/// adds simple conversion to TimeInterval
-extension CGFloat {
-    var interval: TimeInterval { return TimeInterval(self) }
-}

+ 0 - 18
Pods/UICircularProgressRing/src/UICircularProgressRing/UICircularProgressRing.h

@@ -1,18 +0,0 @@
-//
-//  UICircularProgressRing.h
-//  UICircularProgressRing
-//
-//  Created by Luis Padron on 9/13/16.
-//  Copyright © 2016 Luis Padron. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for UICircularProgressRing.
-FOUNDATION_EXPORT double UICircularProgressRingVersionNumber;
-
-//! Project version string for UICircularProgressRing.
-FOUNDATION_EXPORT const unsigned char UICircularProgressRingVersionString[];
-
-
-

+ 0 - 274
Pods/UICircularProgressRing/src/UICircularProgressRing/UICircularProgressRing.swift

@@ -1,274 +0,0 @@
-//
-//  UICircularProgressRing.swift
-//  UICircularProgressRing
-//
-//  Copyright (c) 2019 Luis Padron
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a
-//  copy of this software and associated documentation files (the "Software"),
-//  to deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is furnished
-//  to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-//  INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND
-//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-//  FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-//  OR OTHERWISE, ARISING FROM, OUT OF OR IN
-//  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-import UIKit
-
-final public class UICircularProgressRing: UICircularRing {
-    // MARK: Members
-
-    /**
-     The delegate for the UICircularRing
-
-     ## Important ##
-     When progress is done updating via UICircularRing.setValue(_:), the
-     finishedUpdatingProgressFor(_ ring: UICircularRing) will be called.
-
-     The ring will be passed to the delegate in order to keep track of
-     multiple ring updates if needed.
-
-     ## Author
-     Luis Padron
-     */
-    public weak var delegate: UICircularProgressRingDelegate?
-
-    /**
-     The value property for the progress ring.
-
-     ## Important ##
-     Default = 0
-
-     Must be a non-negative value. If this value falls below `minValue` it will be
-     clamped and set equal to `minValue`.
-
-     This cannot be used to get the value while the ring is animating, to get
-     current value while animating use `currentValue`.
-
-     The current value of the progress ring after animating, use startProgress(value:)
-     to alter the value with the option to animate and have a completion handler.
-
-     ## Author
-     Luis Padron
-     */
-    @IBInspectable public var value: CGFloat = 0 {
-        didSet {
-            if value < minValue {
-                #if DEBUG
-                print("Warning in: \(#file):\(#line)")
-                print("Attempted to set a value less than minValue, value has been set to minValue.\n")
-                #endif
-                ringLayer.value = minValue
-            } else if value > maxValue {
-                #if DEBUG
-                print("Warning in: \(#file):\(#line)")
-                print("Attempted to set a value greater than maxValue, value has been set to maxValue.\n")
-                #endif
-                ringLayer.value = maxValue
-            } else {
-                ringLayer.value = value
-            }
-        }
-    }
-
-    /**
-     The current value of the progress ring
-
-     This will return the current value of the progress ring,
-     if the ring is animating it will be updated in real time.
-     If the ring is not currently animating then the value returned
-     will be the `value` property of the ring
-
-     ## Author
-     Luis Padron
-     */
-    public var currentValue: CGFloat? {
-        return isAnimating ? layer.presentation()?.value(forKey: .value) as? CGFloat : value
-    }
-
-    /**
-     The minimum value for the progress ring. ex: (0) -> 100.
-
-     ## Important ##
-     Default = 100
-
-     Must be a non-negative value, the absolute value is taken when setting this property.
-
-     The `value` of the progress ring must NOT fall below `minValue` if it does the `value` property is clamped
-     and will be set equal to `value`, you will receive a warning message in the console.
-
-     Making this value greater than
-
-     ## Author
-     Luis Padron
-     */
-    @IBInspectable public var minValue: CGFloat = 0.0 {
-        didSet { ringLayer.minValue = minValue }
-    }
-
-    /**
-     The maximum value for the progress ring. ex: 0 -> (100)
-
-     ## Important ##
-     Default = 100
-
-     Must be a non-negative value, the absolute value is taken when setting this property.
-
-     Unlike the `minValue` member `value` can extend beyond `maxValue`. What happens in this case
-     is the inner ring will do an extra loop through the outer ring, this is not noticible however.
-
-
-     ## Author
-     Luis Padron
-     */
-    @IBInspectable public var maxValue: CGFloat = 100.0 {
-        didSet { ringLayer.maxValue = maxValue }
-    }
-
-    /**
-     The type of animation function the ring view will use
-
-     ## Important ##
-     Default = .easeInEaseOut
-
-     ## Author
-     Luis Padron
-     */
-    public var animationTimingFunction: CAMediaTimingFunctionName = .easeInEaseOut {
-        didSet { ringLayer.animationTimingFunction = animationTimingFunction }
-    }
-
-    /**
-     The formatter responsible for formatting the
-     value of the progress ring into a readable text string
-     which is then displayed in the label of the ring.
-
-     Default formatter is of type `UICircularProgressRingFormatter`.
-
-     ## Author
-     Luis Padron
-     */
-    public var valueFormatter: UICircularRingValueFormatter = UICircularProgressRingFormatter() {
-        didSet { ringLayer.valueFormatter = valueFormatter }
-    }
-
-    /**
-     Typealias for the startProgress(:) method closure
-     */
-    public typealias ProgressCompletion = (() -> Void)
-
-    /// The completion block to call after the animation is done
-    private var completion: ProgressCompletion?
-
-    // MARK: API
-
-    /**
-     Sets the current value for the progress ring, calling this method while ring is
-     animating will cancel the previously set animation and start a new one.
-
-     - Parameter to: The value to be set for the progress ring
-     - Parameter duration: The time interval duration for the animation
-     - Parameter completion: The completion closure block that will be called when
-     animtion is finished (also called when animationDuration = 0), default is nil
-
-     ## Important ##
-     Animation duration = 0 will cause no animation to occur, and value will instantly
-     be set.
-
-     ## Author
-     Luis Padron
-     */
-    public func startProgress(to value: CGFloat, duration: TimeInterval, completion: ProgressCompletion? = nil) {
-        // Store the completion event locally
-        self.completion = completion
-
-        // call super class helper function to begin animating layer
-        startAnimation(duration: duration) {
-            self.delegate?.didFinishProgress(for: self)
-            self.completion?()
-        }
-
-        self.value = value
-    }
-
-    /**
-     Pauses the currently running animation and halts all progress.
-
-     ## Important ##
-     This method has no effect unless called when there is a running animation.
-     You should call this method manually whenever the progress ring is not in an active view,
-     for example in `viewWillDisappear` in a parent view controller.
-
-     ## Author
-     Luis Padron & Nicolai Cornelis
-     */
-    public func pauseProgress() {
-        // call super class helper to stop layer animation
-        pauseAnimation()
-        delegate?.didPauseProgress(for: self)
-    }
-
-    /**
-     Continues the animation with its remaining time from where it left off before it was paused.
-     This method has no effect unless called when there is a paused animation.
-     You should call this method when you wish to resume a paused animation.
-
-     ## Author
-     Luis Padron & Nicolai Cornelis
-     */
-    public func continueProgress() {
-        // call super class helper to continue layer animation
-        continueAnimation {
-            self.delegate?.didFinishProgress(for: self)
-            self.completion?()
-        }
-
-        delegate?.didContinueProgress(for: self)
-    }
-
-    /**
-     Resets the progress back to the `minValue` of the progress ring.
-     Does **not** perform any animations
-
-     ## Author
-     Luis Padron
-     */
-    public func resetProgress() {
-        // call super class helper to reset animation layer
-        resetAnimation()
-        value = minValue
-        // Remove reference to the completion block
-        completion = nil
-    }
-
-    // MARK: Overrides
-
-    override func initialize() {
-        super.initialize()
-        ringLayer.ring = self
-        ringLayer.value = value
-        ringLayer.maxValue = maxValue
-        ringLayer.minValue = minValue
-        ringLayer.valueFormatter = valueFormatter
-    }
-
-    override func didUpdateValue(newValue: CGFloat) {
-        super.didUpdateValue(newValue: newValue)
-        delegate?.didUpdateProgressValue(for: self, to: newValue)
-    }
-
-    override func willDisplayLabel(label: UILabel) {
-        super.willDisplayLabel(label: label)
-        delegate?.willDisplayLabel(for: self, label)
-    }
-}

+ 0 - 92
Pods/UICircularProgressRing/src/UICircularProgressRing/UICircularProgressRingDelegate.swift

@@ -1,92 +0,0 @@
-//
-//  UICircularProgressRingDelegate.swift
-//  UICircularProgressRing
-//
-//  Copyright (c) 2019 Luis Padron
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a
-//  copy of this software and associated documentation files (the "Software"),
-//  to deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is furnished
-//  to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-//  INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND
-//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-//  FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-//  OR OTHERWISE, ARISING FROM, OUT OF OR IN
-//  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-import UIKit
-
-/**
- This is the protocol declaration for the UICircularRing delegate property
- 
- ## Important ##
- When progress is done updating via UICircularRing.setValue(_:), the
- finishedUpdatingProgress(forRing: UICircularRing) will be called.
- 
- The ring will be passed to the delegate in order to keep 
- track of multiple ring updates if needed.
- 
- ## Author
- Luis Padron
- */
-public protocol UICircularProgressRingDelegate: class {
-    /**
-     Called when progress ring is done animating for current value
-     
-     - Paramater
-        - ring: The ring which finished animating
-     
-     */
-    func didFinishProgress(for ring: UICircularProgressRing)
-
-    /**
-     Called when progress has paused
-
-     - Parameter:
-       - ring: The ring which has paused
-     */
-    func didPauseProgress(for ring: UICircularProgressRing)
-
-    /**
-     Called when the progress has continued after a pause
-
-     - Parameter:
-       - ring: The ring which has continued
-     */
-    func didContinueProgress(for ring: UICircularProgressRing)
-
-    /**
-     This method is called whenever the value is updated, this means during animation this method will be called in real time.
-     This can be used to update another label or do some other work, whenever you need the exact current value of the ring
-     during animation.
-
-     ## Important:
-
-     This is a very hot method and may be called hundreds of times per second during animations. As such make sure to only
-     do very simple and non-intensive work in this method. Doing any work that takes time will considerably slow down your application.
-
-     - Paramater
-        - ring: The ring which updated the progress
-        - newValue: The value which the ring has updated to
-     */
-    func didUpdateProgressValue(for ring: UICircularProgressRing, to newValue: CGFloat)
-
-    /**
-     This method is called whenever the label is about to be drawn.
-     This can be used to modify the label looks e.g. NSAttributedString for text kerning
-
-     - Paramater
-        - ring: The ring which the label will be displayed in
-        - label: The label which will be displayed
-     */
-    func willDisplayLabel(for ring: UICircularProgressRing, _ label: UILabel)
-}

+ 0 - 608
Pods/UICircularProgressRing/src/UICircularProgressRing/UICircularRing.swift

@@ -1,608 +0,0 @@
-//
-//  UICircularRing.swift
-//  UICircularProgressRing
-//
-//  Copyright (c) 2019 Luis Padron
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a
-//  copy of this software and associated documentation files (the "Software"),
-//  to deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is furnished
-//  to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-//  INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND
-//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-//  FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-//  OR OTHERWISE, ARISING FROM, OUT OF OR IN
-//  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-import UIKit
-
-/**
- 
- # UICircularRing
-
- This is the base class of `UICircularProgressRing` and `UICircularTimerRing`.
- You should not instantiate this class, instead use one of the concrete classes provided
- or subclass and make your own.
-
- This is the UIView subclass that creates and handles everything
- to do with the circular ring.
- 
- This class has a custom CAShapeLayer (`UICircularRingLayer`) which
- handels the drawing and animating of the view
- 
- ## Author
- Luis Padron
- 
- */
-@IBDesignable open class UICircularRing: UIView {
-
-    // MARK: Circle Properties
-
-    /**
-     Whether or not the progress ring should be a full circle.
-     
-     What this means is that the outer ring will always go from 0 - 360 degrees and
-     the inner ring will be calculated accordingly depending on current value.
-     
-     ## Important ##
-     Default = true
-     
-     When this property is true any value set for `endAngle` will be ignored.
-     
-     ## Author
-     Luis Padron
-     
-     */
-    @IBInspectable open var fullCircle: Bool = true {
-        didSet { ringLayer.setNeedsDisplay() }
-    }
-
-    // MARK: View Style
-
-    /**
-     The style of the progress ring.
-     
-     Type: `UICircularRingStyle`
-     
-     The five styles include `inside`, `ontop`, `dashed`, `dotted`, and `gradient`
-     
-     ## Important ##
-     Default = UICircularRingStyle.inside
-     
-     ## Author
-     Luis Padron
-     */
-    open var style: UICircularRingStyle = .inside {
-        didSet { ringLayer.setNeedsDisplay() }
-    }
-
-    /**
-     The options for a gradient ring.
-
-     If this is non-`nil` then a gradient style will be applied.
-
-     ## Important ##
-    Default = `nil`
-    */
-    open var gradientOptions: UICircularRingGradientOptions? = nil {
-        didSet { ringLayer.setNeedsDisplay() }
-    }
-
-    /**
-     A toggle for showing or hiding the value label.
-     If false the current value will not be shown.
-
-     ## Important ##
-     Default = true
-
-     ## Author
-     Luis Padron
-     */
-    @IBInspectable public var shouldShowValueText: Bool = true {
-        didSet { ringLayer.setNeedsDisplay() }
-    }
-
-    /**
-     Style for the value knob, default is `nil`.
-
-     ## Important ##
-     If this is `nil`, no value knob is shown.
-
-    */
-    open var valueKnobStyle: UICircularRingValueKnobStyle? {
-        didSet { ringLayer.setNeedsDisplay() }
-    }
-
-    /**
-     The start angle for the entire progress ring view.
-     
-     Please note that Cocoa Touch uses a clockwise rotating unit circle.
-     I.e: 90 degrees is at the bottom and 270 degrees is at the top
-     
-     ## Important ##
-     Default = 0 (degrees)
-     
-     Values should be in degrees (they're converted to radians internally)
-     
-     ## Author
-     Luis Padron
-     */
-    @IBInspectable open var startAngle: CGFloat = 0 {
-        didSet { ringLayer.setNeedsDisplay() }
-    }
-
-    /**
-     The end angle for the entire progress ring
-     
-     Please note that Cocoa Touch uses a clockwise rotating unit circle.
-     I.e: 90 degrees is at the bottom and 270 degrees is at the top
-     
-     ## Important ##
-     Default = 360 (degrees)
-     
-     Values should be in degrees (they're converted to radians internally)
-     
-     ## Author
-     Luis Padron
-     */
-    @IBInspectable open var endAngle: CGFloat = 360 {
-        didSet { ringLayer.setNeedsDisplay() }
-    }
-
-    // MARK: Outer Ring properties
-
-    /**
-     The width of the outer ring for the progres bar
-     
-     ## Important ##
-     Default = 10.0
-     
-     ## Author
-     Luis Padron
-     */
-    @IBInspectable open var outerRingWidth: CGFloat = 10.0 {
-        didSet { ringLayer.setNeedsDisplay() }
-    }
-
-    /**
-     The color for the outer ring
-     
-     ## Important ##
-     Default = UIColor.gray
-     
-     ## Author
-     Luis Padron
-     */
-    @IBInspectable open var outerRingColor: UIColor = UIColor.gray {
-        didSet { ringLayer.setNeedsDisplay() }
-    }
-
-    /**
-     The style for the tip/cap of the outer ring
-     
-     Type: `CGLineCap`
-     
-     ## Important ##
-     Default = CGLineCap.butt
-     
-     This is only noticible when ring is not a full circle.
-     
-     ## Author
-     Luis Padron
-     */
-    open var outerCapStyle: CGLineCap = .butt {
-        didSet { ringLayer.setNeedsDisplay() }
-    }
-
-    // MARK: Inner Ring properties
-
-    /**
-     The width of the inner ring for the progres bar
-     
-     ## Important ##
-     Default = 5.0
-     
-     ## Author
-     Luis Padron
-     */
-    @IBInspectable open var innerRingWidth: CGFloat = 5.0 {
-        didSet { ringLayer.setNeedsDisplay() }
-    }
-
-    /**
-     The color of the inner ring for the progres bar
-     
-     ## Important ##
-     Default = UIColor.blue
-     
-     ## Author
-     Luis Padron
-     */
-    @IBInspectable open var innerRingColor: UIColor = UIColor.blue {
-        didSet { ringLayer.setNeedsDisplay() }
-    }
-
-    /**
-     The spacing between the outer ring and inner ring
-     
-     ## Important ##
-     This only applies when using progressRingStyle = 1
-     
-     Default = 1
-     
-     ## Author
-     Luis Padron
-     */
-    @IBInspectable open var innerRingSpacing: CGFloat = 1 {
-        didSet { ringLayer.setNeedsDisplay() }
-    }
-
-    /**
-     The style for the tip/cap of the inner ring
-     
-     Type: `CGLineCap`
-     
-     ## Important ##
-     Default = CGLineCap.round
-     
-     ## Author
-     Luis Padron
-     */
-    open var innerCapStyle: CGLineCap = .round {
-        didSet { ringLayer.setNeedsDisplay() }
-    }
-
-    // MARK: Label
-
-    /**
-     The text color for the value label field
-     
-     ## Important ##
-     Default = UIColor.black
-     
-     
-     ## Author
-     Luis Padron
-     */
-    @IBInspectable open var fontColor: UIColor = UIColor.black {
-        didSet { ringLayer.setNeedsDisplay() }
-    }
-
-    /**
-     The font to be used for the progress indicator.
-     All font attributes are specified here except for font color, which is done
-     using `fontColor`.
-     
-     
-     ## Important ##
-     Default = UIFont.systemFont(ofSize: 18)
-     
-     
-     ## Author
-     Luis Padron
-     */
-    @IBInspectable open var font: UIFont = UIFont.systemFont(ofSize: 18) {
-        didSet { ringLayer.setNeedsDisplay() }
-    }
-
-    /**
-     This returns whether or not the ring is currently animating
-     
-     ## Important ##
-     Get only property
-     
-     ## Author
-     Luis Padron
-     */
-    open var isAnimating: Bool {
-        return ringLayer.animation(forKey: .value) != nil
-    }
-
-    /**
-     The direction the circle is drawn in
-     Example: true -> clockwise
-     
-     ## Important ##
-     Default = true (draw the circle clockwise)
-     
-     ## Author
-     Pete Walker
-     */
-    @IBInspectable open var isClockwise: Bool = true {
-        didSet { ringLayer.setNeedsDisplay() }
-    }
-
-    /**
-     Typealias for animateProperties(duration:animations:completion:) fucntion completion
-     */
-    public typealias PropertyAnimationCompletion = (() -> Void)
-
-    // MARK: Private / internal
-
-    /**
-     Set the ring layer to the default layer, cated as custom layer
-     */
-    var ringLayer: UICircularRingLayer {
-        // swiftlint:disable:next force_cast
-        return layer as! UICircularRingLayer
-    }
-
-    /// This variable stores how long remains on the timer when it's paused
-    private var pausedTimeRemaining: TimeInterval = 0
-
-    /// Used to determine when the animation was paused
-    private var animationPauseTime: CFTimeInterval?
-
-    /// This stores the animation when the timer is paused. We use this variable to continue the animation where it left off.
-    /// See https://stackoverflow.com/questions/7568567/restoring-animation-where-it-left-off-when-app-resumes-from-background
-    var snapshottedAnimation: CAAnimation?
-
-    /// The completion timer, also indicates whether or not the view is animating
-    var animationCompletionTimer: Timer?
-
-    typealias AnimationCompletion = () -> Void
-
-    // MARK: Methods
-
-    /**
-     Overrides the default layer with the custom UICircularRingLayer class
-     */
-    override open class var layerClass: AnyClass {
-        return UICircularRingLayer.self
-    }
-
-    /**
-     Overriden public init to initialize the layer and view
-     */
-    override public init(frame: CGRect) {
-        super.init(frame: frame)
-        // Call the internal initializer
-        initialize()
-    }
-
-    /**
-     Overriden public init to initialize the layer and view
-     */
-    required public init?(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder)
-        // Call the internal initializer
-        initialize()
-    }
-
-    /**
-     This method initializes the custom CALayer to the default values
-     */
-    func initialize() {
-        // This view will become the value delegate of the layer, which will call the updateValue method when needed
-        ringLayer.ring = self
-
-        // Helps with pixelation and blurriness on retina devices
-        ringLayer.contentsScale = UIScreen.main.scale
-        ringLayer.shouldRasterize = true
-        ringLayer.rasterizationScale = UIScreen.main.scale * 2
-        ringLayer.masksToBounds = false
-
-        backgroundColor = UIColor.clear
-        ringLayer.backgroundColor = UIColor.clear.cgColor
-
-        NotificationCenter.default.addObserver(self,
-                                               selector: #selector(restoreAnimation),
-                                               name: UIApplication.willEnterForegroundNotification,
-                                               object: nil)
-
-        NotificationCenter.default.addObserver(self,
-                                               selector: #selector(snapshotAnimation),
-                                               name: UIApplication.willResignActiveNotification,
-                                               object: nil)
-    }
-
-    /**
-     Overriden because of custom layer drawing in UICircularRingLayer
-     */
-    open override func draw(_ rect: CGRect) {
-        super.draw(rect)
-    }
-
-    // MARK: Internal API
-
-    /**
-     These methods are called from the layer class in order to notify
-     this class about changes to the value and label display.
-
-     In this base class they do nothing.
-     */
-
-    func didUpdateValue(newValue: CGFloat) { }
-
-    func willDisplayLabel(label: UILabel) { }
-
-    /**
-     These functions are here to allow reuse between subclasses.
-     They handle starting, pausing and resetting an animation of the ring.
-    */
-
-    func startAnimation(duration: TimeInterval, completion: @escaping AnimationCompletion) {
-        if isAnimating {
-            animationPauseTime = nil
-        }
-
-        ringLayer.timeOffset = 0
-        ringLayer.beginTime = 0
-        ringLayer.speed = 1
-        ringLayer.animated = duration > 0
-        ringLayer.animationDuration = duration
-
-        // Check if a completion timer is still active and if so stop it
-        animationCompletionTimer?.invalidate()
-        animationCompletionTimer = Timer.scheduledTimer(timeInterval: duration,
-                                                        target: self,
-                                                        selector: #selector(self.animationDidComplete),
-                                                        userInfo: completion,
-                                                        repeats: false)
-    }
-
-    func pauseAnimation() {
-        guard isAnimating else {
-            #if DEBUG
-            print("""
-                    UICircularProgressRing: Progress was paused without having been started.
-                    This has no effect but may indicate that you're unnecessarily calling this method.
-                    """)
-            #endif
-            return
-        }
-
-        snapshotAnimation()
-
-        let pauseTime = ringLayer.convertTime(CACurrentMediaTime(), from: nil)
-        animationPauseTime = pauseTime
-
-        ringLayer.speed = 0.0
-        ringLayer.timeOffset = pauseTime
-
-        if let fireTime = animationCompletionTimer?.fireDate {
-            pausedTimeRemaining = fireTime.timeIntervalSince(Date())
-        } else {
-            pausedTimeRemaining = 0
-        }
-
-        animationCompletionTimer?.invalidate()
-        animationCompletionTimer = nil
-    }
-
-    func continueAnimation(completion: @escaping AnimationCompletion) {
-        guard let pauseTime = animationPauseTime else {
-            #if DEBUG
-            print("""
-                    UICircularRing: Progress was continued without having been paused.
-                    This has no effect but may indicate that you're unnecessarily calling this method.
-                    """)
-            #endif
-            return
-        }
-
-        restoreAnimation()
-
-        ringLayer.speed = 1.0
-        ringLayer.timeOffset = 0.0
-        ringLayer.beginTime = 0.0
-
-        let timeSincePause = ringLayer.convertTime(CACurrentMediaTime(), from: nil) - pauseTime
-
-        ringLayer.beginTime = timeSincePause
-
-        animationCompletionTimer?.invalidate()
-        animationCompletionTimer = Timer.scheduledTimer(timeInterval: pausedTimeRemaining,
-                                               target: self,
-                                               selector: #selector(animationDidComplete),
-                                               userInfo: completion,
-                                               repeats: false)
-
-        animationPauseTime = nil
-    }
-
-    func resetAnimation() {
-        ringLayer.animated = false
-        ringLayer.removeAnimation(forKey: .value)
-        snapshottedAnimation = nil
-
-        // Stop the timer and thus make the completion method not get fired
-        animationCompletionTimer?.invalidate()
-        animationCompletionTimer = nil
-        animationPauseTime = nil
-
-    }
-
-    // MARK: API
-
-    /**
-     This function allows animation of the animatable properties of the `UICircularRing`.
-     These properties include `innerRingColor, innerRingWidth, outerRingColor, outerRingWidth, innerRingSpacing, fontColor`.
-     
-     Simply call this function and inside of the animation block change the animatable properties as you would in any `UView`
-     animation block.
-     
-     The completion block is called when all animations finish.
-     */
-    open func animateProperties(duration: TimeInterval, animations: () -> Void) {
-        animateProperties(duration: duration, animations: animations, completion: nil)
-    }
-
-    /**
-     This function allows animation of the animatable properties of the `UICircularRing`.
-     These properties include `innerRingColor, innerRingWidth, outerRingColor, outerRingWidth, innerRingSpacing, fontColor`.
-     
-     Simply call this function and inside of the animation block change the animatable properties as you would in any `UView`
-     animation block.
-     
-     The completion block is called when all animations finish.
-     */
-    open func animateProperties(duration: TimeInterval, animations: () -> Void,
-                                completion: PropertyAnimationCompletion? = nil) {
-        ringLayer.shouldAnimateProperties = true
-        ringLayer.propertyAnimationDuration = duration
-        CATransaction.begin()
-        CATransaction.setCompletionBlock {
-            // Reset and call completion
-            self.ringLayer.shouldAnimateProperties = false
-            self.ringLayer.propertyAnimationDuration = 0.0
-            completion?()
-        }
-        // Commit and perform animations
-        animations()
-        CATransaction.commit()
-    }
-}
-
-// MARK: Helpers
-
-extension UICircularRing {
-    /**
-     This method is called when the application goes into the background or when the
-     ProgressRing is paused using the pauseProgress method.
-     This is necessary for the animation to properly pick up where it left off.
-     Triggered by UIApplicationWillResignActive.
-
-     ## Author
-     Nicolai Cornelis
-     */
-    @objc func snapshotAnimation() {
-        guard let animation = ringLayer.animation(forKey: .value) else { return }
-        snapshottedAnimation = animation
-    }
-
-    /**
-     This method is called when the application comes back into the foreground or
-     when the ProgressRing is resumed using the continueProgress method.
-     This is necessary for the animation to properly pick up where it left off.
-     Triggered by UIApplicationWillEnterForeground.
-
-     ## Author
-     Nicolai Cornelis
-     */
-    @objc func restoreAnimation() {
-        guard let animation = snapshottedAnimation else { return }
-        ringLayer.add(animation, forKey: AnimationKeys.value.rawValue)
-    }
-
-    /// Called when the animation timer is complete
-    @objc func animationDidComplete(withTimer timer: Timer) {
-        (timer.userInfo as? AnimationCompletion)?()
-    }
-}
-
-extension UICircularRing {
-    /// Helper enum for animation key
-    enum AnimationKeys: String {
-        case value
-    }
-}

+ 0 - 400
Pods/UICircularProgressRing/src/UICircularProgressRing/UICircularRingLayer.swift

@@ -1,400 +0,0 @@
-//
-//  UICircularRingLayer.swift
-//  UICircularProgressRing
-//
-//  Copyright (c) 2019 Luis Padron
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a
-//  copy of this software and associated documentation files (the "Software"),
-//  to deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is furnished
-//  to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-//  INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND
-//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-//  FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-//  OR OTHERWISE, ARISING FROM, OUT OF OR IN
-//  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-import UIKit
-
-/**
- The internal subclass for CAShapeLayer.
- This is the class that handles all the drawing and animation.
- This class is not interacted with, instead
- properties are set in UICircularRing and those are delegated to here.
-
- */
-class UICircularRingLayer: CAShapeLayer {
-
-    // MARK: Properties
-
-    @NSManaged var value: CGFloat
-    @NSManaged var minValue: CGFloat
-    @NSManaged var maxValue: CGFloat
-
-    /// the delegate for the value, is notified when value changes
-    @NSManaged weak var ring: UICircularRing!
-
-    /// formatter for the text of the value label
-    var valueFormatter: UICircularRingValueFormatter?
-
-    /// the style for the value knob
-    var valueKnobStyle: UICircularRingValueKnobStyle?
-
-    // MARK: Animation members
-
-    var animationDuration: TimeInterval = 1.0
-    var animationTimingFunction: CAMediaTimingFunctionName = .easeInEaseOut
-    var animated = false
-
-    /// the value label which draws the text for the current value
-    lazy var valueLabel: UILabel = UILabel(frame: .zero)
-
-    // MARK: Animatable properties
-
-    /// whether or not animatable properties should be animated when changed
-    var shouldAnimateProperties: Bool = false
-
-    /// the animation duration for a animatable property animation
-    var propertyAnimationDuration: TimeInterval = 0.0
-
-    /// the properties which are animatable
-    static let animatableProperties: [String] = ["innerRingWidth", "innerRingColor",
-                                                         "outerRingWidth", "outerRingColor",
-                                                         "fontColor", "innerRingSpacing"]
-
-    // Returns whether or not a given property key is animatable
-    static func isAnimatableProperty(_ key: String) -> Bool {
-        return animatableProperties.firstIndex(of: key) != nil
-    }
-
-    // MARK: Init
-
-    override init() {
-        super.init()
-    }
-
-    override init(layer: Any) {
-        // copy our properties to this layer which will be used for animation
-        guard let layer = layer as? UICircularRingLayer else { fatalError("unable to copy layer") }
-        valueFormatter = layer.valueFormatter
-        valueKnobStyle = layer.valueKnobStyle
-        animationDuration = layer.animationDuration
-        animationTimingFunction = layer.animationTimingFunction
-        animated = layer.animated
-        shouldAnimateProperties = layer.shouldAnimateProperties
-        propertyAnimationDuration = layer.propertyAnimationDuration
-        super.init(layer: layer)
-    }
-
-    required init?(coder aDecoder: NSCoder) { return nil }
-
-    // MARK: Draw
-
-    /**
-     Overriden for custom drawing.
-     Draws the outer ring, inner ring and value label.
-     */
-    override func draw(in ctx: CGContext) {
-        super.draw(in: ctx)
-        UIGraphicsPushContext(ctx)
-        // Draw the rings
-        drawOuterRing()
-        drawInnerRing(in: ctx)
-        // Draw the label
-        drawValueLabel()
-        // Call the delegate and notifiy of updated value
-        if let updatedValue = value(forKey: "value") as? CGFloat {
-            ring.didUpdateValue(newValue: updatedValue)
-        }
-        UIGraphicsPopContext()
-
-    }
-
-    // MARK: Animation methods
-
-    /**
-     Watches for changes in the value property, and setNeedsDisplay accordingly
-     */
-    override class func needsDisplay(forKey key: String) -> Bool {
-        if key == "value" || isAnimatableProperty(key) {
-            return true
-        } else {
-            return super.needsDisplay(forKey: key)
-        }
-    }
-
-    /**
-     Creates animation when value property is changed
-     */
-    override func action(forKey event: String) -> CAAction? {
-        if event == "value" && animated {
-            let animation = CABasicAnimation(keyPath: "value")
-            animation.fromValue = presentation()?.value(forKey: "value")
-            animation.timingFunction = CAMediaTimingFunction(name: animationTimingFunction)
-            animation.duration = animationDuration
-            return animation
-        } else if UICircularRingLayer.isAnimatableProperty(event) && shouldAnimateProperties {
-            let animation = CABasicAnimation(keyPath: event)
-            animation.fromValue = presentation()?.value(forKey: event)
-            animation.timingFunction = CAMediaTimingFunction(name: animationTimingFunction)
-            animation.duration = propertyAnimationDuration
-            return animation
-        } else {
-            return super.action(forKey: event)
-        }
-    }
-
-    // MARK: Helpers
-
-    /**
-     Draws the outer ring for the view.
-     Sets path properties according to how the user has decided to customize the view.
-     */
-    private func drawOuterRing() {
-        guard ring.outerRingWidth > 0 else { return }
-        let center: CGPoint = CGPoint(x: bounds.midX, y: bounds.midY)
-
-        let knobSize = ring.valueKnobStyle?.size ?? 0
-        let borderWidth: CGFloat
-        if case let UICircularRingStyle.bordered(width, _) = ring.style {
-            borderWidth = width
-        } else {
-            borderWidth = 0
-        }
-
-        let offSet = max(ring.outerRingWidth, ring.innerRingWidth) / 2
-                        + (knobSize / 4)
-                        + (borderWidth * 2)
-        let outerRadius: CGFloat = min(bounds.width, bounds.height) / 2 - offSet
-        let start: CGFloat = ring.fullCircle ? 0 : ring.startAngle.rads
-        let end: CGFloat = ring.fullCircle ? .pi * 2 : ring.endAngle.rads
-        let outerPath = UIBezierPath(arcCenter: center,
-                                     radius: outerRadius,
-                                     startAngle: start,
-                                     endAngle: end,
-                                     clockwise: true)
-        outerPath.lineWidth = ring.outerRingWidth
-        outerPath.lineCapStyle = ring.outerCapStyle
-        // Update path depending on style of the ring
-        updateOuterRingPath(outerPath, radius: outerRadius, style: ring.style)
-
-        ring.outerRingColor.setStroke()
-        outerPath.stroke()
-    }
-
-    /**
-     Draws the inner ring for the view.
-     Sets path properties according to how the user has decided to customize the view.
-     */
-    private func drawInnerRing(in ctx: CGContext) {
-        guard ring.innerRingWidth > 0 else { return }
-
-        let center: CGPoint = CGPoint(x: bounds.midX, y: bounds.midY)
-
-        let innerEndAngle = calculateInnerEndAngle()
-        let radiusIn = calculateInnerRadius()
-
-        // Start drawing
-        let innerPath: UIBezierPath = UIBezierPath(arcCenter: center,
-                                                   radius: radiusIn,
-                                                   startAngle: ring.startAngle.rads,
-                                                   endAngle: innerEndAngle.rads,
-                                                   clockwise: ring.isClockwise)
-
-        // Draw path
-        ctx.setLineWidth(ring.innerRingWidth)
-        ctx.setLineJoin(.round)
-        ctx.setLineCap(ring.innerCapStyle)
-        ctx.setStrokeColor(ring.innerRingColor.cgColor)
-        ctx.addPath(innerPath.cgPath)
-        ctx.drawPath(using: .stroke)
-
-        if let gradientOptions = ring.gradientOptions {
-            // Create gradient and draw it
-            var cgColors: [CGColor] = [CGColor]()
-            for color: UIColor in gradientOptions.colors {
-                cgColors.append(color.cgColor)
-            }
-
-            guard let gradient: CGGradient = CGGradient(colorsSpace: nil,
-                                                        colors: cgColors as CFArray,
-                                                        locations: gradientOptions.colorLocations)
-            else {
-                fatalError("\nUnable to create gradient for progress ring.\n" +
-                    "Check values of gradientColors and gradientLocations.\n")
-            }
-
-            ctx.saveGState()
-            ctx.addPath(innerPath.cgPath)
-            ctx.replacePathWithStrokedPath()
-            ctx.clip()
-
-            drawGradient(gradient,
-                         start: gradientOptions.startPosition,
-                         end: gradientOptions.endPosition,
-                         in: ctx)
-
-            ctx.restoreGState()
-        }
-
-        if let knobStyle = ring.valueKnobStyle, value > minValue {
-            let knobOffset = knobStyle.size / 2
-            drawValueKnob(in: ctx, origin: CGPoint(x: innerPath.currentPoint.x - knobOffset,
-                                                   y: innerPath.currentPoint.y - knobOffset))
-        }
-    }
-
-    /// Updates the outer ring path depending on the ring's style
-    private func updateOuterRingPath(_ path: UIBezierPath, radius: CGFloat, style: UICircularRingStyle) {
-        switch style {
-        case .dashed(let pattern):
-            path.setLineDash(pattern, count: pattern.count, phase: 0.0)
-
-        case .dotted:
-            path.setLineDash([0, path.lineWidth * 2], count: 2, phase: 0)
-            path.lineCapStyle = .round
-
-        case .bordered(let borderWidth, let borderColor):
-            let center: CGPoint = CGPoint(x: bounds.midX, y: bounds.midY)
-            let knobSize = valueKnobStyle?.size ?? 0
-            let offSet = max(ring.outerRingWidth, ring.innerRingWidth) / 2
-                            + knobSize / 4
-                            + borderWidth * 2
-            let outerRadius: CGFloat = min(bounds.width, bounds.height) / 2 - offSet
-            let borderStartAngle = ring.outerCapStyle == .butt ? ring.startAngle - borderWidth : ring.startAngle
-            let borderEndAngle = ring.outerCapStyle == .butt ? ring.endAngle + borderWidth : ring.endAngle
-            let start: CGFloat = ring.fullCircle ? 0 : borderStartAngle.rads
-            let end: CGFloat = ring.fullCircle ? .pi * 2 : borderEndAngle.rads
-            let borderPath = UIBezierPath(arcCenter: center,
-                                          radius: outerRadius,
-                                          startAngle: start,
-                                          endAngle: end,
-                                          clockwise: true)
-            UIColor.clear.setFill()
-            borderPath.fill()
-            borderPath.lineWidth = (borderWidth * 2) + ring.outerRingWidth
-            borderPath.lineCapStyle = ring.outerCapStyle
-            borderColor.setStroke()
-            borderPath.stroke()
-        default:
-            break
-        }
-    }
-
-    /// Returns the end angle of the inner ring
-    private func calculateInnerEndAngle() -> CGFloat {
-        let innerEndAngle: CGFloat
-
-        if ring.fullCircle {
-            if !ring.isClockwise {
-                innerEndAngle = ring.startAngle - ((value - minValue) / (maxValue - minValue) * 360.0)
-            } else {
-                innerEndAngle = (value - minValue) / (maxValue - minValue) * 360.0 + ring.startAngle
-            }
-        } else {
-            // Calculate the center difference between the end and start angle
-            let angleDiff: CGFloat = (ring.startAngle > ring.endAngle) ? (360.0 - ring.startAngle + ring.endAngle) : (ring.endAngle - ring.startAngle)
-            // Calculate how much we should draw depending on the value set
-            if !ring.isClockwise {
-                innerEndAngle = ring.startAngle - ((value - minValue) / (maxValue - minValue) * angleDiff)
-            } else {
-                innerEndAngle = (value - minValue) / (maxValue - minValue) * angleDiff + ring.startAngle
-            }
-        }
-
-        return innerEndAngle
-    }
-
-    /// Returns the raidus of the inner ring
-    private func calculateInnerRadius() -> CGFloat {
-        // The radius for style 1 is set below
-        // The radius for style 1 is a bit less than the outer,
-        // this way it looks like its inside the circle
-        let radiusIn: CGFloat
-
-        let knobSize = ring.valueKnobStyle?.size ?? 0
-
-        switch ring.style {
-        case .inside:
-            let difference = ring.outerRingWidth * 2 + ring.innerRingSpacing + knobSize / 2
-            let offSet = ring.innerRingWidth / 2 + knobSize / 2
-            radiusIn = (min(bounds.width - difference, bounds.height - difference) / 2) - offSet
-        case .bordered(let borderWidth, _):
-            let offSet = (max(ring.outerRingWidth, ring.innerRingWidth) / 2) + (knobSize / 4) + (borderWidth * 2)
-            radiusIn = (min(bounds.width, bounds.height) / 2) - offSet
-        default:
-            let offSet = (max(ring.outerRingWidth, ring.innerRingWidth) / 2) + (knobSize / 4)
-            radiusIn = (min(bounds.width, bounds.height) / 2) - offSet
-        }
-
-        return radiusIn
-    }
-
-    /**
-     Draws a gradient with a start and end position inside the provided context
-     */
-    private func drawGradient(_ gradient: CGGradient,
-                              start: UICircularRingGradientPosition,
-                              end: UICircularRingGradientPosition,
-                              in context: CGContext) {
-
-        context.drawLinearGradient(gradient,
-                                   start: start.pointForPosition(in: bounds),
-                                   end: end.pointForPosition(in: bounds),
-                                   options: .drawsBeforeStartLocation)
-    }
-
-    /**
-     Draws the value knob inside the provided context
-     */
-    private func drawValueKnob(in context: CGContext, origin: CGPoint) {
-        guard let knobStyle = ring.valueKnobStyle else { return }
-
-        context.saveGState()
-
-        let rect = CGRect(origin: origin, size: CGSize(width: knobStyle.size, height: knobStyle.size))
-        let knobPath = UIBezierPath(ovalIn: rect)
-
-        context.setShadow(offset: knobStyle.shadowOffset,
-                          blur: knobStyle.shadowBlur,
-                          color: knobStyle.shadowColor.cgColor)
-        context.addPath(knobPath.cgPath)
-        context.setFillColor(knobStyle.color.cgColor)
-        context.setLineCap(.round)
-        context.setLineWidth(12)
-        context.drawPath(using: .fill)
-
-        context.restoreGState()
-    }
-
-    /**
-     Draws the value label for the view.
-     Only drawn if shouldShowValueText = true
-     */
-    func drawValueLabel() {
-        guard ring.shouldShowValueText else { return }
-
-        // Draws the text field
-        // Some basic label properties are set
-        valueLabel.font = ring.font
-        valueLabel.textAlignment = .center
-        valueLabel.textColor = ring.fontColor
-        valueLabel.text = valueFormatter?.string(for: value)
-        ring.willDisplayLabel(label: valueLabel)
-        valueLabel.sizeToFit()
-
-        // Deterime what should be the center for the label
-        valueLabel.center = CGPoint(x: bounds.midX, y: bounds.midY)
-
-        valueLabel.drawText(in: bounds)
-    }
-}

+ 0 - 197
Pods/UICircularProgressRing/src/UICircularProgressRing/UICircularRingStyle.swift

@@ -1,197 +0,0 @@
-//
-//  UICircularRingStyle.swift
-//  UICircularProgressRing
-//
-//  Copyright (c) 2019 Luis Padron
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a
-//  copy of this software and associated documentation files (the "Software"),
-//  to deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is furnished
-//  to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-//  INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND
-//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-//  FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-//  OR OTHERWISE, ARISING FROM, OUT OF OR IN
-//  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-import UIKit.UIColor
-
-// MARK: UICircularRingStyle
-
-/**
- 
- # UICircularRingStyle
- 
- This is an enumeration which is used to determine the style of the progress ring.
- 
- ## Author
- Luis Padron
- 
- */
-public enum UICircularRingStyle {
-    /// inner ring is inside the circle
-    case inside
-
-    /// inner ring is placed ontop of the outer ring
-    case ontop
-
-    /// outer ring is dashed, the pattern list is how the dashes should appear
-    case dashed(pattern: [CGFloat])
-
-    /// outer ring is dotted
-    case dotted
-
-    /// inner ring is placed ontop of the outer ring and outer ring has border
-    case bordered(width: CGFloat, color: UIColor)
-}
-
-// MARK: UICircularRingValueKnobStyle
-
-/**
-
- # UICircularRingValueKnobStyle
-
- Struct for setting the style of the value knob
-
- ## Author
- Luis Padron
-
- */
-public struct UICircularRingValueKnobStyle {
-
-    /// default implmementation of the knob style
-    public static let `default` = UICircularRingValueKnobStyle(size: 15.0, color: .lightGray)
-
-    /// the size of the knob
-    public let size: CGFloat
-
-    /// the color of the knob
-    public let color: UIColor
-
-    /// the amount of blur to give the shadow
-    public let shadowBlur: CGFloat
-
-    /// the offset to give the shadow
-    public let shadowOffset: CGSize
-
-    /// the color for the shadow
-    public let shadowColor: UIColor
-
-    /// creates a new `UICircularRingValueKnobStyle`
-    public init(size: CGFloat,
-                color: UIColor,
-                shadowBlur: CGFloat = 2.0,
-                shadowOffset: CGSize = .zero,
-                shadowColor: UIColor = UIColor.black.withAlphaComponent(0.8)) {
-        self.size = size
-        self.color = color
-        self.shadowBlur = shadowBlur
-        self.shadowOffset = shadowOffset
-        self.shadowColor = shadowColor
-    }
-}
-
-// MARK: UICircularRingGradientPosition
-
-/**
-
- UICircularRingGradientPosition
-
- This is an enumeration which is used to determine the position for a
- gradient. Used inside the `UICircularRingLayer` to allow customization
- for the gradient.
- */
-public enum UICircularRingGradientPosition {
-    /// Gradient positioned at the top
-    case top
-    /// Gradient positioned at the bottom
-    case bottom
-    /// Gradient positioned to the left
-    case left
-    /// Gradient positioned to the right
-    case right
-    /// Gradient positioned in the top left corner
-    case topLeft
-    /// Gradient positioned in the top right corner
-    case topRight
-    /// Gradient positioned in the bottom left corner
-    case bottomLeft
-    /// Gradient positioned in the bottom right corner
-    case bottomRight
-
-    /**
-     Returns a `CGPoint` in the coordinates space of the passed in `CGRect`
-     for the specified position of the gradient.
-     */
-    func pointForPosition(in rect: CGRect) -> CGPoint {
-        switch self {
-        case .top:
-            return CGPoint(x: rect.midX, y: rect.minY)
-        case .bottom:
-            return CGPoint(x: rect.midX, y: rect.maxY)
-        case .left:
-            return CGPoint(x: rect.minX, y: rect.midY)
-        case .right:
-            return CGPoint(x: rect.maxX, y: rect.midY)
-        case .topLeft:
-            return CGPoint(x: rect.minX, y: rect.minY)
-        case .topRight:
-            return CGPoint(x: rect.maxX, y: rect.minY)
-        case .bottomLeft:
-            return CGPoint(x: rect.minX, y: rect.maxY)
-        case .bottomRight:
-            return CGPoint(x: rect.maxX, y: rect.maxY)
-        }
-    }
-}
-
-// MARK: UICircularRingGradientOptions
-
-/**
- UICircularRingGradientOptions
-
- Struct for defining the options for the UICircularRingStyle.gradient case.
-
- ## Important ##
- Make sure the number of `colors` is equal to the number of `colorLocations`
- */
-public struct UICircularRingGradientOptions {
-
-    /// a default styling option for the gradient style
-    public static let `default` = UICircularRingGradientOptions(startPosition: .topRight,
-                                                            endPosition: .bottomLeft,
-                                                            colors: [.red, .blue],
-                                                            colorLocations: [0, 1])
-
-    /// the start location for the gradient
-    public let startPosition: UICircularRingGradientPosition
-
-    /// the end location for the gradient
-    public let endPosition: UICircularRingGradientPosition
-
-    /// the colors to use in the gradient, the count of this list must match the count of `colorLocations`
-    public let colors: [UIColor]
-
-    /// the locations of where to place the colors, valid numbers are from 0.0 - 1.0
-    public let colorLocations: [CGFloat]
-
-    /// create a new UICircularRingGradientOptions
-    public init(startPosition: UICircularRingGradientPosition,
-                endPosition: UICircularRingGradientPosition,
-                colors: [UIColor],
-                colorLocations: [CGFloat]) {
-        self.startPosition = startPosition
-        self.endPosition = endPosition
-        self.colors = colors
-        self.colorLocations = colorLocations
-    }
-}

+ 0 - 167
Pods/UICircularProgressRing/src/UICircularProgressRing/UICircularRingValueFormatter.swift

@@ -1,167 +0,0 @@
-//
-//  UICircularRingValueFormatter.swift
-//  UICircularProgressRing
-//
-//  Created by Luis on 2/7/19.
-//  Copyright © 2019 Luis Padron. All rights reserved.
-//
-
-import Foundation
-
-// MARK: UICircularRingValueFormatter
-
-/**
- UICircularRingValueFormatter
-
- Any custom formatter must conform to this protocol.
-
- */
-public protocol UICircularRingValueFormatter {
-    /// returns a string for the given object
-    func string(for value: Any) -> String?
-}
-
-// MARK: UICircularTimerRingFormatter
-
-/**
- UICircularTimerRingFormatter
-
- The formatter used in UICircularTimerRing class, formats
- the ring value into a time string.
- */
-public struct UICircularTimerRingFormatter: UICircularRingValueFormatter {
-    // MARK: Members
-
-    /// defines the units allowed to be used when converting string, by default `[.minute, .second]`
-    public var units: NSCalendar.Unit {
-        didSet { formatter.allowedUnits = units }
-    }
-
-    /// the style of the formatted string, by default `.short`
-    public var style: DateComponentsFormatter.UnitsStyle {
-        didSet { formatter.unitsStyle = style }
-    }
-
-    /// formatter which formats the time string of the ring label
-    private var formatter: DateComponentsFormatter {
-        let formatter = DateComponentsFormatter()
-        formatter.allowedUnits = units
-        formatter.unitsStyle = style
-        return formatter
-    }
-
-    // MARK: Init
-
-    public init(units: NSCalendar.Unit = [.minute, .second],
-                style: DateComponentsFormatter.UnitsStyle = .short) {
-        self.units = units
-        self.style = style
-    }
-
-    // MARK: API
-
-    /// formats the value of the ring using the date components formatter with given units/style
-    public func string(for value: Any) -> String? {
-        guard let value = value as? CGFloat else { return nil }
-        return formatter.string(from: value.interval)
-    }
-}
-
-// MARK: UICircularProgressRingFormatter
-
-/**
- UICircularProgressRingFormatter
-
- The formatter used in UICircularProgressRing class,
- responsible for formatting the value of the ring into a readable string
- */
-public struct UICircularProgressRingFormatter: UICircularRingValueFormatter {
-
-    // MARK: Members
-
-    /**
-     The name of the value indicator the value label will
-     appened to the value
-     Example: " GB" -> "100 GB"
-
-     ## Important ##
-     Default = "%"
-
-     ## Author
-     Luis Padron
-     */
-    public var valueIndicator: String
-
-    /**
-     A toggle for either placing the value indicator right or left to the value
-     Example: true -> "GB 100" (instead of 100 GB)
-
-     ## Important ##
-     Default = false (place value indicator to the right)
-
-     ## Author
-     Elad Hayun
-     */
-    public var rightToLeft: Bool
-
-    /**
-     A toggle for showing or hiding floating points from
-     the value in the value label
-
-     ## Important ##
-     Default = false (dont show)
-
-     To customize number of decmial places to show, assign a value to decimalPlaces.
-
-     ## Author
-     Luis Padron
-     */
-    public var showFloatingPoint: Bool
-
-    /**
-     The amount of decimal places to show in the value label
-
-     ## Important ##
-     Default = 2
-
-     Only used when showFloatingPoint = true
-
-     ## Author
-     Luis Padron
-     */
-    public var decimalPlaces: Int
-
-    // MARK: Init
-
-    public init(valueIndicator: String = "%",
-                rightToLeft: Bool = false,
-                showFloatingPoint: Bool = false,
-                decimalPlaces: Int = 2) {
-        self.valueIndicator = valueIndicator
-        self.rightToLeft = rightToLeft
-        self.showFloatingPoint = showFloatingPoint
-        self.decimalPlaces = decimalPlaces
-    }
-
-    // MARK: API
-
-    /// formats the value of the progress ring using the given properties
-    public func string(for value: Any) -> String? {
-        guard let value = value as? CGFloat else { return nil }
-
-        if rightToLeft {
-            if showFloatingPoint {
-                return "\(valueIndicator)" + String(format: "%.\(decimalPlaces)f", value)
-            } else {
-                return "\(valueIndicator)\(Int(value))"
-            }
-
-        } else {
-            if showFloatingPoint {
-                return String(format: "%.\(decimalPlaces)f", value) + "\(valueIndicator)"
-            } else {
-                return "\(Int(value))\(valueIndicator)"
-            }
-        }
-    }
-}

+ 0 - 153
Pods/UICircularProgressRing/src/UICircularProgressRing/UICircularTimerRing.swift

@@ -1,153 +0,0 @@
-//
-//  UICircularTimerRing.swift
-//  UICircularProgressRing
-//
-//  Copyright (c) 2019 Luis Padron
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a
-//  copy of this software and associated documentation files (the "Software"),
-//  to deal in the Software without restriction, including without limitation the
-//  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is furnished
-//  to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-//  INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND
-//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-//  FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-//  OR OTHERWISE, ARISING FROM, OUT OF OR IN
-//  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-import UIKit
-
-final public class UICircularTimerRing: UICircularRing {
-    // MARK: Members
-
-    /**
-     The formatter used when formatting the value into a string for the ring.
-
-     Default formatter is of type `UICircularTimerRingFormatter`.
-     */
-    public var valueFormatter: UICircularRingValueFormatter = UICircularTimerRingFormatter() {
-        didSet { ringLayer.valueFormatter = valueFormatter }
-    }
-
-    /**
-     The handler for the timer.
-
-     The handler is called whenever the timer finishes or is paused.
-     If the timer is paused handler will be called with (false, elapsedTime)
-     Otherwise the handler will be called with (true, finalTime)
-     */
-    public typealias TimerHandler = (State) -> Void
-
-    // MARK: Private Members
-
-    /// This is the max value for the layer, which corresponds
-    /// to the time that was set for the timer
-    private var time: TimeInterval = 60
-
-    /// the elapsed time since calling `startTimer`
-    private var elapsedTime: TimeInterval? {
-        return layer.presentation()?.value(forKey: .value) as? TimeInterval
-    }
-
-    /// the completion for over all timer
-    private var timerHandler: TimerHandler?
-
-    // MARK: API
-
-    /**
-     Starts the timer until the given time is elapsed.
-
-     Parameters:
-        - startTime: the time at which the timer will begin, default is 0.
-        - endtime: the time at which the timer will end, the animation duration will be `endTime - startTime`.
-        - handler: the handler which is called and updated depending on the state of the timer.
-     */
-    public func startTimer(from startTime: TimeInterval = 0.0, to endTime: TimeInterval, handler: TimerHandler?) {
-        // begin animation to start time, this should be done instantly thus 0 duration
-        startAnimation(duration: 0) {
-            // begin animation to end time, this is done with difference in endTime and startTime
-            self.startAnimation(duration: endTime - startTime) {
-                self.timerHandler?(.finished)
-            }
-
-            // this will cause the animation to the end time value
-            self.ringLayer.value = endTime.float
-            self.ringLayer.maxValue = endTime.float
-        }
-
-        // this causes the animation to the start time
-        ringLayer.value = startTime.float
-        ringLayer.maxValue = endTime.float
-
-        // store time and handler
-        time = endTime
-        timerHandler = handler
-    }
-
-    /**
-     Pauses the timer.
-
-     Handler will be called with (false, elapsedTime)
-     */
-    public func pauseTimer() {
-        timerHandler?(.paused(elpasedTime: elapsedTime))
-        pauseAnimation()
-    }
-
-    /**
-     Continues the timer from a previously paused time.
-     */
-    public func continueTimer() {
-        self.timerHandler?(.continued(elapsedTime: elapsedTime))
-        continueAnimation {
-            self.timerHandler?(.finished)
-        }
-    }
-
-    /**
-     Resets the timer, this means the time is reset and
-     previously set handler will no longer be used.
-     */
-    public func resetTimer() {
-        resetAnimation()
-        ringLayer.value = 0
-        timerHandler = nil
-    }
-
-    // MARK: Overrides
-
-    /// initialize with some defaults relevant to this timer ring
-    override func initialize() {
-        super.initialize()
-        ringLayer.ring = self
-        ringLayer.minValue = 0
-        ringLayer.value = 0
-        ringLayer.maxValue = time.float
-        ringLayer.valueFormatter = valueFormatter
-        ringLayer.animationTimingFunction = .linear
-    }
-}
-
-// MARK: UICircularTimerRing.State
-
-public extension UICircularTimerRing {
-    /// state of the timer ring, used in handler
-    enum State {
-        /// the timer has finished
-        case finished
-
-        /// the timer was continued called `continueTimer`
-        case continued(elapsedTime: TimeInterval?)
-
-        /// the timer was paused called `pauseTimer`
-        case paused(elpasedTime: TimeInterval?)
-    }
-}

+ 0 - 2
deltachat-ios.xcodeproj/project.pbxproj

@@ -1074,7 +1074,6 @@
 				"${BUILT_PRODUCTS_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework",
 				"${BUILT_PRODUCTS_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
 				"${BUILT_PRODUCTS_DIR}/SwiftyBeaver/SwiftyBeaver.framework",
 				"${BUILT_PRODUCTS_DIR}/SwiftyBeaver/SwiftyBeaver.framework",
-				"${BUILT_PRODUCTS_DIR}/UICircularProgressRing/UICircularProgressRing.framework",
 			);
 			);
 			name = "[CP] Embed Pods Frameworks";
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 			outputPaths = (
@@ -1084,7 +1083,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SCSiriWaveformView.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SCSiriWaveformView.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBeaver.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBeaver.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/UICircularProgressRing.framework",
 			);
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellPath = /bin/sh;

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff