Skip to content

Commit

Permalink
fix: 디자인 QA 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
ericKwon95 committed Aug 19, 2024
1 parent 585e5cd commit bb29a27
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 7 deletions.
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
Expand Up @@ -21,12 +21,12 @@ struct AddDiet: View {
Color.componentBackground
.ignoresSafeArea(edges: .top)

VStack {
VStack(spacing: 0) {
searchBar()
CustomTabBar()
}

VStack {
VStack(spacing: 0) {
Spacer()
BottomPicker(isAddingList: $isAddingList)
.padding(.bottom, proxy.safeAreaInsets.bottom)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ struct FoodInfo: View {

HStack(spacing: 12) {
Text("\(food.caloriesPerUnit)kcal")
.font(.system(size: 16))
.fontWeight(.medium)
.foregroundStyle(.textSecondary)
AddButton()
}
}
Expand Down Expand Up @@ -61,8 +64,8 @@ struct FoodInfo: View {
.foregroundStyle(.textNormal)
Text(food.unit)
.font(.system(size: 16))
.fontWeight(.light)
.foregroundStyle(.textSecondary)
.fontWeight(.regular)
.foregroundStyle(.textPlaceholder)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,5 @@ struct FoodListRow: View {

#Preview {
FoodListRow(food: ModelData().foods.first!, isRankedList: true)
.environment(ModelData())
}
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ struct FrequentlyEaten: View {

@ViewBuilder
func frequentlyEatenGroup() -> some View {
VStack(alignment: .leading) {
VStack(alignment: .leading, spacing: 8) {
HStack(spacing: 0) {
Text("남성")
.font(.system(size: 16))
Expand All @@ -92,14 +92,16 @@ struct FrequentlyEaten: View {
.font(.system(size: 16))
.fontWeight(.bold)
.foregroundStyle(.textNormal)
.padding(.leading, 8)
}

Text("\(currentDateString) 아침 식사 기준")
.font(.system(size: 15))
.fontWeight(.regular)
.foregroundStyle(.textPlaceholder)
}
.padding(.horizontal, 20)
.padding(.top, 23)
.padding(.top, 24)
}
}

Expand Down

0 comments on commit bb29a27

Please sign in to comment.