Skip to content

Commit

Permalink
Merge pull request #120 from cpmpercussion/develop
Browse files Browse the repository at this point in the history 
Updated to 1.0.1
  • Loading branch information
@cpmpercussion
cpmpercussion committed Sep 10, 2018
2 parents 420c451 + 905d255 commit 6ff3cb0
Show file tree
Hide file tree
Showing 11 changed files with 150 additions and 19 deletions.
32 changes: 19 additions & 13 deletions Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="took the stage" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8qM-fi-pVE" userLabel="context">
<rect key="frame" x="52" y="392.66666666666669" width="93" height="17"/>
<rect key="frame" x="52" y="393" width="93" height="17"/>
<constraints>
<constraint firstAttribute="height" constant="17" id="qdX-dO-tUu"/>
</constraints>
Expand All @@ -36,7 +36,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="instrument" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6dJ-ZF-dqm">
<rect key="frame" x="275" y="392.66666666666669" width="87" height="22"/>
<rect key="frame" x="276" y="393" width="87" height="22"/>
<constraints>
<constraint firstAttribute="height" constant="22" id="bZ0-LP-Mio"/>
</constraints>
Expand All @@ -45,29 +45,28 @@
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fmu-Vs-F8c" userLabel="metadata container">
<rect key="frame" x="52" y="16" width="310" height="50"/>
<rect key="frame" x="52" y="16" width="311" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="performername" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zm0-8q-7kP">
<rect key="frame" x="54" y="3.3333333333333321" width="127" height="21.666666666666668"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="performername" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zm0-8q-7kP">
<rect key="frame" x="53.999999999999993" y="3.3333333333333321" width="126.33333333333331" height="21.666666666666668"/>
<accessibility key="accessibilityConfiguration" hint="Displays performer stage name" identifier="Stage name" label="Stage name"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="date and time" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RbJ-Tv-ySY" userLabel="Date">
<rect key="frame" x="54" y="27.666666666666664" width="89" height="17"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="date and time" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RbJ-Tv-ySY" userLabel="Date">
<rect key="frame" x="54.000000000000007" y="28" width="88.666666666666686" height="17"/>
<accessibility key="accessibilityConfiguration">
<accessibilityTraits key="traits" staticText="YES" notEnabled="YES"/>
</accessibility>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" fixedFrame="YES" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="Zvi-FN-w8i">
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="Zvi-FN-w8i">
<rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cxR-qX-Aey">
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="cxR-qX-Aey">
<rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
<accessibility key="accessibilityConfiguration" hint="Displays performer avatar" identifier="Avatar image" label="Avatar image">
<bool key="isElement" value="YES"/>
Expand All @@ -82,21 +81,28 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="Zvi-FN-w8i" firstAttribute="top" secondItem="fmu-Vs-F8c" secondAttribute="top" id="75J-rp-UqR"/>
<constraint firstItem="Zm0-8q-7kP" firstAttribute="centerY" secondItem="fmu-Vs-F8c" secondAttribute="centerY" constant="-11" id="QA7-4Q-nmx"/>
<constraint firstAttribute="height" constant="50" id="RoH-fE-34h"/>
<constraint firstItem="RbJ-Tv-ySY" firstAttribute="centerY" secondItem="fmu-Vs-F8c" secondAttribute="centerY" constant="11" id="iBh-oW-MYz"/>
<constraint firstItem="Zm0-8q-7kP" firstAttribute="leading" secondItem="RbJ-Tv-ySY" secondAttribute="leading" id="w2j-MU-07A"/>
<constraint firstItem="Zm0-8q-7kP" firstAttribute="leading" secondItem="fmu-Vs-F8c" secondAttribute="leading" constant="54" id="z0r-VO-7eE"/>
<constraint firstItem="Zm0-8q-7kP" firstAttribute="leading" secondItem="Zvi-FN-w8i" secondAttribute="trailing" constant="4" id="zTg-QU-z3O"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qwU-ld-Uy2">
<rect key="frame" x="52" y="74" width="310" height="310.66666666666669"/>
<rect key="frame" x="52" y="74" width="311" height="311"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<accessibility key="accessibilityConfiguration" hint="Displays performance" identifier="Jam area" label="Jam area">
<bool key="isElement" value="YES"/>
</accessibility>
<constraints>
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="500" id="Q5a-IJ-Esn"/>
<constraint firstAttribute="width" secondItem="qwU-ld-Uy2" secondAttribute="height" multiplier="1:1" id="VzA-GE-cNg"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JOw-B7-ob4">
<rect key="frame" x="318" y="340.66666666666669" width="36" height="36"/>
<rect key="frame" x="319" y="341" width="36" height="36"/>
<accessibility key="accessibilityConfiguration" hint="Tap to reply to this performance" identifier="Reply button" label="Reply button"/>
<constraints>
<constraint firstAttribute="width" constant="36" id="YNc-to-Xg0"/>
Expand All @@ -105,7 +111,7 @@
<state key="normal" title="reply" image="microjam-reply"/>
</button>
<button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ske-ad-PVr">
<rect key="frame" x="60" y="340.66666666666669" width="36" height="36"/>
<rect key="frame" x="60" y="341" width="36" height="36"/>
<accessibility key="accessibilityConfiguration" hint="Plays this performance" identifier="Play button" label="Play button"/>
<constraints>
<constraint firstAttribute="height" constant="36" id="gNE-VS-NXh"/>
Expand Down
21 changes: 21 additions & 0 deletions chirpey/Assets.xcassets/empty-profile-image.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "empty-profile-image.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added chirpey/Assets.xcassets/empty-profile-image.imageset/empty-profile-image.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions chirpey/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>1.0.1</string>
<key>CFBundleVersion</key>
<string>74</string>
<string>77</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>
Expand Down
15 changes: 15 additions & 0 deletions chirpey/MicrojamTabBarController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ class MicrojamTabBarController: UITabBarController {
controller.tabBarItem = UITabBarItem(title: TabBarItemTitles.jamTab, image: #imageLiteral(resourceName: "localjamsTabIcon"), selectedImage: nil)
let navigation = UINavigationController(rootViewController: controller)
viewControllers?.append(navigation)
// Accessibility elements
controller.isAccessibilityElement = true
controller.accessibilityTraits = UIAccessibilityTraitButton
controller.accessibilityLabel = "Jam button"
controller.accessibilityHint = "Tap to create a new Jam"
controller.title = "jam!"
}

Expand All @@ -46,6 +51,11 @@ class MicrojamTabBarController: UITabBarController {
// controller.view.translatesAutoresizingMaskIntoConstraints = false
let navigation = UINavigationController(rootViewController: controller)
viewControllers?.append(navigation)
// Accessibility elements
controller.isAccessibilityElement = true
controller.accessibilityTraits = UIAccessibilityTraitButton
controller.accessibilityLabel = "Profile button"
controller.accessibilityHint = "Tap to access your user profile"
} else {
print("TABVC: User Settings Tab could not be initialised.")
}
Expand All @@ -58,6 +68,11 @@ class MicrojamTabBarController: UITabBarController {
// controller.view.translatesAutoresizingMaskIntoConstraints = false
let navigation = UINavigationController(rootViewController: controller)
viewControllers?.append(navigation)
// Accessibility elements
controller.isAccessibilityElement = true
controller.accessibilityTraits = UIAccessibilityTraitButton
controller.accessibilityLabel = "Profile button"
controller.accessibilityHint = "Tap to access your user profile"
} else {
print("TABVC: Profile Tab could not be initialised.")
}
Expand Down
1 change: 1 addition & 0 deletions chirpey/PerformanceTableCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class PerformanceTableCell: UITableViewCell {

/// Updates UI with data from a given PerformerProfile
func display(performerProfile profile: PerformerProfile) {
avatarImageView.image = #imageLiteral(resourceName: "empty-profile-image")
avatarImageView.image = profile.avatar
performer.text = profile.stageName
}
Expand Down
7 changes: 7 additions & 0 deletions chirpey/PerformerInfoHeader.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,16 @@ class PerformerInfoHeader: UICollectionReusableView {
/// A UIImageView for the performer's avatar
let avatarImageView : UIImageView = {
let imageView = UIImageView()
imageView.image = #imageLiteral(resourceName: "empty-profile-image")
imageView.layer.borderWidth = 1
imageView.layer.borderColor = UIColor(white: 0.8, alpha: 1).cgColor
imageView.translatesAutoresizingMaskIntoConstraints = false

imageView.isAccessibilityElement = true
imageView.accessibilityTraits = UIAccessibilityTraitImage
imageView.accessibilityLabel = "Avatar image"
imageView.accessibilityIdentifier = "Avatar image"
imageView.accessibilityHint = "Displays the user's avatar image"
return imageView
}()
/// A UILabel for the performer's stagename
Expand Down
5 changes: 4 additions & 1 deletion chirpey/ProfileScreenController.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
</collectionViewFlowLayout>
<cells>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="V9L-pz-K1M">
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="unneededreuseid" id="V9L-pz-K1M">
<rect key="frame" x="0.0" y="444" width="50" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
Expand Down Expand Up @@ -109,6 +109,9 @@
</activityIndicatorView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<accessibility key="accessibilityConfiguration" hint="Tap to select a new avatar image" identifier="Avatar image chooser" label="Avatar image">
<bool key="isElement" value="YES"/>
</accessibility>
<constraints>
<constraint firstItem="dYX-7a-eae" firstAttribute="top" secondItem="RUy-r8-EZt" secondAttribute="top" id="0xZ-Uv-eaF"/>
<constraint firstItem="2qH-hw-KUp" firstAttribute="top" secondItem="RUy-r8-EZt" secondAttribute="top" id="8DU-X0-I9w"/>
Expand Down
Loading

0 comments on commit 6ff3cb0

Please sign in to comment.