diff --git a/Child Labor.xcodeproj/project.pbxproj b/Child Labor.xcodeproj/project.pbxproj index 69a8703..ddd47cf 100755 --- a/Child Labor.xcodeproj/project.pbxproj +++ b/Child Labor.xcodeproj/project.pbxproj @@ -255,7 +255,7 @@ 8303DFCE1B41F21A00E4FD42 /* Tonga-map.png in Resources */ = {isa = PBXBuildFile; fileRef = 8303DF521B41F21A00E4FD42 /* Tonga-map.png */; }; 8303DFCF1B41F21A00E4FD42 /* Trinidad and Tobago-map.png in Resources */ = {isa = PBXBuildFile; fileRef = 8303DF531B41F21A00E4FD42 /* Trinidad and Tobago-map.png */; }; 8303DFD01B41F21A00E4FD42 /* Tunisia-map.png in Resources */ = {isa = PBXBuildFile; fileRef = 8303DF541B41F21A00E4FD42 /* Tunisia-map.png */; }; - 8303DFD11B41F21A00E4FD42 /* Turkey-map.png in Resources */ = {isa = PBXBuildFile; fileRef = 8303DF551B41F21A00E4FD42 /* Turkey-map.png */; }; + 8303DFD11B41F21A00E4FD42 /* Turkey (Türkiye)-map.png in Resources */ = {isa = PBXBuildFile; fileRef = 8303DF551B41F21A00E4FD42 /* Turkey (Türkiye)-map.png */; }; 8303DFD21B41F21A00E4FD42 /* Tuvalu-map.png in Resources */ = {isa = PBXBuildFile; fileRef = 8303DF561B41F21A00E4FD42 /* Tuvalu-map.png */; }; 8303DFD31B41F21A00E4FD42 /* Uganda-map.png in Resources */ = {isa = PBXBuildFile; fileRef = 8303DF571B41F21A00E4FD42 /* Uganda-map.png */; }; 8303DFD51B41F21A00E4FD42 /* Uruguay-map.png in Resources */ = {isa = PBXBuildFile; fileRef = 8303DF591B41F21A00E4FD42 /* Uruguay-map.png */; }; @@ -467,7 +467,7 @@ 8310FF381ABB11310025F7AE /* Tonga.png in Resources */ = {isa = PBXBuildFile; fileRef = 8310FE581ABB11310025F7AE /* Tonga.png */; }; 8310FF391ABB11310025F7AE /* Trinidad_and_Tobago.png in Resources */ = {isa = PBXBuildFile; fileRef = 8310FE591ABB11310025F7AE /* Trinidad_and_Tobago.png */; }; 8310FF3A1ABB11310025F7AE /* Tunisia.png in Resources */ = {isa = PBXBuildFile; fileRef = 8310FE5A1ABB11310025F7AE /* Tunisia.png */; }; - 8310FF3B1ABB11310025F7AE /* Turkey.png in Resources */ = {isa = PBXBuildFile; fileRef = 8310FE5B1ABB11310025F7AE /* Turkey.png */; }; + 8310FF3B1ABB11310025F7AE /* Turkey_(Türkiye).png in Resources */ = {isa = PBXBuildFile; fileRef = 8310FE5B1ABB11310025F7AE /* Turkey_(Türkiye).png */; }; 8310FF3C1ABB11310025F7AE /* Turkmenistan.png in Resources */ = {isa = PBXBuildFile; fileRef = 8310FE5C1ABB11310025F7AE /* Turkmenistan.png */; }; 8310FF3D1ABB11310025F7AE /* Turks_and_Caicos_Islands.png in Resources */ = {isa = PBXBuildFile; fileRef = 8310FE5D1ABB11310025F7AE /* Turks_and_Caicos_Islands.png */; }; 8310FF3E1ABB11310025F7AE /* Tuvalu.png in Resources */ = {isa = PBXBuildFile; fileRef = 8310FE5E1ABB11310025F7AE /* Tuvalu.png */; }; @@ -642,7 +642,7 @@ 8347AA081B3F58C400C439BA /* Montenegro.png in Resources */ = {isa = PBXBuildFile; fileRef = 8347AA071B3F58C400C439BA /* Montenegro.png */; }; 8347AA0A1B3F597300C439BA /* Tokelau.png in Resources */ = {isa = PBXBuildFile; fileRef = 8347AA091B3F597300C439BA /* Tokelau.png */; }; 8347AA0C1B3F5A0A00C439BA /* Heard_and_McDonald_Islands.png in Resources */ = {isa = PBXBuildFile; fileRef = 8347AA0B1B3F5A0A00C439BA /* Heard_and_McDonald_Islands.png */; }; - 8347AA0E1B3F5AB800C439BA /* Saint_Helena,_Ascensión,_and_Tristán_da_Cunha.png in Resources */ = {isa = PBXBuildFile; fileRef = 8347AA0D1B3F5AB800C439BA /* Saint_Helena,_Ascensión,_and_Tristán_da_Cunha.png */; }; + 8347AA0E1B3F5AB800C439BA /* Saint_Helena_Ascension_and_Tristan_da_Cunha.png in Resources */ = {isa = PBXBuildFile; fileRef = 8347AA0D1B3F5AB800C439BA /* Saint_Helena_Ascension_and_Tristan_da_Cunha.png */; }; 834D8DA11B4C5EB9001CD795 /* SuggestedActionsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 834D8DA01B4C5EB9001CD795 /* SuggestedActionsTableViewController.swift */; }; 834D8DA31B4C5ECC001CD795 /* LawsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 834D8DA21B4C5ECC001CD795 /* LawsTableViewController.swift */; }; 834D8DA51B4C5EE8001CD795 /* ConventionsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 834D8DA41B4C5EE8001CD795 /* ConventionsTableViewController.swift */; }; @@ -743,7 +743,7 @@ 8356187E1BD7DE79007BCF75 /* Peru.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835617F51BD7DE78007BCF75 /* Peru.pdf */; }; 8356187F1BD7DE79007BCF75 /* Philippines.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835617F61BD7DE78007BCF75 /* Philippines.pdf */; }; 835618811BD7DE79007BCF75 /* Rwanda.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835617F81BD7DE78007BCF75 /* Rwanda.pdf */; }; - 835618821BD7DE79007BCF75 /* Saint Helena, Ascensión, and Tristán da Cunha.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835617F91BD7DE78007BCF75 /* Saint Helena, Ascensión, and Tristán da Cunha.pdf */; }; + 835618821BD7DE79007BCF75 /* Saint Helena Ascension and Tristan da Cunha.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835617F91BD7DE78007BCF75 /* Saint Helena Ascension and Tristan da Cunha.pdf */; }; 835618831BD7DE79007BCF75 /* Saint Lucia.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835617FA1BD7DE78007BCF75 /* Saint Lucia.pdf */; }; 835618841BD7DE79007BCF75 /* Saint Vincent and the Grenadines.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835617FB1BD7DE78007BCF75 /* Saint Vincent and the Grenadines.pdf */; }; 835618851BD7DE79007BCF75 /* Samoa.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835617FC1BD7DE78007BCF75 /* Samoa.pdf */; }; @@ -766,7 +766,7 @@ 835618961BD7DE79007BCF75 /* Tokelau.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 8356180D1BD7DE79007BCF75 /* Tokelau.pdf */; }; 835618971BD7DE79007BCF75 /* Tonga.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 8356180E1BD7DE79007BCF75 /* Tonga.pdf */; }; 835618991BD7DE79007BCF75 /* Tunisia.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835618101BD7DE79007BCF75 /* Tunisia.pdf */; }; - 8356189A1BD7DE79007BCF75 /* Turkey.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835618111BD7DE79007BCF75 /* Turkey.pdf */; }; + 8356189A1BD7DE79007BCF75 /* Turkey_(Türkiye).pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835618111BD7DE79007BCF75 /* Turkey_(Türkiye).pdf */; }; 8356189B1BD7DE79007BCF75 /* Tuvalu.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835618121BD7DE79007BCF75 /* Tuvalu.pdf */; }; 8356189C1BD7DE79007BCF75 /* Uganda.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835618131BD7DE79007BCF75 /* Uganda.pdf */; }; 8356189D1BD7DE79007BCF75 /* Ukraine.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 835618141BD7DE79007BCF75 /* Ukraine.pdf */; }; @@ -1413,7 +1413,7 @@ 8303DF521B41F21A00E4FD42 /* Tonga-map.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Tonga-map.png"; sourceTree = ""; }; 8303DF531B41F21A00E4FD42 /* Trinidad and Tobago-map.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Trinidad and Tobago-map.png"; sourceTree = ""; }; 8303DF541B41F21A00E4FD42 /* Tunisia-map.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Tunisia-map.png"; sourceTree = ""; }; - 8303DF551B41F21A00E4FD42 /* Turkey-map.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Turkey-map.png"; sourceTree = ""; }; + 8303DF551B41F21A00E4FD42 /* Turkey (Türkiye)-map.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Turkey (Türkiye)-map.png"; sourceTree = ""; }; 8303DF561B41F21A00E4FD42 /* Tuvalu-map.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Tuvalu-map.png"; sourceTree = ""; }; 8303DF571B41F21A00E4FD42 /* Uganda-map.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Uganda-map.png"; sourceTree = ""; }; 8303DF591B41F21A00E4FD42 /* Uruguay-map.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Uruguay-map.png"; sourceTree = ""; }; @@ -1625,7 +1625,7 @@ 8310FE581ABB11310025F7AE /* Tonga.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Tonga.png; sourceTree = ""; }; 8310FE591ABB11310025F7AE /* Trinidad_and_Tobago.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Trinidad_and_Tobago.png; sourceTree = ""; }; 8310FE5A1ABB11310025F7AE /* Tunisia.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Tunisia.png; sourceTree = ""; }; - 8310FE5B1ABB11310025F7AE /* Turkey.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Turkey.png; sourceTree = ""; }; + 8310FE5B1ABB11310025F7AE /* Turkey_(Türkiye).png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Turkey_(Türkiye).png"; sourceTree = ""; }; 8310FE5C1ABB11310025F7AE /* Turkmenistan.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Turkmenistan.png; sourceTree = ""; }; 8310FE5D1ABB11310025F7AE /* Turks_and_Caicos_Islands.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Turks_and_Caicos_Islands.png; sourceTree = ""; }; 8310FE5E1ABB11310025F7AE /* Tuvalu.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Tuvalu.png; sourceTree = ""; }; @@ -1800,7 +1800,7 @@ 8347AA071B3F58C400C439BA /* Montenegro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Montenegro.png; sourceTree = ""; }; 8347AA091B3F597300C439BA /* Tokelau.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Tokelau.png; sourceTree = ""; }; 8347AA0B1B3F5A0A00C439BA /* Heard_and_McDonald_Islands.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Heard_and_McDonald_Islands.png; sourceTree = ""; }; - 8347AA0D1B3F5AB800C439BA /* Saint_Helena,_Ascensión,_and_Tristán_da_Cunha.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Saint_Helena,_Ascensión,_and_Tristán_da_Cunha.png"; sourceTree = ""; }; + 8347AA0D1B3F5AB800C439BA /* Saint_Helena_Ascension_and_Tristan_da_Cunha.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Saint_Helena_Ascension_and_Tristan_da_Cunha.png; sourceTree = ""; }; 834D8DA01B4C5EB9001CD795 /* SuggestedActionsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SuggestedActionsTableViewController.swift; sourceTree = ""; }; 834D8DA21B4C5ECC001CD795 /* LawsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LawsTableViewController.swift; sourceTree = ""; }; 834D8DA41B4C5EE8001CD795 /* ConventionsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConventionsTableViewController.swift; sourceTree = ""; }; @@ -1901,7 +1901,7 @@ 835617F51BD7DE78007BCF75 /* Peru.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Peru.pdf; sourceTree = ""; }; 835617F61BD7DE78007BCF75 /* Philippines.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Philippines.pdf; sourceTree = ""; }; 835617F81BD7DE78007BCF75 /* Rwanda.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Rwanda.pdf; sourceTree = ""; }; - 835617F91BD7DE78007BCF75 /* Saint Helena, Ascensión, and Tristán da Cunha.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "Saint Helena, Ascensión, and Tristán da Cunha.pdf"; sourceTree = ""; }; + 835617F91BD7DE78007BCF75 /* Saint Helena Ascension and Tristan da Cunha.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "Saint Helena Ascension and Tristan da Cunha.pdf"; sourceTree = ""; }; 835617FA1BD7DE78007BCF75 /* Saint Lucia.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "Saint Lucia.pdf"; sourceTree = ""; }; 835617FB1BD7DE78007BCF75 /* Saint Vincent and the Grenadines.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "Saint Vincent and the Grenadines.pdf"; sourceTree = ""; }; 835617FC1BD7DE78007BCF75 /* Samoa.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Samoa.pdf; sourceTree = ""; }; @@ -1924,7 +1924,7 @@ 8356180D1BD7DE79007BCF75 /* Tokelau.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Tokelau.pdf; sourceTree = ""; }; 8356180E1BD7DE79007BCF75 /* Tonga.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Tonga.pdf; sourceTree = ""; }; 835618101BD7DE79007BCF75 /* Tunisia.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Tunisia.pdf; sourceTree = ""; }; - 835618111BD7DE79007BCF75 /* Turkey.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Turkey.pdf; sourceTree = ""; }; + 835618111BD7DE79007BCF75 /* Turkey_(Türkiye).pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "Turkey_(Türkiye).pdf"; sourceTree = ""; }; 835618121BD7DE79007BCF75 /* Tuvalu.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Tuvalu.pdf; sourceTree = ""; }; 835618131BD7DE79007BCF75 /* Uganda.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Uganda.pdf; sourceTree = ""; }; 835618141BD7DE79007BCF75 /* Ukraine.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = Ukraine.pdf; sourceTree = ""; }; @@ -2493,7 +2493,7 @@ 8303DF521B41F21A00E4FD42 /* Tonga-map.png */, 8303DF531B41F21A00E4FD42 /* Trinidad and Tobago-map.png */, 8303DF541B41F21A00E4FD42 /* Tunisia-map.png */, - 8303DF551B41F21A00E4FD42 /* Turkey-map.png */, + 8303DF551B41F21A00E4FD42 /* Turkey (Türkiye)-map.png */, 8303DF561B41F21A00E4FD42 /* Tuvalu-map.png */, 8303DF571B41F21A00E4FD42 /* Uganda-map.png */, 8335AEA41B667906000748F0 /* Ukraine-map.png */, @@ -2681,7 +2681,7 @@ 8310FE311ABB11310025F7AE /* Romania.png */, 8310FE321ABB11310025F7AE /* Russia.png */, 8310FE331ABB11310025F7AE /* Rwanda.png */, - 8347AA0D1B3F5AB800C439BA /* Saint_Helena,_Ascensión,_and_Tristán_da_Cunha.png */, + 8347AA0D1B3F5AB800C439BA /* Saint_Helena_Ascension_and_Tristan_da_Cunha.png */, 8310FE341ABB11310025F7AE /* Saint_Kitts_and_Nevis.png */, 8310FE351ABB11310025F7AE /* Saint_Lucia.png */, 8310FE361ABB11310025F7AE /* Saint_Pierre.png */, @@ -2723,7 +2723,7 @@ 8310FE581ABB11310025F7AE /* Tonga.png */, 8310FE591ABB11310025F7AE /* Trinidad_and_Tobago.png */, 8310FE5A1ABB11310025F7AE /* Tunisia.png */, - 8310FE5B1ABB11310025F7AE /* Turkey.png */, + 8310FE5B1ABB11310025F7AE /* Turkey_(Türkiye).png */, 8310FE5C1ABB11310025F7AE /* Turkmenistan.png */, 8310FE5D1ABB11310025F7AE /* Turks_and_Caicos_Islands.png */, 8310FE5E1ABB11310025F7AE /* Tuvalu.png */, @@ -3394,7 +3394,7 @@ 835617F51BD7DE78007BCF75 /* Peru.pdf */, 835617F61BD7DE78007BCF75 /* Philippines.pdf */, 835617F81BD7DE78007BCF75 /* Rwanda.pdf */, - 835617F91BD7DE78007BCF75 /* Saint Helena, Ascensión, and Tristán da Cunha.pdf */, + 835617F91BD7DE78007BCF75 /* Saint Helena Ascension and Tristan da Cunha.pdf */, 835617FA1BD7DE78007BCF75 /* Saint Lucia.pdf */, 835617FB1BD7DE78007BCF75 /* Saint Vincent and the Grenadines.pdf */, 835617FC1BD7DE78007BCF75 /* Samoa.pdf */, @@ -3417,7 +3417,7 @@ 8356180D1BD7DE79007BCF75 /* Tokelau.pdf */, 8356180E1BD7DE79007BCF75 /* Tonga.pdf */, 835618101BD7DE79007BCF75 /* Tunisia.pdf */, - 835618111BD7DE79007BCF75 /* Turkey.pdf */, + 835618111BD7DE79007BCF75 /* Turkey_(Türkiye).pdf */, 835618121BD7DE79007BCF75 /* Tuvalu.pdf */, 835618131BD7DE79007BCF75 /* Uganda.pdf */, 835618141BD7DE79007BCF75 /* Ukraine.pdf */, @@ -3859,7 +3859,7 @@ 8356184A1BD7DE79007BCF75 /* Ethiopia.pdf in Resources */, EDF0414220EFA71F00506499 /* icons_lettuce-33@3x.png in Resources */, 8335AF651B667963000748F0 /* icons_Rubber.png in Resources */, - 8310FF3B1ABB11310025F7AE /* Turkey.png in Resources */, + 8310FF3B1ABB11310025F7AE /* Turkey_(Türkiye).png in Resources */, 8310FE8B1ABB11310025F7AE /* British_Virgin_Islands.png in Resources */, 8310FEAC1ABB11310025F7AE /* Equatorial_Guinea.png in Resources */, 8310FF281ABB11310025F7AE /* Soviet_Union.png in Resources */, @@ -3879,7 +3879,7 @@ 8303DFAC1B41F21A00E4FD42 /* Mozambique-map.png in Resources */, 83AD13911B669137004B92D3 /* icons_Fireworks-33@2x.png in Resources */, 8303DFD31B41F21A00E4FD42 /* Uganda-map.png in Resources */, - 8356189A1BD7DE79007BCF75 /* Turkey.pdf in Resources */, + 8356189A1BD7DE79007BCF75 /* Turkey_(Türkiye).pdf in Resources */, 8310FEEA1ABB11310025F7AE /* Martinique.png in Resources */, 83AD13DA1B669137004B92D3 /* icons_Surgical_Instruments-33@2x.png in Resources */, EDF0417020EFAA5800506499 /* icons_Carrots-33@3x.png in Resources */, @@ -4105,7 +4105,7 @@ 835618601BD7DE79007BCF75 /* Kosovo.pdf in Resources */, 8335AF941B667F78000748F0 /* icons_Granite_(crushed).png in Resources */, 83AD12811B668E71004B92D3 /* icons_Furniture-33@3x.png in Resources */, - 8303DFD11B41F21A00E4FD42 /* Turkey-map.png in Resources */, + 8303DFD11B41F21A00E4FD42 /* Turkey (Türkiye)-map.png in Resources */, 83AD12D31B668E71004B92D3 /* icons_Tungsten_ore_(wolframite)-33@3x.png in Resources */, 83AD13871B669137004B92D3 /* icons_Cottonseed_(hybrid)-33@2x.png in Resources */, 8335AFA01B66803E000748F0 /* icons_Silk_Thread.png in Resources */, @@ -4171,7 +4171,7 @@ 83AD13981B669137004B92D3 /* icons_Furniture_(steel)-33@2x.png in Resources */, 8310FEDF1ABB11310025F7AE /* Lithuania.png in Resources */, 83AD13A01B669137004B92D3 /* icons_Gold-33@2x.png in Resources */, - 835618821BD7DE79007BCF75 /* Saint Helena, Ascensión, and Tristán da Cunha.pdf in Resources */, + 835618821BD7DE79007BCF75 /* Saint Helena Ascension and Tristan da Cunha.pdf in Resources */, EDF0415420EFA8E300506499 /* icons_Sheep-33@3x.png in Resources */, 8310FE861ABB11310025F7AE /* Bhutan.png in Resources */, 6682420824E4280D009B203E /* Mexico.pdf in Resources */, @@ -4382,7 +4382,7 @@ 8310FF371ABB11310025F7AE /* Togo.png in Resources */, 8310FF181ABB11310025F7AE /* Samoa.png in Resources */, 835618351BD7DE79007BCF75 /* Cambodia.pdf in Resources */, - 8347AA0E1B3F5AB800C439BA /* Saint_Helena,_Ascensión,_and_Tristán_da_Cunha.png in Resources */, + 8347AA0E1B3F5AB800C439BA /* Saint_Helena_Ascension_and_Tristan_da_Cunha.png in Resources */, 8335AFC01B66827E000748F0 /* icons_Coal.png in Resources */, 83AD126D1B668E71004B92D3 /* icons_Corn-33@3x.png in Resources */, 835618281BD7DE79007BCF75 /* Bangladesh.pdf in Resources */, diff --git a/Child Labor/BackgroundNew.png b/Child Labor/BackgroundNew.png index 278dd4a..dd698f6 100644 Binary files a/Child Labor/BackgroundNew.png and b/Child Labor/BackgroundNew.png differ diff --git a/Child Labor/CountryController.swift b/Child Labor/CountryController.swift index 1e12d6e..ccf104e 100644 --- a/Child Labor/CountryController.swift +++ b/Child Labor/CountryController.swift @@ -295,7 +295,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", "Turkey", "North Korea", "Taiwan", "Tajikistan", "Turkmenistan", "Vietnam", "British Indian Ocean Territories", "Heard and McDonald Islands", "Pitcairn Islands", "Russia", "Sudan", "Venezuela"].contains(self.countryName) { + if ["China", "Iran", "Malaysia", "Turkey (Türkiye)", "North Korea", "Taiwan", "Tajikistan", "Turkmenistan", "Vietnam", "British Indian Ocean Territories", "Heard and McDonald Islands", "Pitcairn Islands", "Russia", "Sudan", "Venezuela"].contains(self.countryName) { return 0 // Otherwise @@ -377,24 +377,18 @@ class CountryController: UITableViewController, UICollectionViewDataSource, UICo if (indexPath.row == 1) { if (countryName=="Somalia") { - - - performSegue(withIdentifier: "presentSomalia", sender: self) + performSegue(withIdentifier: "presentStats", sender: self) } else if (countryName=="Pakistan") { - - - performSegue(withIdentifier: "presentPakistan", sender: self) + performSegue(withIdentifier: "presentStats", sender: self) } else if (countryName=="Tanzania") { - - - performSegue(withIdentifier: "presentTanzania", sender: self) + performSegue(withIdentifier: "presentStats", sender: self) } diff --git a/Child Labor/GoodsTableViewController.swift b/Child Labor/GoodsTableViewController.swift index cbdc466..e568b7d 100755 --- a/Child Labor/GoodsTableViewController.swift +++ b/Child Labor/GoodsTableViewController.swift @@ -314,7 +314,7 @@ class GoodsTableViewController: UITableViewController, UISearchBarDelegate, UITe { goodsCount.text = "1 result found for search " + searchBarFilter.text! } - if(getGoodsCount() == 169) + if(getGoodsCount() == 170) { goodsCount.text = "" } diff --git a/Child Labor/Main.storyboard b/Child Labor/Main.storyboard index a82be2b..80c471c 100644 --- a/Child Labor/Main.storyboard +++ b/Child Labor/Main.storyboard @@ -250,11 +250,11 @@ - + -