diff --git a/AltStore.xcodeproj/project.pbxproj b/AltStore.xcodeproj/project.pbxproj index 07836e95..6f3bf149 100644 --- a/AltStore.xcodeproj/project.pbxproj +++ b/AltStore.xcodeproj/project.pbxproj @@ -20,6 +20,7 @@ BFD247932284D4B700981D42 /* AppTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFD247922284D4B700981D42 /* AppTableViewCell.swift */; }; BFD247952284D7BD00981D42 /* Apps.plist in Resources */ = {isa = PBXBuildFile; fileRef = BFD247942284D7BD00981D42 /* Apps.plist */; }; BFD2479A2284D80900981D42 /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFD247992284D80900981D42 /* App.swift */; }; + BFD2479C2284E19A00981D42 /* AppDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFD2479B2284E19A00981D42 /* AppDetailViewController.swift */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -51,6 +52,7 @@ BFD247922284D4B700981D42 /* AppTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppTableViewCell.swift; sourceTree = ""; }; BFD247942284D7BD00981D42 /* Apps.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Apps.plist; sourceTree = ""; }; BFD247992284D80900981D42 /* App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = App.swift; sourceTree = ""; }; + BFD2479B2284E19A00981D42 /* AppDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDetailViewController.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -110,6 +112,7 @@ children = ( BFD2476F2284B9A500981D42 /* AppsViewController.swift */, BFD247922284D4B700981D42 /* AppTableViewCell.swift */, + BFD2479B2284E19A00981D42 /* AppDetailViewController.swift */, ); path = Apps; sourceTree = ""; @@ -225,6 +228,7 @@ BFD2478F2284C8F900981D42 /* Button.swift in Sources */, BFD247722284B9A500981D42 /* SecondViewController.swift in Sources */, BFD2478C2284C4C300981D42 /* AppIconImageView.swift in Sources */, + BFD2479C2284E19A00981D42 /* AppDetailViewController.swift in Sources */, BFD2476E2284B9A500981D42 /* AppDelegate.swift in Sources */, BFD247702284B9A500981D42 /* AppsViewController.swift in Sources */, BFD2479A2284D80900981D42 /* App.swift in Sources */, diff --git a/AltStore/Apps/AppDetailViewController.swift b/AltStore/Apps/AppDetailViewController.swift new file mode 100644 index 00000000..ebfa6ce9 --- /dev/null +++ b/AltStore/Apps/AppDetailViewController.swift @@ -0,0 +1,110 @@ +// +// AppDetailViewController.swift +// AltStore +// +// Created by Riley Testut on 5/9/19. +// Copyright © 2019 Riley Testut. All rights reserved. +// + +import UIKit +import Roxas + +@objc(ScreenshotCollectionViewCell) +private class ScreenshotCollectionViewCell: UICollectionViewCell +{ + @IBOutlet var imageView: UIImageView! +} + +extension AppDetailViewController +{ + private enum Row: Int + { + case general + case screenshots + case description + } +} + +class AppDetailViewController: UITableViewController +{ + var app: App! + + private lazy var screenshotsDataSource = self.makeScreenshotsDataSource() + + @IBOutlet private var nameLabel: UILabel! + @IBOutlet private var subtitleLabel: UILabel! + @IBOutlet private var developerButton: UIButton! + @IBOutlet private var appIconImageView: UIImageView! + + @IBOutlet private var downloadButton: UIButton! + + @IBOutlet private var screenshotsCollectionView: UICollectionView! + + @IBOutlet private var descriptionLabel: UILabel! + + override func viewDidLoad() + { + super.viewDidLoad() + + self.tableView.delegate = self + self.screenshotsCollectionView.dataSource = self.screenshotsDataSource + + self.update() + } + + override func viewDidLayoutSubviews() + { + super.viewDidLayoutSubviews() + + guard let image = self.screenshotsDataSource.items.first else { return } + + let aspectRatio = image.size.width / image.size.height + + let height = self.screenshotsCollectionView.bounds.height + let width = self.screenshotsCollectionView.bounds.height * aspectRatio + + let layout = self.screenshotsCollectionView.collectionViewLayout as! UICollectionViewFlowLayout + layout.itemSize = CGSize(width: width, height: height) + } +} + +private extension AppDetailViewController +{ + func update() + { + self.nameLabel.text = self.app.name + self.subtitleLabel.text = self.app.subtitle + self.developerButton.setTitle(self.app.developer, for: .normal) + self.appIconImageView.image = UIImage(named: self.app.iconName) + + let text = String(format: NSLocalizedString("Download %@", comment: ""), self.app.name) + self.downloadButton.setTitle(text, for: .normal) + + self.descriptionLabel.text = self.app.localizedDescription + } + + func makeScreenshotsDataSource() -> RSTArrayCollectionViewDataSource + { + let screenshots = self.app.screenshotNames.compactMap(UIImage.init(named:)) + + let dataSource = RSTArrayCollectionViewDataSource(items: screenshots) + dataSource.cellConfigurationHandler = { (cell, screenshot, indexPath) in + let cell = cell as! ScreenshotCollectionViewCell + cell.imageView.image = screenshot + } + + return dataSource + } +} + +extension AppDetailViewController +{ + override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat + { + guard indexPath.row == Row.screenshots.rawValue else { return super.tableView(tableView, heightForRowAt: indexPath) } + guard !self.screenshotsDataSource.items.isEmpty else { return 0.0 } + + let height = self.view.bounds.height * 0.67 + return height + } +} diff --git a/AltStore/Apps/AppsViewController.swift b/AltStore/Apps/AppsViewController.swift index 8b54ef5d..82c092bb 100644 --- a/AltStore/Apps/AppsViewController.swift +++ b/AltStore/Apps/AppsViewController.swift @@ -22,6 +22,18 @@ class AppsViewController: UITableViewController // Hide trailing row separators. self.tableView.tableFooterView = UIView() } + + override func prepare(for segue: UIStoryboardSegue, sender: Any?) + { + guard segue.identifier == "showAppDetail" else { return } + + guard let cell = sender as? UITableViewCell, let indexPath = self.tableView.indexPath(for: cell) else { return } + + let app = self.dataSource.item(at: indexPath) + + let appDetailViewController = segue.destination as! AppDetailViewController + appDetailViewController.app = app + } } private extension AppsViewController diff --git a/AltStore/Base.lproj/Main.storyboard b/AltStore/Base.lproj/Main.storyboard index c2daeb3a..77e220cc 100644 --- a/AltStore/Base.lproj/Main.storyboard +++ b/AltStore/Base.lproj/Main.storyboard @@ -114,6 +114,9 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -178,7 +386,11 @@ + + + + diff --git a/AltStore/Components/Button.swift b/AltStore/Components/Button.swift index f3c2aebb..aa2860ea 100644 --- a/AltStore/Components/Button.swift +++ b/AltStore/Components/Button.swift @@ -13,6 +13,7 @@ class Button: UIButton override var intrinsicContentSize: CGSize { var size = super.intrinsicContentSize size.width += 20 + size.height += 10 return size } diff --git a/AltStore/Model/App.swift b/AltStore/Model/App.swift index 20f50bfc..3ac61bdc 100644 --- a/AltStore/Model/App.swift +++ b/AltStore/Model/App.swift @@ -12,6 +12,10 @@ class App: NSObject, Codable { var name: String var subtitle: String + var developer: String + + var localizedDescription: String var iconName: String + var screenshotNames: [String] } diff --git a/AltStore/Resources/Apps.plist b/AltStore/Resources/Apps.plist index 11f1262f..91ecbed4 100644 --- a/AltStore/Resources/Apps.plist +++ b/AltStore/Resources/Apps.plist @@ -7,16 +7,45 @@ Delta subtitle All-in-one Nintendo emulator + localizedDescription + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Sed enim ut sem viverra aliquet eget sit amet. Viverra mauris in aliquam sem fringilla ut. Egestas erat imperdiet sed euismod nisi porta. Sit amet dictum sit amet justo donec enim diam vulputate. Phasellus vestibulum lorem sed risus ultricies tristique nulla. Elit pellentesque habitant morbi tristique. Ut lectus arcu bibendum at. Ullamcorper a lacus vestibulum sed. Mi tempus imperdiet nulla malesuada pellentesque elit eget gravida. Nec feugiat nisl pretium fusce id velit ut. Amet nulla facilisi morbi tempus. Ut sem nulla pharetra diam sit amet nisl. + +Tortor at auctor urna nunc id cursus metus. Commodo ullamcorper a lacus vestibulum sed arcu non odio. Faucibus turpis in eu mi bibendum neque egestas. Auctor augue mauris augue neque gravida in fermentum et sollicitudin. Aliquam vestibulum morbi blandit cursus risus at ultrices mi tempus. Placerat in egestas erat imperdiet sed euismod nisi. Aliquam id diam maecenas ultricies mi eget mauris. Nunc faucibus a pellentesque sit amet porttitor eget dolor. Sed faucibus turpis in eu mi. Tortor vitae purus faucibus ornare suspendisse sed nisi lacus sed. Id semper risus in hendrerit gravida rutrum quisque. At lectus urna duis convallis convallis. Egestas maecenas pharetra convallis posuere. Id velit ut tortor pretium viverra. Quam pellentesque nec nam aliquam sem et tortor consequat. Risus pretium quam vulputate dignissim. Urna nec tincidunt praesent semper feugiat nibh sed pulvinar. + +Tempor orci eu lobortis elementum nibh tellus. Mattis rhoncus urna neque viverra justo nec. Maecenas pharetra convallis posuere morbi leo. Rhoncus mattis rhoncus urna neque viverra justo nec. Gravida dictum fusce ut placerat orci nulla pellentesque dignissim enim. At imperdiet dui accumsan sit amet. Elit sed vulputate mi sit amet mauris commodo. Pellentesque habitant morbi tristique senectus. Tortor id aliquet lectus proin nibh. Magna etiam tempor orci eu lobortis elementum. Est pellentesque elit ullamcorper dignissim. Dapibus ultrices in iaculis nunc. Commodo quis imperdiet massa tincidunt nunc pulvinar sapien et ligula. Diam vel quam elementum pulvinar. Vel turpis nunc eget lorem dolor sed viverra. Tortor pretium viverra suspendisse potenti nullam ac tortor vitae. Euismod nisi porta lorem mollis. Massa id neque aliquam vestibulum morbi blandit. + +Massa massa ultricies mi quis hendrerit dolor magna eget est. Augue interdum velit euismod in pellentesque massa. Sed risus ultricies tristique nulla aliquet enim. Risus viverra adipiscing at in tellus. Donec adipiscing tristique risus nec feugiat. Eget sit amet tellus cras adipiscing enim eu turpis. Auctor neque vitae tempus quam pellentesque nec. Sit amet tellus cras adipiscing enim eu turpis egestas. Dui faucibus in ornare quam viverra. Fermentum iaculis eu non diam phasellus vestibulum lorem. Odio ut enim blandit volutpat maecenas. Dolor sit amet consectetur adipiscing elit pellentesque habitant morbi tristique. Pellentesque diam volutpat commodo sed egestas egestas. Aliquam purus sit amet luctus venenatis lectus magna fringilla. Viverra mauris in aliquam sem fringilla ut morbi tincidunt. Elit duis tristique sollicitudin nibh sit. Fermentum dui faucibus in ornare quam viverra orci sagittis. Aliquet eget sit amet tellus cras adipiscing. + developer + Riley Testut iconName DeltaIcon + screenshotNames + + Delta1 + Delta2 + Delta3 + Delta4 + name Clipboard Manager subtitle Simple but powerful clipboard manager + localizedDescription + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Sed enim ut sem viverra aliquet eget sit amet. Viverra mauris in aliquam sem fringilla ut. Egestas erat imperdiet sed euismod nisi porta. Sit amet dictum sit amet justo donec enim diam vulputate. Phasellus vestibulum lorem sed risus ultricies tristique nulla. Elit pellentesque habitant morbi tristique. Ut lectus arcu bibendum at. Ullamcorper a lacus vestibulum sed. Mi tempus imperdiet nulla malesuada pellentesque elit eget gravida. Nec feugiat nisl pretium fusce id velit ut. Amet nulla facilisi morbi tempus. Ut sem nulla pharetra diam sit amet nisl. + +Tortor at auctor urna nunc id cursus metus. Commodo ullamcorper a lacus vestibulum sed arcu non odio. Faucibus turpis in eu mi bibendum neque egestas. Auctor augue mauris augue neque gravida in fermentum et sollicitudin. Aliquam vestibulum morbi blandit cursus risus at ultrices mi tempus. Placerat in egestas erat imperdiet sed euismod nisi. Aliquam id diam maecenas ultricies mi eget mauris. Nunc faucibus a pellentesque sit amet porttitor eget dolor. Sed faucibus turpis in eu mi. Tortor vitae purus faucibus ornare suspendisse sed nisi lacus sed. Id semper risus in hendrerit gravida rutrum quisque. At lectus urna duis convallis convallis. Egestas maecenas pharetra convallis posuere. Id velit ut tortor pretium viverra. Quam pellentesque nec nam aliquam sem et tortor consequat. Risus pretium quam vulputate dignissim. Urna nec tincidunt praesent semper feugiat nibh sed pulvinar. + +Tempor orci eu lobortis elementum nibh tellus. Mattis rhoncus urna neque viverra justo nec. Maecenas pharetra convallis posuere morbi leo. Rhoncus mattis rhoncus urna neque viverra justo nec. Gravida dictum fusce ut placerat orci nulla pellentesque dignissim enim. At imperdiet dui accumsan sit amet. Elit sed vulputate mi sit amet mauris commodo. Pellentesque habitant morbi tristique senectus. Tortor id aliquet lectus proin nibh. Magna etiam tempor orci eu lobortis elementum. Est pellentesque elit ullamcorper dignissim. Dapibus ultrices in iaculis nunc. Commodo quis imperdiet massa tincidunt nunc pulvinar sapien et ligula. Diam vel quam elementum pulvinar. Vel turpis nunc eget lorem dolor sed viverra. Tortor pretium viverra suspendisse potenti nullam ac tortor vitae. Euismod nisi porta lorem mollis. Massa id neque aliquam vestibulum morbi blandit. + +Massa massa ultricies mi quis hendrerit dolor magna eget est. Augue interdum velit euismod in pellentesque massa. Sed risus ultricies tristique nulla aliquet enim. Risus viverra adipiscing at in tellus. Donec adipiscing tristique risus nec feugiat. Eget sit amet tellus cras adipiscing enim eu turpis. Auctor neque vitae tempus quam pellentesque nec. Sit amet tellus cras adipiscing enim eu turpis egestas. Dui faucibus in ornare quam viverra. Fermentum iaculis eu non diam phasellus vestibulum lorem. Odio ut enim blandit volutpat maecenas. Dolor sit amet consectetur adipiscing elit pellentesque habitant morbi tristique. Pellentesque diam volutpat commodo sed egestas egestas. Aliquam purus sit amet luctus venenatis lectus magna fringilla. Viverra mauris in aliquam sem fringilla ut morbi tincidunt. Elit duis tristique sollicitudin nibh sit. Fermentum dui faucibus in ornare quam viverra orci sagittis. Aliquet eget sit amet tellus cras adipiscing. + developer + Riley Testut iconName ClipboardIcon + screenshotNames + diff --git a/AltStore/Resources/Assets.xcassets/App Screenshots/Contents.json b/AltStore/Resources/Assets.xcassets/App Screenshots/Contents.json new file mode 100644 index 00000000..da4a164c --- /dev/null +++ b/AltStore/Resources/Assets.xcassets/App Screenshots/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AltStore/Resources/Assets.xcassets/App Screenshots/Delta1.imageset/Contents.json b/AltStore/Resources/Assets.xcassets/App Screenshots/Delta1.imageset/Contents.json new file mode 100644 index 00000000..56332a02 --- /dev/null +++ b/AltStore/Resources/Assets.xcassets/App Screenshots/Delta1.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "IMG_8547.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AltStore/Resources/Assets.xcassets/App Screenshots/Delta1.imageset/IMG_8547.png b/AltStore/Resources/Assets.xcassets/App Screenshots/Delta1.imageset/IMG_8547.png new file mode 100644 index 00000000..abb59e21 Binary files /dev/null and b/AltStore/Resources/Assets.xcassets/App Screenshots/Delta1.imageset/IMG_8547.png differ diff --git a/AltStore/Resources/Assets.xcassets/App Screenshots/Delta2.imageset/Contents.json b/AltStore/Resources/Assets.xcassets/App Screenshots/Delta2.imageset/Contents.json new file mode 100644 index 00000000..f3cfd54b --- /dev/null +++ b/AltStore/Resources/Assets.xcassets/App Screenshots/Delta2.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "IMG_8548.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AltStore/Resources/Assets.xcassets/App Screenshots/Delta2.imageset/IMG_8548.png b/AltStore/Resources/Assets.xcassets/App Screenshots/Delta2.imageset/IMG_8548.png new file mode 100644 index 00000000..3eed2c21 Binary files /dev/null and b/AltStore/Resources/Assets.xcassets/App Screenshots/Delta2.imageset/IMG_8548.png differ diff --git a/AltStore/Resources/Assets.xcassets/App Screenshots/Delta3.imageset/Contents.json b/AltStore/Resources/Assets.xcassets/App Screenshots/Delta3.imageset/Contents.json new file mode 100644 index 00000000..c695debf --- /dev/null +++ b/AltStore/Resources/Assets.xcassets/App Screenshots/Delta3.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "IMG_8549.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AltStore/Resources/Assets.xcassets/App Screenshots/Delta3.imageset/IMG_8549.png b/AltStore/Resources/Assets.xcassets/App Screenshots/Delta3.imageset/IMG_8549.png new file mode 100644 index 00000000..a36386d5 Binary files /dev/null and b/AltStore/Resources/Assets.xcassets/App Screenshots/Delta3.imageset/IMG_8549.png differ diff --git a/AltStore/Resources/Assets.xcassets/App Screenshots/Delta4.imageset/Contents.json b/AltStore/Resources/Assets.xcassets/App Screenshots/Delta4.imageset/Contents.json new file mode 100644 index 00000000..fe220a2c --- /dev/null +++ b/AltStore/Resources/Assets.xcassets/App Screenshots/Delta4.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "IMG_8550.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/AltStore/Resources/Assets.xcassets/App Screenshots/Delta4.imageset/IMG_8550.png b/AltStore/Resources/Assets.xcassets/App Screenshots/Delta4.imageset/IMG_8550.png new file mode 100644 index 00000000..21ab55cc Binary files /dev/null and b/AltStore/Resources/Assets.xcassets/App Screenshots/Delta4.imageset/IMG_8550.png differ