Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version35 #23

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Version35 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
889adcc
Make UITableViewCell behaves as a button
veverka Jul 16, 2015
512e4ed
Remove Listen Tab
veverka Jul 16, 2015
a669daa
add only asset.submitted == true
veverka Jul 16, 2015
64893e0
Merge branch 'remove-listen-button' into version35
veverka Jul 16, 2015
ce9c503
Merge branch 'main-view-filter-submitted' into version35
veverka Jul 16, 2015
0facb90
Version 35
veverka Jul 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Digita11y/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="49e-Tb-3d3">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="49e-Tb-3d3">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies>
<scenes>
Expand Down Expand Up @@ -589,7 +589,6 @@
</tabBar>
<connections>
<segue destination="XqT-Yg-vHH" kind="relationship" relationship="viewControllers" id="u7Y-xg-7CH"/>
<segue destination="7j4-Da-wXB" kind="relationship" relationship="viewControllers" id="lzU-1b-eKA"/>
<segue destination="tpp-bF-1ch" kind="relationship" relationship="viewControllers" id="XPn-Io-2eX"/>
</connections>
</tabBarController>
Expand Down
1 change: 1 addition & 0 deletions Digita11y/Controllers/BrowseTableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class BrowseTableViewController: BaseTableViewController, RWFrameworkProtocol {
cell.tag = self.exhibitionViewModel?.IDForIndex(indexPath.row) ?? 0
cell.titleLabel.text = self.exhibitionViewModel?.titleForIndex(indexPath.row) ?? ""
cell.accessibilityLabel = self.exhibitionViewModel?.accessibilityLabelForIndex(indexPath.row) ?? ""
cell.accessibilityTraits = UIAccessibilityTraitButton;
cell.bannerImageView.sd_setImageWithURL(self.exhibitionViewModel?.imageURLForIndex(indexPath.row), placeholderImage: UIImage(named:"browse-cell"))

return cell
Expand Down
2 changes: 1 addition & 1 deletion Digita11y/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>34</string>
<string>35</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSLocationWhenInUseUsageDescription</key>
Expand Down
2 changes: 2 additions & 0 deletions Digita11y/Models/Asset.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ private var TextCache = [String:String]()

struct Asset {
var assetDescription = ""
var submitted: Bool = false
var volume = 0
var project = 0
var assetID = 0
Expand All @@ -28,6 +29,7 @@ struct Asset {

init(json: JSON) {
assetDescription = json["description"].string ?? ""
submitted = json["submitted"].boolValue ?? false
volume = json["volume"].int ?? 0
project = json["project"].int ?? 0
assetID = json["asset_id"].int ?? 0
Expand Down
2 changes: 1 addition & 1 deletion Digita11y/Operations/RequestAssets.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ func requestAssets(completion: (assets: [Asset]) -> ()) {
if (data != nil) {
let json = JSON(data: data!)
let assets = json.array?.map { Asset(json: $0) } ?? []
completion(assets: assets)
completion(assets: assets.filter { $0.submitted })
}
}) { (error) -> Void in
debugPrintln(error.localizedDescription)
Expand Down