Update translations logic

erolburak · Nov 8, 2024 · b2c4c19 · b2c4c19
1 parent ceb0175
commit b2c4c19
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 68 deletions.
diff --git a/BobbysNews/Presentation/ContentView.swift b/BobbysNews/Presentation/ContentView.swift
@@ -211,11 +211,11 @@ struct ContentView: View {
         }
         .onChange(of: viewModel.translate) {
             Task {
-                await viewModel.translateConfiguration()
+                await viewModel.configureTranslations()
             }
         }
         .translationTask(viewModel.translationSessionConfiguration) { translateSession in
-            await viewModel.translate(translateSession: translateSession)
+            await viewModel.fetchTranslations(translateSession: translateSession)
         }
     }
 }
@@ -258,7 +258,7 @@ private struct ListItem: View {
 
                     Spacer()
 
-                    Text((article.titleTranslated ?? article.title) ?? String(localized: "EmptyArticleTitle"))
+                    Text((article.showTranslations ? article.titleTranslated : article.title) ?? String(localized: "EmptyArticleTitle"))
                         .font(.system(.subheadline,
                                       weight: .semibold))
                         .lineLimit(2)

diff --git a/BobbysNews/Presentation/ContentViewModel.swift b/BobbysNews/Presentation/ContentViewModel.swift
@@ -66,8 +66,8 @@ final class ContentViewModel {
         }
     }
 
-    var articles: [Article] = []
-    var countries: [String] = []
+    var articles = [Article]()
+    var countries = [String]()
     var listDisabled: Bool { stateTopHeadlines != .loaded }
     var listOpacity: Double { stateTopHeadlines == .loaded ? 1 : 0.3 }
     var selectedCountry = "" {
@@ -116,6 +116,21 @@ final class ContentViewModel {
         await fetchSources()
     }
 
+    @MainActor
+    func configureTranslations() async {
+        guard await checkNetworkConnection() == true else {
+            translate = false
+            return
+        }
+        if translate, translationSessionConfiguration == nil {
+            translationSessionConfiguration = TranslationSession.Configuration()
+        } else if translate {
+            translationSessionConfiguration?.invalidate()
+        } else {
+            showArticlesTranslations(show: false)
+        }
+    }
+
     @MainActor
     func fetchSources(sensoryFeedback: Bool? = nil) async {
         if sensoryFeedback == true {
@@ -159,95 +174,79 @@ final class ContentViewModel {
     }
 
     @MainActor
-    func reset() async {
-        do {
-            /// Delete all persisted sources
-            try deleteSourcesUseCase.delete()
-            /// Delete all persisted topHeadlines
-            try deleteTopHeadlinesUseCase.delete()
-            apiKeyVersion = 1
-            articles.removeAll()
-            countries.removeAll()
-            selectedCountry = ""
-            stateSources = .emptyRead
-            stateTopHeadlines = .emptyRead
-            translate = false
-            translateDisabled = true
-            await MainActor.run {
-                sensoryFeedbackTrigger(feedback: .success)
-            }
-        } catch {
-            await MainActor.run {
-                showAlert(error: .reset)
-            }
-        }
-    }
-
-    func showSettingsTip() throws {
-        SettingsTip.show = true
-    }
-
-    @MainActor
-    func translate(translateSession: TranslationSession) async {
+    func fetchTranslations(translateSession: TranslationSession) async {
         stateTopHeadlines = .isTranslating
-        var contentRequests: [TranslationSession.Request]? = []
-        var titleRequests: [TranslationSession.Request]? = []
+        var contentRequests = [TranslationSession.Request]()
+        var titleRequests = [TranslationSession.Request]()
         for (index, article) in articles.enumerated() {
             if let content = article.content,
                article.contentTranslated == nil
             {
-                contentRequests?.append(TranslationSession.Request(sourceText: content,
-                                                                   clientIdentifier: "\(index)"))
+                contentRequests.append(TranslationSession.Request(sourceText: content,
+                                                                  clientIdentifier: "\(index)"))
             }
             if let title = article.title,
                article.titleTranslated == nil
             {
-                titleRequests?.append(TranslationSession.Request(sourceText: title,
-                                                                 clientIdentifier: "\(index)"))
+                titleRequests.append(TranslationSession.Request(sourceText: title,
+                                                                clientIdentifier: "\(index)"))
             }
         }
         do {
-            if let contentRequests,
-               !contentRequests.isEmpty
-            {
+            if !contentRequests.isEmpty {
                 for try await response in translateSession.translate(batch: contentRequests) {
                     guard let index = Int(response.clientIdentifier ?? "") else {
                         continue
                     }
                     articles[index].contentTranslated = response.targetText
                 }
             }
-            if let titleRequests,
-               !titleRequests.isEmpty
-            {
+            if !titleRequests.isEmpty {
                 for try await response in translateSession.translate(batch: titleRequests) {
                     guard let index = Int(response.clientIdentifier ?? "") else {
                         continue
                     }
                     articles[index].titleTranslated = response.targetText
                 }
             }
-            updateStateTopHeadlines(state: contentRequests?.isEmpty == true && titleRequests?.isEmpty == true ? .emptyTranslate : .loaded)
+            guard !articles.compactMap(\.contentTranslated).isEmpty,
+                  !articles.compactMap(\.titleTranslated).isEmpty else {
+                return updateStateTopHeadlines(state: .emptyTranslate)
+            }
+            showArticlesTranslations(show: true)
         } catch {
             updateStateTopHeadlines(error: error,
                                     state: .emptyTranslate)
         }
     }
 
     @MainActor
-    func translateConfiguration() async {
-        guard await checkNetworkConnection() == true else {
+    func reset() async {
+        do {
+            /// Delete all persisted sources
+            try deleteSourcesUseCase.delete()
+            /// Delete all persisted topHeadlines
+            try deleteTopHeadlinesUseCase.delete()
+            apiKeyVersion = 1
+            articles.removeAll()
+            countries.removeAll()
+            selectedCountry = ""
+            stateSources = .emptyRead
+            stateTopHeadlines = .emptyRead
             translate = false
-            return
-        }
-        if translate, translationSessionConfiguration == nil {
-            translationSessionConfiguration = TranslationSession.Configuration()
-        } else if translate {
-            translationSessionConfiguration?.invalidate()
-        } else {
-            deleteTranslations()
+            translateDisabled = true
+            await MainActor.run {
+                sensoryFeedbackTrigger(feedback: .success)
+            }
+        } catch {
+            await MainActor.run {
+                showAlert(error: .reset)
+            }
         }
-        sensoryFeedbackTrigger(feedback: .success)
+    }
+
+    func showSettingsTip() throws {
+        SettingsTip.show = true
     }
 
     @MainActor
@@ -268,13 +267,6 @@ final class ContentViewModel {
                              .datastoreLocation(.groupContainer(identifier: "com.burakerol.BobbysNews"))])
     }
 
-    private func deleteTranslations() {
-        for index in articles.indices {
-            articles[index].contentTranslated = nil
-            articles[index].titleTranslated = nil
-        }
-    }
-
     private func readSources() {
         do {
             guard let sources = try readSourcesUseCase.read().sources else {
@@ -318,6 +310,14 @@ final class ContentViewModel {
         sensoryFeedbackTrigger(feedback: .error)
     }
 
+    private func showArticlesTranslations(show: Bool) {
+        for index in articles.indices {
+            articles[index].showTranslations = show
+        }
+        sensoryFeedbackTrigger(feedback: .success)
+        updateStateTopHeadlines(state: articles.isEmpty ? stateTopHeadlines == .emptyFetch ? .emptyFetch : .emptyRead : .loaded)
+    }
+
     private func updateStateSources(error: Error? = nil,
                                     state: StatesSources)
     {

diff --git a/BobbysNews/Presentation/DetailViewModel.swift b/BobbysNews/Presentation/DetailViewModel.swift
@@ -24,13 +24,13 @@ final class DetailViewModel {
 
     var article: Article
     var articleContent: String {
-        article.contentTranslated ?? article.content ?? String(localized: "EmptyArticleContent")
+        (article.showTranslations ? article.contentTranslated : article.content) ?? String(localized: "EmptyArticleContent")
     }
 
     var articleImage: Image?
 
     var articleTitle: String {
-        article.titleTranslated ?? article.title ?? String(localized: "EmptyArticleTitle")
+        (article.showTranslations ? article.titleTranslated : article.title) ?? String(localized: "EmptyArticleTitle")
     }
 
     var navigationTitleOpacity: Double {

diff --git a/BobbysNewsDomain/Sources/BobbysNewsDomain/Entity/Article.swift b/BobbysNewsDomain/Sources/BobbysNewsDomain/Entity/Article.swift
@@ -21,6 +21,7 @@ public struct Article: Hashable, Identifiable, Sendable {
     public let url: URL?
     public let urlToImage: URL?
     public var contentTranslated: String?
+    public var showTranslations = false
     public var titleTranslated: String?
 
     // MARK: - Lifecycles

diff --git a/BobbysNewsDomain/Tests/BobbysNewsDomainTests/Entity/ArticleTests.swift b/BobbysNewsDomain/Tests/BobbysNewsDomainTests/Entity/ArticleTests.swift
@@ -24,6 +24,7 @@ struct ArticleTests {
             article?.content == "Test" &&
             article?.contentTranslated == nil &&
             article?.publishedAt == .distantPast &&
+            !article?.showTranslations &&
             article?.source?.category == "Test" &&
             article?.source?.country == "uk" &&
             article?.source?.id == "Test" &&

diff --git a/BobbysNewsDomain/Tests/BobbysNewsDomainTests/UseCase/Extension/ArticleExtensionTests.swift b/BobbysNewsDomain/Tests/BobbysNewsDomainTests/UseCase/Extension/ArticleExtensionTests.swift
@@ -25,6 +25,7 @@ struct ArticleExtensionTests {
             article.content == "Test" &&
             article.contentTranslated == nil &&
             article.publishedAt == .distantPast &&
+            !article.showTranslations &&
             article.source?.category == "Test" &&
             article.source?.country == "uk" &&
             article.source?.id == "Test" &&

diff --git a/BobbysNewsTests/Presentation/DetailViewModelTests.swift b/BobbysNewsTests/Presentation/DetailViewModelTests.swift
@@ -46,6 +46,7 @@ struct DetailViewModelTests {
             sut.article.content == article.content &&
             sut.article.contentTranslated == nil &&
             sut.article.publishedAt == article.publishedAt &&
+            sut.article.showTranslations == article.showTranslations &&
             sut.article.source?.category == article.source?.category &&
             sut.article.source?.country == article.source?.country &&
             sut.article.source?.id == article.source?.id &&