Skip to content

Commit

Permalink
Merge pull request #94 from Zolon-DOL/master
Browse files Browse the repository at this point in the history 
sprint 2 changes
  • Loading branch information
@pbhatt17
pbhatt17 authored Jul 31, 2020
2 parents 5422ba1 + 1c8f8c9 commit 44d08d9
Show file tree
Hide file tree
Showing 11 changed files with 6,040 additions and 5,294 deletions.
11,148 changes: 5,971 additions & 5,177 deletions app/src/main/assets/countries_2019.xml
View file

Large diffs are not rendered by default.

52 changes: 12 additions & 40 deletions app/src/main/assets/goods_2019.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,15 +300,8 @@
<Country_Name>Cambodia</Country_Name>
<Country_Region>Asia and the Pacific</Country_Region>
<Child_Labor>Yes</Child_Labor>
<Forced_Labor>No</Forced_Labor>
<Forced_Child_Labor>No</Forced_Child_Labor>
</Country>
<Country>
<Country_Name>Cambodia</Country_Name>
<Country_Region>Asia and the Pacific</Country_Region>
<Child_Labor>No</Child_Labor>
<Forced_Labor>Yes</Forced_Labor>
<Forced_Child_Labor>Yes</Forced_Child_Labor>
<Forced_Child_Labor>No</Forced_Child_Labor>
</Country>
<Country>
<Country_Name>China</Country_Name>
Expand Down Expand Up @@ -909,13 +902,6 @@
<Country_Name>Brazil</Country_Name>
<Country_Region>Latin America and the Caribbean</Country_Region>
<Child_Labor>Yes</Child_Labor>
<Forced_Labor>No</Forced_Labor>
<Forced_Child_Labor>No</Forced_Child_Labor>
</Country>
<Country>
<Country_Name>Brazil</Country_Name>
<Country_Region>Latin America and the Caribbean</Country_Region>
<Child_Labor>No</Child_Labor>
<Forced_Labor>Yes</Forced_Labor>
<Forced_Child_Labor>No</Forced_Child_Labor>
</Country>
Expand Down Expand Up @@ -1624,7 +1610,7 @@
</Countries>
</Good>
<Good>
<Good_Name>Fruits (Pome and Stone)</Good_Name>
<Good_Name>Fruit (Pome and Stone)</Good_Name>
<Good_Sector>Agriculture</Good_Sector>
<Countries>
<Country>
Expand Down Expand Up @@ -2218,7 +2204,7 @@
</Countries>
</Good>
<Good>
<Good_Name>Khat/Miraa</Good_Name>
<Good_Name>Khat/Miraa (stimulant plant)</Good_Name>
<Good_Sector>Agriculture</Good_Sector>
<Countries>
<Country>
Expand All @@ -2228,12 +2214,6 @@
<Forced_Labor>No</Forced_Labor>
<Forced_Child_Labor>No</Forced_Child_Labor>
</Country>
</Countries>
</Good>
<Good>
<Good_Name>Khat/Miraa (stimulant plant)</Good_Name>
<Good_Sector>Agriculture</Good_Sector>
<Countries>
<Country>
<Country_Name>Kenya</Country_Name>
<Country_Region>Sub-Saharan Africa</Country_Region>
Expand Down Expand Up @@ -2490,13 +2470,6 @@
<Country_Name>Indonesia</Country_Name>
<Country_Region>Asia and the Pacific</Country_Region>
<Child_Labor>Yes</Child_Labor>
<Forced_Labor>No</Forced_Labor>
<Forced_Child_Labor>No</Forced_Child_Labor>
</Country>
<Country>
<Country_Name>Indonesia</Country_Name>
<Country_Region>Asia and the Pacific</Country_Region>
<Child_Labor>No</Child_Labor>
<Forced_Labor>Yes</Forced_Labor>
<Forced_Child_Labor>No</Forced_Child_Labor>
</Country>
Expand Down Expand Up @@ -2888,7 +2861,7 @@
</Good>
<Good>
<Good_Name>Rubber Gloves</Good_Name>
<Good_Sector>Manufacturing</Good_Sector>
<Good_Sector>Agriculture</Good_Sector>
<Countries>
<Country>
<Country_Name>Malaysia</Country_Name>
Expand Down Expand Up @@ -2982,7 +2955,7 @@
<Country_Region>Asia and the Pacific</Country_Region>
<Child_Labor>Yes</Child_Labor>
<Forced_Labor>Yes</Forced_Labor>
<Forced_Child_Labor>Yes</Forced_Child_Labor>
<Forced_Child_Labor>No</Forced_Child_Labor>
</Country>
</Countries>
</Good>
Expand Down Expand Up @@ -3585,13 +3558,6 @@
<Country_Name>China</Country_Name>
<Country_Region />
<Child_Labor>Yes</Child_Labor>
<Forced_Labor>No</Forced_Labor>
<Forced_Child_Labor>No</Forced_Child_Labor>
</Country>
<Country>
<Country_Name>China</Country_Name>
<Country_Region />
<Child_Labor>No</Child_Labor>
<Forced_Labor>Yes</Forced_Labor>
<Forced_Child_Labor>No</Forced_Child_Labor>
</Country>
Expand Down Expand Up @@ -3860,6 +3826,13 @@
<Forced_Labor>No</Forced_Labor>
<Forced_Child_Labor>No</Forced_Child_Labor>
</Country>
<Country>
<Country_Name>Zambia</Country_Name>
<Country_Region>Sub-Saharan Africa</Country_Region>
<Child_Labor>Yes</Child_Labor>
<Forced_Labor>No</Forced_Labor>
<Forced_Child_Labor>No</Forced_Child_Labor>
</Country>
<Country>
<Country_Name>Zimbabwe</Country_Name>
<Country_Region>Sub-Saharan Africa</Country_Region>
Expand Down Expand Up @@ -4022,4 +3995,3 @@
</Countries>
</Good>
</Goods>

40 changes: 20 additions & 20 deletions app/src/main/java/gov/dol/childlabor/MenuMain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,22 +67,22 @@ public void onClick(View v) {

ChildLaborReport.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.dol.gov/sites/dolgov/files/ILAB/child_labor_reports/tda2018/ChildLaborReport.pdf"));
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.dol.gov/sites/dolgov/files/ILAB/child_labor_reports/tda2019/SweatToil.pdf"));
startActivity(intent);
AppHelpers.trackScreenView((AnalyticsApplication) getApplication(), "More Information Screen");
}
});


TextView ChildLaborListGoods = (TextView) findViewById(R.id.ChildLaborListGoods);

ChildLaborListGoods.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.dol.gov/sites/dolgov/files/ILAB/ListofGoods.pdf"));
startActivity(intent);
AppHelpers.trackScreenView((AnalyticsApplication) getApplication(), "More Information Screen");
}
});
// TextView ChildLaborListGoods = (TextView) findViewById(R.id.ChildLaborListGoods);
//
// ChildLaborListGoods.setOnClickListener(new View.OnClickListener() {
// public void onClick(View v) {
// Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.dol.gov/sites/dolgov/files/ILAB/ListofGoods.pdf"));
// startActivity(intent);
// AppHelpers.trackScreenView((AnalyticsApplication) getApplication(), "More Information Screen");
// }
// });

TextView SecretaryForeword = (TextView) findViewById(R.id.SecretaryForeword);

Expand All @@ -95,16 +95,16 @@ public void onClick(View v) {
}
});

TextView ForcedChildLaborProducts = (TextView) findViewById(R.id.ForcedChildLaborProducts);

ForcedChildLaborProducts.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.dol.gov/sites/dolgov/files/ILAB/EO_Report_2014.pdf"));
startActivity(intent);
AppHelpers.trackScreenView((AnalyticsApplication) getApplication(), "More Information Screen");

}
});
// TextView ForcedChildLaborProducts = (TextView) findViewById(R.id.ForcedChildLaborProducts);
//
// ForcedChildLaborProducts.setOnClickListener(new View.OnClickListener() {
// public void onClick(View v) {
// Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.dol.gov/sites/dolgov/files/ILAB/EO_Report_2014.pdf"));
// startActivity(intent);
// AppHelpers.trackScreenView((AnalyticsApplication) getApplication(), "More Information Screen");
//
// }
// });



Expand Down
17 changes: 9 additions & 8 deletions app/src/main/java/gov/dol/childlabor/MoreInfoActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ protected void onCreate(Bundle savedInstanceState) {
default:
case R.id.action_reports:
setTitle("Reports");
items = new String[]{"Foreword", "Child Labor Report", "Child and Forced Labor List of Goods", "Forced Child Labor List of Products"};
// items = new String[]{"Foreword", "Child Labor Report", "Child and Forced Labor List of Goods", "Forced Child Labor List of Products"};
items = new String[]{"Foreword", "Child Labor Report"};
break;
/* case R.id.action_fact_sheets:
setTitle("Fact Sheets");
Expand Down Expand Up @@ -75,14 +76,14 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
intent = new Intent(getApplicationContext(), MethodologyActivity.class);
break;
case "Child Labor Report":
intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.dol.gov/sites/dolgov/files/ILAB/child_labor_reports/tda2018/ChildLaborReport.pdf"));
break;
case "Child and Forced Labor List of Goods":
intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.dol.gov/sites/dolgov/files/ILAB/ListofGoods.pdf"));
break;
case "Forced Child Labor List of Products":
intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.dol.gov/sites/dolgov/files/ILAB/EO_Report_2014.pdf"));
intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.dol.gov/sites/dolgov/files/ILAB/child_labor_reports/tda2019/SweatToil.pdf"));
break;
// case "Child and Forced Labor List of Goods":
// intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.dol.gov/sites/dolgov/files/ILAB/ListofGoods.pdf"));
// break;
// case "Forced Child Labor List of Products":
// intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.dol.gov/sites/dolgov/files/ILAB/EO_Report_2014.pdf"));
// break;
case "TDA FAQs":
case "TVPRA FAQs":
case "EO FAQs":
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/res/layout-land/content_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,23 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:contentDescription="Open ILAP website in browser"
android:onClick="openBrowserILAB"
android:src="@drawable/ilab"
android:tint="#FFF" />
android:tint="#000000" />

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:contentDescription="Open Department of Labor website in browser"
android:onClick="openBrowserDOL"
android:src="@drawable/dol"
android:tint="#FFF" />
android:tint="#000000" />

</RelativeLayout>
4 changes: 2 additions & 2 deletions app/src/main/res/layout/content_good_view.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
android:layout_height="160dp"
android:layout_alignParentTop="false"
android:layout_alignParentRight="false"
android:alpha=".50"
android:scaleType="fitEnd"
android:src="@drawable/icons_alcoholic_beverages"
android:alpha=".25"/>
android:src="@drawable/icons_alcoholic_beverages" />

<LinearLayout
android:orientation="vertical"
Expand Down
12 changes: 7 additions & 5 deletions app/src/main/res/layout/content_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,29 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:contentDescription="Open ILAP website in browser"
android:onClick="openBrowserILAB"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="10dp"
android:src="@drawable/ilab"
android:tint="#FFF" />
android:tint="#000000" />

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:contentDescription="Open Department of Labor website in browser"
android:onClick="openBrowserDOL"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="10dp"
android:src="@drawable/dol"
android:tint="#FFF" />
android:tint="#000000" />

</RelativeLayout>
30 changes: 3 additions & 27 deletions app/src/main/res/layout/content_menu_page.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,39 +61,15 @@

<TextView
android:id="@+id/ChildLaborReport"
android:clickable="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="10dp"
android:contentDescription="Child Labor Report link"
android:text="Child Labor Report"
android:textColor="#3d3d3d"
android:textSize="16sp"
/>

<TextView
android:id="@+id/ChildLaborListGoods"
android:clickable="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:contentDescription="Sweat And Toil Magazine link"
android:paddingBottom="10dp"
android:contentDescription="Child and Forced Labor List of Goods link"
android:text="Child and Forced Labor List of Goods"
android:text="Sweat And Toil Magazine"
android:textColor="#3d3d3d"
android:textSize="16sp"
/>

<TextView
android:id="@+id/ForcedChildLaborProducts"
android:clickable="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="10dp"
android:contentDescription="Forced Child Labor List of Products link"
android:text="Forced Child Labor List of Products"
android:textColor="#3d3d3d"
android:textSize="16sp"
/>
android:focusable="true" />

<TextView
android:id="@+id/textView14"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/country_good_widget.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
android:id="@+id/countryGoodImageView"
android:layout_width="80dp"
android:layout_height="80dp"
android:paddingTop="10dp"
android:alpha=".5"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:alpha=".25" />
android:paddingTop="10dp"
android:paddingRight="10dp" />

<TextView
android:id="@+id/countryGoodTextView"
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout/exploitation_list_good_widget.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
android:orientation="vertical">

<ImageView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_centerHorizontal="true"
android:id="@+id/exploitationListGoodImageView"
android:layout_width="40dp"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:alpha="1"
android:scaleType="centerInside"
android:src="@drawable/icons_alcoholic_beverages"
android:id="@+id/exploitationListGoodImageView" />
android:src="@drawable/icons_alcoholic_beverages" />

<LinearLayout
android:orientation="horizontal"
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/res/layout/good_list_row.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
xmlns:android="http://schemas.android.com/apk/res/android">

<ImageView
android:id="@+id/goodImageView"
android:layout_width="50dp"
android:layout_height="match_parent"
android:scaleType="centerInside"
android:layout_gravity="center_vertical"
android:layout_marginRight="10dp"
android:src="@drawable/icons_alcoholic_beverages"
android:id="@+id/goodImageView" />
android:alpha="1"
android:scaleType="centerInside"
android:src="@drawable/icons_alcoholic_beverages" />

<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/goodTextView"
Expand Down

0 comments on commit 44d08d9

Please sign in to comment.