Skip to content

Commit

Permalink
Merge branch 'iOS/feat#148'
Browse files Browse the repository at this point in the history
  • Loading branch information
chopmozzi committed Nov 30, 2023
2 parents 8ad694e + 65d5d02 commit 07fa6c6
Show file tree
Hide file tree
Showing 9 changed files with 322 additions and 3 deletions.
32 changes: 32 additions & 0 deletions iOS/Layover/Layover.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@
835A61A22B068115002F22A5 /* PlaybackInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 835A619C2B068115002F22A5 /* PlaybackInteractor.swift */; };
835A61A62B0B4DDD002F22A5 /* Dashboard-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 835A61A52B0B4DDD002F22A5 /* Dashboard-Regular.ttf */; };
835A61A92B0B5A31002F22A5 /* LoginConfigurator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 835A61A82B0B5A31002F22A5 /* LoginConfigurator.swift */; };
836C33992B1843BE00ECAFB0 /* SettingScenePresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836C33932B1843BE00ECAFB0 /* SettingScenePresenter.swift */; };
836C339A2B1843BE00ECAFB0 /* SettingSceneWorker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836C33942B1843BE00ECAFB0 /* SettingSceneWorker.swift */; };
836C339B2B1843BE00ECAFB0 /* SettingSceneRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836C33952B1843BE00ECAFB0 /* SettingSceneRouter.swift */; };
836C339C2B1843BE00ECAFB0 /* SettingSceneModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836C33962B1843BE00ECAFB0 /* SettingSceneModels.swift */; };
836C339D2B1843BE00ECAFB0 /* SettingSceneViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836C33972B1843BE00ECAFB0 /* SettingSceneViewController.swift */; };
836C339E2B1843BE00ECAFB0 /* SettingSceneInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836C33982B1843BE00ECAFB0 /* SettingSceneInteractor.swift */; };
836C33872B15A29600ECAFB0 /* Toast.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836C33862B15A29600ECAFB0 /* Toast.swift */; };
83C35E1B2B108C3500D8DD5C /* PlaybackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83C35E1A2B108C3500D8DD5C /* PlaybackView.swift */; };
83C35E1E2B10923C00D8DD5C /* PlaybackCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83C35E1D2B10923C00D8DD5C /* PlaybackCell.swift */; };
Expand Down Expand Up @@ -223,6 +229,12 @@
835A61A52B0B4DDD002F22A5 /* Dashboard-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Dashboard-Regular.ttf"; sourceTree = "<group>"; };
835A61A82B0B5A31002F22A5 /* LoginConfigurator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginConfigurator.swift; sourceTree = "<group>"; };
835A61AA2B0B85FD002F22A5 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
836C33932B1843BE00ECAFB0 /* SettingScenePresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingScenePresenter.swift; sourceTree = "<group>"; };
836C33942B1843BE00ECAFB0 /* SettingSceneWorker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingSceneWorker.swift; sourceTree = "<group>"; };
836C33952B1843BE00ECAFB0 /* SettingSceneRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingSceneRouter.swift; sourceTree = "<group>"; };
836C33962B1843BE00ECAFB0 /* SettingSceneModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingSceneModels.swift; sourceTree = "<group>"; };
836C33972B1843BE00ECAFB0 /* SettingSceneViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingSceneViewController.swift; sourceTree = "<group>"; };
836C33982B1843BE00ECAFB0 /* SettingSceneInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingSceneInteractor.swift; sourceTree = "<group>"; };
836C33862B15A29600ECAFB0 /* Toast.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Toast.swift; sourceTree = "<group>"; };
83C35E1A2B108C3500D8DD5C /* PlaybackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaybackView.swift; sourceTree = "<group>"; };
83C35E1D2B10923C00D8DD5C /* PlaybackCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaybackCell.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -497,6 +509,19 @@
path = Playback;
sourceTree = "<group>";
};
836C33922B18436A00ECAFB0 /* SettingScene */ = {
isa = PBXGroup;
children = (
836C33932B1843BE00ECAFB0 /* SettingScenePresenter.swift */,
836C33942B1843BE00ECAFB0 /* SettingSceneWorker.swift */,
836C33952B1843BE00ECAFB0 /* SettingSceneRouter.swift */,
836C33962B1843BE00ECAFB0 /* SettingSceneModels.swift */,
836C33972B1843BE00ECAFB0 /* SettingSceneViewController.swift */,
836C33982B1843BE00ECAFB0 /* SettingSceneInteractor.swift */,
);
path = SettingScene;
sourceTree = "<group>";
};
83C35E1C2B10923000D8DD5C /* Cell */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -658,6 +683,7 @@
FC7E457B2AFF6F9D004F155A /* Scenes */ = {
isa = PBXGroup;
children = (
836C33922B18436A00ECAFB0 /* SettingScene */,
19BB8A572B07BEE30070B922 /* UIComponents */,
1945520E2B03AEA400299768 /* Configurator.swift */,
835A61962B0680FC002F22A5 /* Playback */,
Expand Down Expand Up @@ -886,6 +912,7 @@
1972CCD42B138E6B00C3C762 /* SignUpRouter.swift in Sources */,
FC5BE11C2B148D160036366D /* EditProfilePresenter.swift in Sources */,
FC68E2A32B0233BC001AABFF /* NetworkError.swift in Sources */,
836C339C2B1843BE00ECAFB0 /* SettingSceneModels.swift in Sources */,
FC3F3BD82B069EB30080E3A6 /* MapCarouselCollectionViewCell.swift in Sources */,
19A169442B17C71C00DB34C0 /* Board.swift in Sources */,
194552252B0478B400299768 /* HomeViewController.swift in Sources */,
Expand All @@ -904,6 +931,7 @@
FCEE0FF22B036B6000195BBE /* LOButton.swift in Sources */,
FC5BE1212B148D170036366D /* EditProfileInteractor.swift in Sources */,
FC930E7C2B0CD80800AA48E3 /* ProfileConfigurator.swift in Sources */,
836C33992B1843BE00ECAFB0 /* SettingScenePresenter.swift in Sources */,
FC2511A62B049020004717BC /* SignUpConfigurator.swift in Sources */,
194552392B05230E00299768 /* HomeCarouselCollectionViewCell.swift in Sources */,
FC767FAA2B126D080088CF9B /* LOAnnotation.swift in Sources */,
Expand Down Expand Up @@ -940,9 +968,11 @@
FC767F842B1214A80088CF9B /* MockUserWorker.swift in Sources */,
FC930E782B0CD75C00AA48E3 /* ProfileModels.swift in Sources */,
FC68E29B2B02325D001AABFF /* Requestable.swift in Sources */,
836C339B2B1843BE00ECAFB0 /* SettingSceneRouter.swift in Sources */,
FC2511A22B045C3F004717BC /* SignUpPresenter.swift in Sources */,
FC767FA82B1269DB0088CF9B /* LOAnnotationView.swift in Sources */,
19A169232B176C5F00DB34C0 /* TagPlayListPresenter.swift in Sources */,
836C339E2B1843BE00ECAFB0 /* SettingSceneInteractor.swift in Sources */,
FC68E29D2B02326A001AABFF /* Responsable.swift in Sources */,
FC2511A02B045C0A004717BC /* SignUpInteractor.swift in Sources */,
FC767F862B1214C10088CF9B /* CheckUserNameDTO.swift in Sources */,
Expand All @@ -953,6 +983,7 @@
83C35E1B2B108C3500D8DD5C /* PlaybackView.swift in Sources */,
835A61A02B068115002F22A5 /* PlaybackModels.swift in Sources */,
19C7AFCE2B02410F003B35F2 /* AuthManager.swift in Sources */,
836C339D2B1843BE00ECAFB0 /* SettingSceneViewController.swift in Sources */,
FC9BB82C2B094E5500EB72A9 /* UICollectionViewLayout+.swift in Sources */,
194552232B0478B400299768 /* HomeRouter.swift in Sources */,
835783C32B14A41600E7D304 /* MockLoginWorker.swift in Sources */,
Expand All @@ -965,6 +996,7 @@
835A619F2B068115002F22A5 /* PlaybackRouter.swift in Sources */,
19A1693C2B17BD1C00DB34C0 /* BoardDTO.swift in Sources */,
FC2511B12B04EAEC004717BC /* MapModels.swift in Sources */,
836C339A2B1843BE00ECAFB0 /* SettingSceneWorker.swift in Sources */,
FC68E29F2B023315001AABFF /* HTTPMethod.swift in Sources */,
835A619D2B068115002F22A5 /* PlaybackPresenter.swift in Sources */,
FCEE0FFA2B03AF8500195BBE /* SignUpViewController.swift in Sources */,
Expand Down
9 changes: 7 additions & 2 deletions iOS/Layover/Layover/Scenes/Profile/ProfileRouter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ import UIKit

protocol ProfileRoutingLogic {
func routeToEditProfileViewController()
func routeToSettingSceneViewController()
}

protocol ProfileDataPassing {
var dataStore: ProfileDataStore? { get }
}

class ProfileRouter: NSObject, ProfileRoutingLogic, ProfileDataPassing {
final class ProfileRouter: NSObject, ProfileRoutingLogic, ProfileDataPassing {

// MARK: - Properties

Expand All @@ -38,5 +39,9 @@ class ProfileRouter: NSObject, ProfileRoutingLogic, ProfileDataPassing {
editProfileViewController.hidesBottomBarWhenPushed = true
viewController?.navigationController?.pushViewController(editProfileViewController, animated: true)
}


func routeToSettingSceneViewController() {
let settingSceneViewController: SettingSceneViewController = SettingSceneViewController()
viewController?.navigationController?.pushViewController(settingSceneViewController, animated: true)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ final class ProfileViewController: BaseViewController {
}

@objc private func settingButtonDidTap() {

router?.routeToSettingSceneViewController()
}

}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//
// SettingSceneInteractor.swift
// Layover
//
// Created by 황지웅 on 11/30/23.
// Copyright © 2023 CodeBomber. All rights reserved.
//

import UIKit

protocol SettingSceneBusinessLogic {

}

protocol SettingSceneDataStore {

}

final class SettingSceneInteractor: SettingSceneBusinessLogic, SettingSceneDataStore {

// MARK: - Properties

typealias Models = SettingSceneModels

lazy var worker = SettingSceneWorker()
var presenter: SettingScenePresentationLogic?
}
24 changes: 24 additions & 0 deletions iOS/Layover/Layover/Scenes/SettingScene/SettingSceneModels.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
//
// SettingSceneModels.swift
// Layover
//
// Created by 황지웅 on 11/30/23.
// Copyright © 2023 CodeBomber. All rights reserved.
//

import UIKit

enum SettingSceneModels {

enum PerformSettingScene {
struct Request {
var exampleVariable: String?
}

struct Response {
}

struct ViewModel {
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
//
// SettingScenePresenter.swift
// Layover
//
// Created by 황지웅 on 11/30/23.
// Copyright © 2023 CodeBomber. All rights reserved.
//

import UIKit

protocol SettingScenePresentationLogic {

}

final class SettingScenePresenter: SettingScenePresentationLogic {

// MARK: - Properties

typealias Models = SettingSceneModels
weak var viewController: SettingSceneDisplayLogic?

}
27 changes: 27 additions & 0 deletions iOS/Layover/Layover/Scenes/SettingScene/SettingSceneRouter.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//
// SettingSceneRouter.swift
// Layover
//
// Created by 황지웅 on 11/30/23.
// Copyright © 2023 CodeBomber. All rights reserved.
//

import UIKit

protocol SettingSceneRoutingLogic {
}

protocol SettingSceneDataPassing {
var dataStore: SettingSceneDataStore? { get }
}

final class SettingSceneRouter: NSObject, SettingSceneRoutingLogic, SettingSceneDataPassing {

// MARK: - Properties

weak var viewController: SettingSceneViewController?
var dataStore: SettingSceneDataStore?

// MARK: - Routing

}
Loading

0 comments on commit 07fa6c6

Please sign in to comment.