Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 설정 뷰 UI 구현 #154

Closed
wants to merge 20 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
150 changes: 143 additions & 7 deletions iOS/Layover/Layover.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

49 changes: 49 additions & 0 deletions iOS/Layover/Layover/Extensions/Sequence+.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
//
// Sequence+.swift
// Layover
//
// Created by 김인환 on 11/30/23.
// Copyright © 2023 CodeBomber. All rights reserved.
//

extension Sequence {
func asyncMap<T>(
_ transform: (Element) async throws -> T
) async rethrows -> [T] {
var values = [T]()

for element in self {
try await values.append(transform(element))
}

return values
}

func asyncCompactMap<T>(
_ transform: (Element) async throws -> T?
) async rethrows -> [T] {
var values = [T]()

for element in self {
if let value = try await transform(element) {
values.append(value)
}
}

return values
}

func concurrentMap<T>(
_ transform: @escaping (Element) async throws -> T
) async throws -> [T] {
let tasks = map { element in
Task {
try await transform(element)
}
}

return try await tasks.asyncMap { task in
try await task.value
}
}
}
19 changes: 19 additions & 0 deletions iOS/Layover/Layover/Models/Board.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//
// Board.swift
// Layover
//
// Created by 김인환 on 11/30/23.
// Copyright © 2023 CodeBomber. All rights reserved.
//

import Foundation

struct Board {
let identifier: Int
let title: String
let description: String?
let thumbnailImageURL: URL?
let videoURL: URL?
let latitude: Double?
let longitude: Double?
}
16 changes: 16 additions & 0 deletions iOS/Layover/Layover/Models/Member.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// Member.swift
// Layover
//
// Created by 김인환 on 11/30/23.
// Copyright © 2023 CodeBomber. All rights reserved.
//

import Foundation

struct Member {
let identifier: Int
let username: String
let introduce: String
let profileImageURL: URL?
}
15 changes: 15 additions & 0 deletions iOS/Layover/Layover/Models/Post.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// Post.swift
// Layover
//
// Created by 김인환 on 11/29/23.
// Copyright © 2023 CodeBomber. All rights reserved.
//

import Foundation

struct Post {
let member: Member
let board: Board
let tag: [String]
}
37 changes: 37 additions & 0 deletions iOS/Layover/Layover/Network/DTOs/BoardDTO.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
//
// BoardDTO.swift
// Layover
//
// Created by 김인환 on 11/30/23.
// Copyright © 2023 CodeBomber. All rights reserved.
//

import Foundation

struct BoardDTO: Decodable {
let id: Int
let url: String
let videoThumbnail: String
let latitude, longitude, title, content: String

enum CodingKeys: String, CodingKey {
case id
case url = "url"
case videoThumbnail = "video_thumbnail"
case latitude, longitude, title, content
}
}

extension BoardDTO {
func toDomain() -> Board {
return Board(
identifier: id,
title: title,
description: content,
thumbnailImageURL: URL(string: videoThumbnail),
videoURL: URL(string: url),
latitude: Double(latitude),
longitude: Double(longitude)
)
}
}
31 changes: 31 additions & 0 deletions iOS/Layover/Layover/Network/DTOs/MemberDTO.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
//
// MemberDTO.swift
// Layover
//
// Created by 김인환 on 11/30/23.
// Copyright © 2023 CodeBomber. All rights reserved.
//

import Foundation

struct MemberDTO: Decodable {
let id: Int
let username, introduce: String
let profileImageURL: String

enum CodingKeys: String, CodingKey {
case id, username, introduce
case profileImageURL = "profile_image_url"
}
}

extension MemberDTO {
func toDomain() -> Member {
return Member(
identifier: id,
username: username,
introduce: introduce,
profileImageURL: URL(string: profileImageURL)
)
}
}
25 changes: 25 additions & 0 deletions iOS/Layover/Layover/Network/DTOs/PostDTO.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//
// PostDTO.swift
// Layover
//
// Created by 김인환 on 11/30/23.
// Copyright © 2023 CodeBomber. All rights reserved.
//

import Foundation

struct PostDTO: Decodable {
let member: MemberDTO
let board: BoardDTO
let tag: [String]
}

extension PostDTO {
func toDomain() -> Post {
return Post(
member: member.toDomain(),
board: board.toDomain(),
tag: tag
)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
//
// PostEndPointFactory.swift
// Layover
//
// Created by 김인환 on 11/30/23.
// Copyright © 2023 CodeBomber. All rights reserved.
//

import Foundation

protocol PostEndPointFactory {
func makeHomePostListEndPoint() -> EndPoint<Response<[PostDTO]>>
func makeTagSearchPostListEndPoint(by tag: String) -> EndPoint<Response<[PostDTO]>>
}

final class DefaultPostEndPointFactory: PostEndPointFactory {
func makeHomePostListEndPoint() -> EndPoint<Response<[PostDTO]>> {
return EndPoint(
path: "/board/home",
method: .GET
)
}

func makeTagSearchPostListEndPoint(by tag: String) -> EndPoint<Response<[PostDTO]>> {
var queryParameters = [String: String]()
queryParameters.updateValue(tag, forKey: "tag")

return EndPoint(
path: "/board/tag",
method: .GET,
queryParameters: queryParameters
)
}
}
79 changes: 79 additions & 0 deletions iOS/Layover/Layover/Network/Mock/MockData/PostList.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
"customCode": "SUCCESS",
"message": "요청이 성공적으로 처리되었습니다.",
"statusCode": 200,
"data": [
{
"member" : {
"id" : 1,
"username" : "loinsir",
"introduce" : "Hi, my name is hwani",
"profile_image_url" : "https://i.namu.wiki/i/HPFgEkrlX8wtU-agoxsqlzllzfJrcFkDSJYFQxdBHUNyjyZtUpS9zy-7-6lfz4ngzB-1wbLRyhIP4TmnwPwKJ0mUec5403r5TJnI3NZpsYJL6GEVQTmR52YoFGLMbaIe4aGSzh4B4InI9r2g0VV74g.svg"
},
"board" : {
"id" : 1,
"url" : "https://assets.afcdn.com/video49/20210722/v_645516.m3u8",
"video_thumbnail" : "https://think-note.com/wp-content/uploads/2023/07/eta_3.jpg",
"longitude" : "37.0532156213",
"latitude" : "127.060123123",
"title" : "최강 아이돌",
"content" : "게시글 설명"
},
"tag" : ["나도몰라요", "너도몰라요"]
},
{
"member" : {
"id" : 2,
"username" : "chopmozzi",
"introduce" : "Hi, my name is hwani",
"profile_image_url" : "https://m.segye.com/content/image/2023/03/15/20230315514234.jpg"
},
"board" : {
"id" : 2,
"url" : "https://playertest.longtailvideo.com/adaptive/wowzaid3/playlist.m3u8",
"video_thumbnail" : "video_thumbnail_link",
"longitude" : "37.0532156213",
"latitude" : "127.060123123",
"title" : "프로듀스 101",
"content" : "게시글 설명"
},
"tag" : ["해시태그", "해시태그2"]
},
{
"member" : {
"id" : 3,
"username" : "anyukyung",
"introduce" : "Hi, my name is hwani",
"profile_image_url" : "https://images.khan.co.kr/article/2021/11/15/l_2021111502000877900178361.jpg"
},
"board" : {
"id" : 3,
"url" : "https://sample.vodobox.net/skate_phantom_flex_4k/skate_phantom_flex_4k.m3u8",
"video_thumbnail" : "https://cdnimg.melon.co.kr/resource/image/cds/musicstory/imgUrl20210831030133473.jpg/melon/quality/90/optimize",
"longitude" : "37.0532156213",
"latitude" : "127.060123123",
"title" : "프로미스 나인",
"content" : "게시글 설명"
},
"tag" : ["해시태그1", "해시태그2"]
},
{
"member" : {
"id" : 4,
"username" : "layover",
"introduce" : "Hi, my name is hwani",
"profile_image_url" : "profile_image_link"
},
"board" : {
"id" : 4,
"url" : "https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8",
"video_thumbnail" : "https://res.heraldm.com/content/image/2023/04/16/20230416000040_0.jpg",
"longitude" : "37.0532156213",
"latitude" : "127.060123123",
"title" : "아이즈원",
"content" : "게시글 설명2"
},
"tag" : ["해시태그1", "해시태그6"]
}
]
}
4 changes: 2 additions & 2 deletions iOS/Layover/Layover/Network/Provider/Provider.swift
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,14 @@ class Provider: ProviderType {
func request(url: URL) async throws -> Data {
let (data, response) = try await session.data(from: url)
try self.checkStatusCode(of: response)
return try data.decode()
return data
}

func request(url: String) async throws -> Data {
guard let url = URL(string: url) else { throw NetworkError.components }
let (data, response) = try await session.data(from: url)
try self.checkStatusCode(of: response)
return try data.decode()
return data
}

private func checkStatusCode(of response: URLResponse) throws {
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
chopmozzi marked this conversation as resolved.
Show resolved Hide resolved

protocol SettingSceneBusinessLogic {

}

protocol SettingSceneDataStore {

}

final class SettingSceneInteractor: SettingSceneBusinessLogic, SettingSceneDataStore {

// MARK: - Properties

typealias Models = SettingSceneModels

lazy var worker = SettingSceneWorker()
var presenter: SettingScenePresentationLogic?
}
Loading