diff --git a/GP App.xcodeproj/project.pbxproj b/GP App.xcodeproj/project.pbxproj index 45c5b59..291451a 100644 --- a/GP App.xcodeproj/project.pbxproj +++ b/GP App.xcodeproj/project.pbxproj @@ -908,6 +908,10 @@ MARKETING_VERSION = 1.6; PRODUCT_BUNDLE_IDENTIFIER = "be.ghentphotography.www.GP-App"; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -943,6 +947,10 @@ MARKETING_VERSION = 1.6; PRODUCT_BUNDLE_IDENTIFIER = "be.ghentphotography.www.GP-App"; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/GP App.xcodeproj/project.xcworkspace/xcuserdata/dave.xcuserdatad/UserInterfaceState.xcuserstate b/GP App.xcodeproj/project.xcworkspace/xcuserdata/dave.xcuserdatad/UserInterfaceState.xcuserstate index 4fbd807..5d4f28c 100644 Binary files a/GP App.xcodeproj/project.xcworkspace/xcuserdata/dave.xcuserdatad/UserInterfaceState.xcuserstate and b/GP App.xcodeproj/project.xcworkspace/xcuserdata/dave.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/GP App/Assets.xcassets/AppBackground3.imageset/AppBackground3.png b/GP App/Assets.xcassets/AppBackground3.imageset/AppBackground3.png new file mode 100644 index 0000000..d517df7 Binary files /dev/null and b/GP App/Assets.xcassets/AppBackground3.imageset/AppBackground3.png differ diff --git a/GP App/Assets.xcassets/AppBackground3.imageset/Contents.json b/GP App/Assets.xcassets/AppBackground3.imageset/Contents.json new file mode 100644 index 0000000..b26d63e --- /dev/null +++ b/GP App/Assets.xcassets/AppBackground3.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "AppBackground3.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/GP App/Home.swift b/GP App/Home.swift index 53a1b9b..5899f47 100644 --- a/GP App/Home.swift +++ b/GP App/Home.swift @@ -32,10 +32,6 @@ class Home: UIViewController { // Set the view controller's title title = "Ghent Photography" - // Add the search button to the navigation bar - navigationItem.rightBarButtonItem = UIBarButtonItem(customView: searchButton) - searchButton.addTarget(self, action: #selector(searchButtonTapped), for: .touchUpInside) - view.addSubview(scrollView) NSLayoutConstraint.activate([ @@ -81,14 +77,7 @@ class Home: UIViewController { tabBarItem = UITabBarItem(title: "Home", image: UIImage(systemName: "house"), tag: 0) tabBarItem.selectedImage = UIImage(systemName: "house.fill")?.withTintColor(.systemBlue, renderingMode: .alwaysOriginal) } - - // Handle the search button tap event - @objc func searchButtonTapped() { - // Perform the action you want when the search button is tapped - // For example, push a new view controller with search functionality - let searchViewController = SearchViewController(photoNames: photoNames) - navigationController?.pushViewController(searchViewController, animated: true) - } + func createThumbButton(withImage imageName: String, tag: Int) -> UIButton { let button = UIButton() diff --git a/GP App/Our story/OurStoryViewController.swift b/GP App/Our story/OurStoryViewController.swift index ca65204..de15747 100644 --- a/GP App/Our story/OurStoryViewController.swift +++ b/GP App/Our story/OurStoryViewController.swift @@ -63,7 +63,7 @@ class OurStoryViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() setupUI() - view.backgroundColor = UIColor(patternImage: UIImage(named: "AppBackground2")!) + view.backgroundColor = UIColor(patternImage: UIImage(named: "AppBackground3")!) } override func viewWillAppear(_ animated: Bool) { @@ -120,7 +120,7 @@ class OurStoryViewController: UIViewController { ]) // Set the content mode of the background image to "scaleToFill" - let backgroundImage = UIImage(named: "AppBackground2") + let backgroundImage = UIImage(named: "AppBackground3") let backgroundImageView = UIImageView(image: backgroundImage) backgroundImageView.translatesAutoresizingMaskIntoConstraints = false backgroundImageView.contentMode = .scaleToFill