Fix swift lint indentation_width

CruGlobal · Jul 16, 2024 · 3cbcaf5 · 3cbcaf5
1 parent 541058f
commit 3cbcaf5
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 63 deletions.
diff --git a/...ppLanguage/Presentation/DownloadableLanguages/Subviews/DownloadableLanguageItemView.swift b/...ppLanguage/Presentation/DownloadableLanguages/Subviews/DownloadableLanguageItemView.swift
@@ -198,9 +198,8 @@ struct DownloadableLanguageItemView: View {
     }
 
     private func shouldContinueDownloadProgressAnimation() -> Bool {
-        guard isVisible,
-              let animationDownloadProgress = animationDownloadProgress
-        else {
+
+        guard isVisible, let animationDownloadProgress = animationDownloadProgress else {
             return false
         }
 

diff --git a/godtools/App/Share/Common/FileCache/FileCache.swift b/godtools/App/Share/Common/FileCache/FileCache.swift
@@ -269,7 +269,7 @@ class FileCache {
 
             // delete directory since contents were moved
             do {
-               try fileManager.removeItem(at: childDirectory)
+                try fileManager.removeItem(at: childDirectory)
             }
             catch let error {
                 return error

diff --git a/godtools/App/Share/Data/ArticlesRepository/Articles/Cache/ArticleAemCache.swift b/godtools/App/Share/Data/ArticlesRepository/Articles/Cache/ArticleAemCache.swift
@@ -90,11 +90,7 @@ class ArticleAemCache {
                 let dataIsNotCached: Bool
                 let uuidChanged: Bool
 
-                if let aemCacheObject = self.getAemCacheObject(realm: realm, aemUri: aemData.aemUri),
-                   let cachedUUID = aemCacheObject.aemData.articleJcrContent?.uuid,
-                   let uuid = aemData.articleJcrContent?.uuid,
-                   !cachedUUID.isEmpty,
-                   !uuid.isEmpty {
+                if let aemCacheObject = self.getAemCacheObject(realm: realm, aemUri: aemData.aemUri), let cachedUUID = aemCacheObject.aemData.articleJcrContent?.uuid, let uuid = aemData.articleJcrContent?.uuid, !cachedUUID.isEmpty, !uuid.isEmpty {
 
                     dataIsNotCached = false
                     uuidChanged = cachedUUID != uuid

diff --git a/.../App/Share/Data/ArticlesRepository/Articles/Downloader/Parsers/ArticleAemDataParser.swift b/.../App/Share/Data/ArticlesRepository/Articles/Downloader/Parsers/ArticleAemDataParser.swift
@@ -92,32 +92,30 @@ class ArticleAemDataParser {
     }
 
     /*
-
-     NOTE:
-
-     The below preferred variatons are root level keys found in the json structure that is getting parsed.
-
-     It appears that each variation can be appended to an aem import src url in order to load an html page per platform.
-
-     For example, take the following aem import src url:
-
-     https://www.cru.org/content/experience-fragments/shared-library/language-masters/en/how-to-know-god/what-is-christianity/does-god-answer-our-prayers-
-
-     We obtain the json by appending a number representing the maximum amount of levels the json structure will return like so:
-
-     https://www.cru.org/content/experience-fragments/shared-library/language-masters/en/how-to-know-god/what-is-christianity/does-god-answer-our-prayers-.10.json (10 levels).
-
-     We can also append variations 'master' or ('godtools' or 'godtools-variation') to the import src url to load an html page like so:
-
-     master
-     https://www.cru.org/content/experience-fragments/shared-library/language-masters/en/how-to-know-god/what-is-christianity/does-god-answer-our-prayers-/master.html
-
-     //godtools
-     https://www.cru.org/content/experience-fragments/shared-library/language-masters/en/how-to-know-god/what-is-christianity/does-god-answer-our-prayers-/godtools.html
-
-     //godtools-variation
-     https://www.cru.org/content/experience-fragments/shared-library/language-masters/en/how-to-know-god/what-is-christianity/can-you-explain-the-trinity--/godtools-variation.html
-
+    NOTE:
+
+    The below preferred variatons are root level keys found in the json structure that is getting parsed.
+
+    It appears that each variation can be appended to an aem import src url in order to load an html page per platform.
+
+    For example, take the following aem import src url:
+
+    https://www.cru.org/content/experience-fragments/shared-library/language-masters/en/how-to-know-god/what-is-christianity/does-god-answer-our-prayers-
+
+    We obtain the json by appending a number representing the maximum amount of levels the json structure will return like so:
+
+    https://www.cru.org/content/experience-fragments/shared-library/language-masters/en/how-to-know-god/what-is-christianity/does-god-answer-our-prayers-.10.json (10 levels).
+
+    We can also append variations 'master' or ('godtools' or 'godtools-variation') to the import src url to load an html page like so:
+
+    master
+    https://www.cru.org/content/experience-fragments/shared-library/language-masters/en/how-to-know-god/what-is-christianity/does-god-answer-our-prayers-/master.html
+
+    //godtools
+    https://www.cru.org/content/experience-fragments/shared-library/language-masters/en/how-to-know-god/what-is-christianity/does-god-answer-our-prayers-/godtools.html
+
+    //godtools-variation
+    https://www.cru.org/content/experience-fragments/shared-library/language-masters/en/how-to-know-god/what-is-christianity/can-you-explain-the-trinity--/godtools-variation.html
     */
 
     private func getPreferredVariation(aemUrl: URL, aemJson: [String: Any]) -> String? {

diff --git a/...App/Share/Data/DeepLinkingService/Parsers/Legacy/LegacyAppsFlyerDeepLinkValueParser.swift b/...App/Share/Data/DeepLinkingService/Parsers/Legacy/LegacyAppsFlyerDeepLinkValueParser.swift
@@ -21,9 +21,7 @@ class LegacyAppsFlyerDeepLinkValueParser: DeepLinkAppsFlyerParserType {
         if let deepLinkValue = data["deep_link_value"] as? String {
             resourceAbbreviation = deepLinkValue
         }
-        else if let link = data["link"] as? String,
-                let linkComponents = URLComponents(string: link),
-                let deepLinkValue = linkComponents.queryItems?.first(where: { $0.name == "deep_link_value" })?.value {
+        else if let link = data["link"] as? String, let linkComponents = URLComponents(string: link), let deepLinkValue = linkComponents.queryItems?.first(where: { $0.name == "deep_link_value" })?.value {
 
             resourceAbbreviation = deepLinkValue
         }

diff --git a/godtools/App/Share/Data/DeepLinkingService/Parsers/ToolPath/ToolPathDeepLinkParser.swift b/godtools/App/Share/Data/DeepLinkingService/Parsers/ToolPath/ToolPathDeepLinkParser.swift
@@ -24,8 +24,7 @@ class ToolPathDeepLinkParser: DeepLinkUrlParserType {
             return nil
         }
 
-        guard let resourceAbbreviation = pathComponents[safe: toolPathIndex + 2],
-              let language = pathComponents[safe: toolPathIndex + 3] else {
+        guard let resourceAbbreviation = pathComponents[safe: toolPathIndex + 2], let language = pathComponents[safe: toolPathIndex + 3] else {
 
             return nil
         }

diff --git a/godtools/App/Share/Data/ResourcesSHA256FileCache/ResourcesSHA256FileCache.swift b/godtools/App/Share/Data/ResourcesSHA256FileCache/ResourcesSHA256FileCache.swift
@@ -180,8 +180,7 @@ class ResourcesSHA256FileCache {
                                 continue
                             }
 
-                            if let existingRealmSHA256File = realm.object(ofType: RealmSHA256File.self, forPrimaryKey: filenameWithPathExtension),
-                               !existingRealmSHA256File.translations.contains(realmTranslation) {
+                            if let existingRealmSHA256File = realm.object(ofType: RealmSHA256File.self, forPrimaryKey: filenameWithPathExtension), !existingRealmSHA256File.translations.contains(realmTranslation) {
 
                                 existingRealmSHA256File.translations.append(realmTranslation)
                             }

diff --git a/...e/Data/TrackDownloadedTranslationsRepository/Cache/TrackDownloadedTranslationsCache.swift b/...e/Data/TrackDownloadedTranslationsRepository/Cache/TrackDownloadedTranslationsCache.swift
@@ -46,8 +46,7 @@ class TrackDownloadedTranslationsCache {
 
             let downloadedTranslation: RealmDownloadedTranslation = RealmDownloadedTranslation()
 
-            guard let languageId = translation.language?.id, !languageId.isEmpty,
-                  let resourceId = translation.resource?.id, !resourceId.isEmpty else {
+            guard let languageId = translation.language?.id, !languageId.isEmpty, let resourceId = translation.resource?.id, !resourceId.isEmpty else {
 
                 return []
             }

diff --git a/godtools/App/Share/Data/TranslationsRepository/TranslationsRepository.swift b/godtools/App/Share/Data/TranslationsRepository/TranslationsRepository.swift
@@ -238,10 +238,7 @@ extension TranslationsRepository {
 
                 let latestDownloadedTranslation: TranslationModel?
 
-                if shouldFallbackToLatestDownloadedTranslation,
-                   let resourceId = translation.resource?.id,
-                   let languageId = translation.language?.id,
-                   let latestTrackedDownloadedTranslation = self.trackDownloadedTranslationsRepository.getLatestDownloadedTranslation(resourceId: resourceId, languageId: languageId) {
+                if shouldFallbackToLatestDownloadedTranslation, let resourceId = translation.resource?.id, let languageId = translation.language?.id, let latestTrackedDownloadedTranslation = self.trackDownloadedTranslationsRepository.getLatestDownloadedTranslation(resourceId: resourceId, languageId: languageId) {
 
                     latestDownloadedTranslation = self.getTranslation(id: latestTrackedDownloadedTranslation.translationId)
                 }

diff --git a/godtools/App/Share/Data/UserCountersRepository/UserCountersRepository.swift b/godtools/App/Share/Data/UserCountersRepository/UserCountersRepository.swift
@@ -33,21 +33,19 @@ class UserCountersRepository {
     }
 
     func getUserCountersChanged(reloadFromRemote: Bool) -> AnyPublisher<Void, Never> {
+
+        if reloadFromRemote {
 
-            if reloadFromRemote {
-
-                fetchRemoteUserCounters()
-                    .sink(receiveCompletion: { _ in
-
-                    }, receiveValue: { _ in
-
-                    })
-                    .store(in: &cancellables)
-
-            }
-
-            return cache.getUserCountersChanged()
+            fetchRemoteUserCounters()
+                .sink(receiveCompletion: { _ in
+                }, receiveValue: { _ in
+
+                })
+                .store(in: &cancellables)
         }
+
+        return cache.getUserCountersChanged()
+    }
 
     func getUserCounters() -> [UserCounterDataModel] {
 

diff --git a/...e/DetermineToolTranslationsToDownload/DetermineDeepLinkedToolTranslationsToDownload.swift b/...e/DetermineToolTranslationsToDownload/DetermineDeepLinkedToolTranslationsToDownload.swift
@@ -60,8 +60,7 @@ class DetermineDeepLinkedToolTranslationsToDownload: DetermineToolTranslationsTo
 
             return primaryTranslation
         }
-        else if let appLanguage = userAppLanguageRepository.getCachedLanguage(),
-                let appLanguageTranslation = translationsRepository.getLatestTranslation(resourceId: resource.id, languageCode: appLanguage.languageId) {
+        else if let appLanguage = userAppLanguageRepository.getCachedLanguage(), let appLanguageTranslation = translationsRepository.getLatestTranslation(resourceId: resource.id, languageCode: appLanguage.languageId) {
 
             return appLanguageTranslation
         }