Skip to content

Commit

Permalink
Merge pull request #124 from Zolon-DOL/master
Browse files Browse the repository at this point in the history 
Sprint 1 changes
  • Loading branch information
@pbhatt17
pbhatt17 authored Jul 17, 2020
2 parents a0adafa + 01bd8bb commit b42cc67
Show file tree
Hide file tree
Showing 18 changed files with 31,205 additions and 31,102 deletions.
Binary file modified .DS_Store
View file
Binary file not shown.
64 changes: 45 additions & 19 deletions Child Labor.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions Child Labor.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@
<dict>
<key>BuildSystemType</key>
<string>Original</string>
<key>PreviewsEnabled</key>
<false/>
</dict>
</plist>
Binary file modified ...oj/project.xcworkspace/xcuserdata/praveenbhatt.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
43 changes: 22 additions & 21 deletions Child Labor/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="FQM-HS-dU1">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="FQM-HS-dU1">
<device id="retina4_0" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand Down Expand Up @@ -279,7 +279,7 @@
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="detailDisclosure" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l3Q-78-HdS">
<rect key="frame" x="285" y="311" width="25" height="24"/>
<color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<connections>
<segue destination="3s6-C9-493" kind="presentation" id="omh-cQ-qP8"/>
</connections>
Expand Down Expand Up @@ -548,7 +548,7 @@
<constraint firstAttribute="height" constant="66" id="6KX-fH-cCc"/>
<constraint firstAttribute="width" constant="66" id="rlj-Kh-mJA"/>
</constraints>
<color key="tintColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" image="icons_Cotton.png">
<color key="titleShadowColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
Expand Down Expand Up @@ -756,11 +756,11 @@
<rect key="frame" x="0.0" y="548" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Qki-Ia-X0V" id="2Tt-Z3-WHf">
<rect key="frame" x="0.0" y="0.0" width="293" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="301" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="International Conventions" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="gBZ-qi-mN0">
<rect key="frame" x="16" y="0.0" width="269" height="44"/>
<rect key="frame" x="15" y="0.0" width="278" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<nil key="textColor"/>
Expand Down Expand Up @@ -1713,7 +1713,7 @@ and School</string>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="7Io-wa-VmP">
<rect key="frame" x="-117.5" y="11" width="555" height="51"/>
<rect key="frame" x="2.5" y="11" width="315" height="51"/>
<color key="backgroundColor" systemColor="systemOrangeColor" red="1" green="0.58431372550000005" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="za0-Bk-brB"/>
Expand Down Expand Up @@ -1791,7 +1791,7 @@ and School</string>
<constraint firstAttribute="width" constant="33" id="kuL-hW-Amf"/>
<constraint firstAttribute="height" constant="44" id="sl6-el-Te2"/>
</constraints>
<color key="tintColor" red="0.7019608021" green="0.7019608021" blue="0.7019608021" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" image="icons_Cotton-33.png">
<color key="titleShadowColor" red="0.552734375" green="0.552734375" blue="0.552734375" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
Expand All @@ -1808,18 +1808,19 @@ and School</string>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" tag="204" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ECq-dQ-H0W">
<rect key="frame" x="-5" y="12" width="42" height="21"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" alpha="0.80000000000000004" tag="202" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="hand.png" translatesAutoresizingMaskIntoConstraints="NO" id="5F4-gd-7SW">
<imageView userInteractionEnabled="NO" tag="202" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="hand.png" translatesAutoresizingMaskIntoConstraints="NO" id="5F4-gd-7SW">
<rect key="frame" x="4.5" y="26" width="12" height="12"/>
<constraints>
<constraint firstAttribute="height" constant="12" id="DGE-rk-QkB"/>
<constraint firstAttribute="width" constant="12" id="gR8-Sk-SKL"/>
</constraints>
</imageView>
<imageView userInteractionEnabled="NO" alpha="0.80000001192092896" tag="203" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="man.png" translatesAutoresizingMaskIntoConstraints="NO" id="qH5-2b-ybS">
<imageView userInteractionEnabled="NO" tag="203" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="man.png" translatesAutoresizingMaskIntoConstraints="NO" id="qH5-2b-ybS">
<rect key="frame" x="15.5" y="26" width="12" height="12"/>
<constraints>
<constraint firstAttribute="height" constant="12" id="idG-Jz-38U"/>
Expand Down Expand Up @@ -1919,15 +1920,15 @@ and School</string>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" alpha="0.10000000149011612" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icons_Cotton.png" translatesAutoresizingMaskIntoConstraints="NO" id="4Kd-M3-n5y">
<rect key="frame" x="135" y="10" width="175" height="175"/>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icons_Cotton.png" translatesAutoresizingMaskIntoConstraints="NO" id="4Kd-M3-n5y">
<rect key="frame" x="180" y="80" width="130" height="130"/>
<constraints>
<constraint firstAttribute="height" constant="175" id="5so-o5-eHa"/>
<constraint firstAttribute="width" constant="175" id="RIG-uU-HHa"/>
<constraint firstAttribute="height" constant="130" id="5so-o5-eHa"/>
<constraint firstAttribute="width" constant="130" id="RIG-uU-HHa"/>
</constraints>
</imageView>
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="Wdw-tB-KeC">
<rect key="frame" x="-117.5" y="211" width="555" height="51"/>
<rect key="frame" x="2.5" y="211" width="315" height="51"/>
<color key="backgroundColor" systemColor="systemOrangeColor" red="1" green="0.58431372550000005" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="XbU-54-Q50"/>
Expand All @@ -1953,7 +1954,7 @@ and School</string>
<constraint firstAttribute="trailing" secondItem="4Kd-M3-n5y" secondAttribute="trailing" constant="10" id="HZQ-Mj-2e2"/>
<constraint firstItem="6H6-z4-rbS" firstAttribute="top" secondItem="p32-kC-k9K" secondAttribute="bottom" id="KOw-Cf-bmz"/>
<constraint firstItem="Wdw-tB-KeC" firstAttribute="centerY" secondItem="uyM-z8-Kzj" secondAttribute="centerY" id="Kbb-KI-ZBE"/>
<constraint firstItem="4Kd-M3-n5y" firstAttribute="top" secondItem="uyM-z8-Kzj" secondAttribute="top" constant="10" id="VEL-JA-Uil"/>
<constraint firstItem="4Kd-M3-n5y" firstAttribute="top" secondItem="uyM-z8-Kzj" secondAttribute="top" constant="80" id="VEL-JA-Uil"/>
<constraint firstItem="Wdw-tB-KeC" firstAttribute="centerX" secondItem="uyM-z8-Kzj" secondAttribute="centerX" id="b3a-o9-BjT"/>
<constraint firstItem="p32-kC-k9K" firstAttribute="leading" secondItem="uyM-z8-Kzj" secondAttribute="leading" constant="20" symbolic="YES" id="dLc-y8-SfM"/>
<constraint firstItem="6H6-z4-rbS" firstAttribute="top" secondItem="uyM-z8-Kzj" secondAttribute="top" constant="36" id="pd6-cm-ooF"/>
Expand Down Expand Up @@ -6287,6 +6288,11 @@ Standards </string>
<point key="canvasLocation" x="4768.125" y="76.056338028169009"/>
</scene>
</scenes>
<inferredMetricsTieBreakers>
<segue reference="o2e-dV-zlY"/>
<segue reference="Qkd-VV-gmI"/>
<segue reference="UrS-Cc-ziQ"/>
</inferredMetricsTieBreakers>
<resources>
<image name="BackgroundNew.png" width="2058" height="3104"/>
<image name="Brazil-map.png" width="453.60000610351562" height="452.16000366210938"/>
Expand All @@ -6301,9 +6307,4 @@ Standards </string>
<image name="ilab.png" width="66" height="33"/>
<image name="man.png" width="12" height="12"/>
</resources>
<inferredMetricsTieBreakers>
<segue reference="o2e-dV-zlY"/>
<segue reference="3NZ-qU-LZw"/>
<segue reference="UrS-Cc-ziQ"/>
</inferredMetricsTieBreakers>
</document>
2 changes: 1 addition & 1 deletion Child Labor/CountryController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ class CountryController: UITableViewController, UICollectionViewDataSource, UICo

override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
// If this is a TVPRA-only country, or one of British Indian Ocean Territories, Heard and McDonald Islands, or Pitcairn Island, it has no indicator or PDF buttons, so return 0 for both sections
if ["China", "Iran", "Malaysia", "Mexico", "North Korea", "Tajikistan", "Turkmenistan", "Vietnam", "British Indian Ocean Territories", "Heard and McDonald Islands", "Pitcairn Islands", "Russia", "Sudan"].contains(self.countryName) {
if ["China", "Iran", "Malaysia", "Turkey", "North Korea", "Tajikistan", "Turkmenistan", "Vietnam", "British Indian Ocean Territories", "Heard and McDonald Islands", "Pitcairn Islands", "Russia", "Sudan"].contains(self.countryName) {
return 0

// Otherwise
Expand Down
2 changes: 1 addition & 1 deletion Child Labor/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>12</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIApplicationShortcutItems</key>
Expand Down
Loading

0 comments on commit b42cc67

Please sign in to comment.