1.2.0

Kabinett.xcodeproj/project.pbxproj

@@ -89,6 +89,7 @@
 		7F6CE9E62C6E28400074568E /* CameraView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F6CE9E52C6E28400074568E /* CameraView.swift */; };
 		7F78684C2C78B41A0083D204 /* ImagePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F78684B2C78B41A0083D204 /* ImagePickerView.swift */; };
 		7F7868562C7B14220083D204 /* HorizontalPadding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F7868552C7B14220083D204 /* HorizontalPadding.swift */; };
+		7F8B50A02CE612780048A07D /* OptionOverlayGuide.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F8B509F2CE612780048A07D /* OptionOverlayGuide.swift */; };
 		7F9890822C7EF5C30035CB0D /* CustomTabBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F9890812C7EF5C30035CB0D /* CustomTabBar.swift */; };
 		7FCAE2B12C73080000228FA7 /* ImagePreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FCAE2B02C73080000228FA7 /* ImagePreview.swift */; };
 		7FCAE2B82C730E1700228FA7 /* OverlappingImagesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FCAE2B72C730E1700228FA7 /* OverlappingImagesView.swift */; };
@@ -125,9 +126,10 @@
 		AFA58F222C6A004C00A7C569 /* WriteLetterUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA58F212C6A004C00A7C569 /* WriteLetterUseCase.swift */; };
 		AFA58F242C6A02BF00A7C569 /* ImportLetterUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA58F232C6A02BF00A7C569 /* ImportLetterUseCase.swift */; };
 		AFA58F302C6C4B2A00A7C569 /* LetterBoxUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA58F2F2C6C4B2A00A7C569 /* LetterBoxUseCase.swift */; };
+		AFA75B272D013F8900DA418F /* FirestoreLetterWriteManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA75B262D013F8900DA418F /* FirestoreLetterWriteManager.swift */; };
 		AFB88B592C89410600E79F90 /* DefaultWriteLetterUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFB88B582C89410600E79F90 /* DefaultWriteLetterUseCase.swift */; };
 		AFCFDFC32C7C3F2A00BEFFDF /* DefaultProfileUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83949C892C71BC0F0080D72C /* DefaultProfileUseCase.swift */; };
-		AFCFDFC42C7C3F2A00BEFFDF /* FirestoreLetterManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA58F252C6AE33D00A7C569 /* FirestoreLetterManager.swift */; };
+		AFCFDFC42C7C3F2A00BEFFDF /* FirestoreLetterBoxManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA58F252C6AE33D00A7C569 /* FirestoreLetterBoxManager.swift */; };
 		AFDE7D2E2C75797A0019F2DE /* FirestorageLetterManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFDE7D2D2C75797A0019F2DE /* FirestorageLetterManager.swift */; };
 		E2E0DCD12CAED20800596DF7 /* LoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E0DCD02CAED20800596DF7 /* LoadingView.swift */; };
 /* End PBXBuildFile section */
@@ -231,6 +233,7 @@
 		7F6CE9E52C6E28400074568E /* CameraView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraView.swift; sourceTree = "<group>"; };
 		7F78684B2C78B41A0083D204 /* ImagePickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePickerView.swift; sourceTree = "<group>"; };
 		7F7868552C7B14220083D204 /* HorizontalPadding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HorizontalPadding.swift; sourceTree = "<group>"; };
+		7F8B509F2CE612780048A07D /* OptionOverlayGuide.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptionOverlayGuide.swift; sourceTree = "<group>"; };
 		7F9890812C7EF5C30035CB0D /* CustomTabBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTabBar.swift; sourceTree = "<group>"; };
 		7FCAE2B02C73080000228FA7 /* ImagePreview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePreview.swift; sourceTree = "<group>"; };
 		7FCAE2B72C730E1700228FA7 /* OverlappingImagesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverlappingImagesView.swift; sourceTree = "<group>"; };
@@ -267,8 +270,9 @@
 		AFA58F172C69DB1300A7C569 /* Writer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Writer.swift; sourceTree = "<group>"; };
 		AFA58F212C6A004C00A7C569 /* WriteLetterUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WriteLetterUseCase.swift; sourceTree = "<group>"; };
 		AFA58F232C6A02BF00A7C569 /* ImportLetterUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImportLetterUseCase.swift; sourceTree = "<group>"; };
-		AFA58F252C6AE33D00A7C569 /* FirestoreLetterManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirestoreLetterManager.swift; sourceTree = "<group>"; };
+		AFA58F252C6AE33D00A7C569 /* FirestoreLetterBoxManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirestoreLetterBoxManager.swift; sourceTree = "<group>"; };
 		AFA58F2F2C6C4B2A00A7C569 /* LetterBoxUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LetterBoxUseCase.swift; sourceTree = "<group>"; };
+		AFA75B262D013F8900DA418F /* FirestoreLetterWriteManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirestoreLetterWriteManager.swift; sourceTree = "<group>"; };
 		AFB88B582C89410600E79F90 /* DefaultWriteLetterUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultWriteLetterUseCase.swift; sourceTree = "<group>"; };
 		AFDE7D2D2C75797A0019F2DE /* FirestorageLetterManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirestorageLetterManager.swift; sourceTree = "<group>"; };
 		E2E0DCD02CAED20800596DF7 /* LoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingView.swift; sourceTree = "<group>"; };
@@ -391,6 +395,7 @@
 				7F9890812C7EF5C30035CB0D /* CustomTabBar.swift */,
 				7F6CE9C12C6B33DD0074568E /* OptionOverlay.swift */,
 				7F397C542C7DF20C00388645 /* ImportDialog.swift */,
+				7F8B509F2CE612780048A07D /* OptionOverlayGuide.swift */,
 			);
 			path = CustomTabView;
 			sourceTree = "<group>";
@@ -413,7 +418,8 @@
 			children = (
 				83F0D6842C705E42001B8733 /* AuthManager.swift */,
 				83F0D6862C7072DB001B8733 /* FirestoreWriterManager.swift */,
-				AFA58F252C6AE33D00A7C569 /* FirestoreLetterManager.swift */,
+				AFA75B262D013F8900DA418F /* FirestoreLetterWriteManager.swift */,
+				AFA58F252C6AE33D00A7C569 /* FirestoreLetterBoxManager.swift */,
 				83CA92AD2C8181DB00DFB68B /* FirestorageWriterManager.swift */,
 				AFDE7D2D2C75797A0019F2DE /* FirestorageLetterManager.swift */,
 			);
@@ -955,7 +961,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				AFCFDFC32C7C3F2A00BEFFDF /* DefaultProfileUseCase.swift in Sources */,
-				AFCFDFC42C7C3F2A00BEFFDF /* FirestoreLetterManager.swift in Sources */,
+				AFCFDFC42C7C3F2A00BEFFDF /* FirestoreLetterBoxManager.swift in Sources */,
+				AFA75B272D013F8900DA418F /* FirestoreLetterWriteManager.swift in Sources */,
 				577157052C75DD9900E21162 /* Writer.swift in Sources */,
 				04DEC0FE2C7EDB1100D289EA /* KabinettNumberFormatter.swift in Sources */,
 				83F0D6872C7072DB001B8733 /* FirestoreWriterManager.swift in Sources */,
@@ -1053,6 +1060,7 @@
 				577C86732C8B8D5700EAB1BE /* Extension+View.swift in Sources */,
 				53A99EA72C8190B600896AAC /* SearchBarView.swift in Sources */,
 				577157012C75D73700E21162 /* Extension+UIApplication.swift in Sources */,
+				7F8B50A02CE612780048A07D /* OptionOverlayGuide.swift in Sources */,
 				83D9C8E52C830C7600EF2684 /* DefaultSignUpUseCase.swift in Sources */,
 				832C72672C71CF7B0071E8D0 /* SignUpUseCase.swift in Sources */,
 				04DEC0EB2C6C87B500D289EA /* AccountSettingsView.swift in Sources */,

Kabinett/Application/DIContainer/Keys/ServiceKeys.swift

@@ -23,8 +23,12 @@ struct FirestoreWriterManagerKey: InjectionKey {
     typealias Value = FirestoreWriterManager
 }
 
-struct FirestoreLetterManagerKey: InjectionKey {
-    typealias Value = FirestoreLetterManager
+struct FirestoreLetterWriteManagerKey: InjectionKey {
+    typealias Value = FirestoreLetterWriteManager
+}
+
+struct FirestoreLetterBoxManagerKey: InjectionKey {
+    typealias Value = FirestoreLetterBoxManager
 }
 
 struct FirestorageWriterManagerKey: InjectionKey {

Kabinett/Application/KabinettApp.swift

@@ -58,7 +58,7 @@ struct KabinettApp: App {
                             UIEdgeInsets(top: 0, left: -13, bottom: 0, right: 0)
                         )
                     appearance.setBackIndicatorImage(image, transitionMaskImage: image)
-
+                    
                     UINavigationBar.appearance().standardAppearance = appearance
                     UINavigationBar.appearance().scrollEdgeAppearance = appearance
                     UINavigationBar.appearance().compactAppearance = appearance
@@ -86,8 +86,11 @@ struct KabinettApp: App {
             Module(FirestoreWriterManagerKey.self) {
                 FirestoreWriterManager()
             }
-            Module(FirestoreLetterManagerKey.self) {
-                FirestoreLetterManager()
+            Module(FirestoreLetterWriteManagerKey.self) {
+                FirestoreLetterWriteManager()
+            }
+            Module(FirestoreLetterBoxManagerKey.self) {
+                FirestoreLetterBoxManager()
             }
         }
 
@@ -109,8 +112,11 @@ struct KabinettApp: App {
         @Injected(FirestoreWriterManagerKey.self)
         var firestoreWriterManager: FirestoreWriterManager
 
-        @Injected(FirestoreLetterManagerKey.self)
-        var firestoreLetterManager: FirestoreLetterManager
+        @Injected(FirestoreLetterWriteManagerKey.self)
+        var firestoreLetterWriteManager: FirestoreLetterWriteManager
+
+        @Injected(FirestoreLetterBoxManagerKey.self)
+        var firestoreLetterBoxManager: FirestoreLetterBoxManager
 
         @Injected(FirestorageWriterManagerKey.self)
         var firestorageWriterManager: FirestorageWriterManager
@@ -136,21 +142,21 @@ struct KabinettApp: App {
                 DefaultWriteLetterUseCase(
                     authManager: authManager,
                     writerManager: firestoreWriterManager,
-                    letterManager: firestoreLetterManager,
+                    letterManager: firestoreLetterWriteManager,
                     letterStorageManager: firestorageLetterManager
                 )
             }
             Module(LetterBoxUseCaseKey.self) {
                 DefaultLetterBoxUseCase(
-                    letterManager: firestoreLetterManager,
+                    letterManager: firestoreLetterBoxManager,
                     authManager: authManager
                 )
             }
             Module(ImportLetterUseCaseKey.self) {
                 DefaultImportLetterUseCase(
                     authManager: authManager,
                     writerManager: firestoreWriterManager,
-                    letterManager: firestoreLetterManager,
+                    letterManager: firestoreLetterWriteManager,
                     letterStorageManager: firestorageLetterManager
                 )
             }

Kabinett/Data/DefaultUseCases/DefaultImportLetterUseCase.swift

@@ -13,13 +13,13 @@ final class DefaultImportLetterUseCase {
     private let logger: Logger
     private let authManager: AuthManager
     private let writerManager: FirestoreWriterManager
-    private let letterManager: FirestoreLetterManager
+    private let letterManager: FirestoreLetterWriteManager
     private let letterStorageManager: FirestorageLetterManager
 
     init(
         authManager: AuthManager,
         writerManager: FirestoreWriterManager,
-        letterManager: FirestoreLetterManager,
+        letterManager: FirestoreLetterWriteManager,
         letterStorageManager: FirestorageLetterManager
     ) {
         self.logger = Logger(
@@ -79,11 +79,11 @@ extension DefaultImportLetterUseCase: ImportLetterUseCase {
     func findWriter(by query: String) async -> [Writer] {
         do {
             async let resultByName = letterManager.findDocuments(
-                by: Query(key: "name", value: query),
+                by: Query(key: .name, value: query),
                 as: Writer.self
             )
             async let resultByNumber = letterManager.findDocuments(
-                by: Query(key: "kabinettNumber", value: query),
+                by: Query(key: .kabinettNumber, value: query),
                 as: Writer.self
             )
 

Kabinett/Data/DefaultUseCases/DefaultLetterBoxUseCase.swift

@@ -11,11 +11,11 @@ import os
 
 final class DefaultLetterBoxUseCase {
     private let logger: Logger
-    private let letterManager: FirestoreLetterManager
+    private let letterManager: FirestoreLetterBoxManager
     private let authManager: AuthManager
 
     init(
-        letterManager: FirestoreLetterManager,
+        letterManager: FirestoreLetterBoxManager,
         authManager: AuthManager
     ) {
         self.logger = Logger(

Kabinett/Data/DefaultUseCases/DefaultWriteLetterUseCase.swift

@@ -13,13 +13,13 @@ final class DefaultWriteLetterUseCase {
     private let logger: Logger
     private let authManager: AuthManager
     private let writerManager: FirestoreWriterManager
-    private let letterManager: FirestoreLetterManager
+    private let letterManager: FirestoreLetterWriteManager
     private let letterStorageManager: FirestorageLetterManager
 
     init(
         authManager: AuthManager,
         writerManager: FirestoreWriterManager,
-        letterManager: FirestoreLetterManager,
+        letterManager: FirestoreLetterWriteManager,
         letterStorageManager: FirestorageLetterManager
     ) {
         self.logger = Logger(
@@ -34,7 +34,7 @@ final class DefaultWriteLetterUseCase {
 }
 
 extension DefaultWriteLetterUseCase: WriteLetterUseCase {
-    func saveLetter(font: String, 
+    func saveLetter(font: String,
                     postScript: String?,
                     envelope: String,
                     stamp: String,
@@ -89,11 +89,11 @@ extension DefaultWriteLetterUseCase: WriteLetterUseCase {
     func findWriter(by query: String) async -> [Writer] {
         do {
             async let resultByName = letterManager.findDocuments(
-                by: Query(key: "name", value: query),
+                by: Query(key: .name, value: query),
                 as: Writer.self
             )
             async let resultByNumber = letterManager.findDocuments(
-                by: Query(key: "kabinettNumber", value: query),
+                by: Query(key: .kabinettNumber, value: query),
                 as: Writer.self
             )