Skip to content
Merged
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
11 changes: 11 additions & 0 deletions Projects/Domain/Sources/Entity/Enum/RepeatType.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// RepeatType.swift
// Domain
//
// Created by 이동현 on 8/15/25.
//

public enum RepeatType {
case daily
case weekly
}
2 changes: 1 addition & 1 deletion Projects/Domain/Sources/Entity/Enum/WeekType.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Created by 이동현 on 8/3/25.
//

public enum WeekType: String, CaseIterable {
public enum Week: String, CaseIterable {
case monday = "MONDAY"
case tuesday = "TUESDAY"
case wednesday = "WEDNESDAY"
Expand Down
4 changes: 2 additions & 2 deletions Projects/Domain/Sources/Entity/RoutineEntity.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public struct RoutineEntity {
public let routineId: String?
public let historySeq: Int
public let routineName: String
public let repeatDay: [WeekType]
public let repeatDay: [Week]
public let executionTime: String
public let subRoutineSearchResultDto: [SubRoutineEntity]
public let modifiedYn: Bool
Expand All @@ -29,7 +29,7 @@ public struct RoutineEntity {
completeYn: Bool,
routineType: String
) {
let weekType: [WeekType] = repeatDay?.compactMap(WeekType.init(rawValue:)) ?? []
let weekType: [Week] = repeatDay?.compactMap(Week.init(rawValue:)) ?? []

self.routineId = routineId
self.historySeq = historySeq
Expand Down
4 changes: 2 additions & 2 deletions Projects/Domain/Sources/Entity/RoutineSummaryEntity.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
public struct RoutineSummaryEntity {
public let routineId: String?
public let routineName: String
public let repeatDay: [WeekType]
public let repeatDay: [Week]
public let executionTime: String

public init(
Expand All @@ -17,7 +17,7 @@ public struct RoutineSummaryEntity {
repeatDay: [String]?,
executionTime: String
) {
let weekType: [WeekType] = repeatDay?.compactMap(WeekType.init(rawValue:)) ?? []
let weekType: [Week] = repeatDay?.compactMap(Week.init(rawValue:)) ?? []

self.routineId = routineId
self.routineName = routineName
Expand Down
4 changes: 4 additions & 0 deletions Projects/Presentation/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ import ProjectDescription

let project = Project(
name: "Presentation",
settings: .settings(
base: ["OTHER_LDFLAGS": "$(inherited) -ObjC"]
),
targets: [
.target(
name: "Presentation",
Expand All @@ -15,6 +18,7 @@ let project = Project(
.external(name: "SnapKit"),
.external(name: "Kingfisher"),
.external(name: "Lottie"),
.external(name: "FSCalendar"),
.project(target: "Domain", path: "../Domain"),
.project(target: "Shared", path: "../Shared")
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,8 @@
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"localizable" : true
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "routine_creation_date@1x.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "routine_creation_date@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "routine_creation_date@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "routine_creation_list_icon@1x.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "routine_creation_list_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "routine_creation_list_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "routine_creation_one_icon@1x.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "routine_creation_one_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "routine_creation_one_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "routine_creation_repeat_icon@1x.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "routine_creation_repeat_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "routine_creation_repeat_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "routine_creation_three_icon@1x.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "routine_creation_three_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "routine_creation_three_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "routine_creation_time_icon@1x.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "routine_creation_time_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "routine_creation_time_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "routine_creation_two_icon@1x.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "routine_creation_two_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "routine_creation_two_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "clear_icon@1x.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "clear_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "clear_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "divide_line_icon@1x.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "divide_line_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "divide_line_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ enum BitnagilIcon {
static let ellipsisIcon = UIImage(named: "ellipsis_icon", in: bundle, with: nil)
static let informationIcon = UIImage(named: "information_icon", in: bundle, with: nil)
static let addRoutineIcon = UIImage(named: "add_routine_icon", in: bundle, with: nil)
static let divideLineIcon = UIImage(named: "divide_line_icon", in: bundle, with: nil)
static let clearIcon = UIImage(named: "clear_icon", in: bundle, with: nil)

// MARK: - Tab Bar Icons
static let homeIcon = UIImage(named: "home_fill_icon", in: bundle, with: nil)
Expand All @@ -72,6 +74,13 @@ enum BitnagilIcon {
static let repeatIcon = UIImage(named: "repeat_icon", in: bundle, with: nil)
static let editIcon = UIImage(named: "edit_icon", in: bundle, with: nil)
static let trashIcon = UIImage(named: "trash_icon", in: bundle, with: nil)
static let routineTimeIcon = UIImage(named: "routine_creation_time_icon", in: bundle, with: nil)
static let routineListIcon = UIImage(named: "routine_creation_list_icon", in: bundle, with: nil)
static let routineDateIcon = UIImage(named: "routine_creation_date", in: bundle, with: nil)
static let routineRepeatIcon = UIImage(named: "routine_creation_repeat_icon", in: bundle, with: nil)
static let oneIcon = UIImage(named: "routine_creation_one_icon", in: bundle, with: nil)
static let twoIcon = UIImage(named: "routine_creation_two_icon", in: bundle, with: nil)
static let threeIcon = UIImage(named: "routine_creation_three_icon", in: bundle, with: nil)
}

enum Direction {
Expand Down
9 changes: 5 additions & 4 deletions Projects/Presentation/Sources/Home/View/HomeView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ final class HomeView: BaseViewController<HomeViewModel> {
guard let routineCreationViewModel = DIContainer.shared.resolve(type: RoutineCreationViewModel.self)
else { fatalError("routineCreationViewModel 의존성이 등록되지 않았습니다.") }

let routineCreationView = RoutineCreationView(viewModel: routineCreationViewModel)
let routineCreationView = RoutineCreationViewController(viewModel: routineCreationViewModel)
routineCreationView.hidesBottomBarWhenPushed = true
self.navigationController?.pushViewController(routineCreationView, animated: true)
}
Expand Down Expand Up @@ -597,8 +597,9 @@ extension HomeView: FloatingMenuViewDelegate {
guard let routineCreationViewModel = DIContainer.shared.resolve(type: RoutineCreationViewModel.self) else {
fatalError("routineCreationViewModel 의존성이 등록되지 않았습니다.")
}
let routineCreationView = RoutineCreationView(viewModel: routineCreationViewModel)
routineCreationView.hidesBottomBarWhenPushed = true
self.navigationController?.pushViewController(routineCreationView, animated: true)
let routineCreationViewController = RoutineCreationViewController(viewModel: routineCreationViewModel)
routineCreationViewController.hidesBottomBarWhenPushed = true

self.navigationController?.pushViewController(routineCreationViewController, animated: true)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ extension RecommendedRoutineView: RecommendedRoutineCardViewDelegate {
fatalError("routineCreationViewModel 의존성이 등록되지 않았습니다.")
}

let routineCreationView = RoutineCreationView(viewModel: routineCreationViewModel, recommendRoutineId: routine.id)
let routineCreationView = RoutineCreationViewController(viewModel: routineCreationViewModel, recommendRoutineId: routine.id)
routineCreationView.hidesBottomBarWhenPushed = true
self.navigationController?.pushViewController(routineCreationView, animated: true)
}
Expand All @@ -326,7 +326,7 @@ extension RecommendedRoutineView: FloatingMenuViewDelegate {
guard let routineCreationViewModel = DIContainer.shared.resolve(type: RoutineCreationViewModel.self) else {
fatalError("routineCreationViewModel 의존성이 등록되지 않았습니다.")
}
let routineCreationView = RoutineCreationView(viewModel: routineCreationViewModel)
let routineCreationView = RoutineCreationViewController(viewModel: routineCreationViewModel)
routineCreationView.hidesBottomBarWhenPushed = true
self.navigationController?.pushViewController(routineCreationView, animated: true)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ final class ResultRecommendedRoutineView: BaseViewController<ResultRecommendedRo
private func goToRoutineCreationView(routineId: Int) {
guard let routineCreationViewModel = DIContainer.shared.resolve(type: RoutineCreationViewModel.self)
else { fatalError("routineCreationViewModel 의존성이 등록되지 않았습니다.") }
let routineCreationView = RoutineCreationView(viewModel: routineCreationViewModel, recommendRoutineId: routineId)
let routineCreationView = RoutineCreationViewController(viewModel: routineCreationViewModel, recommendRoutineId: routineId)
routineCreationView.hidesBottomBarWhenPushed = true
self.navigationController?.pushViewController(routineCreationView, animated: true)
}
Expand Down
Loading
Loading