Skip to content

Commit 222c02d

Browse files
pbhatt17pbhatt17
authored
Merge pull request #127 from Zolon-DOL/master
Sprint 2 changes 2023
2 parents 4bef7c9 + be6aa44 commit 222c02d

File tree

6 files changed

+82
-70
lines changed

6 files changed

+82
-70
lines changed

‎app/src/main/java/gov/dol/childlabor/MoreInfoActivity.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package gov.dol.childlabor;
22

33
import android.content.Intent;
4+
import android.graphics.Color;
5+
import android.graphics.drawable.ColorDrawable;
46
import android.net.Uri;
57
import android.os.Bundle;
68

‎app/src/main/java/gov/dol/childlabor/TabbedCountryListSpinnerActivity.java‎

Lines changed: 73 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import androidx.viewpager.widget.PagerAdapter;
1414
import androidx.viewpager.widget.ViewPager;
1515
import android.os.Bundle;
16+
import android.text.InputType;
1617
import android.view.LayoutInflater;
1718
import android.view.Menu;
1819
import android.view.MenuItem;
@@ -210,80 +211,86 @@ public void onPrepareOptionsMenu(Menu menu) {
210211
searchView.clearFocus();
211212
}
212213

214+
if (searchView != null) {
215+
searchView.setInputType(InputType.TYPE_TEXT_VARIATION_PERSON_NAME);
216+
}
217+
213218

214219
searchView.setQueryHint(searchstring);
215220
searchView.setIconified(false);
216221
searchView.clearFocus();
217222
searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
218223
@Override
219224
public boolean onQueryTextChange(String query) {
220-
searchQuery = query;
221-
TextView countrycountTextView = (TextView) getView().findViewById(R.id.countrycounttextview);
222-
Country[] countries;
223-
String selection;
224-
switch (sectionNumber) {
225-
case 2:
226-
searchstring = query.trim();
227-
if( searchstring.trim().equals("")) {
228-
searchstring = "Filter Countries/Areas";
229-
searchView.setQueryHint(searchstring);
230-
}
231-
selection = ((Spinner) getView().findViewById(R.id.listViewSpinner)).getSelectedItem().toString();
232-
countries = getCountriesBySearch(query, getCountriesByLevel(selection));
233-
if (countrycount != null) {
234-
countrycountTextView.setVisibility(View.VISIBLE);
235-
countrycountTextView.setText(String.valueOf(countrycount) + " results found for " + query.trim());
236-
countrycountTextView.announceForAccessibility(String.valueOf(countrycount) + " results found for " + query.trim());
237-
countrycountTextView.setContentDescription(String.valueOf(countrycount) + " results found for " + query.trim());
238-
countrycountTextView.setFocusable(true);
239-
countrycountTextView.setFocusableInTouchMode(true);
240-
}
241-
else
242-
{
243-
countrycountTextView.setVisibility(View.GONE);
244-
}
245-
break;
246-
case 3:
247-
searchstring = query.trim();
248-
if( searchstring.trim().equals("")) {
249-
searchstring = "Filter Countries/Areas";
250-
searchView.setQueryHint(searchstring);
251-
}
252-
selection = ((Spinner) getView().findViewById(R.id.listViewSpinner)).getSelectedItem().toString();
253-
countries = getCountriesBySearch(query, getCountriesByRegion(selection));
254-
if (countrycount != null) {
255-
countrycountTextView.setVisibility(View.VISIBLE);
256-
countrycountTextView.setText(String.valueOf(countrycount) + " results found for " + query.trim());
257-
countrycountTextView.announceForAccessibility(String.valueOf(countrycount) + " results found for " + query.trim());
258-
countrycountTextView.setContentDescription(String.valueOf(countrycount) + " results found for " + query.trim());
259-
countrycountTextView.setFocusable(true);
260-
countrycountTextView.setFocusableInTouchMode(true);
261-
}
262-
else
263-
{
264-
countrycountTextView.setVisibility(View.GONE);
265-
}
266-
break;
267-
default:
268-
searchstring = query.trim();
269-
countries = getCountriesBySearch(query);
270-
271-
if (countrycount != null) {
272-
countrycountTextView.setVisibility(View.VISIBLE);
273-
countrycountTextView.setText(String.valueOf(countrycount) + " results found for " + query.trim());
274-
countrycountTextView.announceForAccessibility(String.valueOf(countrycount) + " results found for " + query.trim());
275-
countrycountTextView.setContentDescription(String.valueOf(countrycount) + " results found for " + query.trim());
276-
countrycountTextView.setFocusable(true);
277-
countrycountTextView.setFocusableInTouchMode(true);
278-
}
279-
else
280-
{
281-
countrycountTextView.setVisibility(View.GONE);
282-
}
225+
boolean check_alphabetOnly = query.matches("[a-zA-Z ]+");
226+
if (check_alphabetOnly) {
227+
searchQuery = query;
228+
TextView countrycountTextView = (TextView) getView().findViewById(R.id.countrycounttextview);
229+
Country[] countries;
230+
String selection;
231+
switch (sectionNumber) {
232+
case 2:
233+
searchstring = query.trim();
234+
if (searchstring.trim().equals("")) {
235+
searchstring = "Filter Countries/Areas";
236+
searchView.setQueryHint(searchstring);
237+
}
238+
selection = ((Spinner) getView().findViewById(R.id.listViewSpinner)).getSelectedItem().toString();
239+
countries = getCountriesBySearch(query, getCountriesByLevel(selection));
240+
if (countrycount != null) {
241+
countrycountTextView.setVisibility(View.VISIBLE);
242+
countrycountTextView.setText(String.valueOf(countrycount) + " results found for " + query.trim());
243+
countrycountTextView.announceForAccessibility(String.valueOf(countrycount) + " results found for " + query.trim());
244+
countrycountTextView.setContentDescription(String.valueOf(countrycount) + " results found for " + query.trim());
245+
countrycountTextView.setFocusable(true);
246+
countrycountTextView.setFocusableInTouchMode(true);
247+
} else {
248+
countrycountTextView.setVisibility(View.GONE);
249+
}
250+
break;
251+
case 3:
252+
searchstring = query.trim();
253+
if (searchstring.trim().equals("")) {
254+
searchstring = "Filter Countries/Areas";
255+
searchView.setQueryHint(searchstring);
256+
}
257+
selection = ((Spinner) getView().findViewById(R.id.listViewSpinner)).getSelectedItem().toString();
258+
countries = getCountriesBySearch(query, getCountriesByRegion(selection));
259+
if (countrycount != null) {
260+
countrycountTextView.setVisibility(View.VISIBLE);
261+
countrycountTextView.setText(String.valueOf(countrycount) + " results found for " + query.trim());
262+
countrycountTextView.announceForAccessibility(String.valueOf(countrycount) + " results found for " + query.trim());
263+
countrycountTextView.setContentDescription(String.valueOf(countrycount) + " results found for " + query.trim());
264+
countrycountTextView.setFocusable(true);
265+
countrycountTextView.setFocusableInTouchMode(true);
266+
} else {
267+
countrycountTextView.setVisibility(View.GONE);
268+
}
269+
break;
270+
default:
271+
searchstring = query.trim();
272+
countries = getCountriesBySearch(query);
273+
274+
if (countrycount != null) {
275+
countrycountTextView.setVisibility(View.VISIBLE);
276+
countrycountTextView.setText(String.valueOf(countrycount) + " results found for " + query.trim());
277+
countrycountTextView.announceForAccessibility(String.valueOf(countrycount) + " results found for " + query.trim());
278+
countrycountTextView.setContentDescription(String.valueOf(countrycount) + " results found for " + query.trim());
279+
countrycountTextView.setFocusable(true);
280+
countrycountTextView.setFocusableInTouchMode(true);
281+
} else {
282+
countrycountTextView.setVisibility(View.GONE);
283+
}
284+
}
285+
286+
CountryListAdapter itemsAdapter = new CountryListAdapter(getActivity(), countries, 1);
287+
ListView listView = (ListView) getView().findViewById(R.id.listView);
288+
listView.setAdapter(itemsAdapter);
289+
}else{
290+
if( !searchQuery.trim().equals("")) {
291+
searchView.setQuery(searchQuery, false);
292+
}
283293
}
284-
CountryListAdapter itemsAdapter = new CountryListAdapter(getActivity(), countries, 1);
285-
ListView listView = (ListView) getView().findViewById(R.id.listView);
286-
listView.setAdapter(itemsAdapter);
287294
return false;
288295
}
289296

‎app/src/main/java/gov/dol/childlabor/ToolKitActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected void onCreate(Bundle savedInstanceState) {
3333
button.setOnClickListener(new View.OnClickListener() {
3434
public void onClick(View v) {
3535
Intent intent = new Intent(Intent.ACTION_VIEW);
36-
intent.setData(Uri.parse("market://details?id=gov.dol.complychain"));
36+
intent.setData(Uri.parse("https://play.google.com/store/apps/details?id=gov.dol.complychain&hl=en_US&gl=US&pli=1"));//"market://details?id=gov.dol.complychain"));
3737
startActivity(intent);
3838
// Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.dol.gov/ComplyChain"));
3939
// startActivity(intent);

‎app/src/main/res/layout/activity_charts_list.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
android:layout_width="match_parent"
6464
android:layout_height="wrap_content"
6565
android:text="Goods By Region"
66+
android:visibility="gone"
6667
android:drawableRight="@drawable/ic_baseline_keyboard_arrow_right_24"
6768
app:drawableEndCompat="@drawable/ic_baseline_keyboard_arrow_right_24" />
6869
<TextView

‎app/src/main/res/layout/content_menu_page.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<TextView
4444
android:id="@+id/textView10"
4545
android:layout_width="match_parent"
46-
android:layout_height="wrap_content"
46+
android:layout_height="1dp"
4747
android:layout_marginBottom="10dp"
4848
android:background="#dadada" />
4949

@@ -177,7 +177,7 @@
177177
<TextView
178178
android:visibility="visible"
179179
android:layout_width="match_parent"
180-
android:layout_height="wrap_content"
180+
android:layout_height="1dp"
181181
android:layout_marginBottom="10dp"
182182
android:background="#dadada" />
183183
<TextView

‎app/src/main/res/menu/menu_search.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
xmlns:tools="http://schemas.android.com/tools">
44
<item android:id="@+id/search"
55
android:title="Filter"
6+
android:digits="abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ"
67
android:icon="@android:drawable/ic_menu_search"
78
app:showAsAction="always"
8-
app:actionViewClass="android.widget.SearchView" />
9+
app:actionViewClass="android.widget.SearchView"
10+
/>
911
</menu>

0 commit comments

Comments
 (0)