Refactoring: addWord -> addFlashcard. Added new models

Pro2005 · Sep 3, 2016 · eb746b2 · eb746b2
1 parent 9127812
commit eb746b2
Show file tree

Hide file tree

Showing 51 changed files with 481 additions and 351 deletions.
diff --git a/DigDic.xcodeproj/project.pbxproj b/DigDic.xcodeproj/project.pbxproj
diff --git a/.../Configurator/IDAddWordConfigurator.swift → ...igurator/IDAddFlashcardConfigurator.swift b/.../Configurator/IDAddWordConfigurator.swift → ...igurator/IDAddFlashcardConfigurator.swift
@@ -1,5 +1,5 @@
 //
-//  IDAddWordIDAddWordConfigurator.swift
+//  IDAddFlashcardIDAddFlashcardConfigurator.swift
 //  DigDic
 //
 //  Created by ls on 26/08/2016.
@@ -8,24 +8,24 @@
 
 import UIKit
 
-class IDAddWordModuleConfigurator {
+class IDAddFlashcardModuleConfigurator {
 
     func configureModuleForViewInput<UIViewController>(viewInput: UIViewController) {
 
-        if let viewController = viewInput as? IDAddWordViewController {
+        if let viewController = viewInput as? IDAddFlashcardViewController {
             configure(viewController)
         }
     }
 
-    private func configure(viewController: IDAddWordViewController) {
+    private func configure(viewController: IDAddFlashcardViewController) {
 
-        let router = IDAddWordRouter(viewController: viewController)
+        let router = IDAddFlashcardRouter(viewController: viewController)
 
-        let presenter = IDAddWordPresenter()
+        let presenter = IDAddFlashcardPresenter()
         presenter.view = viewController
         presenter.router = router
 
-        let interactor = IDAddWordInteractor()
+        let interactor = IDAddFlashcardInteractor()
         interactor.output = presenter
 
         presenter.interactor = interactor

diff --git a/DigDic/Modules/AddWord/Interactor/IDAddFlashcardInteractor.swift b/DigDic/Modules/AddWord/Interactor/IDAddFlashcardInteractor.swift
@@ -0,0 +1,27 @@
+//
+//  IDAddFlashcardIDAddFlashcardInteractor.swift
+//  DigDic
+//
+//  Created by ls on 26/08/2016.
+//  Copyright © 2016 Ilya Denisov. All rights reserved.
+//
+
+class IDAddFlashcardInteractor: IDAddFlashcardInteractorInput {
+
+    weak var output: IDAddFlashcardInteractorOutput!
+    lazy var service: IDDictionaryService = IDDictionaryService(source: IDLocalDataBaseSource())
+
+    func addFlashcardWithDataHolders(dataHolders: [IDAddFlashcardDataHolder]) -> IDFlashcard {
+        let flashcard = service.flashcardModelForFilling()
+//        dataHolders.map{ dataHolder in
+//            switch dataHolder {
+//            case let imageDataHolder as IDAddFlashcardImageDataHolder:
+//                if let image = imageDataHolder.image {
+//                    
+//                }
+//            }
+//        }
+        return flashcard
+    }
+
+}
diff --git a/...Interactor/IDAddWordInteractorInput.swift → ...actor/IDAddFlashcardInteractorInput.swift b/...Interactor/IDAddWordInteractorInput.swift → ...actor/IDAddFlashcardInteractorInput.swift
@@ -1,5 +1,5 @@
 //
-//  IDAddWordIDAddWordInteractorInput.swift
+//  IDAddFlashcardIDAddFlashcardInteractorInput.swift
 //  DigDic
 //
 //  Created by ls on 26/08/2016.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-protocol IDAddWordInteractorInput: IDBaseInteractorInput {
+protocol IDAddFlashcardInteractorInput: IDBaseInteractorInput {
 
 
 }
diff --git a/...nteractor/IDAddWordInteractorOutput.swift → ...ctor/IDAddFlashcardInteractorOutput.swift b/...nteractor/IDAddWordInteractorOutput.swift → ...ctor/IDAddFlashcardInteractorOutput.swift
@@ -1,5 +1,5 @@
 //
-//  IDAddWordIDAddWordInteractorOutput.swift
+//  IDAddFlashcardIDAddFlashcardInteractorOutput.swift
 //  DigDic
 //
 //  Created by ls on 26/08/2016.
@@ -8,6 +8,6 @@
 
 import Foundation
 
-protocol IDAddWordInteractorOutput: IDBaseInteractorOutput {
+protocol IDAddFlashcardInteractorOutput: IDBaseInteractorOutput {
 
 }
diff --git a/DigDic/Modules/AddWord/Interactor/IDAddWordInteractor.swift b/DigDic/Modules/AddWord/Interactor/IDAddWordInteractor.swift
diff --git a/...Word/Presenter/IDAddWordModuleInput.swift → ...Presenter/IDAddFlashcardModuleInput.swift b/...Word/Presenter/IDAddWordModuleInput.swift → ...Presenter/IDAddFlashcardModuleInput.swift
@@ -1,11 +1,11 @@
 //
-//  AddWordIDAddWordModuleInput.swift
+//  AddFlashcardIDAddFlashcardModuleInput.swift
 //  DigDic
 //
 //  Created by ls on 26/08/2016.
 //  Copyright © 2016 Ilya Denisov. All rights reserved.
 //
 
-protocol IDAddWordModuleInput: IDBaseModuleInput {
+protocol IDAddFlashcardModuleInput: IDBaseModuleInput {
 
 }
diff --git a/...ddWord/Presenter/IDAddWordPresenter.swift → ...d/Presenter/IDAddFlashcardPresenter.swift b/...ddWord/Presenter/IDAddWordPresenter.swift → ...d/Presenter/IDAddFlashcardPresenter.swift
@@ -1,17 +1,17 @@
 //
-//  AddWordIDAddWordPresenter.swift
+//  AddFlashcardIDAddFlashcardPresenter.swift
 //  DigDic
 //
 //  Created by ls on 26/08/2016.
 //  Copyright © 2016 Ilya Denisov. All rights reserved.
 //
 import UIKit
 
-class IDAddWordPresenter: NSObject, IDAddWordModuleInput, IDAddWordViewOutput, IDAddWordInteractorOutput {
+class IDAddFlashcardPresenter: NSObject, IDAddFlashcardModuleInput, IDAddFlashcardViewOutput, IDAddFlashcardInteractorOutput {
 
-    weak var view: IDAddWordViewInput!
-    var interactor: IDAddWordInteractorInput!
-    var router: IDAddWordRouterInput!
+    weak var view: IDAddFlashcardViewInput!
+    var interactor: IDAddFlashcardInteractorInput!
+    var router: IDAddFlashcardRouterInput!
 
     func viewIsReady() {
         view.setupInitialState()
@@ -34,15 +34,15 @@ class IDAddWordPresenter: NSObject, IDAddWordModuleInput, IDAddWordViewOutput, I
         self.view.addFormForSelectingImage()
     }
 
-    func didTapSelectImageButton(dataHolder: IDAddWordDataHolder) {
+    func didTapSelectImageButton(dataHolder: IDAddFlashcardDataHolder) {
         self.view.displayDialogForSelectingImage { (result) in
             if let image = result {
                 self.view.displayDialogForCropImage(image, dataHolder: dataHolder)
             }
         }
     }
 
-    func didCropImage(image: UIImage, dataHolder: IDAddWordDataHolder) {
+    func didCropImage(image: UIImage, dataHolder: IDAddFlashcardDataHolder) {
         self.view.updateImageForDataHolder(image, dataHolder: dataHolder)
     }
 

diff --git a/...ules/AddWord/Router/IDAddWordRouter.swift → ...AddWord/Router/IDAddFlashcardRouter.swift b/...ules/AddWord/Router/IDAddWordRouter.swift → ...AddWord/Router/IDAddFlashcardRouter.swift
@@ -1,12 +1,12 @@
 //
-//  AddWordIDAddWordRouter.swift
+//  AddFlashcardIDAddFlashcardRouter.swift
 //  DigDic
 //
 //  Created by ls on 26/08/2016.
 //  Copyright © 2016 Ilya Denisov. All rights reserved.
 //
 
-class IDAddWordRouter: IDBaseRouter, IDAddWordRouterInput {
+class IDAddFlashcardRouter: IDBaseRouter, IDAddFlashcardRouterInput {
 
     func dismiss() {
         self.viewController .dismissViewControllerAnimated(true, completion: nil)

diff --git a/...AddWord/Router/IDAddWordRouterInput.swift → ...rd/Router/IDAddFlashcardRouterInput.swift b/...AddWord/Router/IDAddWordRouterInput.swift → ...rd/Router/IDAddFlashcardRouterInput.swift
@@ -1,5 +1,5 @@
 //
-//  AddWordIDAddWordRouterInput.swift
+//  AddFlashcardIDAddFlashcardRouterInput.swift
 //  DigDic
 //
 //  Created by ls on 26/08/2016.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-protocol IDAddWordRouterInput: IDBaseRouterInput {
+protocol IDAddFlashcardRouterInput: IDBaseRouterInput {
 
     func dismiss()
 

diff --git a/...d/View/CellObjectBuilder/ConcreteCellObjectBuilders/IDAddFlashcardCellObjectBuilder.swift b/...d/View/CellObjectBuilder/ConcreteCellObjectBuilders/IDAddFlashcardCellObjectBuilder.swift
@@ -0,0 +1,15 @@
+//
+//  IDAddFlashcardCellObjectBuilder.swift
+//  DigDic
+//
+//  Created by Ilya Denisov on 8/31/16.
+//  Copyright © 2016 Ilya Denisov. All rights reserved.
+//
+
+import Foundation
+
+protocol IDAddFlashcardCellObjectBuilder {
+
+    func cellObjectForDataHolder(dataHolder: IDAddFlashcardDataHolder) -> IDAddFlashcardCell
+
+}
diff --git a/...ObjectBuilder/ConcreteCellObjectBuilders/IDAddFlashcardSelectImageCellObjectBuilder.swift b/...ObjectBuilder/ConcreteCellObjectBuilders/IDAddFlashcardSelectImageCellObjectBuilder.swift
@@ -0,0 +1,22 @@
+//
+//  IDAddFlashcardSelectImageCellObjectBuilder.swift
+//  DigDic
+//
+//  Created by Ilya Denisov on 8/31/16.
+//  Copyright © 2016 Ilya Denisov. All rights reserved.
+//
+
+import Foundation
+
+class IDAddFlashcardSelectImageCellObjectBuilder: IDAddFlashcardCellObjectBuilder {
+
+    func cellObjectForDataHolder(dataHolder: IDAddFlashcardDataHolder) -> IDAddFlashcardCell {
+        let view = NSBundle.mainBundle().loadNibNamed(String(IDAddFlashcardSelectImageCell), owner: nil, options: nil).last
+        let cell = view as! IDAddFlashcardSelectImageCell
+        if let imageDataHolder = dataHolder as? IDAddFlashcardImageDataHolder {
+            cell.loadFromDataHolder(imageDataHolder)
+        }
+        return cell
+    }
+
+}
diff --git a/...ddWord/View/CellObjectBuilder/ConcreteCellObjectBuilders/IDAddWordCellObjectBuilder.swift b/...ddWord/View/CellObjectBuilder/ConcreteCellObjectBuilders/IDAddWordCellObjectBuilder.swift
diff --git a/.../CellObjectBuilder/ConcreteCellObjectBuilders/IDAddWordSelectImageCellObjectBuilder.swift b/.../CellObjectBuilder/ConcreteCellObjectBuilders/IDAddWordSelectImageCellObjectBuilder.swift
diff --git a/DigDic/Modules/AddWord/View/CellObjectBuilder/IDAddFlashcardCellObjectBuilderFactory.swift b/DigDic/Modules/AddWord/View/CellObjectBuilder/IDAddFlashcardCellObjectBuilderFactory.swift
@@ -0,0 +1,22 @@
+//
+//  IDAddFlashcardCellObjectBuilderFactory.swift
+//  DigDic
+//
+//  Created by Ilya Denisov on 8/31/16.
+//  Copyright © 2016 Ilya Denisov. All rights reserved.
+//
+
+import Foundation
+
+class IDAddFlashcardCellObjectBuilderFactory {
+
+    class func builderForDataHolder(dataHolder: IDAddFlashcardDataHolder) -> IDAddFlashcardCellObjectBuilder? {
+        switch dataHolder {
+        case _ as IDAddFlashcardImageDataHolder:
+            return IDAddFlashcardSelectImageCellObjectBuilder()
+        default:
+            return nil
+        }
+    }
+
+}
diff --git a/DigDic/Modules/AddWord/View/CellObjectBuilder/IDAddWordCellObjectBuilderFactory.swift b/DigDic/Modules/AddWord/View/CellObjectBuilder/IDAddWordCellObjectBuilderFactory.swift
diff --git a/...es/AddWord/View/Cells/IDAddWordCell.swift → ...dWord/View/Cells/IDAddFlashcardCell.swift b/...es/AddWord/View/Cells/IDAddWordCell.swift → ...dWord/View/Cells/IDAddFlashcardCell.swift
@@ -1,5 +1,5 @@
 //
-//  IDAddWordCell.swift
+//  IDAddFlashcardCell.swift
 //  DigDic
 //
 //  Created by Ilya Denisov on 8/31/16.
@@ -8,6 +8,6 @@
 
 import Foundation
 
-protocol IDAddWordCell {
+protocol IDAddFlashcardCell {
 
 }
diff --git a/...tImageCell/IDAddWordSelectImageCell.swift → ...eCell/IDAddFlashcardSelectImageCell.swift b/...tImageCell/IDAddWordSelectImageCell.swift → ...eCell/IDAddFlashcardSelectImageCell.swift
@@ -9,7 +9,7 @@
 import Foundation
 import UIKit
 
-class IDAddWordSelectImageCell: UITableViewCell, IDAddWordCell {
+class IDAddFlashcardSelectImageCell: UITableViewCell, IDAddFlashcardCell {
 
     @IBOutlet weak var backgroundImageView: UIImageView!
     @IBOutlet weak var label: UILabel!
@@ -24,7 +24,7 @@ class IDAddWordSelectImageCell: UITableViewCell, IDAddWordCell {
         super.updateConstraints()
     }
 
-    func loadFromDataHolder(dataHolder: IDAddWordImageDataHolder) {
+    func loadFromDataHolder(dataHolder: IDAddFlashcardImageDataHolder) {
         if let image = dataHolder.image {
             self.backgroundImageView.image = image
             self.label.hidden = true

diff --git a/...ectImageCell/IDAddWordSelectImageCell.xib → ...ageCell/IDAddFlashcardSelectImageCell.xib b/...ectImageCell/IDAddWordSelectImageCell.xib → ...ageCell/IDAddFlashcardSelectImageCell.xib
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
-        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="122" id="UM2-Ve-3f0" customClass="IDAddWordSelectImageCell" customModule="DigDic" customModuleProvider="target">
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="122" id="UM2-Ve-3f0" customClass="IDAddFlashcardSelectImageCell" customModule="DigDic" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="493" height="122"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UM2-Ve-3f0" id="nPk-5J-DBV">