This commit is contained in:
Vladimir Dubovik 2024-12-04 14:22:11 +03:00
parent 89c648de3e
commit ddceec8551
6 changed files with 58 additions and 2 deletions

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "arrow.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 221 B

View File

@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "Vector.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 222 B

View File

@ -38,14 +38,17 @@ extension Date {
var week: [WeekDay] = [] var week: [WeekDay] = []
let weekForDate = calendar.dateInterval(of: .weekOfMonth, for: startOfDate) let weekForDate = calendar.dateInterval(of: .weekOfMonth, for: startOfDate)
//print("Start: \(weekForDate?.start)")
//print("End: \(weekForDate?.end)")
guard let startOfWeek = weekForDate?.start else { guard let startOfWeek = weekForDate?.start else {
return [] return []
} }
// Создаем дни для недели
(0..<7).forEach { index in (0..<7).forEach { index in
if let weekDay = calendar.date(byAdding: .day, value: index, to: startOfWeek) { if let weekDay = calendar.date(byAdding: .day, value: index, to: startOfWeek) {
week.append(.init(date: weekDay)) week.append(WeekDay(date: weekDay))
} }
} }

View File

@ -13,7 +13,8 @@ struct ScheduleView: View {
@State private var weekSlider: [[Date.WeekDay]] = [] @State private var weekSlider: [[Date.WeekDay]] = []
@State private var currentWeekIndex: Int = 1 @State private var currentWeekIndex: Int = 1
@State private var createWeek: Bool = false @State private var createWeek: Bool = false
@ObservedObject var vm = ViewModel() @State private var isShowingMonthSlider: Bool = false
@StateObject var vm = ViewModel()
var body: some View { var body: some View {
VStack { VStack {
@ -107,6 +108,16 @@ struct ScheduleView: View {
Text(currentDate.format("MMMM")) Text(currentDate.format("MMMM"))
.font(.system(size: 20, weight: .bold)) .font(.system(size: 20, weight: .bold))
.foregroundStyle(Color("grayForDate")) .foregroundStyle(Color("grayForDate"))
Spacer()
HStack (spacing: 2) {
Text(isShowingMonthSlider ? "Свернуть" : "Развернуть")
.font(.system(size: 15, weight: .light))
.foregroundStyle(Color.blue)
Image(isShowingMonthSlider ? "arrowup" : "arrowdown")
}
.onTapGesture {
isShowingMonthSlider.toggle()
}
} }
} }
.padding(.top, 8) .padding(.top, 8)