Merge pull request Team-ShortcutsZip#527 from Team-ShortcutsZip/featu…

…re/523-SearchView [Feat] Team-ShortcutsZip#523 - SearchView UI 구현
JMM00 · Apr 20, 2024 · 9eaf790 · 9eaf790
2 parents 001928e + c09d62b
commit 9eaf790
Show file tree

Hide file tree

Showing 13 changed files with 559 additions and 133 deletions.
diff --git a/HappyAnding/HappyAnding.xcodeproj/project.pbxproj b/HappyAnding/HappyAnding.xcodeproj/project.pbxproj
@@ -179,6 +179,7 @@
 		F9DB8EBB293986E100516CE1 /* ShareExtensionViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F976E85029395B350088BBA1 /* ShareExtensionViewModel.swift */; };
 		F9DB8EBD293987BD00516CE1 /* ShareExtensionCustomTextEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9DB8EBC293987BD00516CE1 /* ShareExtensionCustomTextEditor.swift */; };
 		F9DB8ED3293B4C3200516CE1 /* ShareExtensionTagTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9DB8ED2293B4C3200516CE1 /* ShareExtensionTagTextField.swift */; };
+		F9E7073A2BC6933000319533 /* SearchViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9E707392BC6933000319533 /* SearchViewModel.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -359,6 +360,7 @@
 		F9DB8EB82939853D00516CE1 /* ShareExtensionValidationTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareExtensionValidationTextField.swift; sourceTree = "<group>"; };
 		F9DB8EBC293987BD00516CE1 /* ShareExtensionCustomTextEditor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareExtensionCustomTextEditor.swift; sourceTree = "<group>"; };
 		F9DB8ED2293B4C3200516CE1 /* ShareExtensionTagTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareExtensionTagTextField.swift; sourceTree = "<group>"; };
+		F9E707392BC6933000319533 /* SearchViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchViewModel.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -562,6 +564,7 @@
 				A34BF82929AFC308009BC946 /* FeatureViews */,
 				87E606AE291062D300C3DA13 /* SignInViews */,
 				8792479A291BDF820040D5C3 /* SearchView.swift */,
+				F9E707392BC6933000319533 /* SearchViewModel.swift */,
 				3D41EE07290A4C18008BE986 /* Launch Screen.storyboard */,
 				F9136EB5293612310034AAB2 /* ShortcutsZipView.swift */,
 			);
@@ -687,7 +690,6 @@
 				F91F09DC29AE012600E04FA0 /* ShortcutGrade.swift */,
 				872B5D3C2A2E0FF9008DCC57 /* CurationType.swift */,
 				A323D3C92AEE870700DDA716 /* SuggestionForm.swift */,
-				F980171D2BBC2A24004F2EA7 /* ExploreShortcutSectionType.swift */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -1039,6 +1041,7 @@
 				A323D3CA2AEE870700DDA716 /* SuggestionForm.swift in Sources */,
 				4DF15D752A4ECE1F0014F854 /* ListCategoryShortcutViewModel.swift in Sources */,
 				87E99CDB29042CCA009B691F /* Category.swift in Sources */,
+				F9E7073A2BC6933000319533 /* SearchViewModel.swift in Sources */,
 				876B4F6F299E3D91009672D9 /* NavigationRouter.swift in Sources */,
 				F98017202BBC2A6F004F2EA7 /* ExploreCell.swift in Sources */,
 				A04ACB062903D0B2004A85A6 /* MyShortcutCardView.swift in Sources */,
@@ -1340,7 +1343,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.happyanding.HappyAnding;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = ShortcutsZipProfile_Dev_20231113;
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = ShortcutsZipProfile_Dev_20240317;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -1383,7 +1386,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.happyanding.HappyAnding;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = ShortcutsZipProfile_Dev_20231113;
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = ShortcutsZipProfile_Dev_20240317;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -1398,14 +1401,16 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 7JPPWR5997;
+				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.happyanding.HappyAndingTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1418,14 +1423,16 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 7JPPWR5997;
+				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.happyanding.HappyAndingTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1437,13 +1444,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 7JPPWR5997;
+				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.happyanding.HappyAndingUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1455,13 +1464,15 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 7JPPWR5997;
+				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.happyanding.HappyAndingUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1492,7 +1503,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.happyanding.HappyAnding.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = ShortcutsZipShareExtProfile_Dev_20231113;
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = ShortcutsZipShareExtProfile_Dev_20240317;
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -1524,7 +1535,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.happyanding.HappyAnding.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = ShortcutsZipShareExtProfile_Dev_20231113;
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = ShortcutsZipShareExtProfile_Dev_20240317;
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;

diff --git a/HappyAnding/HappyAnding/Extensions/SCZ+Color.swift b/HappyAnding/HappyAnding/Extensions/SCZ+Color.swift
@@ -60,7 +60,6 @@ struct GradientType {
 }
 
 struct SCZColor {
-    static let defaultColor = Red().light.fillGradient()
     static let colors: [String: ColorProtocol] = [
         "Red": Red(),
         "Coral": Coral(),
@@ -71,6 +70,7 @@ struct SCZColor {
         "Teal": Teal(),
         "Cyan": Cyan(),
         "Blue": Blue(),
+        "Pink": Pink(),
         "Purple": Purple(),
         "LightPurple": Lavendar(),
         "Silver": Silver(),
@@ -565,7 +565,7 @@ extension SCZColor {
         )
     }
     struct CharcoalGray {
-        static let color: Color = Color(hexString: "404040")
+        static let color = Color(hexString: "404040")
         static let opacity88 = Color(hexString: "404040", opacity: 0.88)
         static let opacity64 = Color(hexString: "404040", opacity: 0.64)
         static let opacity48 = Color(hexString: "404040", opacity: 0.48)
@@ -574,4 +574,12 @@ extension SCZColor {
         static let opacity08 = Color(hexString: "404040", opacity: 0.08)
         static let opacity04 = Color(hexString: "404040", opacity: 0.04)
     }
+
+    struct SCZBlue {
+        static let strong = Color(hexString: "3366FF")
+        static let opacity88 = Color(hexString: "4B78FF")
+        static let opacity48 = Color(hexString: "9DB6FF")
+        static let opacity16 = Color(hexString: "DEE7FF")
+        static let opacity08 = Color(hexString: "EFF3FF")
+    }
 }
diff --git a/HappyAnding/HappyAnding/Extensions/SCZColor.swift b/HappyAnding/HappyAnding/Extensions/SCZColor.swift
@@ -0,0 +1,8 @@
+//
+//  SCZColor.swift
+//  HappyAnding
+//
+//  Created by JeonJimin on 4/10/24.
+//
+
+import Foundation
diff --git a/HappyAnding/HappyAnding/Extensions/String/String+Date.swift b/HappyAnding/HappyAnding/Extensions/String/String+Date.swift
@@ -34,4 +34,20 @@ extension String {
 
         return date
     }
+
+    func getPostDateFormat() -> String? {
+        let inputFormatter = DateFormatter()
+            inputFormatter.dateFormat = "yyyyMMddHHmmss"
+
+            if let date = inputFormatter.date(from: self) {
+                let outputFormatter = DateFormatter()
+                outputFormatter.locale = Locale(identifier: "ko_KR")
+                outputFormatter.dateFormat = "M월 d일 a h시 m분"
+
+                let output = outputFormatter.string(from: date)
+                return output
+            } else {
+                return nil
+            }
+    }
 }
diff --git a/HappyAnding/HappyAnding/Extensions/View/View+Navigation.swift b/HappyAnding/HappyAnding/Extensions/View/View+Navigation.swift
@@ -87,8 +87,6 @@ extension View {
             ListCurationView(viewModel: ListCurationViewModel(data: data as! CurationType))
         case is User:
             ShowProfileView(viewModel: ShowProfileViewModel(data: data as! User))
-        case is NavigationSearch:
-            SearchView()
         case is Category:
             ListCategoryShortcutView(viewModel: ListCategoryShortcutViewModel(data: data as! Category))
         case is NavigationNicknameView:
@@ -141,9 +139,6 @@ struct NavigationViewModifier: ViewModifier {
             .navigationDestination(for: NavigationWithdrawal.self) { _ in
                 WithdrawalView()
             }
-            .navigationDestination(for: NavigationSearch.self) { _ in
-                SearchView()
-            }
             .navigationDestination(for: NavigationSettingView.self) { _ in
                 SettingView()
             }

diff --git a/HappyAnding/HappyAnding/Model/SectionType.swift b/HappyAnding/HappyAnding/Model/SectionType.swift
@@ -83,8 +83,8 @@ enum SectionType {
         case .popular:
             return Image(systemName: self.icon)
                 .foregroundStyle(
-                    Color(hexString: "3366FF", opacity: 0.88),
-                    Color(hexString: "3366FF", opacity: 0.88)
+                    SCZColor.SCZBlue.opacity88,
+                    SCZColor.SCZBlue.opacity88
                 )
         case .myShortcut:
             return Image(systemName: "square.text.square.fill")
@@ -101,8 +101,8 @@ enum SectionType {
         case .myLovingShortcut:
             return Image(systemName: "heart.fill")
                 .foregroundStyle(
-                    Color(hexString: "3366FF", opacity: 0.88),
-                    Color(hexString: "3366FF", opacity: 0.88)
+                    SCZColor.SCZBlue.opacity88,
+                    SCZColor.SCZBlue.opacity88
                 )
         }
     }

diff --git a/HappyAnding/HappyAnding/TextLiteral.swift b/HappyAnding/HappyAnding/TextLiteral.swift
@@ -246,6 +246,18 @@ enum TextLiteral {
     static let searchViewRecommendedKeyword: String = "추천 검색어"
     static let searchViewProposal: String = "단축어 제안하기"
     static let searchViewProposalURL: String = "https://docs.google.com/forms/d/e/1FAIpQLScQc3KeYjDGCE-C2YRU-Hwy2XNy5bt89KVX1OMUzRiySaMX1Q/viewform"
+    static let searchViewMoreResult: String = "더 많은 검색 결과 보기"
+    static let searchViewRelatedShortcut: String = "관련된 단축어"
+    static let searchVIewRelatedPost: String = "관련된 글"
+    static func searchViewEmptyResult(_ searchText: String) -> String {
+            return "😵 \'\(searchText)\'에 관련된 단축어나 글이 없어요."
+        }
+    static func searchTextRelatedShortcutShare(_ searchText: String) -> String {
+            return "\'\(searchText)\' 관련 단축어 공유하기"
+        }
+    static func searchTextRelatedPost(_ searchText: String) -> String {
+            return "\'\(searchText)\' 관련 질문하기"
+        }
 
     //MARK: - CustomShareViewController
     static let customShareViewControllerSignInAlertTitle: String = "로그인을 먼저 진행해주세요"

diff --git a/HappyAnding/HappyAnding/Views/Components/ExploreCell.swift b/HappyAnding/HappyAnding/Views/Components/ExploreCell.swift
@@ -45,7 +45,7 @@ struct OrderedCell: View {
         }
         .padding(12)
         .frame(width: 108, height: 144, alignment: .top)
-        .background( SCZColor.colors[shortcut.color]?.color(for: colorScheme).fillGradient() ?? SCZColor.defaultColor)
+        .background( SCZColor.colors[shortcut.color]?.color(for: colorScheme).fillGradient() ?? Color.clear.toGradient())
         .cornerRadius(16)
         .roundedBorder(cornerRadius: 16, color: Color.white, isNormalBlend: true, opacity: 0.12)
     }
@@ -66,7 +66,7 @@ struct UnorderedCell: View{
             HStack {
                 RoundedRectangle(cornerRadius: 1)
                     .frame(width: 2, height: 30)
-                    .foregroundStyle(SCZColor.colors[shortcut.color]?.color(for: colorScheme).fillGradient() ?? SCZColor.defaultColor)
+                    .foregroundStyle(SCZColor.colors[shortcut.color]?.color(for: colorScheme).fillGradient() ?? Color.clear.toGradient())
                 Image(systemName: shortcut.sfSymbol)
                     .foregroundStyle(SCZColor.CharcoalGray.opacity88)
             }

diff --git a/HappyAnding/HappyAnding/Views/Components/ShortcutIcon.swift b/HappyAnding/HappyAnding/Views/Components/ShortcutIcon.swift
@@ -17,7 +17,7 @@ struct ShortcutIcon: View {
     var body: some View {
         ZStack {
             RoundedRectangle(cornerRadius: 13)
-                .foregroundStyle(SCZColor.colors[color]?.color(for: colorScheme).fillGradient() ?? SCZColor.defaultColor)
+                .foregroundStyle(SCZColor.colors[color]?.color(for: colorScheme).fillGradient() ?? Color.clear.toGradient())
                 .roundedBorder(cornerRadius: 13, color: .white, isNormalBlend: true, opacity: 0.24)
                 .frame(width: size, height: size)
             Image(systemName: sfSymbol)

diff --git a/HappyAnding/HappyAnding/Views/ExploreShortcutViews/ExploreShortcutView.swift b/HappyAnding/HappyAnding/Views/ExploreShortcutViews/ExploreShortcutView.swift
@@ -17,6 +17,7 @@ struct ExploreShortcutView: View {
         ScrollView(.vertical, showsIndicators: false) {
             VStack(spacing: 12) {
                 PromoteSection(items: viewModel.fetchAdminCuration())
+                    .padding(.top, 12)
                 ForEach (sectionType, id: \.self) { type in
                     CardSection(type: type, shortcuts: viewModel.fetchShortcuts(by: type))
                 }
@@ -32,7 +33,6 @@ struct ExploreShortcutView: View {
                         withAnimation {
                             isSearchActivated.toggle()
                         }
-                        print("검색창")
                     } label: {
                         Image(systemName: "sparkle.magnifyingglass")
                             .symbolRenderingMode(.palette)
@@ -52,7 +52,7 @@ struct ExploreShortcutView: View {
                         Image(systemName: "bell.badge.fill")
                             .symbolRenderingMode(.palette)
                             .foregroundStyle(
-                                Color(hexString: "3366FF"),
+                                SCZColor.SCZBlue.strong,
                                 LinearGradient(
                                     colors: [SCZColor.CharcoalGray.opacity88, SCZColor.CharcoalGray.opacity48],
                                     startPoint: .top,