diff --git a/App/Sources/DesignSystem/Extensions/View+MindWayBackButton.swift b/App/Sources/DesignSystem/Extensions/View+MindWayBackButton.swift index 422e1fd..94c66eb 100644 --- a/App/Sources/DesignSystem/Extensions/View+MindWayBackButton.swift +++ b/App/Sources/DesignSystem/Extensions/View+MindWayBackButton.swift @@ -21,7 +21,7 @@ struct MindWayBackButtonModifier: ViewModifier { willDismiss() dismiss() } label: { - MindWayAsset.Icons.chevronRight.swiftUIImage + MindWayAsset.Icons.chevronLeft.swiftUIImage .foregroundColor(.mindway(.black(.black))) } } diff --git a/App/Sources/Feature/GoalReadingFeature/GoalReadingView.swift b/App/Sources/Feature/GoalReadingFeature/GoalReadingView.swift index bdff944..ef49b96 100644 --- a/App/Sources/Feature/GoalReadingFeature/GoalReadingView.swift +++ b/App/Sources/Feature/GoalReadingFeature/GoalReadingView.swift @@ -8,39 +8,40 @@ struct GoalReadingView: View { var bookCount: [Int] = [0, 2, 2, 4, 1, 0, 0] var body: some View { - ZStack { - VStack(spacing: 20) { - ZStack { - RoundedRectangle(cornerRadius: 8) - .frame(height: 219) - .foregroundColor(.mindway(.white(.white))) - .shadow(color: .black.opacity(0.05), radius: 10, x: 0) - .padding(.horizontal, 24) - .padding(.top, 20) + NavigationView { + ZStack { + VStack(spacing: 20) { + ZStack { + RoundedRectangle(cornerRadius: 8) + .frame(height: 219) + .foregroundColor(.mindway(.white(.white))) + .shadow(color: .black.opacity(0.05), radius: 10, x: 0) + .padding(.horizontal, 24) + .padding(.top, 20) + + GoalReadingGraph( + bookCount: bookCount, + week: week + ) + } - GoalReadingGraph( - bookCount: bookCount, - week: week - ) - } - - ZStack { - RoundedRectangle(cornerRadius: 8) - .frame(height: 60) - .foregroundColor(.mindway(.white(.white))) - .shadow(color: .black.opacity(0.05), radius: 10, x: 0) - .padding(.horizontal, 24) + ZStack { + RoundedRectangle(cornerRadius: 8) + .frame(height: 60) + .foregroundColor(.mindway(.white(.white))) + .shadow(color: .black.opacity(0.05), radius: 10, x: 0) + .padding(.horizontal, 24) + + MindWayAsset.Icons.addMain.swiftUIImage + } - MindWayAsset.Icons.addMain.swiftUIImage - } - - ForEach(0..<2, id: \.self) { _ in - readingBookList() + ForEach(0..<2, id: \.self) { _ in + readingBookList() + } + + Spacer() } - - Spacer() } - .navigationTitle("목표 도서량") .toolbar { ToolbarItemGroup(placement: .navigationBarTrailing) { Button { @@ -49,12 +50,18 @@ struct GoalReadingView: View { MindWayAsset.Icons.addBlack.swiftUIImage } } + + ToolbarItemGroup(placement: .principal) { + Text("목표 도서량") + .mindWaySemiboldFont(.m2) + } } + .mindWayBackButton(dismiss: dismiss) } .mindWayBottomSheet(isShowing: $isShowingSettingPage) { SettingGoalReadingView(viewModel: GoalReadingViewModel()) } - .mindWayBackButton(dismiss: dismiss) + } @ViewBuilder diff --git a/App/Sources/Feature/MainFeature/Component/GoalReadingGraph.swift b/App/Sources/Feature/MainFeature/Component/GoalReadingGraph.swift index c8d4c12..1a277c1 100644 --- a/App/Sources/Feature/MainFeature/Component/GoalReadingGraph.swift +++ b/App/Sources/Feature/MainFeature/Component/GoalReadingGraph.swift @@ -40,7 +40,7 @@ struct GoalReadingGraph: View { .foregroundColor(.mindway(.gray(.g8))) Rectangle() - .frame(width: 16, height: CGFloat(count+1)*CGFloat(count+1)) + .frame(width: 16, height: CGFloat(count*3)) .foregroundColor(.mindway(.main(.main))) .cornerRadius(4, corners: [.topRight, .topLeft]) } diff --git a/XCConfig/MindWay/DEBUG.xcconfig b/XCConfig/MindWay/DEBUG.xcconfig deleted file mode 100644 index 28b2166..0000000 --- a/XCConfig/MindWay/DEBUG.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "../Shared.xcconfig" diff --git a/XCConfig/MindWay/RELEASE.xcconfig b/XCConfig/MindWay/RELEASE.xcconfig deleted file mode 100644 index 28b2166..0000000 --- a/XCConfig/MindWay/RELEASE.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "../Shared.xcconfig" diff --git a/XCConfig/Service/DEBUG.xcconfig b/XCConfig/Service/DEBUG.xcconfig deleted file mode 100644 index a9b3ab3..0000000 --- a/XCConfig/Service/DEBUG.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include "../Shared.xcconfig" -BASE_URL = https:/$()/port-0-mindway-v2-backend-2aat2clum8ienx.sel5.cloudtype.app diff --git a/XCConfig/Service/RELEASE.xcconfig b/XCConfig/Service/RELEASE.xcconfig deleted file mode 100644 index a9b3ab3..0000000 --- a/XCConfig/Service/RELEASE.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include "../Shared.xcconfig" -BASE_URL = https:/$()/port-0-mindway-v2-backend-2aat2clum8ienx.sel5.cloudtype.app diff --git a/XCConfig/ThirdPartyLib/DEBUG.xcconfig b/XCConfig/ThirdPartyLib/DEBUG.xcconfig deleted file mode 100644 index 28b2166..0000000 --- a/XCConfig/ThirdPartyLib/DEBUG.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "../Shared.xcconfig" diff --git a/XCConfig/ThirdPartyLib/RELEASE.xcconfig b/XCConfig/ThirdPartyLib/RELEASE.xcconfig deleted file mode 100644 index 28b2166..0000000 --- a/XCConfig/ThirdPartyLib/RELEASE.xcconfig +++ /dev/null @@ -1 +0,0 @@ -#include "../Shared.xcconfig"