From 66dc244cf00dd59f6abbe61be11a5b434cd1df18 Mon Sep 17 00:00:00 2001 From: Seyeon CHO <135544903+crownjoe@users.noreply.github.com> Date: Sun, 3 Nov 2024 14:45:10 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[FIX/#176]=20=EC=B5=9C=EA=B7=BC=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=EC=96=B4=20=EC=88=9C=EC=84=9C=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EB=B0=8F=20=EC=B4=88=EA=B8=B0=ED=99=94=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PLAT/PLAT.xcodeproj/project.pbxproj | 8 ++++---- .../xcshareddata/swiftpm/Package.resolved | 2 +- PLAT/PLAT/Domain/Path/PathModel/PathModel.swift | 4 ++++ .../Presentaion/TrackAppend/TrackAppendContentSheet.swift | 3 ++- .../Presentaion/TrackAppend/TrackAppendSearchSheet.swift | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/PLAT/PLAT.xcodeproj/project.pbxproj b/PLAT/PLAT.xcodeproj/project.pbxproj index 5f1a6085..0e93fee8 100644 --- a/PLAT/PLAT.xcodeproj/project.pbxproj +++ b/PLAT/PLAT.xcodeproj/project.pbxproj @@ -1317,7 +1317,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"PLAT/Preview Content\""; - DEVELOPMENT_TEAM = 9XG4S4XZWN; + DEVELOPMENT_TEAM = 4QMNM64P9Z; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = PLAT/App/Info.plist; @@ -1337,7 +1337,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0.0; - PRODUCT_BUNDLE_IDENTIFIER = com.letsplat.thinkyside; + PRODUCT_BUNDLE_IDENTIFIER = com.letsplat.crownjoe; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -1359,7 +1359,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"PLAT/Preview Content\""; - DEVELOPMENT_TEAM = 9XG4S4XZWN; + DEVELOPMENT_TEAM = 4QMNM64P9Z; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = PLAT/App/Info.plist; @@ -1379,7 +1379,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0.0; - PRODUCT_BUNDLE_IDENTIFIER = com.letsplat.thinkyside; + PRODUCT_BUNDLE_IDENTIFIER = com.letsplat.crownjoe; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; diff --git a/PLAT/PLAT.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/PLAT/PLAT.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index e8820c3b..a82596be 100644 --- a/PLAT/PLAT.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/PLAT/PLAT.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "cd7879009d043d76bd05c069f568f25d1fa92e65e5e99cc5cc44ff26a4a97d00", + "originHash" : "4431d53f035041d1ac18189c51e43b62ea787f5cc354f5d826ec182da55a6e47", "pins" : [ { "identity" : "kingfisher", diff --git a/PLAT/PLAT/Domain/Path/PathModel/PathModel.swift b/PLAT/PLAT/Domain/Path/PathModel/PathModel.swift index 9c08a32e..b75e0c56 100644 --- a/PLAT/PLAT/Domain/Path/PathModel/PathModel.swift +++ b/PLAT/PLAT/Domain/Path/PathModel/PathModel.swift @@ -47,4 +47,8 @@ final class PathModel: PathModelProtocol { func dismissFullScreenCover() { self.fullScreenCover = nil } + + func popSheet() { + sheetPath.removeLast() + } } diff --git a/PLAT/PLAT/Presentaion/TrackAppend/TrackAppendContentSheet.swift b/PLAT/PLAT/Presentaion/TrackAppend/TrackAppendContentSheet.swift index 6d4b875a..5393cbfa 100644 --- a/PLAT/PLAT/Presentaion/TrackAppend/TrackAppendContentSheet.swift +++ b/PLAT/PLAT/Presentaion/TrackAppend/TrackAppendContentSheet.swift @@ -68,8 +68,9 @@ struct TrackAppendContentSheet: View { location: currentLocation ) ) - + pathModel.dismissSheet() + pathModel.popSheet() } label: { RoundedRectangle(cornerRadius: 14) .foregroundStyle(.platPurple) diff --git a/PLAT/PLAT/Presentaion/TrackAppend/TrackAppendSearchSheet.swift b/PLAT/PLAT/Presentaion/TrackAppend/TrackAppendSearchSheet.swift index c63fd778..fec31a20 100644 --- a/PLAT/PLAT/Presentaion/TrackAppend/TrackAppendSearchSheet.swift +++ b/PLAT/PLAT/Presentaion/TrackAppend/TrackAppendSearchSheet.swift @@ -161,7 +161,7 @@ private struct TrackAppendRecentTerm: View { ScrollView(.horizontal, showsIndicators: false) { LazyHStack(spacing: 8) { - ForEach(Array(recentSearchTermList.enumerated()), id: \.offset) { index, term in + ForEach(Array(recentSearchTermList.enumerated()).reversed(), id: \.offset) { index, term in HStack(spacing: 8) { Button { searchTerm = term From dc34325f96a76aaa7e0bebb1303e5d073ce5c38a Mon Sep 17 00:00:00 2001 From: Seyeon CHO <135544903+crownjoe@users.noreply.github.com> Date: Sun, 3 Nov 2024 15:33:15 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[FIX/#176]=20=EA=B2=8C=EC=8B=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=B0=8C=EA=B7=B8=EB=9F=AC=EC=A7=90=20?= =?UTF-8?q?=EC=9D=B4=EC=8A=88=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrackAppend/TrackAppendContentSheet.swift | 31 ++++++++++++++----- .../TrackAppend/TrackAppendSearchSheet.swift | 3 ++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/PLAT/PLAT/Presentaion/TrackAppend/TrackAppendContentSheet.swift b/PLAT/PLAT/Presentaion/TrackAppend/TrackAppendContentSheet.swift index 5393cbfa..1f4185c1 100644 --- a/PLAT/PLAT/Presentaion/TrackAppend/TrackAppendContentSheet.swift +++ b/PLAT/PLAT/Presentaion/TrackAppend/TrackAppendContentSheet.swift @@ -232,16 +232,23 @@ struct TrackAppendContentAddSheet: View { state = .none } } label: { - Image(uiImage: image) - .resizable() + + RoundedRectangle(cornerRadius: 3) + .foregroundStyle(.gray9) .frame(width: 56, height: 56) + .aspectRatio(1, contentMode: .fill) + .overlay { + Image(uiImage: image) + .resizable() + .scaledToFill() + } .clipShape(RoundedRectangle(cornerRadius: 3)) .overlay(alignment: .topTrailing) { Image(systemName: "xmark") .resizable() .frame(width: 5, height: 5) .padding(.init(top: 2, leading: 0, bottom: 0, trailing: 2)) - .foregroundStyle(.gray7) + .foregroundStyle(.red) } } Spacer() @@ -259,9 +266,12 @@ struct TrackAppendContentAddSheet: View { .frame(height: 238) .background { if isTextEditorFocused { - RoundedRectangle(cornerRadius: 8).fill(.platBlack).stroke(.platPurple) + RoundedRectangle(cornerRadius: 8) + .fill(.platBlack) + .stroke(.platPurple) } else { - RoundedRectangle(cornerRadius: 8).fill(.gray9) + RoundedRectangle(cornerRadius: 8) + .fill(.gray9) } } .overlay(alignment: .topLeading) { @@ -309,9 +319,14 @@ struct TrackAppendContentAddSheet: View { selectedImage = nil state = .none } label: { - Image(uiImage: image) - .resizable() - .aspectRatio(1, contentMode: .fit) + RoundedRectangle(cornerRadius: 6) + .foregroundStyle(.gray9) + .aspectRatio(1, contentMode: .fill) + .overlay { + Image(uiImage: image) + .resizable() + .scaledToFill() + } .clipShape(RoundedRectangle(cornerRadius: 6)) .overlay(alignment: .topTrailing) { Image(systemName: "xmark") diff --git a/PLAT/PLAT/Presentaion/TrackAppend/TrackAppendSearchSheet.swift b/PLAT/PLAT/Presentaion/TrackAppend/TrackAppendSearchSheet.swift index fec31a20..8b417276 100644 --- a/PLAT/PLAT/Presentaion/TrackAppend/TrackAppendSearchSheet.swift +++ b/PLAT/PLAT/Presentaion/TrackAppend/TrackAppendSearchSheet.swift @@ -231,7 +231,10 @@ private struct TrackAppendMusicList: View { Spacer() Image(systemName: "plus.circle") + .font(.system(size: 24, weight: .light)) .foregroundStyle(.gray8) + .padding(.vertical, 16) + .padding(.horizontal, 4) .onTapGesture { trackUseCase.selectTrackAppendMusic(music: music.wrappedValue) pathModel.pushSheet(.trackAppendContent)