From 337a95b12aa090ddc8780466cde8677d84889d1a Mon Sep 17 00:00:00 2001 From: woxtu Date: Sun, 21 May 2023 16:18:35 +0900 Subject: [PATCH] chore: resolve SwiftLint errors (#304) * Use a longer name * Disable the `large_tuple` rule * Avoid a force cast * Bind as a constant --- .swiftlint.yml | 1 + .../CropAuxiliaryIndicatorView+Accessibility.swift | 4 ++-- Sources/Mantis/CropView/CropView.swift | 7 ++++--- Sources/Mantis/Mantis.swift | 5 ++++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.swiftlint.yml b/.swiftlint.yml index 0133ab56..1d5f9738 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -1,5 +1,6 @@ disabled_rules: - trailing_whitespace +- large_tuple opt_in_rules: - empty_count - empty_string diff --git a/Sources/Mantis/CropView/CropAuxiliaryIndicatorView+Accessibility.swift b/Sources/Mantis/CropView/CropAuxiliaryIndicatorView+Accessibility.swift index 1824367e..bd1db92a 100644 --- a/Sources/Mantis/CropView/CropAuxiliaryIndicatorView+Accessibility.swift +++ b/Sources/Mantis/CropView/CropAuxiliaryIndicatorView+Accessibility.swift @@ -20,14 +20,14 @@ extension CropAuxiliaryIndicatorView { } accessibilityHelperViews.removeAll() - for i in 0..<8 { + for index in 0..<8 { let helperView = UIView(frame: .zero) helperView.isAccessibilityElement = true addSubview(helperView) accessibilityHelperViews.append(helperView) - guard let handleType = CropViewAuxiliaryIndicatorHandleType(rawValue: i + 1) else { + guard let handleType = CropViewAuxiliaryIndicatorHandleType(rawValue: index + 1) else { continue } diff --git a/Sources/Mantis/CropView/CropView.swift b/Sources/Mantis/CropView/CropView.swift index b52fd0c5..c69df851 100644 --- a/Sources/Mantis/CropView/CropView.swift +++ b/Sources/Mantis/CropView/CropView.swift @@ -68,9 +68,10 @@ class CropView: UIView { if let indicator = cropViewConfig.cropActivityIndicator { activityIndicator = indicator } else { - activityIndicator = UIActivityIndicatorView(frame: .zero) - (activityIndicator as! UIActivityIndicatorView).color = .white - activityIndicator.transform = CGAffineTransform(scaleX: 2.0, y: 2.0) + let indicator = UIActivityIndicatorView(frame: .zero) + indicator.color = .white + indicator.transform = CGAffineTransform(scaleX: 2.0, y: 2.0) + activityIndicator = indicator } addSubview(activityIndicator) diff --git a/Sources/Mantis/Mantis.swift b/Sources/Mantis/Mantis.swift index ddadf29f..d653518a 100644 --- a/Sources/Mantis/Mantis.swift +++ b/Sources/Mantis/Mantis.swift @@ -85,11 +85,14 @@ private(set) var bundle: Bundle? = { }() private func buildCropView(with image: UIImage, and cropViewConfig: CropViewConfig) -> CropViewProtocol { + let cropAuxiliaryIndicatorView = CropAuxiliaryIndicatorView(frame: .zero, + cropBoxHotAreaUnit: cropViewConfig.cropBoxHotAreaUnit, + disableCropBoxDeformation: cropViewConfig.disableCropBoxDeformation) let imageContainer = ImageContainer(image: image) let cropView = CropView(image: image, cropViewConfig: cropViewConfig, viewModel: buildCropViewModel(with: cropViewConfig), - cropAuxiliaryIndicatorView: CropAuxiliaryIndicatorView(frame: .zero, cropBoxHotAreaUnit: cropViewConfig.cropBoxHotAreaUnit, disableCropBoxDeformation: cropViewConfig.disableCropBoxDeformation), + cropAuxiliaryIndicatorView: cropAuxiliaryIndicatorView, imageContainer: imageContainer, cropWorkbenchView: buildCropWorkbenchView(with: cropViewConfig, and: imageContainer), cropMaskViewManager: buildCropMaskViewManager(with: cropViewConfig))