Skip to content

Commit

Permalink
- New photos added
Browse files Browse the repository at this point in the history
- New app background
- Search function removed
  • Loading branch information
“appledave”vc committed Feb 1, 2024
1 parent 64c7b1a commit 190dcba
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 14 deletions.
8 changes: 8 additions & 0 deletions GP App.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions GP App/Assets.xcassets/AppBackground3.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -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
}
}
13 changes: 1 addition & 12 deletions GP App/Home.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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([
Expand Down Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions GP App/Our story/OurStoryViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 190dcba

Please sign in to comment.