Merge pull request #132 from Zolon-DOL/master

2023 Changes - Sprint 6
USDepartmentofLabor · Aug 11, 2023 · 60b79ff · 60b79ff
2 parents fd066d0 + 536a803
commit 60b79ff
Show file tree

Hide file tree

Showing 8 changed files with 4,866 additions and 5,063 deletions.
diff --git a/...lena, Ascension, and Tristan da Cunha.pdf → ...Helena Ascension and Tristan da Cunha.pdf b/...lena, Ascension, and Tristan da Cunha.pdf → ...Helena Ascension and Tristan da Cunha.pdf
diff --git a/app/src/main/assets/countries_2021.xml b/app/src/main/assets/countries_2021.xml
diff --git a/app/src/main/assets/goods_2021.xml b/app/src/main/assets/goods_2021.xml
diff --git a/app/src/main/java/gov/dol/childlabor/AppHelpers.java b/app/src/main/java/gov/dol/childlabor/AppHelpers.java
@@ -66,7 +66,7 @@ private static int getReportResourceId(Context context, String name) {
 
     public static String getFormattedString(String string) {
         return string.replace(" ", "_").replace("-", "_").replace("/", "_").replace("ô", "o").replace("ã", "a").replace("é", "e").replace("í", "i").replace("ó", "o").replace("á", "a")
-                .replace("(", "").replace(")", "").replace(",", "").replace("'", "").replace("`", "").replace(".", "").replace("ç", "c").toLowerCase();
+                .replace("(", "").replace(")", "").replace(",", "").replace("'", "").replace("`", "").replace(".", "").replace("ç", "c").toLowerCase().replace("ü", "u").toLowerCase();
     }
 
     public static void trackScreenView(AnalyticsApplication application, String screenName) {

diff --git a/app/src/main/java/gov/dol/childlabor/StatisticsActivity.java b/app/src/main/java/gov/dol/childlabor/StatisticsActivity.java
@@ -25,7 +25,7 @@ public class StatisticsActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Country country = (Country) getIntent().getSerializableExtra("country");
-        String[] MultiText = {"Somalia", "Pakistan","Tanzania"};
+        String[] MultiText = {};//{"Somalia", "Pakistan","Tanzania"};
 //        String[] MultiText = {"Pakistan","Tanzania"};
 
 

diff --git a/app/src/main/res/drawable-nodpi/turkey.png → ...ain/res/drawable-nodpi/turkey_turkiye.png b/app/src/main/res/drawable-nodpi/turkey.png → ...ain/res/drawable-nodpi/turkey_turkiye.png
diff --git a/...rc/main/res/drawable-nodpi/turkey_map.png → ...res/drawable-nodpi/turkey_turkiye_map.png b/...rc/main/res/drawable-nodpi/turkey_map.png → ...res/drawable-nodpi/turkey_turkiye_map.png
diff --git a/app/src/main/res/drawable-xhdpi/bg.png b/app/src/main/res/drawable-xhdpi/bg.png