Skip to content

Commit

Permalink
Merge pull request #467 from DeveloperAcademy-POSTECH/feature/464-con…
Browse files Browse the repository at this point in the history 
…solidate-readshortcutviews

[Feat] ReadShortcutView 뷰 합치기
  • Loading branch information
@jim4020key
jim4020key authored Jun 18, 2023
2 parents 4ac6a10 + 4ffaf80 commit ac1bb60
Show file tree
Hide file tree
Showing 10 changed files with 840 additions and 942 deletions.
32 changes: 4 additions & 28 deletions HappyAnding/HappyAnding.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
8792478D2918CE450040D5C3 /* UINavigationContoller+Gesture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8792478C2918CE450040D5C3 /* UINavigationContoller+Gesture.swift */; };
8792479B291BDF820040D5C3 /* SearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8792479A291BDF820040D5C3 /* SearchView.swift */; };
8795A170292AB945004B765F /* UIScreen+Size.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8795A16F292AB945004B765F /* UIScreen+Size.swift */; };
8795A172292ABFDE004B765F /* ReadShortcutVersionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8795A171292ABFDE004B765F /* ReadShortcutVersionView.swift */; };
8795A174292ACA50004B765F /* ReadShortcutCommentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8795A173292ACA50004B765F /* ReadShortcutCommentView.swift */; };
87CFD8492939187200F97B86 /* NicknameTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87CFD8482939187200F97B86 /* NicknameTextField.swift */; };
87DBFB062A2127C0000CC442 /* CheckVersionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87DBFB052A2127C0000CC442 /* CheckVersionView.swift */; };
87E606B0291062F900C3DA13 /* AppleAuthCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87E606AF291062F900C3DA13 /* AppleAuthCoordinator.swift */; };
Expand Down Expand Up @@ -74,8 +72,6 @@
87E99CEE29080D33009B691F /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87E99CED29080D33009B691F /* User.swift */; };
A04ACB062903D0B2004A85A6 /* MyShortcutCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A04ACB052903D0B2004A85A6 /* MyShortcutCardView.swift */; };
A04ACB082903DECC004A85A6 /* MyShortcutCardListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A04ACB072903DECC004A85A6 /* MyShortcutCardListView.swift */; };
A04ACB32290686AA004A85A6 /* ReadShortcutHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A04ACB31290686AA004A85A6 /* ReadShortcutHeaderView.swift */; };
A04ACB34290686C7004A85A6 /* ReadShortcutContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A04ACB33290686C7004A85A6 /* ReadShortcutContentView.swift */; };
A0DD085729276608008177BB /* URL+DeepLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0DD085629276608008177BB /* URL+DeepLink.swift */; };
A0F822AC2910B8F100AF4448 /* ShortcutsZipViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0F822AB2910B8F100AF4448 /* ShortcutsZipViewModel.swift */; };
A0F822B729164D2300AF4448 /* ListCategoryShortcutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0F822B629164D2300AF4448 /* ListCategoryShortcutView.swift */; };
Expand Down Expand Up @@ -210,8 +206,6 @@
8792478C2918CE450040D5C3 /* UINavigationContoller+Gesture.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UINavigationContoller+Gesture.swift"; sourceTree = "<group>"; };
8792479A291BDF820040D5C3 /* SearchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchView.swift; sourceTree = "<group>"; };
8795A16F292AB945004B765F /* UIScreen+Size.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIScreen+Size.swift"; sourceTree = "<group>"; };
8795A171292ABFDE004B765F /* ReadShortcutVersionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadShortcutVersionView.swift; sourceTree = "<group>"; };
8795A173292ACA50004B765F /* ReadShortcutCommentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadShortcutCommentView.swift; sourceTree = "<group>"; };
87CFD8482939187200F97B86 /* NicknameTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NicknameTextField.swift; sourceTree = "<group>"; };
87DBFB052A2127C0000CC442 /* CheckVersionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckVersionView.swift; sourceTree = "<group>"; };
87E606AD2910623C00C3DA13 /* HappyAnding.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = HappyAnding.entitlements; sourceTree = "<group>"; };
Expand Down Expand Up @@ -253,8 +247,6 @@
87E99CED29080D33009B691F /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
A04ACB052903D0B2004A85A6 /* MyShortcutCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyShortcutCardView.swift; sourceTree = "<group>"; };
A04ACB072903DECC004A85A6 /* MyShortcutCardListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyShortcutCardListView.swift; sourceTree = "<group>"; };
A04ACB31290686AA004A85A6 /* ReadShortcutHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadShortcutHeaderView.swift; sourceTree = "<group>"; };
A04ACB33290686C7004A85A6 /* ReadShortcutContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadShortcutContentView.swift; sourceTree = "<group>"; };
A0DD085629276608008177BB /* URL+DeepLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+DeepLink.swift"; sourceTree = "<group>"; };
A0F822AB2910B8F100AF4448 /* ShortcutsZipViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutsZipViewModel.swift; sourceTree = "<group>"; };
A0F822B629164D2300AF4448 /* ListCategoryShortcutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListCategoryShortcutView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -461,7 +453,7 @@
87E99CC52901457B009B691F /* Components */,
87E99C9B28FFF1F4009B691F /* ExploreShortcutViews */,
87E99C9728FFF1C0009B691F /* WriteShortcutViews */,
87E99C9A28FFF1E9009B691F /* ShortcutDetailViews */,
87E99C9A28FFF1E9009B691F /* ReadShortcutViews */,
87E99C9C28FFF1FE009B691F /* ExploreCurationViews */,
87E99C9928FFF1DE009B691F /* WriteCurationViews */,
87E99C9D28FFF207009B691F /* MyPageViews */,
Expand All @@ -484,14 +476,14 @@
path = WriteCurationViews;
sourceTree = "<group>";
};
87E99C9A28FFF1E9009B691F /* ShortcutDetailViews */ = {
87E99C9A28FFF1E9009B691F /* ReadShortcutViews */ = {
isa = PBXGroup;
children = (
A04ACB3029068688004A85A6 /* ReadShortcutView */,
87E99CAC28FFF261009B691F /* ReadShortcutView.swift */,
4DAD635D292AB61700ABF8C1 /* UpdateShortcutView.swift */,
4D3DBB952934E31A00DE8160 /* ShowProfileView.swift */,
);
path = ShortcutDetailViews;
path = ReadShortcutViews;
sourceTree = "<group>";
};
87E99C9B28FFF1F4009B691F /* ExploreShortcutViews */ = {
Expand Down Expand Up @@ -598,18 +590,6 @@
path = TabView;
sourceTree = "<group>";
};
A04ACB3029068688004A85A6 /* ReadShortcutView */ = {
isa = PBXGroup;
children = (
87E99CAC28FFF261009B691F /* ReadShortcutView.swift */,
A04ACB31290686AA004A85A6 /* ReadShortcutHeaderView.swift */,
A04ACB33290686C7004A85A6 /* ReadShortcutContentView.swift */,
8795A171292ABFDE004B765F /* ReadShortcutVersionView.swift */,
8795A173292ACA50004B765F /* ReadShortcutCommentView.swift */,
);
path = ReadShortcutView;
sourceTree = "<group>";
};
A0F822AA2910B8B900AF4448 /* ViewModel */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -871,7 +851,6 @@
F9AC2BB62935201C00165820 /* CheckUpdateVersion.swift in Sources */,
F9131B6B2922D38D00868A0E /* Keyword.swift in Sources */,
F94B432E2907088400987819 /* UserCurationListView.swift in Sources */,
A04ACB34290686C7004A85A6 /* ReadShortcutContentView.swift in Sources */,
A3FF0183291648A300384211 /* MailView.swift in Sources */,
A0F822AC2910B8F100AF4448 /* ShortcutsZipViewModel.swift in Sources */,
87276C382933F6AB00C92F4C /* CustomTextEditor.swift in Sources */,
Expand Down Expand Up @@ -907,7 +886,6 @@
F91A72C1299915C500CA135A /* MoreCaptionTextView.swift in Sources */,
4DAD635E292AB61700ABF8C1 /* UpdateShortcutView.swift in Sources */,
87E99C9F28FFF21B009B691F /* SettingView.swift in Sources */,
A04ACB32290686AA004A85A6 /* ReadShortcutHeaderView.swift in Sources */,
A34BF82829AF3D55009BC946 /* AnnouncementCell.swift in Sources */,
87E99CA928FFF24F009B691F /* ExploreShortcutView.swift in Sources */,
A04ACB082903DECC004A85A6 /* MyShortcutCardListView.swift in Sources */,
Expand All @@ -916,7 +894,6 @@
8792478D2918CE450040D5C3 /* UINavigationContoller+Gesture.swift in Sources */,
8786B33C29ABA588000B46A1 /* View+Gesture.swift in Sources */,
87E99CC7290145AD009B691F /* ShortcutCell.swift in Sources */,
8795A172292ABFDE004B765F /* ReadShortcutVersionView.swift in Sources */,
87E99CBB28FFF298009B691F /* IconModalView.swift in Sources */,
87E99C7028F94EA6009B691F /* ShortcutTabView.swift in Sources */,
F99569182901DC4D0060AAEF /* UIFont+Extension.swift in Sources */,
Expand All @@ -941,7 +918,6 @@
87E99CD32901465F009B691F /* ValidationCheckTextField.swift in Sources */,
87DBFB062A2127C0000CC442 /* CheckVersionView.swift in Sources */,
A3FF01882918581E00384211 /* LicenseView.swift in Sources */,
8795A174292ACA50004B765F /* ReadShortcutCommentView.swift in Sources */,
A3439AFB2939B0E80043E273 /* UserDefaults+Extension.swift in Sources */,
F96D45BB29804057000C2441 /* EnvironmentValues+Alerter.swift in Sources */,
87E99CB528FFF282009B691F /* WriteCurationInfoView.swift in Sources */,
Expand Down
10 changes: 10 additions & 0 deletions HappyAnding/HappyAnding/Extensions/View/View+Gesture.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,13 @@ extension View {
}

}

struct SizePreferenceKey: PreferenceKey {
typealias Value = CGSize
static var defaultValue: Value = .zero

static func reduce(value _: inout Value, nextValue: () -> Value) {
_ = nextValue()
}
}

Loading

0 comments on commit ac1bb60

Please sign in to comment.