TF-250 Improvements, translations

TwoFAS/Sync/SyncHandler.swift

@@ -109,6 +109,7 @@ final class SyncHandler {
         userInfo: [AnyHashable: Any],
         fetchCompletionHandler completionHandler: @escaping (BackgroundFetchResult) -> Void
     ) {
+        #if os(iOS)
         let dict = userInfo as! [String: NSObject]
         guard let notification: CKDatabaseNotification = CKNotification(
             fromRemoteNotificationDictionary: dict
@@ -117,6 +118,10 @@ final class SyncHandler {
             return
         }
         Log("SyncHandler - We have a notification! \(notification)", module: .cloudSync)
+        #elseif os(watchOS)
+        Log("SyncHandler - We have a notification!", module: .cloudSync)
+        #endif
+
         fromNotificationCompletionHandler = completionHandler
         synchronize()
     }

TwoFAS/TwoFAS/Other/Generated/T.generated.swift

@@ -976,6 +976,8 @@ internal enum T {
     internal static let enterNewPinShort = T.tr("Localizable", "security__enter_new_pin_short", fallback: "Enter new PIN")
     /// Please enter your PIN
     internal static let enterPin = T.tr("Localizable", "security__enter_pin", fallback: "Please enter your PIN")
+    /// Enter PIN
+    internal static let enterPinShort = T.tr("Localizable", "security__enter_pin_short", fallback: "Enter PIN")
     /// Please enter your new %s PIN
     internal static func enterYourNewPin(_ p1: UnsafePointer<CChar>) -> String {
       return T.tr("Localizable", "security__enter_your_new_pin", p1, fallback: "Please enter your new %s PIN")

TwoFAS/TwoFASAuth/Generated/T.generated.swift

@@ -976,6 +976,8 @@ internal enum T {
     internal static let enterNewPinShort = T.tr("Localizable", "security__enter_new_pin_short", fallback: "Enter new PIN")
     /// Please enter your PIN
     internal static let enterPin = T.tr("Localizable", "security__enter_pin", fallback: "Please enter your PIN")
+    /// Enter PIN
+    internal static let enterPinShort = T.tr("Localizable", "security__enter_pin_short", fallback: "Enter PIN")
     /// Please enter your new %s PIN
     internal static func enterYourNewPin(_ p1: UnsafePointer<CChar>) -> String {
       return T.tr("Localizable", "security__enter_your_new_pin", p1, fallback: "Please enter your new %s PIN")

TwoFAS/TwoFASWatch Watch App/Main/MainPresenter.swift

@@ -25,28 +25,15 @@ final class MainPresenter: ObservableObject {
     @Published var favoriteList: [Service] = []
 
     private let interactor: MainInteracting
-    private let notificationCenter = NotificationCenter.default
 
     init(interactor: MainInteracting) {
         self.interactor = interactor
-
-        notificationCenter.addObserver(
-            self,
-            selector: #selector(refresh),
-            name: .syncCompletedSuccessfuly,
-            object: nil
-        )
-    }
-
-    deinit {
-        notificationCenter.removeObserver(self)
     }
 
     func onAppear() {
         refresh()
     }
 
-    @objc
     private func refresh() {
         favoriteList = interactor
             .listFavoriteServices()

TwoFAS/TwoFASWatch Watch App/PIN/PINKeyboardPresenter.swift

@@ -56,9 +56,7 @@ final class PINKeyboardPresenter: ObservableObject {
     init(interactor: PINKeyboardInteracting, completion: @escaping (PINKeyboardResult) -> Void) {
         self.interactor = interactor
         self.completion = completion
-    }
-
-    func onAppear() {
+
         showCloseButton = interactor.variant.showCloseButton
         navigationTitle = interactor.variant.navigationTitle
     }
@@ -143,8 +141,8 @@ private extension PINKeyboardPresenter {
 private extension PINKeyboardVariant {
     var navigationTitle: String {
         switch self {
-        case .PINValidation: T.Security.enterPin
-        case .PINValidationWithClose: T.Security.enterPin
+        case .PINValidation: T.Security.enterPinShort
+        case .PINValidationWithClose: T.Security.enterPinShort
         case .enterNewPIN: T.Security.enterNewPinShort
         case .verifyPIN: T.Security.repeatNewPinShort
         }

TwoFAS/TwoFASWatch Watch App/PIN/PINKeyboardView.swift

@@ -101,9 +101,6 @@ struct PINKeyboardView: View {
         })
         .toolbarTitleDisplayMode(.inline)
         .navigationTitle(presenter.navigationTitle)
-        .onAppear {
-            presenter.onAppear()
-        }
     }
 
     @ViewBuilder

TwoFAS/TwoFASWatch Watch App/ServiceList/ServiceCellView.swift

@@ -36,6 +36,7 @@ struct ServiceCellView: View {
                 style: .continuous
             )
             .fill(service.badgeColor)
+            .preferredColorScheme(.dark)
             .frame(width: 5)
             IconRenderer(service: service)
             VStack(alignment: .leading, spacing: 0) {

TwoFAS/TwoFASWatch Watch App/ServiceList/ServiceListPresenter.swift

@@ -24,21 +24,9 @@ final class ServiceListPresenter: ObservableObject {
     @Published var list: [Category] = []
 
     private let interactor: ServiceListInteracting
-    private let notificationCenter = NotificationCenter.default
 
     init(interactor: ServiceListInteracting) {
         self.interactor = interactor
-
-        notificationCenter.addObserver(
-            self,
-            selector: #selector(refresh),
-            name: .syncCompletedSuccessfuly,
-            object: nil
-        )
-    }
-
-    deinit {
-        notificationCenter.removeObserver(self)
     }
 }
 
@@ -47,7 +35,6 @@ extension ServiceListPresenter {
         refresh()
     }
 
-    @objc
     private func refresh() {
         list = interactor.listAllServices()
             .toCategories()

TwoFAS/TwoFASWatch Watch App/Settings/About/LogoView.swift

@@ -28,7 +28,7 @@ struct LogoView: View {
                     .aspectRatio(contentMode: .fit)
                     .frame(width: 40)
                     .padding(.leading, 4)
-                    .padding(.bottom, 4)
+                    .padding(.vertical, 4)
 
                 Text(T.Commons._2fasToolbar)
                     .font(.title)