From 8d76cfdcd3aca5794f0a0f021044df3d86afdbd0 Mon Sep 17 00:00:00 2001 From: Marcin Czachurski Date: Fri, 5 May 2023 14:59:06 +0200 Subject: [PATCH] Remove duplicated code --- Vernissage/Views/StatusView/StatusView.swift | 8 ++------ Vernissage/Widgets/ImageViewer.swift | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Vernissage/Views/StatusView/StatusView.swift b/Vernissage/Views/StatusView/StatusView.swift index f420855..bcfcb36 100644 --- a/Vernissage/Views/StatusView/StatusView.swift +++ b/Vernissage/Views/StatusView/StatusView.swift @@ -240,18 +240,14 @@ struct StatusView: View { } if let imageHeight = self.imageHeight, let imageWidth = self.imageWidth, imageHeight > 0 && imageWidth > 0 { - return self.calculateHeight(width: Double(imageWidth), height: Double(imageHeight)) + let calculatedSize = ImageSizeService.shared.calculate(width: Double(imageWidth), height: Double(imageHeight)) + return calculatedSize.height } // If we don't have image height and width in metadata, we have to use some constant height. return UIScreen.main.bounds.width * 0.75 } - private func calculateHeight(width: Double, height: Double) -> CGFloat { - let divider = width / UIScreen.main.bounds.size.width - return height / divider - } - private func getMainStatus(status: StatusModel) async throws -> StatusModel { guard let inReplyToId = status.inReplyToId else { return status diff --git a/Vernissage/Widgets/ImageViewer.swift b/Vernissage/Widgets/ImageViewer.swift index 9833202..7c25f9a 100644 --- a/Vernissage/Widgets/ImageViewer.swift +++ b/Vernissage/Widgets/ImageViewer.swift @@ -224,7 +224,8 @@ struct ImageViewer: View { private func calculateStartingOffset() -> CGSize { // Image size on the screen. - let imageOnScreenHeight = self.calculateHeight(width: self.imageWidth, height: self.imageHeight) + let calculatedSize = ImageSizeService.shared.calculate(width: self.imageWidth, height: self.imageHeight) + let imageOnScreenHeight = calculatedSize.height // Calculate full space for image. let safeAreaInsetsTop = UIApplication.shared.keyWindow?.safeAreaInsets.top ?? 20.0 @@ -254,9 +255,4 @@ struct ImageViewer: View { return 88.0 } } - - private func calculateHeight(width: Double, height: Double) -> CGFloat { - let divider = width / UIScreen.main.bounds.size.width - return height / divider - } }