diff --git a/dimensionhub/Views/DateNavView.swift b/dimensionhub/Views/DateNavView.swift index d116b04..07c6824 100644 --- a/dimensionhub/Views/DateNavView.swift +++ b/dimensionhub/Views/DateNavView.swift @@ -72,7 +72,7 @@ struct DateNavView: View { ScrollView(.vertical, showsIndicators: false) { VStack(alignment: .center) { ForEach(navModel.dateModels) { model in - VStack(alignment: .leading, spacing: 10) { + VStack(alignment: .leading, spacing: 15) { Text(model.year) HStack { ForEach(model.months, id: \.id) { month in @@ -91,8 +91,11 @@ struct DateNavView: View { } } } + .padding(15) + .frame(height: 600) .task { await self.navModel.loadDateCells(userId: self.userId) + print(UIScreen.main.bounds.height) } } @@ -110,15 +113,15 @@ extension DateNavView { var body: some View { Rectangle() - .frame(width: 80, height: 50) + .frame(width: 80, height: 40) .foregroundColor(selected ? Color.black : Color.white) - .cornerRadius(10) + .cornerRadius(8) .overlay { - RoundedRectangle(cornerRadius: 10) + RoundedRectangle(cornerRadius: 8) .stroke(Color.black, lineWidth: 1) Text(datetime) .foregroundColor(selected ? Color.white : Color.black) - .font(.system(size: 20, weight: .regular)) + .font(.system(size: 18, weight: .regular)) } .onTapGesture { @@ -138,15 +141,15 @@ extension DateNavView { var body: some View { Rectangle() - .frame(width: 80, height: 50) - .foregroundColor(Color.white) - .cornerRadius(10) + .frame(width: 80, height: 40) + .foregroundColor(.white) + .cornerRadius(8) .overlay { - RoundedRectangle(cornerRadius: 10) - .stroke(style: StrokeStyle(lineWidth: 1, dash: [4])) + RoundedRectangle(cornerRadius: 8) + .stroke(Color(hex: "#d7d7d7"), style: StrokeStyle(lineWidth: 1, dash: [4])) Text(datetime) - .foregroundColor(Color.yellow) - .font(.system(size: 20, weight: .regular)) + .foregroundColor(Color(hex: "#d7d7d7")) + .font(.system(size: 18, weight: .regular)) } } @@ -154,7 +157,7 @@ extension DateNavView { } - +// //#Preview { // DateNavView() //} diff --git a/dimensionhub/Views/IndexView.swift b/dimensionhub/Views/IndexView.swift index af2352c..7d773ac 100644 --- a/dimensionhub/Views/IndexView.swift +++ b/dimensionhub/Views/IndexView.swift @@ -365,6 +365,7 @@ extension IndexView { } .task { await self.indexModel.loadData(userId: self.userId) + print(UIScreen.main.bounds.width) } } }