Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcosgriselli
marcosgriselli committed Mar 28, 2019
1 parent c311620 commit 96b4836
Show file tree
Hide file tree
Showing 80 changed files with 9,832 additions and 5,898 deletions.
19 changes: 11 additions & 8 deletions AppStoreSearch.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,13 +340,16 @@
TargetAttributes = {
FB4D6F0F20FA948A000F953A = {
CreatedOnToolsVersion = 9.4.1;
LastSwiftMigration = 1010;
};
FB4D6F2320FA948C000F953A = {
CreatedOnToolsVersion = 9.4.1;
LastSwiftMigration = 1010;
TestTargetID = FB4D6F0F20FA948A000F953A;
};
FB4D6F2E20FA948C000F953A = {
CreatedOnToolsVersion = 9.4.1;
LastSwiftMigration = 1010;
TestTargetID = FB4D6F0F20FA948A000F953A;
};
};
Expand Down Expand Up @@ -461,7 +464,7 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-AppStoreSearch/Pods-AppStoreSearch-frameworks.sh",
"${PODS_ROOT}/Target Support Files/Pods-AppStoreSearch/Pods-AppStoreSearch-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Kingfisher/Kingfisher.framework",
);
name = "[CP] Embed Pods Frameworks";
Expand All @@ -470,7 +473,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-AppStoreSearch/Pods-AppStoreSearch-frameworks.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-AppStoreSearch/Pods-AppStoreSearch-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -683,7 +686,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.marcosgriselli.AppStoreSearch;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -702,7 +705,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.marcosgriselli.AppStoreSearch;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand All @@ -723,7 +726,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.marcosgriselli.AppStoreSearchTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AppStoreSearch.app/AppStoreSearch";
};
Expand All @@ -745,7 +748,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.marcosgriselli.AppStoreSearchTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AppStoreSearch.app/AppStoreSearch";
};
Expand All @@ -766,7 +769,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.marcosgriselli.AppStoreSearchUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = AppStoreSearch;
};
Expand All @@ -787,7 +790,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.marcosgriselli.AppStoreSearchUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = AppStoreSearch;
};
Expand Down
5 changes: 5 additions & 0 deletions ...Search.xcodeproj/xcuserdata/marcosgriselli.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>AppStoreSearch.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
</dict>
</dict>
</dict>
</plist>
2 changes: 1 addition & 1 deletion AppStoreSearch/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}
Expand Down
8 changes: 4 additions & 4 deletions AppStoreSearch/Extensions/UIViewController + Child.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ import UIKit

extension UIViewController {
func add(_ child: UIViewController) {
addChildViewController(child)
addChild(child)
child.view.centerIn(view: view)
child.didMove(toParentViewController: self)
child.didMove(toParent: self)
}

func remove() {
guard parent != nil else {
return
}
willMove(toParentViewController: nil)
removeFromParentViewController()
willMove(toParent: nil)
removeFromParent()
view.removeFromSuperview()
}
}
2 changes: 1 addition & 1 deletion AppStoreSearch/ResultsContainerViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class ResultsContainerViewController: ContentStateViewController {
override func viewDidLoad() {
super.viewDidLoad()
let storyboard = UIStoryboard(name: "Main", bundle: nil)
suggestionsViewController = storyboard.instantiateViewController(withIdentifier: "SuggestedTermsTableViewController") as! SuggestedTermsTableViewController
suggestionsViewController = storyboard.instantiateViewController(withIdentifier: "SuggestedTermsTableViewController") as? SuggestedTermsTableViewController
suggestionsViewController.didSelect = didSelect
}

Expand Down
4 changes: 2 additions & 2 deletions AppStoreSearch/Suggestions/SuggestedTermTableViewCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class SuggestedTermTableViewCell: UITableViewCell {
@IBOutlet weak var label: UILabel!

func set(term: String, searchedTerm: String) {
let attributes: [NSAttributedStringKey: Any] = [
let attributes: [NSAttributedString.Key: Any] = [
.font: UIFont.systemFont(ofSize: 21),
.foregroundColor: UIColor(white: 0.56, alpha: 1.0)
]
Expand All @@ -35,7 +35,7 @@ extension NSMutableAttributedString {
let foundRange = mutableString.range(of: text)
if foundRange.location != NSNotFound {
addAttribute(
NSAttributedStringKey.foregroundColor,
NSAttributedString.Key.foregroundColor,
value: UIColor.black,
range: foundRange
)
Expand Down
4 changes: 2 additions & 2 deletions AppStoreSearch/Utilities/ReusableCells.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ extension UICollectionView {

func registerHeader<T: UICollectionReusableView>(_: T.Type) where T: ReusableView {
register(T.self,
forSupplementaryViewOfKind: UICollectionElementKindSectionHeader,
forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader,
withReuseIdentifier: T.defaultReuseIdentifier)
}

Expand All @@ -79,7 +79,7 @@ extension UICollectionView {
}

func dequeueReusableHeader<T: UICollectionReusableView>(forIndexPath indexPath: IndexPath) -> T where T: ReusableView {
guard let view = dequeueReusableSupplementaryView(ofKind: UICollectionElementKindSectionHeader,
guard let view = dequeueReusableSupplementaryView(ofKind: UICollectionView.elementKindSectionHeader,
withReuseIdentifier: T.defaultReuseIdentifier,
for: indexPath) as? T else {
fatalError("Could not dequeue view with identifier: \(T.defaultReuseIdentifier)")
Expand Down
6 changes: 3 additions & 3 deletions Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- Kingfisher (4.8.0)
- Kingfisher (5.3.0)

DEPENDENCIES:
- Kingfisher
Expand All @@ -9,8 +9,8 @@ SPEC REPOS:
- Kingfisher

SPEC CHECKSUMS:
Kingfisher: 976d828df2b24834c6a3f2fc4d82cdbd26552be1
Kingfisher: 4692c783ffb99e9e2e40a6eb3e518c3b96c6fa8c

PODFILE CHECKSUM: 5b518f1a2f158c7c3cf8b570f281c02dc06e0ec6

COCOAPODS: 1.5.3
COCOAPODS: 1.6.0
97 changes: 68 additions & 29 deletions Pods/Kingfisher/README.md
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 96b4836

Please sign in to comment.