Skip to content

Commit 612cd22

Browse files
committed
rename NewEvent -> EventEdit
1 parent de3924b commit 612cd22

File tree

10 files changed

+113
-131
lines changed

10 files changed

+113
-131
lines changed

Atter.xcodeproj/project.pbxproj

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
8F74564A22E1B051003B9C1D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8F74564822E1B051003B9C1D /* LaunchScreen.storyboard */; };
1313
8F8E659C22E24BA200881D5C /* atter_logic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F8E659B22E24BA100881D5C /* atter_logic.framework */; };
1414
8F8E659D22E24BA200881D5C /* atter_logic.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 8F8E659B22E24BA100881D5C /* atter_logic.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
15-
8F8E65A622E24F3600881D5C /* NewEventPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F8E65A122E24F3600881D5C /* NewEventPresenter.swift */; };
16-
8F8E65A722E24F3600881D5C /* NewEventRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F8E65A222E24F3600881D5C /* NewEventRouter.swift */; };
17-
8F8E65A822E24F3600881D5C /* NewEventViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F8E65A322E24F3600881D5C /* NewEventViewController.swift */; };
18-
8F8E65A922E24F3600881D5C /* NewEventViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F8E65A422E24F3600881D5C /* NewEventViewModel.swift */; };
19-
8F8E65AA22E24F3600881D5C /* NewEventConfigurator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F8E65A522E24F3600881D5C /* NewEventConfigurator.swift */; };
20-
8F8E65AC22E24F4300881D5C /* NewEvent.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8F8E65AB22E24F4300881D5C /* NewEvent.storyboard */; };
15+
8F8E65A622E24F3600881D5C /* EventEditPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F8E65A122E24F3600881D5C /* EventEditPresenter.swift */; };
16+
8F8E65A722E24F3600881D5C /* EventEditRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F8E65A222E24F3600881D5C /* EventEditRouter.swift */; };
17+
8F8E65A822E24F3600881D5C /* EventEditViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F8E65A322E24F3600881D5C /* EventEditViewController.swift */; };
18+
8F8E65A922E24F3600881D5C /* EventEditViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F8E65A422E24F3600881D5C /* EventEditViewModel.swift */; };
19+
8F8E65AA22E24F3600881D5C /* EventEditConfigurator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F8E65A522E24F3600881D5C /* EventEditConfigurator.swift */; };
20+
8F8E65AC22E24F4300881D5C /* EventEdit.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8F8E65AB22E24F4300881D5C /* EventEdit.storyboard */; };
2121
8FD7C8E522E21B050019B532 /* AtterTabBarRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FD7C8E222E21B050019B532 /* AtterTabBarRouter.swift */; };
2222
8FD7C8E622E21B050019B532 /* AtterTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FD7C8E322E21B050019B532 /* AtterTabBarViewController.swift */; };
2323
8FD7C8E722E21B050019B532 /* AtterTabBarConfigurator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8FD7C8E422E21B050019B532 /* AtterTabBarConfigurator.swift */; };
@@ -58,12 +58,12 @@
5858
8F74564922E1B051003B9C1D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5959
8F74564B22E1B051003B9C1D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6060
8F8E659B22E24BA100881D5C /* atter_logic.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = atter_logic.framework; path = "atter-logic/atter-logic/build/xcode-frameworks/atter_logic.framework"; sourceTree = "<group>"; };
61-
8F8E65A122E24F3600881D5C /* NewEventPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewEventPresenter.swift; sourceTree = "<group>"; };
62-
8F8E65A222E24F3600881D5C /* NewEventRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewEventRouter.swift; sourceTree = "<group>"; };
63-
8F8E65A322E24F3600881D5C /* NewEventViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewEventViewController.swift; sourceTree = "<group>"; };
64-
8F8E65A422E24F3600881D5C /* NewEventViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewEventViewModel.swift; sourceTree = "<group>"; };
65-
8F8E65A522E24F3600881D5C /* NewEventConfigurator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewEventConfigurator.swift; sourceTree = "<group>"; };
66-
8F8E65AB22E24F4300881D5C /* NewEvent.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NewEvent.storyboard; sourceTree = "<group>"; };
61+
8F8E65A122E24F3600881D5C /* EventEditPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventEditPresenter.swift; sourceTree = "<group>"; };
62+
8F8E65A222E24F3600881D5C /* EventEditRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventEditRouter.swift; sourceTree = "<group>"; };
63+
8F8E65A322E24F3600881D5C /* EventEditViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventEditViewController.swift; sourceTree = "<group>"; };
64+
8F8E65A422E24F3600881D5C /* EventEditViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventEditViewModel.swift; sourceTree = "<group>"; };
65+
8F8E65A522E24F3600881D5C /* EventEditConfigurator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventEditConfigurator.swift; sourceTree = "<group>"; };
66+
8F8E65AB22E24F4300881D5C /* EventEdit.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = EventEdit.storyboard; sourceTree = "<group>"; };
6767
8FD7C8E222E21B050019B532 /* AtterTabBarRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AtterTabBarRouter.swift; sourceTree = "<group>"; };
6868
8FD7C8E322E21B050019B532 /* AtterTabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AtterTabBarViewController.swift; sourceTree = "<group>"; };
6969
8FD7C8E422E21B050019B532 /* AtterTabBarConfigurator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AtterTabBarConfigurator.swift; sourceTree = "<group>"; };
@@ -133,7 +133,7 @@
133133
8F74563E22E1B050003B9C1D /* Atter */ = {
134134
isa = PBXGroup;
135135
children = (
136-
8F8E65A022E24F2500881D5C /* New Event */,
136+
8F8E65A022E24F2500881D5C /* Event Edit */,
137137
8FD7C8EF22E21FEE0019B532 /* Event List */,
138138
8FD7C8EC22E21CE40019B532 /* Root */,
139139
8FD7C8E922E21C380019B532 /* Generated */,
@@ -179,17 +179,17 @@
179179
path = Delegates;
180180
sourceTree = "<group>";
181181
};
182-
8F8E65A022E24F2500881D5C /* New Event */ = {
182+
8F8E65A022E24F2500881D5C /* Event Edit */ = {
183183
isa = PBXGroup;
184184
children = (
185-
8F8E65A122E24F3600881D5C /* NewEventPresenter.swift */,
186-
8F8E65A222E24F3600881D5C /* NewEventRouter.swift */,
187-
8F8E65A322E24F3600881D5C /* NewEventViewController.swift */,
188-
8F8E65A422E24F3600881D5C /* NewEventViewModel.swift */,
189-
8F8E65A522E24F3600881D5C /* NewEventConfigurator.swift */,
190-
8F8E65AB22E24F4300881D5C /* NewEvent.storyboard */,
191-
);
192-
path = "New Event";
185+
8F8E65A122E24F3600881D5C /* EventEditPresenter.swift */,
186+
8F8E65A222E24F3600881D5C /* EventEditRouter.swift */,
187+
8F8E65A322E24F3600881D5C /* EventEditViewController.swift */,
188+
8F8E65A422E24F3600881D5C /* EventEditViewModel.swift */,
189+
8F8E65A522E24F3600881D5C /* EventEditConfigurator.swift */,
190+
8F8E65AB22E24F4300881D5C /* EventEdit.storyboard */,
191+
);
192+
path = "Event Edit";
193193
sourceTree = "<group>";
194194
};
195195
8FD7C8D322E21A980019B532 /* Tab Bar */ = {
@@ -308,7 +308,7 @@
308308
8FD7C90022E22F290019B532 /* EventCell.xib in Resources */,
309309
8F74564A22E1B051003B9C1D /* LaunchScreen.storyboard in Resources */,
310310
8FD7C8F722E220060019B532 /* EventList.storyboard in Resources */,
311-
8F8E65AC22E24F4300881D5C /* NewEvent.storyboard in Resources */,
311+
8F8E65AC22E24F4300881D5C /* EventEdit.storyboard in Resources */,
312312
8F74564722E1B051003B9C1D /* Assets.xcassets in Resources */,
313313
);
314314
runOnlyForDeploymentPostprocessing = 0;
@@ -420,21 +420,21 @@
420420
files = (
421421
8F74564022E1B050003B9C1D /* AppDelegate.swift in Sources */,
422422
8FD7C8E622E21B050019B532 /* AtterTabBarViewController.swift in Sources */,
423-
8F8E65AA22E24F3600881D5C /* NewEventConfigurator.swift in Sources */,
424-
8F8E65A822E24F3600881D5C /* NewEventViewController.swift in Sources */,
423+
8F8E65AA22E24F3600881D5C /* EventEditConfigurator.swift in Sources */,
424+
8F8E65A822E24F3600881D5C /* EventEditViewController.swift in Sources */,
425425
8FD7C8F522E21FFD0019B532 /* EventListConfigurator.swift in Sources */,
426426
8FD7C8EB22E21C880019B532 /* R.generated.swift in Sources */,
427427
8FD7C8FF22E22F290019B532 /* EventCell.swift in Sources */,
428428
8FD7C8E522E21B050019B532 /* AtterTabBarRouter.swift in Sources */,
429-
8F8E65A622E24F3600881D5C /* NewEventPresenter.swift in Sources */,
429+
8F8E65A622E24F3600881D5C /* EventEditPresenter.swift in Sources */,
430430
8FD7C90222E233F00019B532 /* ViewModel.swift in Sources */,
431-
8F8E65A922E24F3600881D5C /* NewEventViewModel.swift in Sources */,
431+
8F8E65A922E24F3600881D5C /* EventEditViewModel.swift in Sources */,
432432
8FD7C8EE22E21D080019B532 /* RootRouter.swift in Sources */,
433433
8FD7C8F422E21FFD0019B532 /* EventListViewController.swift in Sources */,
434434
8FD7C8F922E2220E0019B532 /* EventListPresenter.swift in Sources */,
435435
8FD7C8E722E21B050019B532 /* AtterTabBarConfigurator.swift in Sources */,
436436
8FD7C8F322E21FFD0019B532 /* EventListRouter.swift in Sources */,
437-
8F8E65A722E24F3600881D5C /* NewEventRouter.swift in Sources */,
437+
8F8E65A722E24F3600881D5C /* EventEditRouter.swift in Sources */,
438438
8FD7C8FB22E2221A0019B532 /* EventListViewModel.swift in Sources */,
439439
);
440440
runOnlyForDeploymentPostprocessing = 0;

Atter/New Event/NewEvent.storyboard renamed to Atter/Event Edit/EventEdit.storyboard

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
1010
</dependencies>
1111
<scenes>
12-
<!--New Event View Controller-->
12+
<!--Event Edit View Controller-->
1313
<scene sceneID="0j0-Kj-SLO">
1414
<objects>
15-
<viewController storyboardIdentifier="NewEventViewController" id="PAu-uL-a8V" customClass="NewEventViewController" customModule="Atter" customModuleProvider="target" sceneMemberID="viewController">
15+
<viewController storyboardIdentifier="EventEditViewController" id="PAu-uL-a8V" customClass="EventEditViewController" customModule="Atter" customModuleProvider="target" sceneMemberID="viewController">
1616
<view key="view" contentMode="scaleToFill" id="YcZ-Kz-JzW">
1717
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
1818
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -21,10 +21,10 @@
2121
<rect key="frame" x="0.0" y="44" width="414" height="818"/>
2222
<subviews>
2323
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="27t-T8-Ly7">
24-
<rect key="frame" x="0.0" y="0.0" width="414" height="62"/>
24+
<rect key="frame" x="0.0" y="0.0" width="414" height="50"/>
2525
<subviews>
2626
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="GTt-9h-1C0">
27-
<rect key="frame" x="16" y="16" width="382" height="30"/>
27+
<rect key="frame" x="16" y="16" width="382" height="18"/>
2828
<nil key="textColor"/>
2929
<fontDescription key="fontDescription" type="system" pointSize="14"/>
3030
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -39,17 +39,17 @@
3939
</constraints>
4040
</view>
4141
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="74X-Ne-R5k">
42-
<rect key="frame" x="0.0" y="62" width="414" height="62"/>
42+
<rect key="frame" x="0.0" y="50" width="414" height="52.5"/>
4343
<subviews>
4444
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Date" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="K5X-B0-a5m">
45-
<rect key="frame" x="16" y="16" width="382" height="30"/>
45+
<rect key="frame" x="16" y="16" width="382" height="20.5"/>
4646
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
4747
<nil key="textColor"/>
4848
<fontDescription key="fontDescription" type="system" pointSize="14"/>
4949
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
5050
</textField>
5151
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vs4-1h-hP0">
52-
<rect key="frame" x="16" y="16" width="382" height="30"/>
52+
<rect key="frame" x="16" y="16" width="382" height="20.5"/>
5353
<fontDescription key="fontDescription" type="system" pointSize="17"/>
5454
<nil key="textColor"/>
5555
<nil key="highlightedColor"/>
@@ -68,7 +68,7 @@
6868
</constraints>
6969
</view>
7070
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="NGd-ZF-gJF">
71-
<rect key="frame" x="0.0" y="124" width="414" height="694"/>
71+
<rect key="frame" x="0.0" y="102.5" width="414" height="715.5"/>
7272
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
7373
</tableView>
7474
</subviews>
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
//
2+
// EventEditConfigurator.swift
3+
// Atter
4+
//
5+
// Created by Patryk Mieszała on 19/07/2019.
6+
// Copyright © 2019 Patryk Mieszała. All rights reserved.
7+
//
8+
9+
import UIKit
10+
import atter_logic
11+
12+
final class EventEditConfigurator {
13+
func configureNewEventModule(event: Event?) -> EventEditViewController? {
14+
guard let viewController: EventEditViewController = R.storyboard.eventEdit.eventEditViewController() else {
15+
return nil
16+
}
17+
let router: EventEditRouter = EventEditRouter(viewController: viewController)
18+
let viewModel: EventEditViewModel = EventEditViewModel(presenter: viewController, event: event)
19+
20+
viewController.router = router
21+
viewController.viewModel = viewModel
22+
23+
return viewController
24+
}
25+
}

Atter/New Event/NewEventPresenter.swift renamed to Atter/Event Edit/EventEditPresenter.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// NewEventPresenter.swift
2+
// EventEditPresenter.swift
33
// Atter
44
//
55
// Created by Patryk Mieszała on 19/07/2019.
@@ -8,7 +8,7 @@
88

99
import Foundation
1010

11-
protocol NewEventPresenter: AnyObject {
11+
protocol EventEditPresenter: AnyObject {
1212
func setSaveButton(enabled: Bool)
1313
func display(date: String)
1414
func dismiss()

Atter/New Event/NewEventRouter.swift renamed to Atter/Event Edit/EventEditRouter.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// NewEventRouter.swift
2+
// EventEditRouter.swift
33
// Atter
44
//
55
// Created by Patryk Mieszała on 19/07/2019.
@@ -8,16 +8,16 @@
88

99
import UIKit
1010

11-
final class NewEventRouter {
11+
final class EventEditRouter {
1212

13-
weak var viewController: NewEventViewController?
13+
weak var viewController: EventEditViewController?
1414

15-
init(viewController: NewEventViewController?) {
15+
init(viewController: EventEditViewController?) {
1616
self.viewController = viewController
1717
}
1818
}
1919

20-
extension NewEventRouter {
20+
extension EventEditRouter {
2121
func dismiss() {
2222
viewController?.navigationController?.popViewController(animated: true)
2323
}

Atter/New Event/NewEventViewController.swift renamed to Atter/Event Edit/EventEditViewController.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// NewEventViewController.swift
2+
// EventEditViewController.swift
33
// Atter
44
//
55
// Created by Patryk Mieszała on 19/07/2019.
@@ -8,7 +8,7 @@
88

99
import UIKit
1010

11-
final class NewEventViewController: UIViewController {
11+
final class EventEditViewController: UIViewController {
1212

1313
@IBOutlet private weak var nameField: UITextField!
1414
@IBOutlet private weak var dateField: UITextField!
@@ -18,8 +18,8 @@ final class NewEventViewController: UIViewController {
1818

1919
private lazy var saveButton: UIBarButtonItem = UIBarButtonItem(title: "Save", style: .plain, target: nil, action: nil)
2020

21-
var viewModel: NewEventViewModel?
22-
var router: NewEventRouter?
21+
var viewModel: EventEditViewModel?
22+
var router: EventEditRouter?
2323

2424
override func viewDidLoad() {
2525
super.viewDidLoad()
@@ -33,7 +33,7 @@ final class NewEventViewController: UIViewController {
3333
}
3434
}
3535

36-
extension NewEventViewController: NewEventPresenter {
36+
extension EventEditViewController: EventEditPresenter {
3737
func setSaveButton(enabled: Bool) {
3838
saveButton.isEnabled = enabled
3939
}
@@ -47,7 +47,7 @@ extension NewEventViewController: NewEventPresenter {
4747
}
4848
}
4949

50-
private extension NewEventViewController {
50+
private extension EventEditViewController {
5151
func setupSaveButton() {
5252
navigationItem.rightBarButtonItem = saveButton
5353
saveButton.target = viewModel

Atter/New Event/NewEventViewModel.swift renamed to Atter/Event Edit/EventEditViewModel.swift

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// NewEventViewModel.swift
2+
// EventEditViewModel.swift
33
// Atter
44
//
55
// Created by Patryk Mieszała on 19/07/2019.
@@ -9,9 +9,12 @@
99
import UIKit
1010
import atter_logic
1111

12-
final class NewEventViewModel: ViewModel {
12+
final class EventEditViewModel: ViewModel {
13+
14+
private weak var presenter: EventEditPresenter?
15+
private let newEventUseCase: SaveEvent
16+
private let event: Event?
1317

14-
private weak var presenter: NewEventPresenter?
1518
private var name: String?
1619
private var date: Date = Date()
1720

@@ -23,11 +26,12 @@ final class NewEventViewModel: ViewModel {
2326
return df.string(from: date)
2427
}
2528

26-
private let newEventUseCase: SaveEvent
27-
28-
init(presenter: NewEventPresenter, newEventUseCase: SaveEvent = .init()) {
29+
init(presenter: EventEditPresenter,
30+
newEventUseCase: SaveEvent = .init(),
31+
event: Event?) {
2932
self.presenter = presenter
3033
self.newEventUseCase = newEventUseCase
34+
self.event = event
3135
}
3236

3337
func viewDidLoad() {
@@ -68,7 +72,7 @@ final class NewEventViewModel: ViewModel {
6872
}
6973
}
7074

71-
private extension NewEventViewModel {
75+
private extension EventEditViewModel {
7276
func refreshSaveButtonStatus() {
7377
let nameValidated = (name?.count ?? 0) > 2
7478

0 commit comments

Comments
 (0)