Merge pull request #13 from Zolon-DOL/2021-changes

2021 changes
USDepartmentofLabor · Sep 20, 2021 · 2b57257 · 2b57257
2 parents 93aa350 + e5464ca
commit 2b57257
Show file tree

Hide file tree

Showing 136 changed files with 45 additions and 15 deletions.
diff --git a/app/src/main/assets/Afghanistan.pdf b/app/src/main/assets/Afghanistan.pdf
diff --git a/app/src/main/assets/Albania.pdf b/app/src/main/assets/Albania.pdf
diff --git a/app/src/main/assets/Algeria.pdf b/app/src/main/assets/Algeria.pdf
diff --git a/app/src/main/assets/Angola.pdf b/app/src/main/assets/Angola.pdf
diff --git a/app/src/main/assets/Anguilla.pdf b/app/src/main/assets/Anguilla.pdf
diff --git a/app/src/main/assets/Argentina.pdf b/app/src/main/assets/Argentina.pdf
diff --git a/app/src/main/assets/Armenia.pdf b/app/src/main/assets/Armenia.pdf
diff --git a/app/src/main/assets/Azerbaijan.pdf b/app/src/main/assets/Azerbaijan.pdf
diff --git a/app/src/main/assets/Bangladesh.pdf b/app/src/main/assets/Bangladesh.pdf
diff --git a/app/src/main/assets/Belize.pdf b/app/src/main/assets/Belize.pdf
diff --git a/app/src/main/assets/Benin.pdf b/app/src/main/assets/Benin.pdf
diff --git a/app/src/main/assets/Bhutan.pdf b/app/src/main/assets/Bhutan.pdf
diff --git a/app/src/main/assets/Bolivia.pdf b/app/src/main/assets/Bolivia.pdf
diff --git a/app/src/main/assets/Bosnia and Herzegovina.pdf b/app/src/main/assets/Bosnia and Herzegovina.pdf
diff --git a/app/src/main/assets/Botswana.pdf b/app/src/main/assets/Botswana.pdf
diff --git a/app/src/main/assets/Brazil.pdf b/app/src/main/assets/Brazil.pdf
diff --git a/app/src/main/assets/British Virgin Islands.pdf b/app/src/main/assets/British Virgin Islands.pdf
diff --git a/app/src/main/assets/Burkina Faso.pdf b/app/src/main/assets/Burkina Faso.pdf
diff --git a/app/src/main/assets/Burma.pdf b/app/src/main/assets/Burma.pdf
diff --git a/app/src/main/assets/Burundi.pdf b/app/src/main/assets/Burundi.pdf
diff --git a/app/src/main/assets/Cabo Verde.pdf b/app/src/main/assets/Cabo Verde.pdf
diff --git a/app/src/main/assets/Cambodia.pdf b/app/src/main/assets/Cambodia.pdf
diff --git a/app/src/main/assets/Cameroon.pdf b/app/src/main/assets/Cameroon.pdf
diff --git a/app/src/main/assets/Central African Republic.pdf b/app/src/main/assets/Central African Republic.pdf
diff --git a/app/src/main/assets/Chad.pdf b/app/src/main/assets/Chad.pdf
diff --git a/app/src/main/assets/Chile.pdf b/app/src/main/assets/Chile.pdf
diff --git a/app/src/main/assets/Christmas Island.pdf b/app/src/main/assets/Christmas Island.pdf
diff --git a/app/src/main/assets/Cocos (Keeling) Islands.pdf b/app/src/main/assets/Cocos (Keeling) Islands.pdf
diff --git a/app/src/main/assets/Colombia.pdf b/app/src/main/assets/Colombia.pdf
diff --git a/app/src/main/assets/Comoros.pdf b/app/src/main/assets/Comoros.pdf
diff --git a/app/src/main/assets/Congo, Democratic Republic of the.pdf b/app/src/main/assets/Congo, Democratic Republic of the.pdf
diff --git a/app/src/main/assets/Congo, Republic of the.pdf b/app/src/main/assets/Congo, Republic of the.pdf
diff --git a/app/src/main/assets/Cook Islands.pdf b/app/src/main/assets/Cook Islands.pdf
diff --git a/app/src/main/assets/Costa Rica.pdf b/app/src/main/assets/Costa Rica.pdf
diff --git a/app/src/main/assets/Cote d'Ivoire.pdf b/app/src/main/assets/Cote d'Ivoire.pdf
diff --git a/app/src/main/assets/Djibouti.pdf b/app/src/main/assets/Djibouti.pdf
diff --git a/app/src/main/assets/Dominica.pdf b/app/src/main/assets/Dominica.pdf
diff --git a/app/src/main/assets/Dominican Republic.pdf b/app/src/main/assets/Dominican Republic.pdf
diff --git a/app/src/main/assets/Ecuador.pdf b/app/src/main/assets/Ecuador.pdf
diff --git a/app/src/main/assets/Egypt.pdf b/app/src/main/assets/Egypt.pdf
diff --git a/app/src/main/assets/El Salvador.pdf b/app/src/main/assets/El Salvador.pdf
diff --git a/app/src/main/assets/Eritrea.pdf b/app/src/main/assets/Eritrea.pdf
diff --git a/app/src/main/assets/Eswatini.pdf b/app/src/main/assets/Eswatini.pdf
diff --git a/app/src/main/assets/Ethiopia.pdf b/app/src/main/assets/Ethiopia.pdf
diff --git a/app/src/main/assets/Falkland Islands (Islas Malvinas).pdf b/app/src/main/assets/Falkland Islands (Islas Malvinas).pdf
diff --git a/app/src/main/assets/Fiji.pdf b/app/src/main/assets/Fiji.pdf
diff --git a/app/src/main/assets/Gabon.pdf b/app/src/main/assets/Gabon.pdf
diff --git a/app/src/main/assets/Gambia, The.pdf b/app/src/main/assets/Gambia, The.pdf
diff --git a/app/src/main/assets/Georgia.pdf b/app/src/main/assets/Georgia.pdf
diff --git a/app/src/main/assets/Ghana.pdf b/app/src/main/assets/Ghana.pdf
diff --git a/app/src/main/assets/Grenada.pdf b/app/src/main/assets/Grenada.pdf
diff --git a/app/src/main/assets/Guatemala.pdf b/app/src/main/assets/Guatemala.pdf
diff --git a/app/src/main/assets/Guinea-Bissau.pdf b/app/src/main/assets/Guinea-Bissau.pdf
diff --git a/app/src/main/assets/Guinea.pdf b/app/src/main/assets/Guinea.pdf
diff --git a/app/src/main/assets/Guyana.pdf b/app/src/main/assets/Guyana.pdf
diff --git a/app/src/main/assets/Haiti.pdf b/app/src/main/assets/Haiti.pdf
diff --git a/app/src/main/assets/Honduras.pdf b/app/src/main/assets/Honduras.pdf
diff --git a/app/src/main/assets/India.pdf b/app/src/main/assets/India.pdf
diff --git a/app/src/main/assets/Indonesia.pdf b/app/src/main/assets/Indonesia.pdf
diff --git a/app/src/main/assets/Iraq.pdf b/app/src/main/assets/Iraq.pdf
diff --git a/app/src/main/assets/Jamaica.pdf b/app/src/main/assets/Jamaica.pdf
diff --git a/app/src/main/assets/Jordan.pdf b/app/src/main/assets/Jordan.pdf
diff --git a/app/src/main/assets/Kazakhstan.pdf b/app/src/main/assets/Kazakhstan.pdf
diff --git a/app/src/main/assets/Kenya.pdf b/app/src/main/assets/Kenya.pdf
diff --git a/app/src/main/assets/Kiribati.pdf b/app/src/main/assets/Kiribati.pdf
diff --git a/app/src/main/assets/Kosovo.pdf b/app/src/main/assets/Kosovo.pdf
diff --git a/app/src/main/assets/Kyrgyz Republic.pdf b/app/src/main/assets/Kyrgyz Republic.pdf
diff --git a/app/src/main/assets/Lebanon.pdf b/app/src/main/assets/Lebanon.pdf
diff --git a/app/src/main/assets/Lesotho.pdf b/app/src/main/assets/Lesotho.pdf
diff --git a/app/src/main/assets/Liberia.pdf b/app/src/main/assets/Liberia.pdf
diff --git a/app/src/main/assets/Madagascar.pdf b/app/src/main/assets/Madagascar.pdf
diff --git a/app/src/main/assets/Malawi.pdf b/app/src/main/assets/Malawi.pdf
diff --git a/app/src/main/assets/Maldives.pdf b/app/src/main/assets/Maldives.pdf
diff --git a/app/src/main/assets/Mali.pdf b/app/src/main/assets/Mali.pdf
diff --git a/app/src/main/assets/Mauritania.pdf b/app/src/main/assets/Mauritania.pdf
diff --git a/app/src/main/assets/Mauritius.pdf b/app/src/main/assets/Mauritius.pdf
diff --git a/app/src/main/assets/Mexico.pdf b/app/src/main/assets/Mexico.pdf
diff --git a/app/src/main/assets/Moldova.pdf b/app/src/main/assets/Moldova.pdf
diff --git a/app/src/main/assets/Mongolia.pdf b/app/src/main/assets/Mongolia.pdf
diff --git a/app/src/main/assets/Montenegro.pdf b/app/src/main/assets/Montenegro.pdf
diff --git a/app/src/main/assets/Montserrat.pdf b/app/src/main/assets/Montserrat.pdf
diff --git a/app/src/main/assets/Morocco.pdf b/app/src/main/assets/Morocco.pdf
diff --git a/app/src/main/assets/Mozambique.pdf b/app/src/main/assets/Mozambique.pdf
diff --git a/app/src/main/assets/Namibia.pdf b/app/src/main/assets/Namibia.pdf
diff --git a/app/src/main/assets/Nepal.pdf b/app/src/main/assets/Nepal.pdf
diff --git a/app/src/main/assets/Nicaragua.pdf b/app/src/main/assets/Nicaragua.pdf
diff --git a/app/src/main/assets/Niger.pdf b/app/src/main/assets/Niger.pdf
diff --git a/app/src/main/assets/Nigeria.pdf b/app/src/main/assets/Nigeria.pdf
diff --git a/app/src/main/assets/Niue.pdf b/app/src/main/assets/Niue.pdf
diff --git a/app/src/main/assets/Norfolk Island.pdf b/app/src/main/assets/Norfolk Island.pdf
diff --git a/app/src/main/assets/North Macedonia.pdf b/app/src/main/assets/North Macedonia.pdf
diff --git a/app/src/main/assets/Oman.pdf b/app/src/main/assets/Oman.pdf
diff --git a/app/src/main/assets/Pakistan.pdf b/app/src/main/assets/Pakistan.pdf
diff --git a/app/src/main/assets/Panama.pdf b/app/src/main/assets/Panama.pdf
diff --git a/app/src/main/assets/Papua New Guinea.pdf b/app/src/main/assets/Papua New Guinea.pdf
diff --git a/app/src/main/assets/Paraguay.pdf b/app/src/main/assets/Paraguay.pdf
diff --git a/app/src/main/assets/Peru.pdf b/app/src/main/assets/Peru.pdf
diff --git a/app/src/main/assets/Philippines.pdf b/app/src/main/assets/Philippines.pdf
diff --git a/app/src/main/assets/Rwanda.pdf b/app/src/main/assets/Rwanda.pdf
diff --git a/app/src/main/assets/Saint Helena, Ascension, and Tristan da Cunha.pdf b/app/src/main/assets/Saint Helena, Ascension, and Tristan da Cunha.pdf
diff --git a/app/src/main/assets/Saint Lucia.pdf b/app/src/main/assets/Saint Lucia.pdf
diff --git a/app/src/main/assets/Saint Vincent and the Grenadines.pdf b/app/src/main/assets/Saint Vincent and the Grenadines.pdf
diff --git a/app/src/main/assets/Samoa.pdf b/app/src/main/assets/Samoa.pdf
diff --git a/app/src/main/assets/Sao Tome and Principe.pdf b/app/src/main/assets/Sao Tome and Principe.pdf
diff --git a/app/src/main/assets/Senegal.pdf b/app/src/main/assets/Senegal.pdf
diff --git a/app/src/main/assets/Serbia.pdf b/app/src/main/assets/Serbia.pdf
diff --git a/app/src/main/assets/Sierra Leone.pdf b/app/src/main/assets/Sierra Leone.pdf
diff --git a/app/src/main/assets/Solomon Islands.pdf b/app/src/main/assets/Solomon Islands.pdf
diff --git a/app/src/main/assets/Somalia.pdf b/app/src/main/assets/Somalia.pdf
diff --git a/app/src/main/assets/South Africa.pdf b/app/src/main/assets/South Africa.pdf
diff --git a/app/src/main/assets/South Sudan.pdf b/app/src/main/assets/South Sudan.pdf
diff --git a/app/src/main/assets/Sri Lanka.pdf b/app/src/main/assets/Sri Lanka.pdf
diff --git a/app/src/main/assets/Suriname.pdf b/app/src/main/assets/Suriname.pdf
diff --git a/app/src/main/assets/Tanzania.pdf b/app/src/main/assets/Tanzania.pdf
diff --git a/app/src/main/assets/Thailand.pdf b/app/src/main/assets/Thailand.pdf
diff --git a/app/src/main/assets/Timor-Leste.pdf b/app/src/main/assets/Timor-Leste.pdf
diff --git a/app/src/main/assets/Togo.pdf b/app/src/main/assets/Togo.pdf
diff --git a/app/src/main/assets/Tokelau.pdf b/app/src/main/assets/Tokelau.pdf
diff --git a/app/src/main/assets/Tonga.pdf b/app/src/main/assets/Tonga.pdf
diff --git a/app/src/main/assets/Tunisia.pdf b/app/src/main/assets/Tunisia.pdf
diff --git a/app/src/main/assets/Tuvalu.pdf b/app/src/main/assets/Tuvalu.pdf
diff --git a/app/src/main/assets/Uganda.pdf b/app/src/main/assets/Uganda.pdf
diff --git a/app/src/main/assets/Ukraine.pdf b/app/src/main/assets/Ukraine.pdf
diff --git a/app/src/main/assets/Uzbekistan.pdf b/app/src/main/assets/Uzbekistan.pdf
diff --git a/app/src/main/assets/Vanuatu.pdf b/app/src/main/assets/Vanuatu.pdf
diff --git a/app/src/main/assets/Wallis and Futuna.pdf b/app/src/main/assets/Wallis and Futuna.pdf
diff --git a/app/src/main/assets/West Bank and the Gaza Strip.pdf b/app/src/main/assets/West Bank and the Gaza Strip.pdf
diff --git a/app/src/main/assets/Western Sahara.pdf b/app/src/main/assets/Western Sahara.pdf
diff --git a/app/src/main/assets/Yemen.pdf b/app/src/main/assets/Yemen.pdf
diff --git a/app/src/main/assets/Zambia.pdf b/app/src/main/assets/Zambia.pdf
diff --git a/app/src/main/assets/Zimbabwe.pdf b/app/src/main/assets/Zimbabwe.pdf
diff --git a/app/src/main/assets/www/aboutthisapp.html b/app/src/main/assets/www/aboutthisapp.html
@@ -1,25 +1,26 @@
 </!DOCTYPE html>
 <html>
 <head>
-	<title>About this App</title>
+    <title>About this App</title>
 </head>
 <body style="font-family: Helvetica Neue";>
-<h1>About This App<//h1>
+<h1>About This App</h1>
 
 <h2>What is this app? </h2>
 
 <p>Sweat &amp; Toil: Child Labor, Forced Labor, and Human Trafficking Around the World is a comprehensive resource developed by the U.S. Department of Labor (USDOL) documenting child labor and forced labor worldwide. Data and research in this app are taken from ILAB’s three flagship reports: <i><a href="https://www.dol.gov/agencies/ilab/resources/reports/child-labor/findings/">Findings on the Worst Forms of Child Labor</a></i>; <i><a href="https://www.dol.gov/agencies/ilab/reports/child-labor/list-of-goods/">List of Goods Produced by Child Labor or Forced Labor</a></i>; and <i><a href="https://www.dol.gov/agencies/ilab/reports/child-labor/list-of-products">List of Products Produced by Forced or Indentured Child Labor</a></i>. This app fits these three information-packed reports the size of a phone book in the palm of your hand. Key things you can do with this app are: </p>
 
 <ol>
-	<li>Check countries’ efforts to eliminate child labor; </li>
+    <li>Check countries’ efforts to eliminate child labor; </li>
 
-	<li>Find child labor data; </li>
+    <li>Find child labor data; </li>
 
-	<li>Browse goods produced with child labor or forced labor;</li>
+    <li>Browse goods produced with child labor or forced labor;</li>
 
-	<li>Review laws, ratifications, and enforcement efforts; and </li>
+    <li>Review laws, ratifications, and enforcement efforts;</li>
 
-	<li>See what governments, businesses, and consumers can to do end child labor.</li>
+    <li>See what governments, businesses, and consumers can to do end child labor; and</li>
+    <li>Browse USDOL’s projects to combat child labor and forced labor.</li>
 </ol>
 
 
@@ -33,14 +34,15 @@ <h2>How can I use this app?</h2>
 
 <h2>What’s new in the app?</h2>
 
-<p>Sweat &amp; Toil is now in its seventh year, and contains the latest information from the 2020 reporting period. It also includes updated data for the <i><a href="https://www.dol.gov/agencies/ilab/reports/child-labor/list-of-goods/">List of Goods Produced by Child Labor or Forced Labor</a></i> and <i><a href="https://www.dol.gov/agencies/ilab/reports/child-labor/list-of-products">List of Products Produced by Forced or Indentured Child Labor</a>.</i></p>
+<p>Sweat &amp; Toil is now in its seventh year, and contains the latest information from the 2020 reporting period. It also includes new information related to ILAB’s projects to combat child labor and forced labor in each country.
+</p>
 
 <h2>What’s in the Legal Standards Section?</h2>
 
 <p>The Legal Standards Section contains information on whether national laws meet internationally defined standards to protect children from child labor and its worst forms. This includes minimum age laws and those relating to working conditions, the worst forms of child labor, and education. It also includes comprehensive data on military recruitment laws.</p>
 <ul>
-	<li>Yes/No reflects whether a country’s laws meet international standards. </li>
-	<li>The data appears green when a country’s laws are compliant with international standards. When the data appears red, a country’s legislative framework lacks basic protections, either due to the absence of laws or gaps in existing laws. </li>
+    <li>Yes/No reflects whether a country’s laws meet international standards. </li>
+    <li>The data appears green when a country’s laws are compliant with international standards. When the data appears red, a country’s legislative framework lacks basic protections, either due to the absence of laws or gaps in existing laws. </li>
 </ul>
 <p>For more information, consult the country profile linked to the country page, under <i>Report PDF.</i> </p>
 
@@ -56,4 +58,4 @@ <h2>Have ideas for ways to improve the app, want to submit information on child
 
 <p>Please use <a href="mailto:[email protected]">[email protected]</a> to email any ideas for ways to improve the app, submit information regarding child labor or forced labor globally, or ask questions related to technical issues. For more information about our work, please visit <a href="https://www.dol.gov/agencies/ilab">www.dol.gov/agencies/ilab</a>. </p>
 </body>
-</html>
+</html>
diff --git a/app/src/main/java/gov/dol/childlabor/MenuMain.java b/app/src/main/java/gov/dol/childlabor/MenuMain.java
@@ -1,6 +1,7 @@
 package gov.dol.childlabor;
 
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.TextView;
@@ -47,6 +48,15 @@ public void onClick(View v) {
                 startActivity(intent);
             }
         });
+        TextView betterTrade = (TextView) findViewById(R.id.better_trade);
+
+        betterTrade.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse("https://www.dol.gov/BetterTradeTool"));
+                startActivity(intent);
+            }
+        });
 
 
 /*        TextView action_fact_sheets = (TextView) findViewById(R.id.action_fact_sheets);

diff --git a/app/src/main/res/drawable-xhdpi/bg.png b/app/src/main/res/drawable-xhdpi/bg.png
diff --git a/app/src/main/res/drawable-xhdpi/bg_last_year.png b/app/src/main/res/drawable-xhdpi/bg_last_year.png
diff --git a/app/src/main/res/layout/content_menu_page.xml b/app/src/main/res/layout/content_menu_page.xml
@@ -45,10 +45,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
-            android:background="#dadada"
-            android:contentDescription=" " />
+            android:background="#dadada" />
 
         <TextView
+            android:visibility="gone"
             android:id="@+id/SecretaryForeword"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -60,6 +60,7 @@
             android:textSize="16sp" />
 
         <TextView
+            android:visibility="gone"
             android:id="@+id/SweatAndToilMagazine"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -71,12 +72,12 @@
             android:textSize="16sp"
             android:focusable="true" />
         <TextView
+            android:visibility="gone"
             android:id="@+id/textView11"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
-            android:background="#dadada"
-            android:contentDescription=" " />
+            android:background="#dadada" />
 
 <!--        <TextView-->
 <!--            android:id="@+id/textView14"-->
@@ -173,6 +174,23 @@
             android:textColor="#3d3d3d"
             android:textSize="16sp"
              />
+        <TextView
+            android:visibility="visible"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:background="#dadada" />
+        <TextView
+            android:id="@+id/better_trade"
+            android:clickable="true"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:contentDescription="New: Better Trade Tool"
+            android:paddingBottom="10dp"
+            android:text="NEW: Better Trade Tool"
+            android:textColor="#3d3d3d"
+            android:textSize="16sp"
+            />
     </LinearLayout>
     </ScrollView>