Merge branch 'release/v1.2.0'

Author: woin2ee

.github/workflows/create_new_release.yml

@@ -5,15 +5,19 @@ on:
     # branches:
     #   - main
     tags:
-    - 'v*'
+    - 'v*.*.*'
 
 jobs:
   create_new_release:
     name: Create new release
     runs-on: ubuntu-latest
+    env:
+      CURRENT_TAG: ${{ github.ref_name }}
     permissions:
       contents: write
     steps:
     - uses: actions/checkout@v3
     - name: Create Release
       uses: ncipollo/[email protected]
+      with:
+        bodyFile: "Changelog/$CURRENT_TAG.md"

Changelog/v1.2.0.md

@@ -0,0 +1,7 @@
+## Features
+- Add activity indicator to translation web view controller.
+- Add feature to disable translation button when no word.
+
+## Enhancement
+- Add exception processing that the device unconnected network.
+- Change text color of `no Word` label

Resources/iOSCore/Localization/en.lproj/Localizable.strings

@@ -54,3 +54,5 @@ google_drive_logout = "Google Drive Logout";
 signed_out_of_google_drive = "Signed out of Google Drive.";
 
 synchronize_to_google_drive = "Synchronize to Google Drive.";
+
+please_check_your_network_connection = "Please check your network connection.";

Resources/iOSCore/Localization/ko.lproj/Localizable.strings

@@ -54,3 +54,5 @@ google_drive_logout = "구글 드라이브 로그아웃";
 signed_out_of_google_drive = "구글 드라이브에서 로그아웃되었습니다.";
 
 synchronize_to_google_drive = "구글 드라이브에 동기화 합니다.";
+
+please_check_your_network_connection = "네트워크 연결 상태를 확인해 주세요.";

Sources/Domain/UseCases/WordRxUseCase.swift

@@ -7,7 +7,6 @@
 
 import Foundation
 import RxSwift
-import Utility
 
 public final class WordRxUseCase: WordRxUseCaseProtocol {
 
@@ -69,13 +68,10 @@ public final class WordRxUseCase: WordRxUseCaseProtocol {
 
     public func getWord(by uuid: UUID) -> RxSwift.Single<Word> {
         return .create { single in
-            let maybeWord = self.wordUseCase.getWord(by: uuid)
-
-            do {
-                let word = try unwrapOrThrow(maybeWord)
+            if let word = self.wordUseCase.getWord(by: uuid) {
                 single(.success(word))
-            } catch {
-                single(.failure(error))
+            } else {
+                single(.failure(WordRxUseCaseError.invalidUUID(uuid)))
             }
 
             return Disposables.create()
@@ -137,3 +133,7 @@ public final class WordRxUseCase: WordRxUseCaseProtocol {
     }
 
 }
+
+enum WordRxUseCaseError: Error {
+    case invalidUUID(UUID)
+}

Sources/Testing/TestDoubles/WordRxUseCaseFake.swift

@@ -0,0 +1,81 @@
+//
+//  WordRxUseCaseFake.swift
+//  iOSCore
+//
+//  Created by Jaewon Yun on 2023/11/12.
+//  Copyright © 2023 woin2ee. All rights reserved.
+//
+
+@testable import Domain
+import Foundation
+import RxSwift
+
+public final class WordRxUseCaseFake: WordRxUseCaseProtocol {
+
+    let wordUseCaseFake: WordUseCaseFake = .init()
+
+    public init() {
+    }
+
+    public func addNewWord(_ word: Domain.Word) -> RxSwift.Single<Void> {
+        wordUseCaseFake.addNewWord(word)
+        return .just(())
+    }
+
+    public func deleteWord(by uuid: UUID) -> RxSwift.Single<Void> {
+        wordUseCaseFake.deleteWord(by: uuid)
+        return .just(())
+    }
+
+    public func getWordList() -> RxSwift.Single<[Domain.Word]> {
+        let wordList = wordUseCaseFake.getWordList()
+        return .just(wordList)
+    }
+
+    public func getMemorizedWordList() -> RxSwift.Single<[Domain.Word]> {
+        let wordList = wordUseCaseFake.getMemorizedWordList()
+        return .just(wordList)
+    }
+
+    public func getUnmemorizedWordList() -> RxSwift.Single<[Domain.Word]> {
+        let wordList = wordUseCaseFake.getUnmemorizedWordList()
+        return .just(wordList)
+    }
+
+    public func getWord(by uuid: UUID) -> RxSwift.Single<Domain.Word> {
+        guard let word = wordUseCaseFake.getWord(by: uuid) else {
+            return .error(WordRxUseCaseError.invalidUUID(uuid))
+        }
+        return .just(word)
+    }
+
+    public func updateWord(by uuid: UUID, to newWord: Domain.Word) -> RxSwift.Single<Void> {
+        wordUseCaseFake.updateWord(by: uuid, to: newWord)
+        return .just(())
+    }
+
+    public func randomizeUnmemorizedWordList() -> RxSwift.Single<Void> {
+        wordUseCaseFake.randomizeUnmemorizedWordList()
+        return .just(())
+    }
+
+    public func updateToNextWord() -> RxSwift.Single<Void> {
+        wordUseCaseFake.updateToNextWord()
+        return .just(())
+    }
+
+    public func updateToPreviousWord() -> RxSwift.Single<Void> {
+        wordUseCaseFake.updateToPreviousWord()
+        return .just(())
+    }
+
+    public func markCurrentWordAsMemorized(uuid: UUID) -> RxSwift.Single<Void> {
+        wordUseCaseFake.markCurrentWordAsMemorized(uuid: uuid)
+        return .just(())
+    }
+
+    public var currentUnmemorizedWord: Domain.Word? {
+        wordUseCaseFake.currentUnmemorizedWord
+    }
+
+}

Sources/Utility/NetworkMonitor.swift

@@ -0,0 +1,40 @@
+//
+//  NetworkMonitor.swift
+//  Utility
+//
+//  Created by Jaewon Yun on 2023/11/13.
+//  Copyright © 2023 woin2ee. All rights reserved.
+//
+
+import Foundation
+import Network
+
+/// 인터넷 연결 상태를 모니터링하는 객체입니다.
+///
+/// 모니터링을 시작하기 위해서 `start()` 함수를 호출해야 합니다.
+public final class NetworkMonitor {
+
+    public static let shared: NetworkMonitor = .init()
+
+    let queue: DispatchQueue = .global()
+    let monitor: NWPathMonitor = .init()
+
+    public private(set) var isEstablishedConnection: Bool = false
+
+    private init() {
+        monitor.pathUpdateHandler = { [weak self] path in
+            if path.status == .satisfied {
+                self?.isEstablishedConnection = true
+            } else {
+                self?.isEstablishedConnection = false
+            }
+        }
+
+        monitor.start(queue: self.queue)
+    }
+
+    public static func start() {
+        _ = NetworkMonitor.shared
+    }
+
+}

Sources/WordChecker/Application/AppDelegate.swift

@@ -12,6 +12,7 @@ import iOSCore
 import RxSwift
 import RxUtility
 import UIKit
+import Utility
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -20,6 +21,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         injectDependencies()
         initUserSettingsIfFirstLaunch()
         attemptRestoreGoogleSignInState()
+        NetworkMonitor.start()
+
         return true
     }
 

Sources/WordCheckerDev/Application/AppDelegate.swift

@@ -11,13 +11,15 @@ import iOSCore
 import RxSwift
 import RxUtility
 import UIKit
+import Utility
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         injectDependencies()
         initUserSettingsIfFirstLaunch()
+        NetworkMonitor.start()
 
         return true
     }

Sources/iOSCore/Localization/WCString.swift

@@ -64,4 +64,6 @@ struct WCString {
         return .init(format: localizedString, arguments: [word])
     }
 
+    static let please_check_your_network_connection = NSLocalizedString("please_check_your_network_connection", bundle: Bundle.module, comment: "")
+
 }

Sources/iOSCore/Scenes/Common/ActivityIndicatorViewController.swift

@@ -10,13 +10,17 @@ import SnapKit
 import Then
 import UIKit
 
+/// 화면 전체에 dim view 와 함께 `ActivityIndicator` 를 띄우고 싶을때 사용하는 ViewController 입니다.
+///
+/// `startAnimating(on:)` 함수를 이용하여 원하는 ViewController 에 `ActivityIndicator` 를 띄울 수 있습니다.
+/// 적절한 시점에 반드시 `stopAnimating(on:)` 함수를 호출하여 `ActivityIndicator` 를 화면에서 제거해야 합니다.
 final class ActivityIndicatorViewController: UIViewController {
 
     static let shared: ActivityIndicatorViewController = .init()
 
     let activityIndicatorView: UIActivityIndicatorView = .init(style: .large)
 
-    private init() {
+    init() {
         super.init(nibName: nil, bundle: nil)
 
         self.modalPresentationStyle = .overFullScreen

Sources/iOSCore/Scenes/WordChecking/Subviews/WordChecking+BottomButton.swift

@@ -32,6 +32,15 @@ extension WordCheckingView {
             return config
         }
 
+        override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+            // 하위뷰의 여부, hidden, alpha 값 등 hitTest 에 영향을 미치는 요소들을 무시합니다.
+            if self.point(inside: point, with: event) {
+                return self
+            } else {
+                return nil
+            }
+        }
+
     }
 
 }

Sources/iOSCore/Scenes/WordChecking/TranslationWebView/TranslationWebViewController.swift

@@ -7,17 +7,22 @@
 //
 
 import Domain
+import Then
 import UIKit
 import WebKit
 
-final class TranslationWebViewController: UIViewController {
+final class TranslationWebViewController: BaseViewController {
 
-    let webView: WKWebView = .init()
+    lazy var webView: WKWebView = .init().then {
+        $0.navigationDelegate = self
+    }
 
     var translationSite: TranslationSite
 
     var word: String = ""
 
+    private var activityIndicatorView: ActivityIndicatorViewController? = .init()
+
     init(translationSite: TranslationSite) {
         self.translationSite = translationSite
         super.init(nibName: nil, bundle: nil)
@@ -31,6 +36,12 @@ final class TranslationWebViewController: UIViewController {
         self.view = webView
     }
 
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+
+        activityIndicatorView = nil
+    }
+
     func loadWebView() throws {
         let url: String = translationSite.url(forWord: word)
 
@@ -56,3 +67,17 @@ extension TranslationWebViewController {
     }
 
 }
+
+// MARK: - WKNavigationDelegate
+
+extension TranslationWebViewController: WKNavigationDelegate {
+
+    func webView(_ webView: WKWebView, didCommit navigation: WKNavigation!) {
+        activityIndicatorView?.startAnimating(on: self)
+    }
+
+    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        activityIndicatorView?.stopAnimating(on: self)
+    }
+
+}

Sources/iOSCore/Scenes/WordChecking/WordCheckingViewController.swift

@@ -13,6 +13,7 @@ import SFSafeSymbols
 import Then
 import Toast
 import UIKit
+import Utility
 import WebKit
 
 final class WordCheckingViewController: RxBaseViewController, View {
@@ -102,13 +103,23 @@ final class WordCheckingViewController: RxBaseViewController, View {
 
         rootView.translateButton.rx.tap
             .subscribe(with: self, onNext: { owner, _ in
+                guard NetworkMonitor.shared.isEstablishedConnection else {
+                    owner.presentOKAlert(title: nil, message: WCString.please_check_your_network_connection)
+                    return
+                }
+
+                guard let word = reactor.currentState.currentWord?.word else {
+                    assertionFailure("현재 표시된 단어가 없는데 번역 버튼이 활성화된 것으로 예상.")
+                    return
+                }
+
                 let translationSite: TranslationSite = .init(
                     translationSourceLanguage: reactor.currentState.translationSourceLanguage,
                     translationTargetLanguage: reactor.currentState.translationTargetLanguage
                 )
 
                 let translationWebViewController: TranslationWebViewController = .init(translationSite: translationSite)
-                translationWebViewController.word = owner.rootView.wordLabel.text ?? ""
+                translationWebViewController.word = word
 
                 do {
                     try translationWebViewController.loadWebView()
@@ -127,8 +138,12 @@ final class WordCheckingViewController: RxBaseViewController, View {
             .drive(with: self) { owner, word in
                 if let currentWord = word {
                     owner.rootView.wordLabel.text = currentWord.word
+                    owner.rootView.wordLabel.textColor = .label
+                    owner.rootView.translateButton.isEnabled = true
                 } else {
                     owner.rootView.wordLabel.text = WCString.noWords
+                    owner.rootView.wordLabel.textColor = .systemGray2
+                    owner.rootView.translateButton.isEnabled = false
                 }
             }
             .disposed(by: self.disposeBag)