Skip to content

Commit

Permalink
v1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@muhdmirzamz
muhdmirzamz committed Jun 12, 2017
1 parent 44b6b95 commit 8d600ed
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 93 deletions.
20 changes: 11 additions & 9 deletions Terawhere.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@
CreatedOnToolsVersion = 8.3.2;
DevelopmentTeam = PL82KCZF4N;
LastSwiftMigration = 0830;
ProvisioningStyle = Manual;
ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.BackgroundModes = {
enabled = 1;
Expand Down Expand Up @@ -763,18 +763,19 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Terawhere/Terawhere.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = PL82KCZF4N;
INFOPLIST_FILE = Terawhere/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = tech.msociety.terawhere;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "70e47b00-a4c0-4b74-9318-611c923fd3cd";
PROVISIONING_PROFILE_SPECIFIER = "Terawhere Testers Distribution";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 1;
};
name = Debug;
};
Expand All @@ -785,17 +786,18 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Terawhere/Terawhere.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = PL82KCZF4N;
INFOPLIST_FILE = Terawhere/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = tech.msociety.terawhere;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "70e47b00-a4c0-4b74-9318-611c923fd3cd";
PROVISIONING_PROFILE_SPECIFIER = "Terawhere Testers Distribution";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 1;
};
name = Release;
};
Expand Down
Binary file modified Terawhere.xcworkspace/xcuserdata/muhdmirzamz.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
12 changes: 0 additions & 12 deletions Terawhere/BookRideViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,16 +177,4 @@ class BookRideViewController: UIViewController, UITableViewDataSource {
public func numberOfSections(in tableView: UITableView) -> Int {
return 1
}


/*
// MARK: - Navigation

// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destinationViewController.
// Pass the selected object to the new view controller.
}
*/

}
2 changes: 1 addition & 1 deletion Terawhere/Database.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Database {

static let serverBaseUrl = "http://139.59.224.66" // dev
// static let serverBaseUrl = "https://api.terawhere.com" // prod
// treat this class as a setup class
// no network calls done here
// to avoid UI stuff from messing with database stuff
Expand Down
28 changes: 14 additions & 14 deletions Terawhere/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<false/>
<key>NSExceptionDomains</key>
<dict>
<key>http://139.59.224.66</key>
<dict>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
</dict>
</dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -39,7 +26,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1</string>
<string>2</string>
<key>FacebookAppID</key>
<string>290133594776141</string>
<key>FacebookDisplayName</key>
Expand All @@ -57,6 +44,19 @@
</array>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<false/>
<key>NSExceptionDomains</key>
<dict>
<key>http://139.59.224.66</key>
<dict>
<key>NSIncludesSubdomains</key>
<true/>
</dict>
</dict>
</dict>
<key>NSLocationWhenInUseUsageDescription</key>
<string>We need to access your location for nearby offers</string>
<key>UIBackgroundModes</key>
Expand Down
30 changes: 1 addition & 29 deletions Terawhere/LocationSearchTableViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ protocol LocationSelectProtocol {
func use(mapItem: MKMapItem, forLocationState state: String)
}

class LocationSearchTableViewController: UITableViewController, UISearchResultsUpdating, UISearchBarDelegate, MKLocalSearchCompleterDelegate {
class LocationSearchTableViewController: UITableViewController, UISearchBarDelegate, MKLocalSearchCompleterDelegate {

var searchController: UISearchController?
var localSearchCompleter: MKLocalSearchCompleter?
Expand All @@ -29,14 +29,7 @@ class LocationSearchTableViewController: UITableViewController, UISearchResultsU
override func viewDidLoad() {
super.viewDidLoad()

// Uncomment the following line to preserve selection between presentations
// self.clearsSelectionOnViewWillAppear = false

// Uncomment the following line to display an Edit button in the navigation bar for this view controller.
// self.navigationItem.rightBarButtonItem = self.editButtonItem()

self.searchController = UISearchController.init(searchResultsController: nil)
searchController?.searchResultsUpdater = self
searchController?.dimsBackgroundDuringPresentation = false
searchController?.hidesNavigationBarDuringPresentation = false
self.definesPresentationContext = true
Expand Down Expand Up @@ -81,27 +74,6 @@ class LocationSearchTableViewController: UITableViewController, UISearchResultsU
self.tableView.reloadData()

}

// MARK: Search results updating delegate
public func updateSearchResults(for searchController: UISearchController) {
// if let searchBarText = self.searchController?.searchBar.text {
// if searchBarText.isEmpty {
// self.filteredLocations?.removeAll()
//
// self.tableView.reloadData()
// }
// }
//
// let localSearchReq = MKLocalSearchRequest()
// localSearchReq.naturalLanguageQuery = self.searchController?.searchBar.text
//
// let localSearch = MKLocalSearch.init(request: localSearchReq)
// localSearch.start { (response, error) in
// self.filteredLocations = response?.mapItems.
//
// self.tableView.reloadData()
// }
}

override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath)
Expand Down
11 changes: 0 additions & 11 deletions Terawhere/MeetupTimeViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,4 @@ class MeetupTimeViewController: UIViewController {

self.dismiss(animated: true, completion: nil)
}

/*
// MARK: - Navigation

// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destinationViewController.
// Pass the selected object to the new view controller.
}
*/

}
6 changes: 0 additions & 6 deletions Terawhere/ViewBookingTableViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@ class ViewBookingTableViewController: UITableViewController {

override func viewDidLoad() {
super.viewDidLoad()

// Uncomment the following line to preserve selection between presentations
// self.clearsSelectionOnViewWillAppear = false

// Uncomment the following line to display an Edit button in the navigation bar for this view controller.
// self.navigationItem.rightBarButtonItem = self.editButtonItem()
}

override func didReceiveMemoryWarning() {
Expand Down
11 changes: 0 additions & 11 deletions Terawhere/ViewOfferTableViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,15 +220,4 @@ class ViewOfferTableViewController: UITableViewController {

return cell!
}

/*
MARKvar Navigation

In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
Get the new view controller using segue.destinationViewController.
Pass the selected object to the new view controller.
}
*/

}

0 comments on commit 8d600ed

Please sign in to comment.