diff --git a/SwiggyClone.xcodeproj/project.pbxproj b/SwiggyClone.xcodeproj/project.pbxproj index 6c17e88..8e58c3c 100644 --- a/SwiggyClone.xcodeproj/project.pbxproj +++ b/SwiggyClone.xcodeproj/project.pbxproj @@ -326,18 +326,10 @@ children = ( 4466D28527D478B9009A5BB6 /* View */, 4466D27F27D471C1009A5BB6 /* Controllers */, - 4466D27E27D471BB009A5BB6 /* Views */, ); path = Search; sourceTree = ""; }; - 4466D27E27D471BB009A5BB6 /* Views */ = { - isa = PBXGroup; - children = ( - ); - path = Views; - sourceTree = ""; - }; 4466D27F27D471C1009A5BB6 /* Controllers */ = { isa = PBXGroup; children = ( diff --git a/SwiggyClone.xcodeproj/project.xcworkspace/xcuserdata/dheerajkumarsharma.xcuserdatad/UserInterfaceState.xcuserstate b/SwiggyClone.xcodeproj/project.xcworkspace/xcuserdata/dheerajkumarsharma.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..44e9686 Binary files /dev/null and b/SwiggyClone.xcodeproj/project.xcworkspace/xcuserdata/dheerajkumarsharma.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SwiggyClone.xcodeproj/xcuserdata/dheerajkumarsharma.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SwiggyClone.xcodeproj/xcuserdata/dheerajkumarsharma.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000..9f9480f --- /dev/null +++ b/SwiggyClone.xcodeproj/xcuserdata/dheerajkumarsharma.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,6 @@ + + + diff --git a/SwiggyClone/AppBase/SceneDelegate.swift b/SwiggyClone/AppBase/SceneDelegate.swift index c3ec281..e8737e2 100644 --- a/SwiggyClone/AppBase/SceneDelegate.swift +++ b/SwiggyClone/AppBase/SceneDelegate.swift @@ -17,12 +17,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { window = UIWindow(frame: UIScreen.main.bounds) window?.windowScene = windowScene -// let VC = TabBarViewController() -// window?.rootViewController = VC + let VC = TabBarViewController() + window?.rootViewController = VC - let VC = SearchViewController() - let navVC = UINavigationController(rootViewController: VC) - window?.rootViewController = navVC +// let VC = SearchViewController() +// let navVC = UINavigationController(rootViewController: VC) +// window?.rootViewController = navVC window?.makeKeyAndVisible() } diff --git a/SwiggyClone/Resources/Assets.xcassets/ic_food_tab.imageset/Contents.json b/SwiggyClone/Resources/Assets.xcassets/ic_food_tab.imageset/Contents.json new file mode 100644 index 0000000..c735eb6 --- /dev/null +++ b/SwiggyClone/Resources/Assets.xcassets/ic_food_tab.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "ic_food_tab.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ic_food_tab@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ic_food_tab@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SwiggyClone/Resources/Assets.xcassets/ic_food_tab.imageset/ic_food_tab.png b/SwiggyClone/Resources/Assets.xcassets/ic_food_tab.imageset/ic_food_tab.png new file mode 100644 index 0000000..410837e Binary files /dev/null and b/SwiggyClone/Resources/Assets.xcassets/ic_food_tab.imageset/ic_food_tab.png differ diff --git a/SwiggyClone/Resources/Assets.xcassets/ic_food_tab.imageset/ic_food_tab@2x.png b/SwiggyClone/Resources/Assets.xcassets/ic_food_tab.imageset/ic_food_tab@2x.png new file mode 100644 index 0000000..fb10a2c Binary files /dev/null and b/SwiggyClone/Resources/Assets.xcassets/ic_food_tab.imageset/ic_food_tab@2x.png differ diff --git a/SwiggyClone/Resources/Assets.xcassets/ic_food_tab.imageset/ic_food_tab@3x.png b/SwiggyClone/Resources/Assets.xcassets/ic_food_tab.imageset/ic_food_tab@3x.png new file mode 100644 index 0000000..434df24 Binary files /dev/null and b/SwiggyClone/Resources/Assets.xcassets/ic_food_tab.imageset/ic_food_tab@3x.png differ diff --git a/SwiggyClone/Resources/Assets.xcassets/ic_food_tab_selected.imageset/Contents.json b/SwiggyClone/Resources/Assets.xcassets/ic_food_tab_selected.imageset/Contents.json new file mode 100644 index 0000000..8945fce --- /dev/null +++ b/SwiggyClone/Resources/Assets.xcassets/ic_food_tab_selected.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "ic_food_tab_selected.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ic_food_tab_selected@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ic_food_tab_selected@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SwiggyClone/Resources/Assets.xcassets/ic_food_tab_selected.imageset/ic_food_tab_selected.png b/SwiggyClone/Resources/Assets.xcassets/ic_food_tab_selected.imageset/ic_food_tab_selected.png new file mode 100644 index 0000000..d134db6 Binary files /dev/null and b/SwiggyClone/Resources/Assets.xcassets/ic_food_tab_selected.imageset/ic_food_tab_selected.png differ diff --git a/SwiggyClone/Resources/Assets.xcassets/ic_food_tab_selected.imageset/ic_food_tab_selected@2x.png b/SwiggyClone/Resources/Assets.xcassets/ic_food_tab_selected.imageset/ic_food_tab_selected@2x.png new file mode 100644 index 0000000..b413296 Binary files /dev/null and b/SwiggyClone/Resources/Assets.xcassets/ic_food_tab_selected.imageset/ic_food_tab_selected@2x.png differ diff --git a/SwiggyClone/Resources/Assets.xcassets/ic_food_tab_selected.imageset/ic_food_tab_selected@3x.png b/SwiggyClone/Resources/Assets.xcassets/ic_food_tab_selected.imageset/ic_food_tab_selected@3x.png new file mode 100644 index 0000000..e6c94d3 Binary files /dev/null and b/SwiggyClone/Resources/Assets.xcassets/ic_food_tab_selected.imageset/ic_food_tab_selected@3x.png differ diff --git a/SwiggyClone/Resources/Assets.xcassets/ic_search_tab.imageset/Contents.json b/SwiggyClone/Resources/Assets.xcassets/ic_search_tab.imageset/Contents.json new file mode 100644 index 0000000..45083a3 --- /dev/null +++ b/SwiggyClone/Resources/Assets.xcassets/ic_search_tab.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "ic_search_tab.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ic_search_tab@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ic_search_tab@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SwiggyClone/Resources/Assets.xcassets/ic_search_tab.imageset/ic_search_tab.png b/SwiggyClone/Resources/Assets.xcassets/ic_search_tab.imageset/ic_search_tab.png new file mode 100644 index 0000000..3759fa4 Binary files /dev/null and b/SwiggyClone/Resources/Assets.xcassets/ic_search_tab.imageset/ic_search_tab.png differ diff --git a/SwiggyClone/Resources/Assets.xcassets/ic_search_tab.imageset/ic_search_tab@2x.png b/SwiggyClone/Resources/Assets.xcassets/ic_search_tab.imageset/ic_search_tab@2x.png new file mode 100644 index 0000000..7048784 Binary files /dev/null and b/SwiggyClone/Resources/Assets.xcassets/ic_search_tab.imageset/ic_search_tab@2x.png differ diff --git a/SwiggyClone/Resources/Assets.xcassets/ic_search_tab.imageset/ic_search_tab@3x.png b/SwiggyClone/Resources/Assets.xcassets/ic_search_tab.imageset/ic_search_tab@3x.png new file mode 100644 index 0000000..3b33cc8 Binary files /dev/null and b/SwiggyClone/Resources/Assets.xcassets/ic_search_tab.imageset/ic_search_tab@3x.png differ diff --git a/SwiggyClone/Resources/Assets.xcassets/ic_search_tab_selected.imageset/Contents.json b/SwiggyClone/Resources/Assets.xcassets/ic_search_tab_selected.imageset/Contents.json new file mode 100644 index 0000000..510556e --- /dev/null +++ b/SwiggyClone/Resources/Assets.xcassets/ic_search_tab_selected.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "ic_search_tab_selected.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ic_search_tab_selected@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ic_search_tab_selected@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SwiggyClone/Resources/Assets.xcassets/ic_search_tab_selected.imageset/ic_search_tab_selected.png b/SwiggyClone/Resources/Assets.xcassets/ic_search_tab_selected.imageset/ic_search_tab_selected.png new file mode 100644 index 0000000..cd1b69e Binary files /dev/null and b/SwiggyClone/Resources/Assets.xcassets/ic_search_tab_selected.imageset/ic_search_tab_selected.png differ diff --git a/SwiggyClone/Resources/Assets.xcassets/ic_search_tab_selected.imageset/ic_search_tab_selected@2x.png b/SwiggyClone/Resources/Assets.xcassets/ic_search_tab_selected.imageset/ic_search_tab_selected@2x.png new file mode 100644 index 0000000..5b7794c Binary files /dev/null and b/SwiggyClone/Resources/Assets.xcassets/ic_search_tab_selected.imageset/ic_search_tab_selected@2x.png differ diff --git a/SwiggyClone/Resources/Assets.xcassets/ic_search_tab_selected.imageset/ic_search_tab_selected@3x.png b/SwiggyClone/Resources/Assets.xcassets/ic_search_tab_selected.imageset/ic_search_tab_selected@3x.png new file mode 100644 index 0000000..8dc185a Binary files /dev/null and b/SwiggyClone/Resources/Assets.xcassets/ic_search_tab_selected.imageset/ic_search_tab_selected@3x.png differ diff --git a/SwiggyClone/Scenes/Model/AppLayouts.swift b/SwiggyClone/Scenes/Model/AppLayouts.swift index 80f7006..a6b978b 100644 --- a/SwiggyClone/Scenes/Model/AppLayouts.swift +++ b/SwiggyClone/Scenes/Model/AppLayouts.swift @@ -19,7 +19,7 @@ class AppLayouts { let section = NSCollectionLayoutSection(group: group) section.contentInsets = NSDirectionalEdgeInsets(top: 10, leading: 15, bottom: 10, trailing: 0) - section.orthogonalScrollingBehavior = .paging + section.orthogonalScrollingBehavior = .continuous return section } diff --git a/SwiggyClone/Scenes/Views/Search/Controllers/SearchViewController+Delegate.swift b/SwiggyClone/Scenes/Views/Search/Controllers/SearchViewController+Delegate.swift index 03ce453..6c38b45 100644 --- a/SwiggyClone/Scenes/Views/Search/Controllers/SearchViewController+Delegate.swift +++ b/SwiggyClone/Scenes/Views/Search/Controllers/SearchViewController+Delegate.swift @@ -5,7 +5,7 @@ // Created by Dheeraj Kumar Sharma on 06/03/22. // -import Foundation +import UIKit extension SearchViewController: SearchContainerViewActionDelegate, SearchedContentActionDelegate { @@ -51,3 +51,12 @@ extension SearchViewController: SearchContainerViewActionDelegate, SearchedConte } } + +extension SearchViewController: UITextFieldDelegate { + + func textFieldShouldReturn(_ textField: UITextField) -> Bool { + textField.resignFirstResponder() + return true + } + +} diff --git a/SwiggyClone/Scenes/Views/Search/Controllers/SearchViewController.swift b/SwiggyClone/Scenes/Views/Search/Controllers/SearchViewController.swift index 8470162..abbbf66 100644 --- a/SwiggyClone/Scenes/Views/Search/Controllers/SearchViewController.swift +++ b/SwiggyClone/Scenes/Views/Search/Controllers/SearchViewController.swift @@ -18,6 +18,7 @@ class SearchViewController: UIViewController { view.translatesAutoresizingMaskIntoConstraints = false view.backgroundColor = .white view.delegate = self + view.searchTextField.delegate = self return view }() @@ -46,6 +47,10 @@ class SearchViewController: UIViewController { setUpConstraints() } + override func touchesBegan(_ touches: Set, with event: UIEvent?) { + self.view.endEditing(true) + } + // MARK: FUNCTIONS - func setUpNavigations(){ diff --git a/SwiggyClone/Scenes/Views/Tab/TabBarViewController.swift b/SwiggyClone/Scenes/Views/Tab/TabBarViewController.swift index c9a12de..69cc7ff 100644 --- a/SwiggyClone/Scenes/Views/Tab/TabBarViewController.swift +++ b/SwiggyClone/Scenes/Views/Tab/TabBarViewController.swift @@ -36,18 +36,18 @@ class TabBarViewController: UITabBarController, UITabBarControllerDelegate{ viewControllers = [foodViewController , searchViewController] - self.tabBar.isTranslucent = false +// self.tabBar.isTranslucent = false self.tabBar.backgroundImage = UIImage() - self.tabBar.barTintColor = .white + UITabBar.appearance().backgroundColor = .white - customTab(selectedImage: "ic_food", deselectedImage: "ic_food_selected", indexOfTab: 0 , tabTitle: "") - customTab(selectedImage: "ic_search", deselectedImage: "ic_search_selected", indexOfTab: 1 , tabTitle: "") + customTab(selectedImage: "ic_food_tab_selected", deselectedImage: "ic_food_tab", indexOfTab: 0 , tabTitle: "") + customTab(selectedImage: "ic_search_tab_selected", deselectedImage: "ic_search_tab", indexOfTab: 1 , tabTitle: "") } func customTab(selectedImage image1 : String , deselectedImage image2: String , indexOfTab index: Int , tabTitle title: String ){ - let selectedImage = UIImage(named: image1) - let deselectedImage = UIImage(named: image2) + let selectedImage = UIImage(named: image1)?.withRenderingMode(.alwaysOriginal) + let deselectedImage = UIImage(named: image2)?.withRenderingMode(.alwaysOriginal) tabItem = self.tabBar.items![index] tabItem.image = deselectedImage @@ -57,3 +57,5 @@ class TabBarViewController: UITabBarController, UITabBarControllerDelegate{ } } + +