Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.2.0(4) #281

Merged
merged 10 commits into from
Dec 24, 2024
Merged

1.2.0(4) #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
711d4b4
Feat: 편지 삭제 모달 창 추가
uunwon Dec 22, 2024
f230bdb
Fix: 편지함 내 편지 리스트 하단 여백 추가
uunwon Dec 22, 2024
62e0d67
Merge branch 'Develop' of https://github.com/APP-iOS5th/FinalProject-…
uunwon Dec 23, 2024
4e9cf79
Fix: +탭 초기 유저에게만 보이기, 안내 문구 변경
the-hye Dec 23, 2024
7dd2267
Merge branch 'Develop' of https://github.com/APP-iOS5th/FinalProject-…
the-hye Dec 23, 2024
4d3fc1d
Fix: +탭 안내 문구 이미지로 변경
the-hye Dec 23, 2024
24a4501
Merge pull request #279 from APP-iOS5th/Fix/ImportLetterToMe
the-hye Dec 24, 2024
453b9ed
Merge branch 'Develop' of https://github.com/APP-iOS5th/FinalProject-…
uunwon Dec 24, 2024
22895f0
Fix: 이미지 사이즈 축소
uunwon Dec 24, 2024
9747ebf
Merge pull request #280 from APP-iOS5th/Refactor/LetterBoxView
the-hye Dec 24, 2024
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
10 changes: 5 additions & 5 deletions Kabinett.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
7F6CE9E62C6E28400074568E /* CameraView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F6CE9E52C6E28400074568E /* CameraView.swift */; };
7F78684C2C78B41A0083D204 /* ImagePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F78684B2C78B41A0083D204 /* ImagePickerView.swift */; };
7F7868562C7B14220083D204 /* HorizontalPadding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F7868552C7B14220083D204 /* HorizontalPadding.swift */; };
7F8B50A02CE612780048A07D /* OptionOverlayGuide.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F8B509F2CE612780048A07D /* OptionOverlayGuide.swift */; };
7F9890822C7EF5C30035CB0D /* CustomTabBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F9890812C7EF5C30035CB0D /* CustomTabBar.swift */; };
7FCAE2B12C73080000228FA7 /* ImagePreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FCAE2B02C73080000228FA7 /* ImagePreview.swift */; };
7FCAE2B82C730E1700228FA7 /* OverlappingImagesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FCAE2B72C730E1700228FA7 /* OverlappingImagesView.swift */; };
Expand Down Expand Up @@ -131,6 +130,7 @@
AFCFDFC32C7C3F2A00BEFFDF /* DefaultProfileUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83949C892C71BC0F0080D72C /* DefaultProfileUseCase.swift */; };
AFCFDFC42C7C3F2A00BEFFDF /* FirestoreLetterBoxManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA58F252C6AE33D00A7C569 /* FirestoreLetterBoxManager.swift */; };
AFDE7D2E2C75797A0019F2DE /* FirestorageLetterManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFDE7D2D2C75797A0019F2DE /* FirestorageLetterManager.swift */; };
AFE197A02D118277003597B9 /* OptionGuideView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFE1979F2D118277003597B9 /* OptionGuideView.swift */; };
E2E0DCD12CAED20800596DF7 /* LoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E0DCD02CAED20800596DF7 /* LoadingView.swift */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -233,7 +233,6 @@
7F6CE9E52C6E28400074568E /* CameraView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraView.swift; sourceTree = "<group>"; };
7F78684B2C78B41A0083D204 /* ImagePickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePickerView.swift; sourceTree = "<group>"; };
7F7868552C7B14220083D204 /* HorizontalPadding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HorizontalPadding.swift; sourceTree = "<group>"; };
7F8B509F2CE612780048A07D /* OptionOverlayGuide.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptionOverlayGuide.swift; sourceTree = "<group>"; };
7F9890812C7EF5C30035CB0D /* CustomTabBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTabBar.swift; sourceTree = "<group>"; };
7FCAE2B02C73080000228FA7 /* ImagePreview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePreview.swift; sourceTree = "<group>"; };
7FCAE2B72C730E1700228FA7 /* OverlappingImagesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverlappingImagesView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -275,6 +274,7 @@
AFA75B262D013F8900DA418F /* FirestoreLetterWriteManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirestoreLetterWriteManager.swift; sourceTree = "<group>"; };
AFB88B582C89410600E79F90 /* DefaultWriteLetterUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultWriteLetterUseCase.swift; sourceTree = "<group>"; };
AFDE7D2D2C75797A0019F2DE /* FirestorageLetterManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirestorageLetterManager.swift; sourceTree = "<group>"; };
AFE1979F2D118277003597B9 /* OptionGuideView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptionGuideView.swift; sourceTree = "<group>"; };
E2E0DCD02CAED20800596DF7 /* LoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingView.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -393,9 +393,9 @@
children = (
7F6CE9BF2C6B2FE90074568E /* CustomTabView.swift */,
7F9890812C7EF5C30035CB0D /* CustomTabBar.swift */,
7F6CE9C12C6B33DD0074568E /* OptionOverlay.swift */,
7F397C542C7DF20C00388645 /* ImportDialog.swift */,
7F8B509F2CE612780048A07D /* OptionOverlayGuide.swift */,
7F6CE9C12C6B33DD0074568E /* OptionOverlay.swift */,
AFE1979F2D118277003597B9 /* OptionGuideView.swift */,
);
path = CustomTabView;
sourceTree = "<group>";
Expand Down Expand Up @@ -981,6 +981,7 @@
7F7868562C7B14220083D204 /* HorizontalPadding.swift in Sources */,
8356843F2CE0A43600120EC8 /* DIContainer.swift in Sources */,
538150542C8AF04B007B1E5A /* Extension+LetterType.swift in Sources */,
AFE197A02D118277003597B9 /* OptionGuideView.swift in Sources */,
AF9B18F82C894B5900F3E446 /* DefaultImportLetterUseCase.swift in Sources */,
5358E0732CE16E630089C59F /* SearchBarViewModel.swift in Sources */,
83CA92AB2C8160CB00DFB68B /* Publisher+.swift in Sources */,
Expand Down Expand Up @@ -1060,7 +1061,6 @@
577C86732C8B8D5700EAB1BE /* Extension+View.swift in Sources */,
53A99EA72C8190B600896AAC /* SearchBarView.swift in Sources */,
577157012C75D73700E21162 /* Extension+UIApplication.swift in Sources */,
7F8B50A02CE612780048A07D /* OptionOverlayGuide.swift in Sources */,
83D9C8E52C830C7600EF2684 /* DefaultSignUpUseCase.swift in Sources */,
832C72672C71CF7B0071E8D0 /* SignUpUseCase.swift in Sources */,
04DEC0EB2C6C87B500D289EA /* AccountSettingsView.swift in Sources */,
Expand Down
12 changes: 12 additions & 0 deletions Kabinett/Assets.xcassets/LetterImportGuide.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "LetterImportGuide.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
19 changes: 19 additions & 0 deletions Kabinett/Assets.xcassets/LetterImportGuide.imageset/LetterImportGuide.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions Kabinett/Assets.xcassets/LetterWriteGuide.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "LetterWriteGuide.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Loading