mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #10 from brion/flash-text

Browse source 
Fix flash of descriptive text before recent cats shown
This commit is contained in:
Yuvi Panda 2013-04-26 05:30:57 -07:00
commit 6a7b0c9ae0
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
commons/res/layout/fragment_categorization.xml
View file

@ -51,6 +51,7 @@
android:gravity="center" android:gravity="center"
android:focusable="true" android:focusable="true"
android:text="@string/categories_skip_explanation" android:text="@string/categories_skip_explanation"
android:visibility="gone"
/> />
<ListView <ListView

11
commons/src/main/java/org/wikimedia/commons/CategorizationFragment.java
View file

@ -96,11 +96,8 @@ public class CategorizationFragment extends SherlockFragment{
categoriesSearchInProgress.setVisibility(View.VISIBLE); categoriesSearchInProgress.setVisibility(View.VISIBLE);
categoriesNotFoundView.setVisibility(View.GONE); categoriesNotFoundView.setVisibility(View.GONE);
if(!TextUtils.isEmpty(filter)) {
// Only hide this on first count of non-empty filter
categoriesSkip.setVisibility(View.GONE); categoriesSkip.setVisibility(View.GONE);
} }
}
@Override @Override
protected void onPostExecute(ArrayList<String> categories) { protected void onPostExecute(ArrayList<String> categories) {
@ -122,13 +119,13 @@ public class CategorizationFragment extends SherlockFragment{
categoriesAdapter.notifyDataSetInvalidated(); categoriesAdapter.notifyDataSetInvalidated();
categoriesSearchInProgress.setVisibility(View.GONE); categoriesSearchInProgress.setVisibility(View.GONE);
if (categories.size() == 0) { if (categories.size() == 0) {
if(!TextUtils.isEmpty(filter)) { if(TextUtils.isEmpty(filter)) {
// If we found no recent cats, show the skip message!
categoriesSkip.setVisibility(View.VISIBLE);
} else {
categoriesNotFoundView.setText(getString(R.string.categories_not_found, filter)); categoriesNotFoundView.setText(getString(R.string.categories_not_found, filter));
categoriesNotFoundView.setVisibility(View.VISIBLE); categoriesNotFoundView.setVisibility(View.VISIBLE);
} }
} else {
// If we found recent cats, hide the skip message!
categoriesSkip.setVisibility(View.GONE);
} }
} }