From 264483838c632ac42c2cfcbe986d9240d145eecd Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Sat, 30 Mar 2013 05:18:45 +0530
Subject: [PATCH] Add descriptive text to tell people how to skip
 categorization

---
 commons/res/layout/fragment_categorization.xml      | 10 ++++++++++
 commons/res/values/strings.xml                      |  5 +++++
 .../wikimedia/commons/CategorizationFragment.java   | 13 +++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/commons/res/layout/fragment_categorization.xml b/commons/res/layout/fragment_categorization.xml
index 893a8a198..aabbc9473 100644
--- a/commons/res/layout/fragment_categorization.xml
+++ b/commons/res/layout/fragment_categorization.xml
@@ -37,6 +37,16 @@
             android:gravity="center"
             />
 
+    <TextView
+        android:id="@+id/categoriesExplanation"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_marginTop="48dp"
+        android:gravity="center"
+        android:focusable="true"
+        android:text="@string/categories_skip_explanation"
+        />
+
     <ListView
         android:id="@+id/categoriesListBox"
         android:layout_height="wrap_content"
diff --git a/commons/res/values/strings.xml b/commons/res/values/strings.xml
index e5dec73c7..c2ed45e79 100644
--- a/commons/res/values/strings.xml
+++ b/commons/res/values/strings.xml
@@ -70,4 +70,9 @@
     </plurals>
 
     <string name="categories_not_found">No categories matching %1$s found</string>
+    <string name="categories_skip_explanation">
+        Add categories to make the image more discoverable on Wikimedia Commons.\n\n
+        Start typing to add categories.\n
+        Tap this message (or hit back) to skip this step.
+    </string>
 </resources>
diff --git a/commons/src/main/java/org/wikimedia/commons/CategorizationFragment.java b/commons/src/main/java/org/wikimedia/commons/CategorizationFragment.java
index 0fa311b5b..3ce4e499d 100644
--- a/commons/src/main/java/org/wikimedia/commons/CategorizationFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/CategorizationFragment.java
@@ -35,6 +35,7 @@ public class CategorizationFragment extends SherlockFragment{
     EditText categoriesFilter;
     ProgressBar categoriesSearchInProgress;
     TextView categoriesNotFoundView;
+    TextView categoriesSkip;
 
     CategoriesAdapter categoriesAdapter;
     CategoriesUpdater lastUpdater = null;
@@ -87,6 +88,11 @@ public class CategorizationFragment extends SherlockFragment{
             filter = categoriesFilter.getText().toString();
             categoriesSearchInProgress.setVisibility(View.VISIBLE);
             categoriesNotFoundView.setVisibility(View.GONE);
+
+            if(!TextUtils.isEmpty(filter)) {
+                // Only hide this on first count of non-empty filter
+                categoriesSkip.setVisibility(View.GONE);
+            }
         }
 
         @Override
@@ -202,6 +208,13 @@ public class CategorizationFragment extends SherlockFragment{
         categoriesFilter = (EditText) rootView.findViewById(R.id.categoriesSearchBox);
         categoriesSearchInProgress = (ProgressBar) rootView.findViewById(R.id.categoriesSearchInProgress);
         categoriesNotFoundView = (TextView) rootView.findViewById(R.id.categoriesNotFound);
+        categoriesSkip = (TextView) rootView.findViewById(R.id.categoriesExplanation);
+
+        categoriesSkip.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View view) {
+                getActivity().finish();
+            }
+        });
 
         ArrayList<CategoryItem> items;
         if(savedInstanceState == null) {