Skip to content

Commit

Permalink
derived labor image changed
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gnanendra18
Gnanendra18 committed Aug 11, 2022
1 parent badd575 commit 9683bf0
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 5 deletions.
4 changes: 4 additions & 0 deletions Child Labor.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
1334AC97283BC372000F647E /* CustomExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1334AC96283BC372000F647E /* CustomExtensions.swift */; };
1334AC992841028D000F647E /* GoodsParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1334AC982841028C000F647E /* GoodsParser.swift */; };
1334AC9B28410338000F647E /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1334AC9A28410338000F647E /* Constants.swift */; };
1358B28328A54D7000A8072C /* derived_labor.png in Resources */ = {isa = PBXBuildFile; fileRef = 1358B28228A54D7000A8072C /* derived_labor.png */; };
136829B0286CA84C0083D8E4 /* CustomLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 136829AF286CA84C0083D8E4 /* CustomLabel.swift */; };
136829B2287C58610083D8E4 /* AssesmentLevelParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 136829B1287C58610083D8E4 /* AssesmentLevelParser.swift */; };
136829B4287C58720083D8E4 /* AssesmentsPieChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 136829B3287C58720083D8E4 /* AssesmentsPieChartViewController.xib */; };
Expand Down Expand Up @@ -1186,6 +1187,7 @@
1334AC96283BC372000F647E /* CustomExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomExtensions.swift; sourceTree = "<group>"; };
1334AC982841028C000F647E /* GoodsParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GoodsParser.swift; sourceTree = "<group>"; };
1334AC9A28410338000F647E /* Constants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
1358B28228A54D7000A8072C /* derived_labor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = derived_labor.png; sourceTree = "<group>"; };
136829AF286CA84C0083D8E4 /* CustomLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomLabel.swift; sourceTree = "<group>"; };
136829B1287C58610083D8E4 /* AssesmentLevelParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AssesmentLevelParser.swift; sourceTree = "<group>"; };
136829B3287C58720083D8E4 /* AssesmentsPieChartViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AssesmentsPieChartViewController.xib; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3532,6 +3534,7 @@
83B05CD41B9F1DE400A0F53A /* complete_goods_by_good.xml */,
380048811D8B993D00E64714 /* ToolkitForResponsibleBusinesses-lo.pdf */,
38CA953D1D4BAF2400319316 /* goods_2016.xml */,
1358B28228A54D7000A8072C /* derived_labor.png */,
380048721D8B991C00E64714 /* Fact Sheet-OFCT-2016-lo.pdf */,
ED16FC2E1F5886F100B9F937 /* [email protected] */,
380048731D8B991C00E64714 /* TDA.pdf */,
Expand Down Expand Up @@ -3773,6 +3776,7 @@
8356187B1BD7DE79007BCF75 /* Panama.pdf in Resources */,
835618541BD7DE79007BCF75 /* Guinea.pdf in Resources */,
8335AFB01B668111000748F0 /* icons_Trona_(mineral).png in Resources */,
1358B28328A54D7000A8072C /* derived_labor.png in Resources */,
8335AF6D1B667963000748F0 /* icons_Silk_Fabric.png in Resources */,
66C225E8289D936D004EADF8 /* [email protected] in Resources */,
6682423824E70B5F009B203E /* [email protected] in Resources */,
Expand Down
Binary file modified ...eproj/project.xcworkspace/xcuserdata/zolontech.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
7 changes: 4 additions & 3 deletions Child Labor/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1722,7 +1722,7 @@ and School</string>
<segment title="" image="child-labor.png"/>
<segment title="" image="forced-labor.png"/>
<segment title="" image="forced-child-labor.png"/>
<segment title="Derived labor"/>
<segment title="" image="derived_labor.png"/>
</segments>
<color key="tintColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
Expand Down Expand Up @@ -1948,7 +1948,7 @@ and School</string>
<segment title="" image="child-labor.png"/>
<segment title="" image="forced-labor.png"/>
<segment title="" image="forced-child-labor.png"/>
<segment title="Derived Labor"/>
<segment title="" image="derived_labor.png"/>
</segments>
<color key="tintColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
Expand Down Expand Up @@ -5993,14 +5993,15 @@ Standards </string>
</scenes>
<inferredMetricsTieBreakers>
<segue reference="iR0-4H-bt0"/>
<segue reference="Qkd-VV-gmI"/>
<segue reference="9ge-aL-a3Z"/>
<segue reference="q6X-np-kmw"/>
<segue reference="lgx-uC-KzH"/>
</inferredMetricsTieBreakers>
<resources>
<image name="BackgroundNew.png" width="1914" height="2666"/>
<image name="Brazil-map.png" width="453.60000610351562" height="452.16000366210938"/>
<image name="child-labor.png" width="60" height="50"/>
<image name="derived_labor.png" width="144" height="77"/>
<image name="dol.png" width="45" height="45"/>
<image name="forced-child-labor.png" width="60" height="50"/>
<image name="forced-labor.png" width="60" height="50"/>
Expand Down
2 changes: 1 addition & 1 deletion Child Labor/GoodController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class GoodController: UITableViewController {
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)

self.customizeSegmentControl()
//self.customizeSegmentControl()
// Make sure the ugly table cell selection is cleared when returning to this view
if let tableIndex = self.tableView.indexPathForSelectedRow {
self.tableView.deselectRow(at: tableIndex, animated: false)
Expand Down
Binary file added Child Labor/derived_labor.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.
2 changes: 1 addition & 1 deletion ExploitationTableViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ class ExploitationTableViewController: UITableViewController, UICollectionViewDa

override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
self.customizeSegmentControl()
//self.customizeSegmentControl()
// Make sure the ugly table cell selection is cleared when returning to this view
if let tableIndex = self.tableView.indexPathForSelectedRow {
self.tableView.deselectRow(at: tableIndex, animated: false)
Expand Down

0 comments on commit 9683bf0

Please sign in to comment.