From 0176995612e2c7fc042f29b614d82e2982a44529 Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Sat, 30 Mar 2013 04:52:35 +0530 Subject: [PATCH] Show explanatory text when no categories are found for search text --- commons/res/layout/fragment_categorization.xml | 8 ++++++++ commons/res/values/strings.xml | 2 ++ .../org/wikimedia/commons/CategorizationFragment.java | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/commons/res/layout/fragment_categorization.xml b/commons/res/layout/fragment_categorization.xml index 1f2b372b7..893a8a198 100644 --- a/commons/res/layout/fragment_categorization.xml +++ b/commons/res/layout/fragment_categorization.xml @@ -29,6 +29,14 @@ /> + + 1 upload %d uploads + + No categories matching %1$s found diff --git a/commons/src/main/java/org/wikimedia/commons/CategorizationFragment.java b/commons/src/main/java/org/wikimedia/commons/CategorizationFragment.java index edfd19d2d..0fa311b5b 100644 --- a/commons/src/main/java/org/wikimedia/commons/CategorizationFragment.java +++ b/commons/src/main/java/org/wikimedia/commons/CategorizationFragment.java @@ -34,6 +34,7 @@ public class CategorizationFragment extends SherlockFragment{ ListView categoriesList; EditText categoriesFilter; ProgressBar categoriesSearchInProgress; + TextView categoriesNotFoundView; CategoriesAdapter categoriesAdapter; CategoriesUpdater lastUpdater = null; @@ -85,6 +86,7 @@ public class CategorizationFragment extends SherlockFragment{ super.onPreExecute(); filter = categoriesFilter.getText().toString(); categoriesSearchInProgress.setVisibility(View.VISIBLE); + categoriesNotFoundView.setVisibility(View.GONE); } @Override @@ -106,6 +108,10 @@ public class CategorizationFragment extends SherlockFragment{ categoriesAdapter.setItems(items); categoriesAdapter.notifyDataSetInvalidated(); categoriesSearchInProgress.setVisibility(View.GONE); + if(!TextUtils.isEmpty(filter) && categories.size() == 0) { + categoriesNotFoundView.setText(getString(R.string.categories_not_found, filter)); + categoriesNotFoundView.setVisibility(View.VISIBLE); + } } @Override @@ -195,6 +201,7 @@ public class CategorizationFragment extends SherlockFragment{ categoriesList = (ListView) rootView.findViewById(R.id.categoriesListBox); categoriesFilter = (EditText) rootView.findViewById(R.id.categoriesSearchBox); categoriesSearchInProgress = (ProgressBar) rootView.findViewById(R.id.categoriesSearchInProgress); + categoriesNotFoundView = (TextView) rootView.findViewById(R.id.categoriesNotFound); ArrayList items; if(savedInstanceState == null) {