From 9a8e3c26789bb2a95a11331217663553f04df3e7 Mon Sep 17 00:00:00 2001 From: youz2me Date: Sat, 20 Jul 2024 02:19:04 +0900 Subject: [PATCH] =?UTF-8?q?fix/#264=20=EB=82=A0=EC=A7=9C=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AddPromise/ViewModel/AddPromiseViewModel.swift | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/KkuMulKum/Source/AddPromise/ViewModel/AddPromiseViewModel.swift b/KkuMulKum/Source/AddPromise/ViewModel/AddPromiseViewModel.swift index 62aba387..4fde94be 100644 --- a/KkuMulKum/Source/AddPromise/ViewModel/AddPromiseViewModel.swift +++ b/KkuMulKum/Source/AddPromise/ViewModel/AddPromiseViewModel.swift @@ -102,8 +102,15 @@ extension AddPromiseViewModel: ViewModelType { let adjustedDate = Observable.combineLatest(input.date, input.time) .map { date, time -> Date in - let currentDate = Date() - if date < currentDate, time < currentDate { + let calendar = Calendar.current + var combinedComponents = DateComponents() + + guard let tempDate = calendar.date(byAdding: .minute, value: -1, to: Date()) else { + return Date() + } + + if calendar.component(.day, from: date) == calendar.component(.day, from: tempDate), + time < tempDate { return Calendar.current.date(byAdding: .day, value: 1, to: date) ?? date } return date