Skip to content
Open
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
6 changes: 4 additions & 2 deletions megabox.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -287,14 +287,15 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = H2KJ74MDG3;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = "Derived/InfoPlists/megabox-Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
OTHER_SWIFT_FLAGS = "-DDEBUG";
PRODUCT_BUNDLE_IDENTIFIER = dev.tuist.megabox;
PRODUCT_BUNDLE_IDENTIFIER = com.umc.sunny;
PRODUCT_NAME = megabox;
SDKROOT = iphoneos;
SUPPORTS_MACCATALYST = NO;
Expand Down Expand Up @@ -339,14 +340,15 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = H2KJ74MDG3;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = "Derived/InfoPlists/megabox-Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
OTHER_SWIFT_FLAGS = "-DDEBUG";
PRODUCT_BUNDLE_IDENTIFIER = dev.tuist.megabox;
PRODUCT_BUNDLE_IDENTIFIER = com.umc.sunny;
PRODUCT_NAME = megabox;
SDKROOT = iphoneos;
SUPPORTS_MACCATALYST = NO;
Expand Down
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.
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.
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.
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.
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
@@ -1,98 +1 @@
{
"images" : [
{
"idiom" : "iphone",
"scale" : "2x",
"size" : "20x20"
},
{
"idiom" : "iphone",
"scale" : "3x",
"size" : "20x20"
},
{
"idiom" : "iphone",
"scale" : "2x",
"size" : "29x29"
},
{
"idiom" : "iphone",
"scale" : "3x",
"size" : "29x29"
},
{
"idiom" : "iphone",
"scale" : "2x",
"size" : "40x40"
},
{
"idiom" : "iphone",
"scale" : "3x",
"size" : "40x40"
},
{
"idiom" : "iphone",
"scale" : "2x",
"size" : "60x60"
},
{
"idiom" : "iphone",
"scale" : "3x",
"size" : "60x60"
},
{
"idiom" : "ipad",
"scale" : "1x",
"size" : "20x20"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "20x20"
},
{
"idiom" : "ipad",
"scale" : "1x",
"size" : "29x29"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "29x29"
},
{
"idiom" : "ipad",
"scale" : "1x",
"size" : "40x40"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "40x40"
},
{
"idiom" : "ipad",
"scale" : "1x",
"size" : "76x76"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "76x76"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "83.5x83.5"
},
{
"idiom" : "ios-marketing",
"scale" : "1x",
"size" : "1024x1024"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"idiom":"watch","filename":"172.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"38mm","scale":"2x","size":"86x86","expected-size":"172","role":"quickLook"},{"idiom":"watch","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"38mm","scale":"2x","size":"40x40","expected-size":"80","role":"appLauncher"},{"idiom":"watch","filename":"88.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"40mm","scale":"2x","size":"44x44","expected-size":"88","role":"appLauncher"},{"idiom":"watch","filename":"102.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"45mm","scale":"2x","size":"51x51","expected-size":"102","role":"appLauncher"},{"idiom":"watch","filename":"108.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"49mm","scale":"2x","size":"54x54","expected-size":"108","role":"appLauncher"},{"idiom":"watch","filename":"92.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"41mm","scale":"2x","size":"46x46","expected-size":"92","role":"appLauncher"},{"idiom":"watch","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"44mm","scale":"2x","size":"50x50","expected-size":"100","role":"appLauncher"},{"idiom":"watch","filename":"196.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"42mm","scale":"2x","size":"98x98","expected-size":"196","role":"quickLook"},{"idiom":"watch","filename":"216.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"44mm","scale":"2x","size":"108x108","expected-size":"216","role":"quickLook"},{"idiom":"watch","filename":"234.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"45mm","scale":"2x","size":"117x117","expected-size":"234","role":"quickLook"},{"idiom":"watch","filename":"258.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"49mm","scale":"2x","size":"129x129","expected-size":"258","role":"quickLook"},{"idiom":"watch","filename":"48.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"38mm","scale":"2x","size":"24x24","expected-size":"48","role":"notificationCenter"},{"idiom":"watch","filename":"55.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"42mm","scale":"2x","size":"27.5x27.5","expected-size":"55","role":"notificationCenter"},{"idiom":"watch","filename":"66.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"45mm","scale":"2x","size":"33x33","expected-size":"66","role":"notificationCenter"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"watch","role":"companionSettings","scale":"3x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"watch","role":"companionSettings","scale":"2x"},{"size":"1024x1024","expected-size":"1024","filename":"1024.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"watch-marketing","scale":"1x"},{"size":"128x128","expected-size":"128","filename":"128.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"256x256","expected-size":"256","filename":"256.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"128x128","expected-size":"256","filename":"256.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"256x256","expected-size":"512","filename":"512.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"32","filename":"32.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"512x512","expected-size":"512","filename":"512.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"16","filename":"16.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"32","filename":"32.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"64","filename":"64.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"512x512","expected-size":"1024","filename":"1024.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"}]}
4 changes: 2 additions & 2 deletions megabox/Sources/Order/Views/BestMenuSectionView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ struct BestMenuSectionView: View {
VStack(alignment: .leading, spacing: 8) {
Text("베스트 메뉴")
.font(.bold22)
.foregroundColor(.black)
.foregroundStyle(.black)

Text("영화 볼때 뭐먹지 고민될 때 베스트 메뉴!")
.font(.regular12)
.foregroundColor(Color("gray04"))
.foregroundStyle(Color("gray04"))
}

ScrollView(.horizontal, showsIndicators: false) {
Expand Down
6 changes: 3 additions & 3 deletions megabox/Sources/Order/Views/DirectOrderDetailView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ struct DirectOrderDetailView: View {
router.pop()
} label: {
Image(systemName: "chevron.left")
.foregroundColor(.black)
.foregroundStyle(.black)
.font(.system(size: 18, weight: .medium))
}

// 타이틀
Text("바로주문")
.font(.semiBold18)
.foregroundColor(.black)
.foregroundStyle(.black)

Spacer()

Expand All @@ -53,7 +53,7 @@ struct DirectOrderDetailView: View {
// 장바구니 액션
} label: {
Image(systemName: "cart")
.foregroundColor(.black)
.foregroundStyle(.black)
.font(.system(size: 20))
}
}
Expand Down
6 changes: 3 additions & 3 deletions megabox/Sources/Order/Views/MenuItemCardModifiers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ struct BestBadgeModifier: ViewModifier {
if isBest {
Text("BEST")
.font(.medium10)
.foregroundColor(.white)
.foregroundStyle(.white)
.padding(.horizontal, 8)
.padding(.vertical, 4)
.background(Color.red)
Expand All @@ -33,7 +33,7 @@ struct RecommendedBadgeModifier: ViewModifier {
if isRecommended {
Text("추천")
.font(.medium10)
.foregroundColor(.white)
.foregroundStyle(.white)
.padding(.horizontal, 8)
.padding(.vertical, 4)
.background(Color.blue)
Expand All @@ -58,7 +58,7 @@ struct SoldOutModifier: ViewModifier {

Text("품절")
.font(.bold18)
.foregroundColor(.white)
.foregroundStyle(.white)
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions megabox/Sources/Order/Views/MenuItemCardView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,24 @@ struct MenuItemCardView: View {
VStack(alignment: .leading, spacing: 4) {
Text(menuItem.name)
.font(.regular13)
.foregroundColor(.black)
.foregroundStyle(.black)

// 가격 표시
if let originalPrice = menuItem.originalPrice {
HStack(spacing: 4) {
Text("\(formatPrice(menuItem.price))원")
.font(.semiBold14)
.foregroundColor(.black)
.foregroundStyle(.black)

Text("\(formatPrice(originalPrice))원")
.font(.regular09)
.foregroundColor(Color("gray04"))
.foregroundStyle(Color("gray04"))
.strikethrough()
}
} else {
Text("\(formatPrice(menuItem.price))원")
.font(.semiBold14)
.foregroundColor(.black)
.foregroundStyle(.black)
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions megabox/Sources/Order/Views/OrderCardLayoutModifiers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ struct TopLeftTextLayoutStyle: ViewModifier {
VStack(alignment: .leading, spacing: 8) {
Text(title)
.font(titleFont)
.foregroundColor(.black)
.foregroundStyle(.black)

if let description = description {
Text(description)
.font(.regular12)
.foregroundColor(Color("gray04"))
.foregroundStyle(Color("gray04"))
.multilineTextAlignment(.leading)
.frame(maxWidth: .infinity, alignment: .leading)
}
Expand All @@ -63,7 +63,7 @@ struct TopLeftTextLayoutStyle: ViewModifier {
Spacer()
Image(systemName: iconName)
.font(.system(size: iconSize, weight: .light))
.foregroundColor(.black)
.foregroundStyle(.black)
}
}
.padding(.horizontal, 12)
Expand Down Expand Up @@ -105,12 +105,12 @@ struct HorizontalLayoutStyle: ViewModifier {
VStack(alignment: .leading, spacing: 8) {
Text(title)
.font(titleFont)
.foregroundColor(.black)
.foregroundStyle(.black)

if let description = description {
Text(description)
.font(.regular13)
.foregroundColor(Color("gray04"))
.foregroundStyle(Color("gray04"))
}
}

Expand All @@ -119,7 +119,7 @@ struct HorizontalLayoutStyle: ViewModifier {
// 아이콘
Image(systemName: iconName)
.font(.system(size: iconSize, weight: .light))
.foregroundColor(.black)
.foregroundStyle(.black)
}
.padding(.horizontal, 12)
.padding(.vertical, 15)
Expand Down
4 changes: 2 additions & 2 deletions megabox/Sources/Order/Views/RecommendedMenuSectionView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ struct RecommendedMenuSectionView: View {
VStack(alignment: .leading, spacing: 8) {
Text("추천 메뉴")
.font(.bold22)
.foregroundColor(.black)
.foregroundStyle(.black)

Text("영화 볼때 뭐먹지 고민될 땐 추천 메뉴!")
.font(.regular12)
.foregroundColor(Color("gray04"))
.foregroundStyle(Color("gray04"))
}

ScrollView(.horizontal, showsIndicators: false) {
Expand Down
4 changes: 2 additions & 2 deletions megabox/Sources/Order/Views/TheaterChangeBarView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ struct TheaterChangeBarView: View {
// 왼쪽: 위치 아이콘과 극장명
HStack(spacing: 8) {
Image(systemName: "mappin.circle.fill")
.foregroundColor(style == .purple ? .white : .black)
.foregroundStyle(style == .purple ? .white : .black)
.font(.system(size: 16))

Text(selectedTheater)
Expand All @@ -37,7 +37,7 @@ struct TheaterChangeBarView: View {
} label: {
Text("극장 변경")
.font(.semiBold13)
.foregroundColor(style == .purple ? .white : Color("purple03"))
.foregroundStyle(style == .purple ? .white : Color("purple03"))
.padding(.horizontal, 12)
.padding(.vertical, 6)
.overlay(
Expand Down
Loading