No-ticket: Small refactor

Author: Bohdan

LanguageFlag/Helpers/LayoutImageContainer.swift

@@ -12,12 +12,13 @@ final class LayoutImageContainer {
 
     // MARK: Variables
     static let shared = LayoutImageContainer()
+
     private lazy var layoutDictionary: Dictionary<String, String> = {
         createLayoutDictionary()
     }()
     private var cachedIcons = NSCache<NSString, NSImage>()
 
-    // MARK: Public
+    // MARK: Internal
     func getImage(for keyboardLayout: String) -> NSImage? {
         guard
             let imageName = layoutDictionary[keyboardLayout],

LanguageFlag/Stories/LanguageViewController.swift

@@ -27,6 +27,7 @@ class LanguageViewController: NSViewController {
         addObserver()
     }
 
+    // MARK: - Deinit
     deinit {
         NotificationCenter.default.removeObserver(self)
     }
@@ -38,7 +39,10 @@ extension LanguageViewController {
     @objc
     private func keyboardLayoutChanged(notification: NSNotification) {
         guard let model = notification.object as? KeyboardLayoutNotification else { return }
-        changeFlagImage(keyboardLayout: model.keyboardLayout, isCapsLockEnabled: model.isCapsLockEnabled, iconRef: model.iconRef)
+
+        changeFlagImage(keyboardLayout: model.keyboardLayout,
+                        isCapsLockEnabled: model.isCapsLockEnabled,
+                        iconRef: model.iconRef)
     }
 }
 

LanguageFlag/Stories/LanguageWindow.swift

@@ -1,17 +1,15 @@
-//
-//  LanguageWindow.swift
-//  LanguageFlag
-//
-//  Created by Bohdan Bochkovskyi on 26.02.2023.
-//  Copyright © 2023 Bohdan. All rights reserved.
-//
-
 import Cocoa
 
 final class LanguageWindow: NSWindow {
 
+    // MARK: - Init
     init(contentRect: NSRect) {
         super.init(contentRect: contentRect, styleMask: .borderless, backing: .buffered, defer: false)
+        configureAppearance()
+    }
+    
+    // MARK: - Private
+    private func configureAppearance() {
         isOpaque = false
         backgroundColor = .clear
         level = .floating

LanguageFlag/Stories/LanguageWindowController.swift

@@ -35,6 +35,11 @@ final class LanguageWindowController: NSWindowController {
         configureContentViewController()
         addObserver()
     }
+    
+    // MARK: - Deinit
+    deinit {
+        NotificationCenter.default.removeObserver(self)
+    }
 }
 
 // MARK: - Actions
@@ -58,8 +63,8 @@ extension LanguageWindowController {
 extension LanguageWindowController {
 
     private func configureWindow() {
-        let screenRect = screenRect ?? NSScreen.main?.visibleFrame
-        guard let screenRect else { return }
+        guard let screenRect = screenRect ?? NSScreen.main?.visibleFrame else { return }
+
         let rect = createRect(in: screenRect)
         window = LanguageWindow(contentRect: rect)
         window?.setFrame(rect, display: true)
@@ -69,20 +74,23 @@ extension LanguageWindowController {
         let posX: CGFloat = screen.minX + (screen.width - LanguageViewController.width) / 2
         let posY: CGFloat = screen.minY + screen.height * 0.16
         let rect = NSRect(x: posX, y: posY, width: LanguageViewController.width, height: LanguageViewController.height)
+
         return rect
     }
 
     private func configureContentViewController() {
         let mainStoryboard = NSStoryboard.init(name: "Main", bundle: nil)
+
         guard let flagVC = mainStoryboard.instantiateController(withIdentifier: "flagController") as? LanguageViewController else {
             return
         }
+
         window?.contentViewController = flagVC
         let cornerRadius: CGFloat = 16
-        window?.contentView?.wantsLayer = true
-        window?.contentView?.layer?.cornerRadius = cornerRadius
-        window?.contentView?.superview?.wantsLayer = true
-        window?.contentView?.superview?.layer?.cornerRadius = cornerRadius
+        [window?.contentView, window?.contentView?.superview].forEach {
+            $0?.wantsLayer = true
+            $0?.layer?.cornerRadius = cornerRadius
+        }
     }
 
     private func addObserver() {