From ee6ef99795aeae5f2feb77163f8e3605fba4af86 Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Mon, 20 Jan 2025 15:37:37 +0900 Subject: [PATCH 01/21] =?UTF-8?q?Feat:=20=ED=83=AD=EB=B0=94=20UI=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dorundorun/dorundorun/App/TabbarView.swift | 95 ++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 dorundorun/dorundorun/App/TabbarView.swift diff --git a/dorundorun/dorundorun/App/TabbarView.swift b/dorundorun/dorundorun/App/TabbarView.swift new file mode 100644 index 0000000..3f638db --- /dev/null +++ b/dorundorun/dorundorun/App/TabbarView.swift @@ -0,0 +1,95 @@ +// +// TabbarView.swift +// dorundorun +// +// Created by 박서현 on 1/20/25. +// + +import SwiftUI + +struct TabbarView: View { + + init() { + let appearance = UITabBarAppearance() + appearance.configureWithOpaqueBackground() + appearance.backgroundColor = UIColor.white // 탭바 배경 설정 + + // 활성화된 아이템 색상 + appearance.stackedLayoutAppearance.selected.iconColor = UIColor(#colorLiteral(red: 0.4748314023, green: 0.3105015755, blue: 0.9763918519, alpha: 1)) + appearance.stackedLayoutAppearance.selected.titleTextAttributes = [.foregroundColor: UIColor(#colorLiteral(red: 0.4748314023, green: 0.3105015755, blue: 0.9763918519, alpha: 1))] + + // 비활성화된 아이템 색상 + appearance.stackedLayoutAppearance.normal.iconColor = UIColor(#colorLiteral(red: 0.7401758432, green: 0.6517201066, blue: 0.98768574, alpha: 1)) + appearance.stackedLayoutAppearance.normal.titleTextAttributes = [.foregroundColor: UIColor(#colorLiteral(red: 0.7401758432, green: 0.6517201066, blue: 0.98768574, alpha: 1))] + + // 탭 아이템 중앙 배치 설정 + appearance.stackedItemPositioning = .centered // 중앙 배치 + appearance.stackedItemSpacing = 4 + + UITabBar.appearance().standardAppearance = appearance + } + + var body: some View { + TabView { + VStack { + Text("홈 화면") + .frame(maxWidth: .infinity, maxHeight: .infinity) + + Rectangle() + .frame(height: 4) + .foregroundStyle(Color.gray) + .opacity(0.3) + } + .tabItem { + Label("홈", systemImage: "house") + } + + VStack { + Text("두들런 화면") + .frame(maxWidth: .infinity, maxHeight: .infinity) + + Rectangle() + .frame(height: 4) + .foregroundStyle(Color.gray) + .opacity(0.3) + } + .tabItem { + Label("두들런", systemImage: "waveform.path.ecg") + } + + VStack { + Text("마켓 화면") + .frame(maxWidth: .infinity, maxHeight: .infinity) + + Rectangle() + .frame(height: 4) + .foregroundStyle(Color.gray) + .opacity(0.3) + } + .tabItem { + Label("마켓", systemImage: "cart") + } + + VStack { + Text("마이페이지 화면") + .frame(maxWidth: .infinity, maxHeight: .infinity) + + Rectangle() + .frame(height: 4) + .foregroundStyle(Color.gray) + .opacity(0.3) + } + .tabItem { + Label("마이페이지", systemImage: "person.crop.circle") + } + } + .tint(Color(#colorLiteral(red: 0.4748314023, green: 0.3105015755, blue: 0.9763918519, alpha: 1))) + .onAppear { + UITabBar.appearance().unselectedItemTintColor = UIColor(#colorLiteral(red: 0.7401758432, green: 0.6517201066, blue: 0.98768574, alpha: 1)) + } + } +} + +#Preview { + TabbarView() +} From 03d035e71b42879b6594f5efda7456861113ebaa Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Fri, 24 Jan 2025 15:58:32 +0900 Subject: [PATCH 02/21] =?UTF-8?q?Feat:=20xcodeproj=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 이걸 커밋을 안 하고 있었어서 커밋합니다...! --- .../dorundorun.xcodeproj/project.pbxproj | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dorundorun/dorundorun.xcodeproj/project.pbxproj b/dorundorun/dorundorun.xcodeproj/project.pbxproj index 8a29490..18830cf 100644 --- a/dorundorun/dorundorun.xcodeproj/project.pbxproj +++ b/dorundorun/dorundorun.xcodeproj/project.pbxproj @@ -47,6 +47,18 @@ E27BA6DF2D3FB0F6007B54B0 /* Jalnan2.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Jalnan2.otf; sourceTree = ""; }; E27BA6E52D3FB496007B54B0 /* Color+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+Extension.swift"; sourceTree = ""; }; E27BA6E72D3FB560007B54B0 /* RunningButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunningButton.swift; sourceTree = ""; }; + C3406EE72D3E25B900953DB7 /* TabbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3406EE62D3E25B900953DB7 /* TabbarView.swift */; }; + D7907979253E279541E78415 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1D0A0A7E2B1973475B589A22 /* Preview Assets.xcassets */; }; + F4D2913937ADB672F9E299A4 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4217CBD1D1E22A7F6731360F /* ContentView.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 0BE79716A45CC57BB5D5FAC2 /* dorundorun.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = dorundorun.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 1D0A0A7E2B1973475B589A22 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; + 4217CBD1D1E22A7F6731360F /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; + 9B54D871BBDE0FE1796A1460 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; + AA95E43B40E215CF1F8B9304 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + C3406EE62D3E25B900953DB7 /* TabbarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabbarView.swift; sourceTree = ""; }; F690F5DE8513265C9CE21416 /* dorundorunApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dorundorunApp.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -65,6 +77,8 @@ E27BA6E42D3FB488007B54B0 /* Extension */, 39F80B4D13380475D8FB93FD /* App */, 55F5D06E8DF9721BB671A5DF /* DesignSystem */, + AA95E43B40E215CF1F8B9304 /* Assets.xcassets */, + 39F80B4D13380475D8FB93FD /* App */, 5DEF0DB554957D6F41DAB792 /* Presentaion */, 48E1EFB47D466708BE777860 /* Preview Content */, ); @@ -76,6 +90,7 @@ children = ( F690F5DE8513265C9CE21416 /* dorundorunApp.swift */, 9B54D871BBDE0FE1796A1460 /* Info.plist */, + C3406EE62D3E25B900953DB7 /* TabbarView.swift */, ); path = App; sourceTree = ""; @@ -246,6 +261,9 @@ 179A084F2A528877C884F95C /* dorundorunApp.swift in Sources */, E27BA6E62D3FB496007B54B0 /* Color+Extension.swift in Sources */, E27BA6E92D3FB560007B54B0 /* RunningButton.swift in Sources */, + C3406EE72D3E25B900953DB7 /* TabbarView.swift in Sources */, + F4D2913937ADB672F9E299A4 /* ContentView.swift in Sources */, + 179A084F2A528877C884F95C /* dorundorunApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; From e7942274f63db4071bef8632b1748aa7d862a60d Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Fri, 24 Jan 2025 18:34:18 +0900 Subject: [PATCH 03/21] =?UTF-8?q?Fix=20:=20=ED=83=AD=EB=B0=94=20UI=20?= =?UTF-8?q?=EB=B7=B0=EB=A1=9C=20=ED=95=A0=EB=8B=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 피드백 반영하여 custom 탭바 UI로 만들었습니다! --- .../dorundorun.xcodeproj/project.pbxproj | 22 ++- dorundorun/dorundorun/App/TabbarView.swift | 158 ++++++++++-------- dorundorun/dorundorun/App/doodleRunView.swift | 19 +++ dorundorun/dorundorun/App/homeView.swift | 19 +++ dorundorun/dorundorun/App/marketView.swift | 19 +++ dorundorun/dorundorun/App/myPageView.swift | 19 +++ 6 files changed, 184 insertions(+), 72 deletions(-) create mode 100644 dorundorun/dorundorun/App/doodleRunView.swift create mode 100644 dorundorun/dorundorun/App/homeView.swift create mode 100644 dorundorun/dorundorun/App/marketView.swift create mode 100644 dorundorun/dorundorun/App/myPageView.swift diff --git a/dorundorun/dorundorun.xcodeproj/project.pbxproj b/dorundorun/dorundorun.xcodeproj/project.pbxproj index 18830cf..cd83e6b 100644 --- a/dorundorun/dorundorun.xcodeproj/project.pbxproj +++ b/dorundorun/dorundorun.xcodeproj/project.pbxproj @@ -48,6 +48,11 @@ E27BA6E52D3FB496007B54B0 /* Color+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+Extension.swift"; sourceTree = ""; }; E27BA6E72D3FB560007B54B0 /* RunningButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunningButton.swift; sourceTree = ""; }; C3406EE72D3E25B900953DB7 /* TabbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3406EE62D3E25B900953DB7 /* TabbarView.swift */; }; + C3F5DB202D4393E800605A18 /* tabbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB1F2D4393E800605A18 /* tabbarView.swift */; }; + C3F5DB222D43945700605A18 /* homeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB212D43945700605A18 /* homeView.swift */; }; + C3F5DB242D43948800605A18 /* doodleRunView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB232D43948800605A18 /* doodleRunView.swift */; }; + C3F5DB262D43949C00605A18 /* marketView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB252D43949C00605A18 /* marketView.swift */; }; + C3F5DB282D4394AF00605A18 /* myPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB272D4394AF00605A18 /* myPageView.swift */; }; D7907979253E279541E78415 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1D0A0A7E2B1973475B589A22 /* Preview Assets.xcassets */; }; F4D2913937ADB672F9E299A4 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4217CBD1D1E22A7F6731360F /* ContentView.swift */; }; /* End PBXBuildFile section */ @@ -58,7 +63,11 @@ 4217CBD1D1E22A7F6731360F /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; 9B54D871BBDE0FE1796A1460 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; AA95E43B40E215CF1F8B9304 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - C3406EE62D3E25B900953DB7 /* TabbarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabbarView.swift; sourceTree = ""; }; + C3F5DB1F2D4393E800605A18 /* tabbarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = tabbarView.swift; sourceTree = ""; }; + C3F5DB212D43945700605A18 /* homeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = homeView.swift; sourceTree = ""; }; + C3F5DB232D43948800605A18 /* doodleRunView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = doodleRunView.swift; sourceTree = ""; }; + C3F5DB252D43949C00605A18 /* marketView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = marketView.swift; sourceTree = ""; }; + C3F5DB272D4394AF00605A18 /* myPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = myPageView.swift; sourceTree = ""; }; F690F5DE8513265C9CE21416 /* dorundorunApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dorundorunApp.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -90,7 +99,11 @@ children = ( F690F5DE8513265C9CE21416 /* dorundorunApp.swift */, 9B54D871BBDE0FE1796A1460 /* Info.plist */, - C3406EE62D3E25B900953DB7 /* TabbarView.swift */, + C3F5DB232D43948800605A18 /* doodleRunView.swift */, + C3F5DB1F2D4393E800605A18 /* tabbarView.swift */, + C3F5DB212D43945700605A18 /* homeView.swift */, + C3F5DB252D43949C00605A18 /* marketView.swift */, + C3F5DB272D4394AF00605A18 /* myPageView.swift */, ); path = App; sourceTree = ""; @@ -262,7 +275,12 @@ E27BA6E62D3FB496007B54B0 /* Color+Extension.swift in Sources */, E27BA6E92D3FB560007B54B0 /* RunningButton.swift in Sources */, C3406EE72D3E25B900953DB7 /* TabbarView.swift in Sources */, + C3F5DB262D43949C00605A18 /* marketView.swift in Sources */, F4D2913937ADB672F9E299A4 /* ContentView.swift in Sources */, + C3F5DB242D43948800605A18 /* doodleRunView.swift in Sources */, + C3F5DB222D43945700605A18 /* homeView.swift in Sources */, + C3F5DB282D4394AF00605A18 /* myPageView.swift in Sources */, + C3F5DB202D4393E800605A18 /* tabbarView.swift in Sources */, 179A084F2A528877C884F95C /* dorundorunApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/dorundorun/dorundorun/App/TabbarView.swift b/dorundorun/dorundorun/App/TabbarView.swift index 3f638db..ac4f996 100644 --- a/dorundorun/dorundorun/App/TabbarView.swift +++ b/dorundorun/dorundorun/App/TabbarView.swift @@ -2,94 +2,112 @@ // TabbarView.swift // dorundorun // -// Created by 박서현 on 1/20/25. +// Created by 박서현 on 1/24/25. // import SwiftUI +enum Tab{ + case home + case doodleRun + case market + case myPage +} + struct TabbarView: View { - init() { - let appearance = UITabBarAppearance() - appearance.configureWithOpaqueBackground() - appearance.backgroundColor = UIColor.white // 탭바 배경 설정 - - // 활성화된 아이템 색상 - appearance.stackedLayoutAppearance.selected.iconColor = UIColor(#colorLiteral(red: 0.4748314023, green: 0.3105015755, blue: 0.9763918519, alpha: 1)) - appearance.stackedLayoutAppearance.selected.titleTextAttributes = [.foregroundColor: UIColor(#colorLiteral(red: 0.4748314023, green: 0.3105015755, blue: 0.9763918519, alpha: 1))] - - // 비활성화된 아이템 색상 - appearance.stackedLayoutAppearance.normal.iconColor = UIColor(#colorLiteral(red: 0.7401758432, green: 0.6517201066, blue: 0.98768574, alpha: 1)) - appearance.stackedLayoutAppearance.normal.titleTextAttributes = [.foregroundColor: UIColor(#colorLiteral(red: 0.7401758432, green: 0.6517201066, blue: 0.98768574, alpha: 1))] - - // 탭 아이템 중앙 배치 설정 - appearance.stackedItemPositioning = .centered // 중앙 배치 - appearance.stackedItemSpacing = 4 - - UITabBar.appearance().standardAppearance = appearance - } + @State var seletedTab: Tab = .home var body: some View { - TabView { - VStack { - Text("홈 화면") - .frame(maxWidth: .infinity, maxHeight: .infinity) - - Rectangle() - .frame(height: 4) - .foregroundStyle(Color.gray) - .opacity(0.3) - } - .tabItem { - Label("홈", systemImage: "house") + VStack(spacing : 0){ + switch seletedTab { + case .home: + homeView() + case .doodleRun: + doodleRunView() + case .market: + marketView() + case .myPage: + myPageView() } - VStack { - Text("두들런 화면") - .frame(maxWidth: .infinity, maxHeight: .infinity) - - Rectangle() - .frame(height: 4) - .foregroundStyle(Color.gray) - .opacity(0.3) - } - .tabItem { - Label("두들런", systemImage: "waveform.path.ecg") - } + CustomTabView(selectedTab: $seletedTab) + .frame(height: 60) + .background(Color.white) + } + .edgesIgnoringSafeArea(.bottom) + } +} + +struct CustomTabView: View { + @Binding var selectedTab : Tab + + var body: some View{ + VStack(spacing : 0){ - VStack { - Text("마켓 화면") - .frame(maxWidth: .infinity, maxHeight: .infinity) - - Rectangle() - .frame(height: 4) - .foregroundStyle(Color.gray) - .opacity(0.3) - } - .tabItem { - Label("마켓", systemImage: "cart") - } + Rectangle() + .frame(height: 4) + .foregroundStyle(Color("nutral100")) - VStack { - Text("마이페이지 화면") - .frame(maxWidth: .infinity, maxHeight: .infinity) - - Rectangle() - .frame(height: 4) - .foregroundStyle(Color.gray) - .opacity(0.3) - } - .tabItem { - Label("마이페이지", systemImage: "person.crop.circle") + Spacer() + ZStack{ + HStack{ + Spacer() + + Button(action: {selectedTab = .home}){ + ButtonView(imageName: "home-30", title: "홈", isSelected: selectedTab == .home) + } + + Spacer() + + Button(action: {selectedTab = .doodleRun}){ + ButtonView(imageName: "run-30", title: "두들런", isSelected: selectedTab == .doodleRun) + } + + Spacer() + + Button(action: {selectedTab = .market}){ + ButtonView(imageName: "store-30", title: "마켓", isSelected: selectedTab == .market) + } + + + Spacer() + + Button(action: {selectedTab = .myPage}){ + ButtonView(imageName: "mypage-30", title: "마이", isSelected: selectedTab == .myPage) + } + + Spacer() + + } + .padding(.vertical, 15) } } - .tint(Color(#colorLiteral(red: 0.4748314023, green: 0.3105015755, blue: 0.9763918519, alpha: 1))) - .onAppear { - UITabBar.appearance().unselectedItemTintColor = UIColor(#colorLiteral(red: 0.7401758432, green: 0.6517201066, blue: 0.98768574, alpha: 1)) + .edgesIgnoringSafeArea(.bottom) + } +} + + +struct ButtonView : View { + var imageName : String + var title: String + var isSelected: Bool + + var body: some View{ + VStack{ + Image(imageName) + .renderingMode(.template) + .foregroundStyle(isSelected ? Color("primary200") : Color("nutral500")) + Text(title) + .font(.custom("Jalnan2", size: 12)) + .foregroundStyle(isSelected ? Color("primary200") : Color("nutral600")) +// .padding(.bottom, 40) } + .offset(y: -15) } } #Preview { TabbarView() } + diff --git a/dorundorun/dorundorun/App/doodleRunView.swift b/dorundorun/dorundorun/App/doodleRunView.swift new file mode 100644 index 0000000..b58cf69 --- /dev/null +++ b/dorundorun/dorundorun/App/doodleRunView.swift @@ -0,0 +1,19 @@ +// +// doodleRunView.swift +// dorundorun +// +// Created by 박서현 on 1/24/25. +// + +import SwiftUI + +struct doodleRunView: View { + var body: some View { + Text("두들런 화면") + .frame(maxWidth: .infinity, maxHeight: .infinity) + } +} + +#Preview { + doodleRunView() +} diff --git a/dorundorun/dorundorun/App/homeView.swift b/dorundorun/dorundorun/App/homeView.swift new file mode 100644 index 0000000..2241bca --- /dev/null +++ b/dorundorun/dorundorun/App/homeView.swift @@ -0,0 +1,19 @@ +// +// homeView.swift +// dorundorun +// +// Created by 박서현 on 1/24/25. +// + +import SwiftUI + +struct homeView: View { + var body: some View { + Text("홈 화면") + .frame(maxWidth: .infinity, maxHeight: .infinity) + } +} + +#Preview { + homeView() +} diff --git a/dorundorun/dorundorun/App/marketView.swift b/dorundorun/dorundorun/App/marketView.swift new file mode 100644 index 0000000..c8ffe70 --- /dev/null +++ b/dorundorun/dorundorun/App/marketView.swift @@ -0,0 +1,19 @@ +// +// marketView.swift +// dorundorun +// +// Created by 박서현 on 1/24/25. +// + +import SwiftUI + +struct marketView: View { + var body: some View { + Text("마켓 화면") + .frame(maxWidth: .infinity, maxHeight: .infinity) + } +} + +#Preview { + marketView() +} diff --git a/dorundorun/dorundorun/App/myPageView.swift b/dorundorun/dorundorun/App/myPageView.swift new file mode 100644 index 0000000..9367b51 --- /dev/null +++ b/dorundorun/dorundorun/App/myPageView.swift @@ -0,0 +1,19 @@ +// +// myPageView.swift +// dorundorun +// +// Created by 박서현 on 1/24/25. +// + +import SwiftUI + +struct myPageView: View { + var body: some View { + Text("마이페이지 화면") + .frame(maxWidth: .infinity, maxHeight: .infinity) + } +} + +#Preview { + myPageView() +} From 8ea9aef25082fe0a4e1b2fce140c933189a33cab Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Fri, 24 Jan 2025 22:08:21 +0900 Subject: [PATCH 04/21] =?UTF-8?q?Fix:=20=EC=A4=84=EB=B0=94=EA=BF=88=20?= =?UTF-8?q?=EB=B0=8F=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20=EC=9A=94?= =?UTF-8?q?=EC=86=8C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dorundorun/dorundorun/App/TabbarView.swift | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dorundorun/dorundorun/App/TabbarView.swift b/dorundorun/dorundorun/App/TabbarView.swift index ac4f996..321ed70 100644 --- a/dorundorun/dorundorun/App/TabbarView.swift +++ b/dorundorun/dorundorun/App/TabbarView.swift @@ -55,26 +55,42 @@ struct CustomTabView: View { Spacer() Button(action: {selectedTab = .home}){ - ButtonView(imageName: "home-30", title: "홈", isSelected: selectedTab == .home) + ButtonView( + imageName: "home-30", + title: "홈", + isSelected: selectedTab == .home + ) } Spacer() Button(action: {selectedTab = .doodleRun}){ - ButtonView(imageName: "run-30", title: "두들런", isSelected: selectedTab == .doodleRun) + ButtonView( + imageName: "run-30", + title: "두들런", + isSelected: selectedTab == .doodleRun + ) } Spacer() Button(action: {selectedTab = .market}){ - ButtonView(imageName: "store-30", title: "마켓", isSelected: selectedTab == .market) + ButtonView( + imageName: "store-30", + title: "마켓", + isSelected: selectedTab == .market + ) } Spacer() Button(action: {selectedTab = .myPage}){ - ButtonView(imageName: "mypage-30", title: "마이", isSelected: selectedTab == .myPage) + ButtonView( + imageName: "mypage-30", + title: "마이", + isSelected: selectedTab == .myPage + ) } Spacer() From 2e2803144465bbcffe4d794dd339679507ffa38c Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Fri, 24 Jan 2025 22:28:44 +0900 Subject: [PATCH 05/21] =?UTF-8?q?Fix:=20=EB=A0=88=EC=9D=B4=EC=95=84?= =?UTF-8?q?=EC=9B=83=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 탭 높이, 간격, 폰트 사이즈 등 수정했습니다 --- dorundorun/dorundorun/App/TabbarView.swift | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dorundorun/dorundorun/App/TabbarView.swift b/dorundorun/dorundorun/App/TabbarView.swift index 321ed70..d8e8736 100644 --- a/dorundorun/dorundorun/App/TabbarView.swift +++ b/dorundorun/dorundorun/App/TabbarView.swift @@ -32,7 +32,7 @@ struct TabbarView: View { } CustomTabView(selectedTab: $seletedTab) - .frame(height: 60) + .frame(height: 99) .background(Color.white) } .edgesIgnoringSafeArea(.bottom) @@ -46,14 +46,12 @@ struct CustomTabView: View { VStack(spacing : 0){ Rectangle() - .frame(height: 4) + .frame(height: 3) .foregroundStyle(Color("nutral100")) Spacer() ZStack{ HStack{ - Spacer() - Button(action: {selectedTab = .home}){ ButtonView( imageName: "home-30", @@ -92,10 +90,8 @@ struct CustomTabView: View { isSelected: selectedTab == .myPage ) } - - Spacer() - } + .frame(width: 313, height: 51) .padding(.vertical, 15) } } @@ -105,17 +101,18 @@ struct CustomTabView: View { struct ButtonView : View { - var imageName : String - var title: String - var isSelected: Bool + let imageName : String + let title: String + let isSelected: Bool var body: some View{ VStack{ Image(imageName) .renderingMode(.template) .foregroundStyle(isSelected ? Color("primary200") : Color("nutral500")) + .padding(.vertical, 7) Text(title) - .font(.custom("Jalnan2", size: 12)) + .font(.custom("SUIT", size: 10)) .foregroundStyle(isSelected ? Color("primary200") : Color("nutral600")) // .padding(.bottom, 40) } From 95a08638e551af3bd9e69f15e05e9231d284c6c1 Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Fri, 24 Jan 2025 23:20:34 +0900 Subject: [PATCH 06/21] =?UTF-8?q?Fix:=20pull=20origin=20=EB=B0=9B=EC=95=84?= =?UTF-8?q?=EC=99=80=EC=84=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 색상 등 수정했습니다 --- dorundorun/dorundorun/App/TabbarView.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dorundorun/dorundorun/App/TabbarView.swift b/dorundorun/dorundorun/App/TabbarView.swift index d8e8736..6760389 100644 --- a/dorundorun/dorundorun/App/TabbarView.swift +++ b/dorundorun/dorundorun/App/TabbarView.swift @@ -42,6 +42,7 @@ struct TabbarView: View { struct CustomTabView: View { @Binding var selectedTab : Tab + var body: some View{ VStack(spacing : 0){ @@ -109,12 +110,11 @@ struct ButtonView : View { VStack{ Image(imageName) .renderingMode(.template) - .foregroundStyle(isSelected ? Color("primary200") : Color("nutral500")) + .foregroundStyle(isSelected ? Color.primary200 : Color.neutral500) .padding(.vertical, 7) Text(title) .font(.custom("SUIT", size: 10)) - .foregroundStyle(isSelected ? Color("primary200") : Color("nutral600")) -// .padding(.bottom, 40) + .foregroundStyle(isSelected ? Color.primary200 : Color.neutral600) } .offset(y: -15) } From 1ed4123725e604fe3a45e145468bccdb6aa79e1f Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Fri, 24 Jan 2025 23:21:19 +0900 Subject: [PATCH 07/21] =?UTF-8?q?Fix:=20=EC=B6=A9=EB=8F=8C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 중복된 코드 때문에 충돌이 일어나서 수정했습니다 --- .../dorundorun.xcodeproj/project.pbxproj | 50 +++++++------------ 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/dorundorun/dorundorun.xcodeproj/project.pbxproj b/dorundorun/dorundorun.xcodeproj/project.pbxproj index cd83e6b..ef376dd 100644 --- a/dorundorun/dorundorun.xcodeproj/project.pbxproj +++ b/dorundorun/dorundorun.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 14D7E642E63946C27FA539DE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AA95E43B40E215CF1F8B9304 /* Assets.xcassets */; }; 179A084F2A528877C884F95C /* dorundorunApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = F690F5DE8513265C9CE21416 /* dorundorunApp.swift */; }; 387D3C3B3CC2824201AD8F93 /* Pretendard-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1C9BF0B471C0D91A7651182F /* Pretendard-Bold.otf */; }; 48967D1F4ECBB1551E7590D8 /* Pretendard-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = 445FDCC89177CB17DC59ABBD /* Pretendard-Light.otf */; }; @@ -17,6 +16,13 @@ 7ED3F8F0C2A527633323714E /* Pretendard-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 668F716FF175616D4B8C1EA9 /* Pretendard-SemiBold.otf */; }; 863036F891814ADD79543A39 /* Pretendard-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = A331EFDB52072D295754B1F2 /* Pretendard-Medium.otf */; }; AC4B7064FF253A4AE4FB9E93 /* Pretendard-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 3FB00500D04150D925C0A6F4 /* Pretendard-Regular.otf */; }; + C3406EE72D3E25B900953DB7 /* (null) in Sources */ = {isa = PBXBuildFile; }; + C3606C472D43D83A00A075A1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C3606C462D43D83A00A075A1 /* Assets.xcassets */; }; + C3F5DB202D4393E800605A18 /* TabbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB1F2D4393E800605A18 /* TabbarView.swift */; }; + C3F5DB222D43945700605A18 /* homeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB212D43945700605A18 /* homeView.swift */; }; + C3F5DB242D43948800605A18 /* doodleRunView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB232D43948800605A18 /* doodleRunView.swift */; }; + C3F5DB262D43949C00605A18 /* marketView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB252D43949C00605A18 /* marketView.swift */; }; + C3F5DB282D4394AF00605A18 /* myPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB272D4394AF00605A18 /* myPageView.swift */; }; D7907979253E279541E78415 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1D0A0A7E2B1973475B589A22 /* Preview Assets.xcassets */; }; E0551A8EFED2ABF50016CEE5 /* Icons.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1092B57F175DF2EC0F756430 /* Icons.xcassets */; }; E27BA6E02D3FB0F6007B54B0 /* Jalnan2.otf in Resources */ = {isa = PBXBuildFile; fileRef = E27BA6DF2D3FB0F6007B54B0 /* Jalnan2.otf */; }; @@ -41,33 +47,17 @@ 77BA639E0011A273D9CCDA17 /* Pretendard-ExtraBold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-ExtraBold.otf"; sourceTree = ""; }; 9B54D871BBDE0FE1796A1460 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; A331EFDB52072D295754B1F2 /* Pretendard-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Medium.otf"; sourceTree = ""; }; - AA95E43B40E215CF1F8B9304 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; B4E4FD66878BCDD0D1E282B2 /* Pretendard-Black.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Black.otf"; sourceTree = ""; }; - D593C384C34403D08F9DF6F2 /* Pretendard-Thin.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Thin.otf"; sourceTree = ""; }; - E27BA6DF2D3FB0F6007B54B0 /* Jalnan2.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Jalnan2.otf; sourceTree = ""; }; - E27BA6E52D3FB496007B54B0 /* Color+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+Extension.swift"; sourceTree = ""; }; - E27BA6E72D3FB560007B54B0 /* RunningButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunningButton.swift; sourceTree = ""; }; - C3406EE72D3E25B900953DB7 /* TabbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3406EE62D3E25B900953DB7 /* TabbarView.swift */; }; - C3F5DB202D4393E800605A18 /* tabbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB1F2D4393E800605A18 /* tabbarView.swift */; }; - C3F5DB222D43945700605A18 /* homeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB212D43945700605A18 /* homeView.swift */; }; - C3F5DB242D43948800605A18 /* doodleRunView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB232D43948800605A18 /* doodleRunView.swift */; }; - C3F5DB262D43949C00605A18 /* marketView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB252D43949C00605A18 /* marketView.swift */; }; - C3F5DB282D4394AF00605A18 /* myPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB272D4394AF00605A18 /* myPageView.swift */; }; - D7907979253E279541E78415 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1D0A0A7E2B1973475B589A22 /* Preview Assets.xcassets */; }; - F4D2913937ADB672F9E299A4 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4217CBD1D1E22A7F6731360F /* ContentView.swift */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 0BE79716A45CC57BB5D5FAC2 /* dorundorun.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = dorundorun.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 1D0A0A7E2B1973475B589A22 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; - 4217CBD1D1E22A7F6731360F /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; - 9B54D871BBDE0FE1796A1460 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; - AA95E43B40E215CF1F8B9304 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - C3F5DB1F2D4393E800605A18 /* tabbarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = tabbarView.swift; sourceTree = ""; }; + C3606C462D43D83A00A075A1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + C3F5DB1F2D4393E800605A18 /* TabbarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabbarView.swift; sourceTree = ""; }; C3F5DB212D43945700605A18 /* homeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = homeView.swift; sourceTree = ""; }; C3F5DB232D43948800605A18 /* doodleRunView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = doodleRunView.swift; sourceTree = ""; }; C3F5DB252D43949C00605A18 /* marketView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = marketView.swift; sourceTree = ""; }; C3F5DB272D4394AF00605A18 /* myPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = myPageView.swift; sourceTree = ""; }; + D593C384C34403D08F9DF6F2 /* Pretendard-Thin.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Thin.otf"; sourceTree = ""; }; + E27BA6DF2D3FB0F6007B54B0 /* Jalnan2.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Jalnan2.otf; sourceTree = ""; }; + E27BA6E52D3FB496007B54B0 /* Color+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+Extension.swift"; sourceTree = ""; }; + E27BA6E72D3FB560007B54B0 /* RunningButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunningButton.swift; sourceTree = ""; }; F690F5DE8513265C9CE21416 /* dorundorunApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dorundorunApp.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -84,9 +74,8 @@ isa = PBXGroup; children = ( E27BA6E42D3FB488007B54B0 /* Extension */, - 39F80B4D13380475D8FB93FD /* App */, 55F5D06E8DF9721BB671A5DF /* DesignSystem */, - AA95E43B40E215CF1F8B9304 /* Assets.xcassets */, + C3606C462D43D83A00A075A1 /* Assets.xcassets */, 39F80B4D13380475D8FB93FD /* App */, 5DEF0DB554957D6F41DAB792 /* Presentaion */, 48E1EFB47D466708BE777860 /* Preview Content */, @@ -99,8 +88,8 @@ children = ( F690F5DE8513265C9CE21416 /* dorundorunApp.swift */, 9B54D871BBDE0FE1796A1460 /* Info.plist */, + C3F5DB1F2D4393E800605A18 /* TabbarView.swift */, C3F5DB232D43948800605A18 /* doodleRunView.swift */, - C3F5DB1F2D4393E800605A18 /* tabbarView.swift */, C3F5DB212D43945700605A18 /* homeView.swift */, C3F5DB252D43949C00605A18 /* marketView.swift */, C3F5DB272D4394AF00605A18 /* myPageView.swift */, @@ -120,7 +109,6 @@ isa = PBXGroup; children = ( E27BA6E82D3FB560007B54B0 /* Components */, - AA95E43B40E215CF1F8B9304 /* Assets.xcassets */, 07E9E0E7584F7ACD69B84B64 /* Colors.xcassets */, 1092B57F175DF2EC0F756430 /* Icons.xcassets */, 849AE2F6A71AFAA45C6A8BCA /* Fonts */, @@ -246,10 +234,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 14D7E642E63946C27FA539DE /* Assets.xcassets in Resources */, 7793A74E729409FA1E0C3404 /* Colors.xcassets in Resources */, E0551A8EFED2ABF50016CEE5 /* Icons.xcassets in Resources */, 593EA6E55F6150BBEB46BC7C /* Pretendard-Black.otf in Resources */, + C3606C472D43D83A00A075A1 /* Assets.xcassets in Resources */, 387D3C3B3CC2824201AD8F93 /* Pretendard-Bold.otf in Resources */, E7BD6D2B10F0319465ECFA40 /* Pretendard-ExtraBold.otf in Resources */, 7804B7E78ABADB9B8E808E19 /* Pretendard-ExtraLight.otf in Resources */, @@ -270,17 +258,15 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - F4D2913937ADB672F9E299A4 /* ContentView.swift in Sources */, - 179A084F2A528877C884F95C /* dorundorunApp.swift in Sources */, E27BA6E62D3FB496007B54B0 /* Color+Extension.swift in Sources */, E27BA6E92D3FB560007B54B0 /* RunningButton.swift in Sources */, - C3406EE72D3E25B900953DB7 /* TabbarView.swift in Sources */, + C3406EE72D3E25B900953DB7 /* (null) in Sources */, C3F5DB262D43949C00605A18 /* marketView.swift in Sources */, F4D2913937ADB672F9E299A4 /* ContentView.swift in Sources */, C3F5DB242D43948800605A18 /* doodleRunView.swift in Sources */, C3F5DB222D43945700605A18 /* homeView.swift in Sources */, C3F5DB282D4394AF00605A18 /* myPageView.swift in Sources */, - C3F5DB202D4393E800605A18 /* tabbarView.swift in Sources */, + C3F5DB202D4393E800605A18 /* TabbarView.swift in Sources */, 179A084F2A528877C884F95C /* dorundorunApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; From 541acd4b36fd241799116ecd54623067298e3eee Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Fri, 24 Jan 2025 23:21:51 +0900 Subject: [PATCH 08/21] =?UTF-8?q?Fix:=20Assets=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Assets 파일에서 계속 오류가 나서 기존 파일 삭제 후 다시 복사, 붙여넣기로 해결했습니다 --- .../AccentColor.colorset/Contents.json | 11 ++++++ .../AppIcon.appiconset/Contents.json | 35 +++++++++++++++++++ .../dorundorun/Assets.xcassets/Contents.json | 6 ++++ 3 files changed, 52 insertions(+) create mode 100644 dorundorun/dorundorun/Assets.xcassets/AccentColor.colorset/Contents.json create mode 100644 dorundorun/dorundorun/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 dorundorun/dorundorun/Assets.xcassets/Contents.json diff --git a/dorundorun/dorundorun/Assets.xcassets/AccentColor.colorset/Contents.json b/dorundorun/dorundorun/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 0000000..eb87897 --- /dev/null +++ b/dorundorun/dorundorun/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/dorundorun/dorundorun/Assets.xcassets/AppIcon.appiconset/Contents.json b/dorundorun/dorundorun/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..2305880 --- /dev/null +++ b/dorundorun/dorundorun/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,35 @@ +{ + "images" : [ + { + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "tinted" + } + ], + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/dorundorun/dorundorun/Assets.xcassets/Contents.json b/dorundorun/dorundorun/Assets.xcassets/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/dorundorun/dorundorun/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} From bd0d07fe360d0c68259b3dde2a2806a9bba73ff3 Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Sat, 25 Jan 2025 12:00:05 +0900 Subject: [PATCH 09/21] =?UTF-8?q?Fix:=20App=20=EB=94=94=EB=A0=89=ED=86=A0?= =?UTF-8?q?=EB=A6=AC=20=ED=95=98=EC=9C=84=EC=97=90=EC=84=9C=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 경로 변경 용도 --- dorundorun/dorundorun/App/TabbarView.swift | 126 ------------------ dorundorun/dorundorun/App/doodleRunView.swift | 19 --- dorundorun/dorundorun/App/homeView.swift | 19 --- dorundorun/dorundorun/App/marketView.swift | 19 --- dorundorun/dorundorun/App/myPageView.swift | 19 --- 5 files changed, 202 deletions(-) delete mode 100644 dorundorun/dorundorun/App/TabbarView.swift delete mode 100644 dorundorun/dorundorun/App/doodleRunView.swift delete mode 100644 dorundorun/dorundorun/App/homeView.swift delete mode 100644 dorundorun/dorundorun/App/marketView.swift delete mode 100644 dorundorun/dorundorun/App/myPageView.swift diff --git a/dorundorun/dorundorun/App/TabbarView.swift b/dorundorun/dorundorun/App/TabbarView.swift deleted file mode 100644 index 6760389..0000000 --- a/dorundorun/dorundorun/App/TabbarView.swift +++ /dev/null @@ -1,126 +0,0 @@ -// -// TabbarView.swift -// dorundorun -// -// Created by 박서현 on 1/24/25. -// - -import SwiftUI - -enum Tab{ - case home - case doodleRun - case market - case myPage -} - -struct TabbarView: View { - - @State var seletedTab: Tab = .home - - var body: some View { - VStack(spacing : 0){ - switch seletedTab { - case .home: - homeView() - case .doodleRun: - doodleRunView() - case .market: - marketView() - case .myPage: - myPageView() - } - - CustomTabView(selectedTab: $seletedTab) - .frame(height: 99) - .background(Color.white) - } - .edgesIgnoringSafeArea(.bottom) - } -} - -struct CustomTabView: View { - @Binding var selectedTab : Tab - - - var body: some View{ - VStack(spacing : 0){ - - Rectangle() - .frame(height: 3) - .foregroundStyle(Color("nutral100")) - - Spacer() - ZStack{ - HStack{ - Button(action: {selectedTab = .home}){ - ButtonView( - imageName: "home-30", - title: "홈", - isSelected: selectedTab == .home - ) - } - - Spacer() - - Button(action: {selectedTab = .doodleRun}){ - ButtonView( - imageName: "run-30", - title: "두들런", - isSelected: selectedTab == .doodleRun - ) - } - - Spacer() - - Button(action: {selectedTab = .market}){ - ButtonView( - imageName: "store-30", - title: "마켓", - isSelected: selectedTab == .market - ) - } - - - Spacer() - - Button(action: {selectedTab = .myPage}){ - ButtonView( - imageName: "mypage-30", - title: "마이", - isSelected: selectedTab == .myPage - ) - } - } - .frame(width: 313, height: 51) - .padding(.vertical, 15) - } - } - .edgesIgnoringSafeArea(.bottom) - } -} - - -struct ButtonView : View { - let imageName : String - let title: String - let isSelected: Bool - - var body: some View{ - VStack{ - Image(imageName) - .renderingMode(.template) - .foregroundStyle(isSelected ? Color.primary200 : Color.neutral500) - .padding(.vertical, 7) - Text(title) - .font(.custom("SUIT", size: 10)) - .foregroundStyle(isSelected ? Color.primary200 : Color.neutral600) - } - .offset(y: -15) - } -} - -#Preview { - TabbarView() -} - diff --git a/dorundorun/dorundorun/App/doodleRunView.swift b/dorundorun/dorundorun/App/doodleRunView.swift deleted file mode 100644 index b58cf69..0000000 --- a/dorundorun/dorundorun/App/doodleRunView.swift +++ /dev/null @@ -1,19 +0,0 @@ -// -// doodleRunView.swift -// dorundorun -// -// Created by 박서현 on 1/24/25. -// - -import SwiftUI - -struct doodleRunView: View { - var body: some View { - Text("두들런 화면") - .frame(maxWidth: .infinity, maxHeight: .infinity) - } -} - -#Preview { - doodleRunView() -} diff --git a/dorundorun/dorundorun/App/homeView.swift b/dorundorun/dorundorun/App/homeView.swift deleted file mode 100644 index 2241bca..0000000 --- a/dorundorun/dorundorun/App/homeView.swift +++ /dev/null @@ -1,19 +0,0 @@ -// -// homeView.swift -// dorundorun -// -// Created by 박서현 on 1/24/25. -// - -import SwiftUI - -struct homeView: View { - var body: some View { - Text("홈 화면") - .frame(maxWidth: .infinity, maxHeight: .infinity) - } -} - -#Preview { - homeView() -} diff --git a/dorundorun/dorundorun/App/marketView.swift b/dorundorun/dorundorun/App/marketView.swift deleted file mode 100644 index c8ffe70..0000000 --- a/dorundorun/dorundorun/App/marketView.swift +++ /dev/null @@ -1,19 +0,0 @@ -// -// marketView.swift -// dorundorun -// -// Created by 박서현 on 1/24/25. -// - -import SwiftUI - -struct marketView: View { - var body: some View { - Text("마켓 화면") - .frame(maxWidth: .infinity, maxHeight: .infinity) - } -} - -#Preview { - marketView() -} diff --git a/dorundorun/dorundorun/App/myPageView.swift b/dorundorun/dorundorun/App/myPageView.swift deleted file mode 100644 index 9367b51..0000000 --- a/dorundorun/dorundorun/App/myPageView.swift +++ /dev/null @@ -1,19 +0,0 @@ -// -// myPageView.swift -// dorundorun -// -// Created by 박서현 on 1/24/25. -// - -import SwiftUI - -struct myPageView: View { - var body: some View { - Text("마이페이지 화면") - .frame(maxWidth: .infinity, maxHeight: .infinity) - } -} - -#Preview { - myPageView() -} From 517055900fd1ce08ec5ae5644b47c89a5dbb04bd Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Sat, 25 Jan 2025 12:01:15 +0900 Subject: [PATCH 10/21] =?UTF-8?q?Fix:=20=EC=BD=94=EB=93=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20Presentation=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 띄어쓰기, 줄바꿈 등 수정하고 모디파이어로 색상 수정했습니다! Presentation 디렉토리로 경로도 옮겼습니다. --- .../dorundorun/Presentaion/TabbarView.swift | 117 ++++++++++++++++++ .../Presentaion/doodleRunView.swift | 19 +++ .../dorundorun/Presentaion/homeView.swift | 19 +++ .../dorundorun/Presentaion/marketView.swift | 19 +++ .../dorundorun/Presentaion/myPageView.swift | 19 +++ 5 files changed, 193 insertions(+) create mode 100644 dorundorun/dorundorun/Presentaion/TabbarView.swift create mode 100644 dorundorun/dorundorun/Presentaion/doodleRunView.swift create mode 100644 dorundorun/dorundorun/Presentaion/homeView.swift create mode 100644 dorundorun/dorundorun/Presentaion/marketView.swift create mode 100644 dorundorun/dorundorun/Presentaion/myPageView.swift diff --git a/dorundorun/dorundorun/Presentaion/TabbarView.swift b/dorundorun/dorundorun/Presentaion/TabbarView.swift new file mode 100644 index 0000000..8b67739 --- /dev/null +++ b/dorundorun/dorundorun/Presentaion/TabbarView.swift @@ -0,0 +1,117 @@ +// +// TabbarView.swift +// dorundorun +// +// Created by 박서현 on 1/24/25. +// + +import SwiftUI + +enum Tab { + case home + case doodleRun + case market + case myPage +} + +struct TabbarView: View { + + @State var seletedTab: Tab = .home + + var body: some View { + VStack(spacing : 0){ + switch seletedTab { + case .home: + homeView() + case .doodleRun: + doodleRunView() + case .market: + marketView() + case .myPage: + myPageView() + } + CustomTabView(selectedTab: $seletedTab) + .frame(height: 99) + .background(Color.neutralWhite) + } + .edgesIgnoringSafeArea(.bottom) + } +} + +struct CustomTabView: View { + @Binding var selectedTab: Tab + + var body: some View{ + VStack(spacing : 0){ + Rectangle() + .frame(height: 3) + .foregroundStyle(Color("nutral100")) + + Spacer() + HStack{ + Button(action: {selectedTab = .home}){ + ButtonView( + imageName: "home-30", + title: "홈", + isSelected: selectedTab == .home + ) + } + + Spacer() + Button(action: {selectedTab = .doodleRun}){ + ButtonView( + imageName: "run-30", + title: "두들런", + isSelected: selectedTab == .doodleRun + ) + } + + Spacer() + Button(action: {selectedTab = .market}){ + ButtonView( + imageName: "store-30", + title: "마켓", + isSelected: selectedTab == .market + ) + } + + Spacer() + Button(action: {selectedTab = .myPage}){ + ButtonView( + imageName: "mypage-30", + title: "마이", + isSelected: selectedTab == .myPage + ) + } + } + .frame(width: 313, height: 51) + .padding(.vertical, 15) + } + .edgesIgnoringSafeArea(.bottom) + } +} + + +struct ButtonView: View { + let imageName: String + let title: String + let isSelected: Bool + + var body: some View{ + VStack{ + Image(imageName) + .renderingMode(.template) + .foregroundStyle(isSelected ? Color.primary200 : Color.neutral500) + .padding(.vertical, 7) + Text(title) + .font(.custom("SUIT", size: 10)) + .foregroundStyle(isSelected ? Color.primary200 : Color.neutral600) + } + .offset(y: -15) + } +} + +#Preview { + TabbarView() +} + diff --git a/dorundorun/dorundorun/Presentaion/doodleRunView.swift b/dorundorun/dorundorun/Presentaion/doodleRunView.swift new file mode 100644 index 0000000..b58cf69 --- /dev/null +++ b/dorundorun/dorundorun/Presentaion/doodleRunView.swift @@ -0,0 +1,19 @@ +// +// doodleRunView.swift +// dorundorun +// +// Created by 박서현 on 1/24/25. +// + +import SwiftUI + +struct doodleRunView: View { + var body: some View { + Text("두들런 화면") + .frame(maxWidth: .infinity, maxHeight: .infinity) + } +} + +#Preview { + doodleRunView() +} diff --git a/dorundorun/dorundorun/Presentaion/homeView.swift b/dorundorun/dorundorun/Presentaion/homeView.swift new file mode 100644 index 0000000..2241bca --- /dev/null +++ b/dorundorun/dorundorun/Presentaion/homeView.swift @@ -0,0 +1,19 @@ +// +// homeView.swift +// dorundorun +// +// Created by 박서현 on 1/24/25. +// + +import SwiftUI + +struct homeView: View { + var body: some View { + Text("홈 화면") + .frame(maxWidth: .infinity, maxHeight: .infinity) + } +} + +#Preview { + homeView() +} diff --git a/dorundorun/dorundorun/Presentaion/marketView.swift b/dorundorun/dorundorun/Presentaion/marketView.swift new file mode 100644 index 0000000..c8ffe70 --- /dev/null +++ b/dorundorun/dorundorun/Presentaion/marketView.swift @@ -0,0 +1,19 @@ +// +// marketView.swift +// dorundorun +// +// Created by 박서현 on 1/24/25. +// + +import SwiftUI + +struct marketView: View { + var body: some View { + Text("마켓 화면") + .frame(maxWidth: .infinity, maxHeight: .infinity) + } +} + +#Preview { + marketView() +} diff --git a/dorundorun/dorundorun/Presentaion/myPageView.swift b/dorundorun/dorundorun/Presentaion/myPageView.swift new file mode 100644 index 0000000..9367b51 --- /dev/null +++ b/dorundorun/dorundorun/Presentaion/myPageView.swift @@ -0,0 +1,19 @@ +// +// myPageView.swift +// dorundorun +// +// Created by 박서현 on 1/24/25. +// + +import SwiftUI + +struct myPageView: View { + var body: some View { + Text("마이페이지 화면") + .frame(maxWidth: .infinity, maxHeight: .infinity) + } +} + +#Preview { + myPageView() +} From 47dcbcf799c1fc657bbccf23b8141adb963df41a Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Sat, 25 Jan 2025 12:04:18 +0900 Subject: [PATCH 11/21] =?UTF-8?q?Fix:=20Assets=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets.xcassets/AppIcon.appiconset/Contents.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dorundorun/dorundorun/DesignSystem/Assets.xcassets/AppIcon.appiconset/Contents.json b/dorundorun/dorundorun/DesignSystem/Assets.xcassets/AppIcon.appiconset/Contents.json index 2305880..60874cf 100644 --- a/dorundorun/dorundorun/DesignSystem/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/dorundorun/dorundorun/DesignSystem/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -29,7 +29,6 @@ } ], "info" : { - "author" : "xcode", - "version" : 1 + } } From 5bf2158d50b420ca6a50ff642bf6bb6d3e5c3f7d Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Sat, 25 Jan 2025 12:04:38 +0900 Subject: [PATCH 12/21] =?UTF-8?q?Fix:=20project.pbxproj=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dorundorun/dorundorun.xcodeproj/project.pbxproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dorundorun/dorundorun.xcodeproj/project.pbxproj b/dorundorun/dorundorun.xcodeproj/project.pbxproj index ef376dd..8ba7bf3 100644 --- a/dorundorun/dorundorun.xcodeproj/project.pbxproj +++ b/dorundorun/dorundorun.xcodeproj/project.pbxproj @@ -88,11 +88,6 @@ children = ( F690F5DE8513265C9CE21416 /* dorundorunApp.swift */, 9B54D871BBDE0FE1796A1460 /* Info.plist */, - C3F5DB1F2D4393E800605A18 /* TabbarView.swift */, - C3F5DB232D43948800605A18 /* doodleRunView.swift */, - C3F5DB212D43945700605A18 /* homeView.swift */, - C3F5DB252D43949C00605A18 /* marketView.swift */, - C3F5DB272D4394AF00605A18 /* myPageView.swift */, ); path = App; sourceTree = ""; @@ -119,6 +114,11 @@ 5DEF0DB554957D6F41DAB792 /* Presentaion */ = { isa = PBXGroup; children = ( + C3F5DB1F2D4393E800605A18 /* TabbarView.swift */, + C3F5DB232D43948800605A18 /* doodleRunView.swift */, + C3F5DB212D43945700605A18 /* homeView.swift */, + C3F5DB252D43949C00605A18 /* marketView.swift */, + C3F5DB272D4394AF00605A18 /* myPageView.swift */, 4217CBD1D1E22A7F6731360F /* ContentView.swift */, ); path = Presentaion; From 095b8eaff910f96f21be880f1defc61578efd807 Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Sat, 25 Jan 2025 12:06:26 +0900 Subject: [PATCH 13/21] =?UTF-8?q?Chore:=20=EB=9D=84=EC=96=B4=EC=93=B0?= =?UTF-8?q?=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dorundorun/dorundorun/Presentaion/TabbarView.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dorundorun/dorundorun/Presentaion/TabbarView.swift b/dorundorun/dorundorun/Presentaion/TabbarView.swift index 8b67739..054c5ba 100644 --- a/dorundorun/dorundorun/Presentaion/TabbarView.swift +++ b/dorundorun/dorundorun/Presentaion/TabbarView.swift @@ -19,7 +19,7 @@ struct TabbarView: View { @State var seletedTab: Tab = .home var body: some View { - VStack(spacing : 0){ + VStack(spacing: 0){ switch seletedTab { case .home: homeView() @@ -42,7 +42,7 @@ struct CustomTabView: View { @Binding var selectedTab: Tab var body: some View{ - VStack(spacing : 0){ + VStack(spacing: 0){ Rectangle() .frame(height: 3) .foregroundStyle(Color("nutral100")) From 463bb0fa394133857ad3c107419bc7cbf02a19e3 Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Sun, 26 Jan 2025 01:01:49 +0900 Subject: [PATCH 14/21] =?UTF-8?q?Fix:=20Assets=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DesignSystem 파일 아래로 이동했습니다! --- .../Fonts}/Assets.xcassets/AccentColor.colorset/Contents.json | 0 .../Fonts}/Assets.xcassets/AppIcon.appiconset/Contents.json | 0 .../{ => DesignSystem/Fonts}/Assets.xcassets/Contents.json | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename dorundorun/dorundorun/{ => DesignSystem/Fonts}/Assets.xcassets/AccentColor.colorset/Contents.json (100%) rename dorundorun/dorundorun/{ => DesignSystem/Fonts}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename dorundorun/dorundorun/{ => DesignSystem/Fonts}/Assets.xcassets/Contents.json (100%) diff --git a/dorundorun/dorundorun/Assets.xcassets/AccentColor.colorset/Contents.json b/dorundorun/dorundorun/DesignSystem/Fonts/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from dorundorun/dorundorun/Assets.xcassets/AccentColor.colorset/Contents.json rename to dorundorun/dorundorun/DesignSystem/Fonts/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/dorundorun/dorundorun/Assets.xcassets/AppIcon.appiconset/Contents.json b/dorundorun/dorundorun/DesignSystem/Fonts/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from dorundorun/dorundorun/Assets.xcassets/AppIcon.appiconset/Contents.json rename to dorundorun/dorundorun/DesignSystem/Fonts/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/dorundorun/dorundorun/Assets.xcassets/Contents.json b/dorundorun/dorundorun/DesignSystem/Fonts/Assets.xcassets/Contents.json similarity index 100% rename from dorundorun/dorundorun/Assets.xcassets/Contents.json rename to dorundorun/dorundorun/DesignSystem/Fonts/Assets.xcassets/Contents.json From a22738bb552ef4f1cb1e59d6803a027d8a76f62b Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Sun, 26 Jan 2025 01:02:51 +0900 Subject: [PATCH 15/21] =?UTF-8?q?Fix:=20=ED=8C=8C=EC=9D=BC=20=EB=B6=84?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TabbarView에서 ButtonView, CustomTabView 분할했습니다 --- .../dorundorun.xcodeproj/project.pbxproj | 18 +++-- .../dorundorun/Presentaion/ButtonView.swift | 31 ++++++++ .../Presentaion/CustomTabView.swift | 65 ++++++++++++++++ .../dorundorun/Presentaion/TabbarView.swift | 74 ------------------- 4 files changed, 108 insertions(+), 80 deletions(-) create mode 100644 dorundorun/dorundorun/Presentaion/ButtonView.swift create mode 100644 dorundorun/dorundorun/Presentaion/CustomTabView.swift diff --git a/dorundorun/dorundorun.xcodeproj/project.pbxproj b/dorundorun/dorundorun.xcodeproj/project.pbxproj index 8ba7bf3..0869356 100644 --- a/dorundorun/dorundorun.xcodeproj/project.pbxproj +++ b/dorundorun/dorundorun.xcodeproj/project.pbxproj @@ -16,8 +16,9 @@ 7ED3F8F0C2A527633323714E /* Pretendard-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 668F716FF175616D4B8C1EA9 /* Pretendard-SemiBold.otf */; }; 863036F891814ADD79543A39 /* Pretendard-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = A331EFDB52072D295754B1F2 /* Pretendard-Medium.otf */; }; AC4B7064FF253A4AE4FB9E93 /* Pretendard-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 3FB00500D04150D925C0A6F4 /* Pretendard-Regular.otf */; }; - C3406EE72D3E25B900953DB7 /* (null) in Sources */ = {isa = PBXBuildFile; }; - C3606C472D43D83A00A075A1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C3606C462D43D83A00A075A1 /* Assets.xcassets */; }; + C3606C4F2D453ABE00A075A1 /* CustomTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3606C4E2D453ABE00A075A1 /* CustomTabView.swift */; }; + C3606C512D453AF500A075A1 /* ButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3606C502D453AF500A075A1 /* ButtonView.swift */; }; + C3606C532D453E4300A075A1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C3606C522D453E4300A075A1 /* Assets.xcassets */; }; C3F5DB202D4393E800605A18 /* TabbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB1F2D4393E800605A18 /* TabbarView.swift */; }; C3F5DB222D43945700605A18 /* homeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB212D43945700605A18 /* homeView.swift */; }; C3F5DB242D43948800605A18 /* doodleRunView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB232D43948800605A18 /* doodleRunView.swift */; }; @@ -48,7 +49,9 @@ 9B54D871BBDE0FE1796A1460 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; A331EFDB52072D295754B1F2 /* Pretendard-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Medium.otf"; sourceTree = ""; }; B4E4FD66878BCDD0D1E282B2 /* Pretendard-Black.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Black.otf"; sourceTree = ""; }; - C3606C462D43D83A00A075A1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + C3606C4E2D453ABE00A075A1 /* CustomTabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTabView.swift; sourceTree = ""; }; + C3606C502D453AF500A075A1 /* ButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonView.swift; sourceTree = ""; }; + C3606C522D453E4300A075A1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; C3F5DB1F2D4393E800605A18 /* TabbarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabbarView.swift; sourceTree = ""; }; C3F5DB212D43945700605A18 /* homeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = homeView.swift; sourceTree = ""; }; C3F5DB232D43948800605A18 /* doodleRunView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = doodleRunView.swift; sourceTree = ""; }; @@ -75,7 +78,6 @@ children = ( E27BA6E42D3FB488007B54B0 /* Extension */, 55F5D06E8DF9721BB671A5DF /* DesignSystem */, - C3606C462D43D83A00A075A1 /* Assets.xcassets */, 39F80B4D13380475D8FB93FD /* App */, 5DEF0DB554957D6F41DAB792 /* Presentaion */, 48E1EFB47D466708BE777860 /* Preview Content */, @@ -119,6 +121,8 @@ C3F5DB212D43945700605A18 /* homeView.swift */, C3F5DB252D43949C00605A18 /* marketView.swift */, C3F5DB272D4394AF00605A18 /* myPageView.swift */, + C3606C4E2D453ABE00A075A1 /* CustomTabView.swift */, + C3606C502D453AF500A075A1 /* ButtonView.swift */, 4217CBD1D1E22A7F6731360F /* ContentView.swift */, ); path = Presentaion; @@ -129,6 +133,7 @@ children = ( E27BA6DC2D3FB0B5007B54B0 /* Jalnan2 */, E27BA6DB2D3FB087007B54B0 /* Pretendard */, + C3606C522D453E4300A075A1 /* Assets.xcassets */, ); path = Fonts; sourceTree = ""; @@ -237,8 +242,8 @@ 7793A74E729409FA1E0C3404 /* Colors.xcassets in Resources */, E0551A8EFED2ABF50016CEE5 /* Icons.xcassets in Resources */, 593EA6E55F6150BBEB46BC7C /* Pretendard-Black.otf in Resources */, - C3606C472D43D83A00A075A1 /* Assets.xcassets in Resources */, 387D3C3B3CC2824201AD8F93 /* Pretendard-Bold.otf in Resources */, + C3606C532D453E4300A075A1 /* Assets.xcassets in Resources */, E7BD6D2B10F0319465ECFA40 /* Pretendard-ExtraBold.otf in Resources */, 7804B7E78ABADB9B8E808E19 /* Pretendard-ExtraLight.otf in Resources */, 48967D1F4ECBB1551E7590D8 /* Pretendard-Light.otf in Resources */, @@ -260,12 +265,13 @@ files = ( E27BA6E62D3FB496007B54B0 /* Color+Extension.swift in Sources */, E27BA6E92D3FB560007B54B0 /* RunningButton.swift in Sources */, - C3406EE72D3E25B900953DB7 /* (null) in Sources */, + C3606C512D453AF500A075A1 /* ButtonView.swift in Sources */, C3F5DB262D43949C00605A18 /* marketView.swift in Sources */, F4D2913937ADB672F9E299A4 /* ContentView.swift in Sources */, C3F5DB242D43948800605A18 /* doodleRunView.swift in Sources */, C3F5DB222D43945700605A18 /* homeView.swift in Sources */, C3F5DB282D4394AF00605A18 /* myPageView.swift in Sources */, + C3606C4F2D453ABE00A075A1 /* CustomTabView.swift in Sources */, C3F5DB202D4393E800605A18 /* TabbarView.swift in Sources */, 179A084F2A528877C884F95C /* dorundorunApp.swift in Sources */, ); diff --git a/dorundorun/dorundorun/Presentaion/ButtonView.swift b/dorundorun/dorundorun/Presentaion/ButtonView.swift new file mode 100644 index 0000000..4ee57d1 --- /dev/null +++ b/dorundorun/dorundorun/Presentaion/ButtonView.swift @@ -0,0 +1,31 @@ +// +// ButtonView.swift +// dorundorun +// +// Created by 박서현 on 1/26/25. +// + +import SwiftUI + +struct ButtonView: View { + let imageName: String + let title: String + let isSelected: Bool + + var body: some View{ + VStack{ + Image(imageName) + .renderingMode(.template) + .foregroundStyle(isSelected ? Color.primary200 : Color.neutral500) + .padding(.vertical, 7) + Text(title) + .font(.custom("SUIT", size: 10)) + .foregroundStyle(isSelected ? Color.primary200 : Color.neutral600) + } + .offset(y: -15) + } +} + +#Preview { + ButtonView(imageName: "home-30", title: "홈", isSelected: true) +} diff --git a/dorundorun/dorundorun/Presentaion/CustomTabView.swift b/dorundorun/dorundorun/Presentaion/CustomTabView.swift new file mode 100644 index 0000000..ba24a4c --- /dev/null +++ b/dorundorun/dorundorun/Presentaion/CustomTabView.swift @@ -0,0 +1,65 @@ +// +// CustonTabView.swift +// dorundorun +// +// Created by 박서현 on 1/26/25. +// + +import SwiftUI + +struct CustomTabView: View { + @Binding var selectedTab: Tab + + var body: some View{ + VStack(spacing: 0){ + Rectangle() + .frame(height: 3) + .foregroundStyle(Color.neutral100) + + Spacer() + HStack{ + Button(action: {selectedTab = .home}){ + ButtonView( + imageName: "home-30", + title: "홈", + isSelected: selectedTab == .home + ) + } + + Spacer() + Button(action: {selectedTab = .doodleRun}){ + ButtonView( + imageName: "run-30", + title: "두들런", + isSelected: selectedTab == .doodleRun + ) + } + + Spacer() + Button(action: {selectedTab = .market}){ + ButtonView( + imageName: "store-30", + title: "마켓", + isSelected: selectedTab == .market + ) + } + + Spacer() + Button(action: {selectedTab = .myPage}){ + ButtonView( + imageName: "mypage-30", + title: "마이", + isSelected: selectedTab == .myPage + ) + } + } + .frame(width: 313, height: 51) + .padding(.vertical, 15) + } + .edgesIgnoringSafeArea(.bottom) + } +} + +#Preview { + CustomTabView(selectedTab: .constant(.home)) +} diff --git a/dorundorun/dorundorun/Presentaion/TabbarView.swift b/dorundorun/dorundorun/Presentaion/TabbarView.swift index 054c5ba..548ec6f 100644 --- a/dorundorun/dorundorun/Presentaion/TabbarView.swift +++ b/dorundorun/dorundorun/Presentaion/TabbarView.swift @@ -38,80 +38,6 @@ struct TabbarView: View { } } -struct CustomTabView: View { - @Binding var selectedTab: Tab - - var body: some View{ - VStack(spacing: 0){ - Rectangle() - .frame(height: 3) - .foregroundStyle(Color("nutral100")) - - Spacer() - HStack{ - Button(action: {selectedTab = .home}){ - ButtonView( - imageName: "home-30", - title: "홈", - isSelected: selectedTab == .home - ) - } - - Spacer() - Button(action: {selectedTab = .doodleRun}){ - ButtonView( - imageName: "run-30", - title: "두들런", - isSelected: selectedTab == .doodleRun - ) - } - - Spacer() - Button(action: {selectedTab = .market}){ - ButtonView( - imageName: "store-30", - title: "마켓", - isSelected: selectedTab == .market - ) - } - - Spacer() - Button(action: {selectedTab = .myPage}){ - ButtonView( - imageName: "mypage-30", - title: "마이", - isSelected: selectedTab == .myPage - ) - } - } - .frame(width: 313, height: 51) - .padding(.vertical, 15) - } - .edgesIgnoringSafeArea(.bottom) - } -} - - -struct ButtonView: View { - let imageName: String - let title: String - let isSelected: Bool - - var body: some View{ - VStack{ - Image(imageName) - .renderingMode(.template) - .foregroundStyle(isSelected ? Color.primary200 : Color.neutral500) - .padding(.vertical, 7) - Text(title) - .font(.custom("SUIT", size: 10)) - .foregroundStyle(isSelected ? Color.primary200 : Color.neutral600) - } - .offset(y: -15) - } -} - #Preview { TabbarView() } - From 66a1de726cf3bfd9b2f8dd2599f23ada34e4e252 Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Sun, 26 Jan 2025 13:33:34 +0900 Subject: [PATCH 16/21] =?UTF-8?q?Fix:=20Assets,=20Assets2=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Assets파일을 Fonts에서 빼오는 과정에서 Assets2파일이 생겨서 해당 부분 수정했습니다! --- .../AccentColor.colorset/Contents.json | 11 ------ .../AppIcon.appiconset/Contents.json | 35 ------------------- .../Fonts/Assets.xcassets/Contents.json | 6 ---- 3 files changed, 52 deletions(-) delete mode 100644 dorundorun/dorundorun/DesignSystem/Fonts/Assets.xcassets/AccentColor.colorset/Contents.json delete mode 100644 dorundorun/dorundorun/DesignSystem/Fonts/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 dorundorun/dorundorun/DesignSystem/Fonts/Assets.xcassets/Contents.json diff --git a/dorundorun/dorundorun/DesignSystem/Fonts/Assets.xcassets/AccentColor.colorset/Contents.json b/dorundorun/dorundorun/DesignSystem/Fonts/Assets.xcassets/AccentColor.colorset/Contents.json deleted file mode 100644 index eb87897..0000000 --- a/dorundorun/dorundorun/DesignSystem/Fonts/Assets.xcassets/AccentColor.colorset/Contents.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "colors" : [ - { - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/dorundorun/dorundorun/DesignSystem/Fonts/Assets.xcassets/AppIcon.appiconset/Contents.json b/dorundorun/dorundorun/DesignSystem/Fonts/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 2305880..0000000 --- a/dorundorun/dorundorun/DesignSystem/Fonts/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "tinted" - } - ], - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/dorundorun/dorundorun/DesignSystem/Fonts/Assets.xcassets/Contents.json b/dorundorun/dorundorun/DesignSystem/Fonts/Assets.xcassets/Contents.json deleted file mode 100644 index 73c0059..0000000 --- a/dorundorun/dorundorun/DesignSystem/Fonts/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} From 89933e9bd0cc6727e0595817fbcee59d7cd2343a Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Sun, 26 Jan 2025 13:34:15 +0900 Subject: [PATCH 17/21] =?UTF-8?q?Fix:=20frame,=20padding=EA=B0=92=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dorundorun/dorundorun.xcodeproj/project.pbxproj | 8 ++++---- dorundorun/dorundorun/Presentaion/ButtonView.swift | 7 +++---- dorundorun/dorundorun/Presentaion/CustomTabView.swift | 6 +++--- dorundorun/dorundorun/Presentaion/TabbarView.swift | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dorundorun/dorundorun.xcodeproj/project.pbxproj b/dorundorun/dorundorun.xcodeproj/project.pbxproj index 0869356..c2930bd 100644 --- a/dorundorun/dorundorun.xcodeproj/project.pbxproj +++ b/dorundorun/dorundorun.xcodeproj/project.pbxproj @@ -18,7 +18,7 @@ AC4B7064FF253A4AE4FB9E93 /* Pretendard-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 3FB00500D04150D925C0A6F4 /* Pretendard-Regular.otf */; }; C3606C4F2D453ABE00A075A1 /* CustomTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3606C4E2D453ABE00A075A1 /* CustomTabView.swift */; }; C3606C512D453AF500A075A1 /* ButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3606C502D453AF500A075A1 /* ButtonView.swift */; }; - C3606C532D453E4300A075A1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C3606C522D453E4300A075A1 /* Assets.xcassets */; }; + C3606C552D45EEE700A075A1 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C3606C542D45EEE700A075A1 /* Assets.xcassets */; }; C3F5DB202D4393E800605A18 /* TabbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB1F2D4393E800605A18 /* TabbarView.swift */; }; C3F5DB222D43945700605A18 /* homeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB212D43945700605A18 /* homeView.swift */; }; C3F5DB242D43948800605A18 /* doodleRunView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F5DB232D43948800605A18 /* doodleRunView.swift */; }; @@ -51,7 +51,7 @@ B4E4FD66878BCDD0D1E282B2 /* Pretendard-Black.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Black.otf"; sourceTree = ""; }; C3606C4E2D453ABE00A075A1 /* CustomTabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTabView.swift; sourceTree = ""; }; C3606C502D453AF500A075A1 /* ButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonView.swift; sourceTree = ""; }; - C3606C522D453E4300A075A1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + C3606C542D45EEE700A075A1 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; C3F5DB1F2D4393E800605A18 /* TabbarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabbarView.swift; sourceTree = ""; }; C3F5DB212D43945700605A18 /* homeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = homeView.swift; sourceTree = ""; }; C3F5DB232D43948800605A18 /* doodleRunView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = doodleRunView.swift; sourceTree = ""; }; @@ -105,6 +105,7 @@ 55F5D06E8DF9721BB671A5DF /* DesignSystem */ = { isa = PBXGroup; children = ( + C3606C542D45EEE700A075A1 /* Assets.xcassets */, E27BA6E82D3FB560007B54B0 /* Components */, 07E9E0E7584F7ACD69B84B64 /* Colors.xcassets */, 1092B57F175DF2EC0F756430 /* Icons.xcassets */, @@ -133,7 +134,6 @@ children = ( E27BA6DC2D3FB0B5007B54B0 /* Jalnan2 */, E27BA6DB2D3FB087007B54B0 /* Pretendard */, - C3606C522D453E4300A075A1 /* Assets.xcassets */, ); path = Fonts; sourceTree = ""; @@ -243,7 +243,7 @@ E0551A8EFED2ABF50016CEE5 /* Icons.xcassets in Resources */, 593EA6E55F6150BBEB46BC7C /* Pretendard-Black.otf in Resources */, 387D3C3B3CC2824201AD8F93 /* Pretendard-Bold.otf in Resources */, - C3606C532D453E4300A075A1 /* Assets.xcassets in Resources */, + C3606C552D45EEE700A075A1 /* Assets.xcassets in Resources */, E7BD6D2B10F0319465ECFA40 /* Pretendard-ExtraBold.otf in Resources */, 7804B7E78ABADB9B8E808E19 /* Pretendard-ExtraLight.otf in Resources */, 48967D1F4ECBB1551E7590D8 /* Pretendard-Light.otf in Resources */, diff --git a/dorundorun/dorundorun/Presentaion/ButtonView.swift b/dorundorun/dorundorun/Presentaion/ButtonView.swift index 4ee57d1..f40b0e7 100644 --- a/dorundorun/dorundorun/Presentaion/ButtonView.swift +++ b/dorundorun/dorundorun/Presentaion/ButtonView.swift @@ -12,17 +12,16 @@ struct ButtonView: View { let title: String let isSelected: Bool - var body: some View{ - VStack{ + var body: some View { + VStack { Image(imageName) .renderingMode(.template) .foregroundStyle(isSelected ? Color.primary200 : Color.neutral500) - .padding(.vertical, 7) + .padding(.bottom, 9) Text(title) .font(.custom("SUIT", size: 10)) .foregroundStyle(isSelected ? Color.primary200 : Color.neutral600) } - .offset(y: -15) } } diff --git a/dorundorun/dorundorun/Presentaion/CustomTabView.swift b/dorundorun/dorundorun/Presentaion/CustomTabView.swift index ba24a4c..8d71e50 100644 --- a/dorundorun/dorundorun/Presentaion/CustomTabView.swift +++ b/dorundorun/dorundorun/Presentaion/CustomTabView.swift @@ -10,10 +10,10 @@ import SwiftUI struct CustomTabView: View { @Binding var selectedTab: Tab - var body: some View{ + var body: some View { VStack(spacing: 0){ Rectangle() - .frame(height: 3) + .frame(height: 4) .foregroundStyle(Color.neutral100) Spacer() @@ -53,7 +53,7 @@ struct CustomTabView: View { ) } } - .frame(width: 313, height: 51) + .frame(width: 300, height: 55) .padding(.vertical, 15) } .edgesIgnoringSafeArea(.bottom) diff --git a/dorundorun/dorundorun/Presentaion/TabbarView.swift b/dorundorun/dorundorun/Presentaion/TabbarView.swift index 548ec6f..719cf8a 100644 --- a/dorundorun/dorundorun/Presentaion/TabbarView.swift +++ b/dorundorun/dorundorun/Presentaion/TabbarView.swift @@ -31,7 +31,7 @@ struct TabbarView: View { myPageView() } CustomTabView(selectedTab: $seletedTab) - .frame(height: 99) + .frame(width: 393, height: 92) .background(Color.neutralWhite) } .edgesIgnoringSafeArea(.bottom) From 434eaf5289db7dd7618b9874354245adef55b902 Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Sun, 26 Jan 2025 13:41:04 +0900 Subject: [PATCH 18/21] =?UTF-8?q?Fix:=20Text=20=EB=B0=91=EC=97=90=20paddin?= =?UTF-8?q?g=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dorundorun/dorundorun/Presentaion/ButtonView.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/dorundorun/dorundorun/Presentaion/ButtonView.swift b/dorundorun/dorundorun/Presentaion/ButtonView.swift index f40b0e7..242f35e 100644 --- a/dorundorun/dorundorun/Presentaion/ButtonView.swift +++ b/dorundorun/dorundorun/Presentaion/ButtonView.swift @@ -21,6 +21,7 @@ struct ButtonView: View { Text(title) .font(.custom("SUIT", size: 10)) .foregroundStyle(isSelected ? Color.primary200 : Color.neutral600) + .padding(.bottom, 22) } } } From ae1f2d59c63efe656212921fe41c3b8208deaad6 Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Sun, 26 Jan 2025 13:46:13 +0900 Subject: [PATCH 19/21] =?UTF-8?q?Fix:=20=EB=9D=84=EC=96=B4=EC=93=B0?= =?UTF-8?q?=EA=B8=B0=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 적용이 안 되어 있어서 재적용합니다... --- dorundorun/dorundorun/Presentaion/TabbarView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dorundorun/dorundorun/Presentaion/TabbarView.swift b/dorundorun/dorundorun/Presentaion/TabbarView.swift index 719cf8a..394c565 100644 --- a/dorundorun/dorundorun/Presentaion/TabbarView.swift +++ b/dorundorun/dorundorun/Presentaion/TabbarView.swift @@ -19,7 +19,7 @@ struct TabbarView: View { @State var seletedTab: Tab = .home var body: some View { - VStack(spacing: 0){ + VStack(spacing: 0) { switch seletedTab { case .home: homeView() From bf4333376ae5419b7e3865dacd1230acc34eb800 Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Sun, 26 Jan 2025 15:36:08 +0900 Subject: [PATCH 20/21] =?UTF-8?q?Fix:=20ButtonView=20=EC=A4=84=EB=B0=94?= =?UTF-8?q?=EA=BF=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dorundorun/dorundorun/Presentaion/ButtonView.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dorundorun/dorundorun/Presentaion/ButtonView.swift b/dorundorun/dorundorun/Presentaion/ButtonView.swift index 242f35e..14b5fab 100644 --- a/dorundorun/dorundorun/Presentaion/ButtonView.swift +++ b/dorundorun/dorundorun/Presentaion/ButtonView.swift @@ -27,5 +27,9 @@ struct ButtonView: View { } #Preview { - ButtonView(imageName: "home-30", title: "홈", isSelected: true) + ButtonView( + imageName: "home-30", + title: "홈", + isSelected: true + ) } From 631cee7464125279166f012778ff4b31e0833f33 Mon Sep 17 00:00:00 2001 From: cinnamonfor6214 Date: Sun, 26 Jan 2025 15:36:27 +0900 Subject: [PATCH 21/21] =?UTF-8?q?FIx:=20width,=20height=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dorundorun/dorundorun/Presentaion/CustomTabView.swift | 1 + dorundorun/dorundorun/Presentaion/TabbarView.swift | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dorundorun/dorundorun/Presentaion/CustomTabView.swift b/dorundorun/dorundorun/Presentaion/CustomTabView.swift index 8d71e50..664c1cc 100644 --- a/dorundorun/dorundorun/Presentaion/CustomTabView.swift +++ b/dorundorun/dorundorun/Presentaion/CustomTabView.swift @@ -56,6 +56,7 @@ struct CustomTabView: View { .frame(width: 300, height: 55) .padding(.vertical, 15) } + .frame(height: 92) .edgesIgnoringSafeArea(.bottom) } } diff --git a/dorundorun/dorundorun/Presentaion/TabbarView.swift b/dorundorun/dorundorun/Presentaion/TabbarView.swift index 394c565..be6f98c 100644 --- a/dorundorun/dorundorun/Presentaion/TabbarView.swift +++ b/dorundorun/dorundorun/Presentaion/TabbarView.swift @@ -31,7 +31,7 @@ struct TabbarView: View { myPageView() } CustomTabView(selectedTab: $seletedTab) - .frame(width: 393, height: 92) + .frame(maxWidth: .infinity) .background(Color.neutralWhite) } .edgesIgnoringSafeArea(.bottom)