Add feature to Browse commons via app

app/src/main/AndroidManifest.xml

@@ -97,6 +97,17 @@
             android:label="@string/title_activity_featured_images"
             android:parentActivityName=".contributions.ContributionsActivity" />
 
+        <activity
+            android:name=".category.CategoryDetailsActivity"
+            android:label="@string/title_activity_featured_images"
+            android:parentActivityName=".contributions.ContributionsActivity" />
+
+        <activity
+            android:name=".explore.SearchActivity"
+            android:label="@string/title_activity_search"
+            android:parentActivityName=".contributions.ContributionsActivity"
+            />
+
         <service android:name=".upload.UploadService" />
 
         <service
@@ -165,6 +176,13 @@
             android:label="@string/provider_categories"
             android:syncable="false" />
 
+        <provider
+            android:name=".explore.recentsearches.RecentSearchesContentProvider"
+            android:authorities="fr.free.nrw.commons.explore.recentsearches.contentprovider"
+            android:exported="false"
+            android:label="@string/provider_searches"
+            android:syncable="false" />
+
         <receiver android:name=".widget.PicOfDayAppWidget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

app/src/main/java/fr/free/nrw/commons/Media.java

@@ -3,13 +3,17 @@
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -356,12 +360,8 @@ public void setCategories(List<String> categories) {
      * @param descriptions Media descriptions
      */
     void setDescriptions(Map<String, String> descriptions) {
-        for (String key : this.descriptions.keySet()) {
-            this.descriptions.remove(key);
-        }
-        for (String key : descriptions.keySet()) {
-            this.descriptions.put(key, descriptions.get(key));
-        }
+        this.descriptions.clear();
+        this.descriptions.putAll(descriptions);
     }
 
     /**

app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.java

@@ -0,0 +1,253 @@
+package fr.free.nrw.commons.category;
+
+import android.content.Context;
+import android.content.Intent;
+import android.database.DataSetObserver;
+import android.os.Bundle;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.view.ViewPager;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.FrameLayout;
+import android.widget.Toast;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import fr.free.nrw.commons.Media;
+import fr.free.nrw.commons.PageTitle;
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.explore.ViewPagerAdapter;
+import fr.free.nrw.commons.media.MediaDetailPagerFragment;
+import fr.free.nrw.commons.theme.NavigationBaseActivity;
+
+import static android.widget.Toast.LENGTH_SHORT;
+
+/**
+ * This activity displays details of a particular category
+ * Its generic and simply takes the name of category name in its start intent to load all images, subcategories in
+ * a particular category on wikimedia commons.
+ */
+
+public class CategoryDetailsActivity extends NavigationBaseActivity
+        implements MediaDetailPagerFragment.MediaDetailProvider,
+                    AdapterView.OnItemClickListener{
+
+
+    private FragmentManager supportFragmentManager;
+    private CategoryImagesListFragment categoryImagesListFragment;
+    private MediaDetailPagerFragment mediaDetails;
+    private String categoryName;
+    @BindView(R.id.mediaContainer) FrameLayout mediaContainer;
+    @BindView(R.id.tabLayout) TabLayout tabLayout;
+    @BindView(R.id.viewPager) ViewPager viewPager;
+
+    ViewPagerAdapter viewPagerAdapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_category_details);
+        ButterKnife.bind(this);
+        supportFragmentManager = getSupportFragmentManager();
+        viewPagerAdapter = new ViewPagerAdapter(getSupportFragmentManager());
+        viewPager.setAdapter(viewPagerAdapter);
+        viewPager.setOffscreenPageLimit(2);
+        tabLayout.setupWithViewPager(viewPager);
+        setTabs();
+        setPageTitle();
+        initDrawer();
+        forceInitBackButton();
+    }
+
+    /**
+     * This activity contains 3 tabs and a viewpager. This method is used to set the titles of tab,
+     * Set the fragments according to the tab selected in the viewPager.
+     */
+    private void setTabs() {
+        List<Fragment> fragmentList = new ArrayList<>();
+        List<String> titleList = new ArrayList<>();
+        categoryImagesListFragment = new CategoryImagesListFragment();
+        SubCategoryListFragment subCategoryListFragment = new SubCategoryListFragment();
+        SubCategoryListFragment parentCategoryListFragment = new SubCategoryListFragment();
+        categoryName = getIntent().getStringExtra("categoryName");
+        if (getIntent() != null && categoryName != null) {
+            Bundle arguments = new Bundle();
+            arguments.putString("categoryName", categoryName);
+            arguments.putBoolean("isParentCategory", false);
+            categoryImagesListFragment.setArguments(arguments);
+            subCategoryListFragment.setArguments(arguments);
+            Bundle parentCategoryArguments = new Bundle();
+            parentCategoryArguments.putString("categoryName", categoryName);
+            parentCategoryArguments.putBoolean("isParentCategory", true);
+            parentCategoryListFragment.setArguments(parentCategoryArguments);
+        }
+        fragmentList.add(categoryImagesListFragment);
+        titleList.add("MEDIA");
+        fragmentList.add(subCategoryListFragment);
+        titleList.add("SUBCATEGORIES");
+        fragmentList.add(parentCategoryListFragment);
+        titleList.add("PARENT CATEGORIES");
+        viewPagerAdapter.setTabData(fragmentList, titleList);
+        viewPagerAdapter.notifyDataSetChanged();
+
+    }
+
+    /**
+     * Gets the passed categoryName from the intents and displays it as the page title
+     */
+    private void setPageTitle() {
+        if (getIntent() != null && getIntent().getStringExtra("categoryName") != null) {
+            setTitle(getIntent().getStringExtra("categoryName"));
+        }
+    }
+
+    /**
+     * This method is called onClick of media inside category details (CategoryImageListFragment).
+     */
+    @Override
+    public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+        tabLayout.setVisibility(View.GONE);
+        viewPager.setVisibility(View.GONE);
+        mediaContainer.setVisibility(View.VISIBLE);
+        if (mediaDetails == null || !mediaDetails.isVisible()) {
+            // set isFeaturedImage true for featured images, to include author field on media detail
+            mediaDetails = new MediaDetailPagerFragment(false, true);
+            FragmentManager supportFragmentManager = getSupportFragmentManager();
+            supportFragmentManager
+                    .beginTransaction()
+                    .replace(R.id.mediaContainer, mediaDetails)
+                    .addToBackStack(null)
+                    .commit();
+            supportFragmentManager.executePendingTransactions();
+        }
+        mediaDetails.showImage(i);
+        forceInitBackButton();
+    }
+
+
+    /**
+     * Consumers should be simply using this method to use this activity.
+     * @param context  A Context of the application package implementing this class.
+     * @param categoryName Name of the category for displaying its details
+     */
+    public static void startYourself(Context context, String categoryName) {
+        Intent intent = new Intent(context, CategoryDetailsActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        intent.putExtra("categoryName", categoryName);
+        context.startActivity(intent);
+    }
+
+    /**
+     * This method is called mediaDetailPagerFragment. It returns the Media Object at that Index
+     * @param i It is the index of which media object is to be returned which is same as
+     *          current index of viewPager.
+     * @return Media Object
+     */
+    @Override
+    public Media getMediaAtPosition(int i) {
+        if (categoryImagesListFragment.getAdapter() == null) {
+            // not yet ready to return data
+            return null;
+        } else {
+            return (Media) categoryImagesListFragment.getAdapter().getItem(i);
+        }
+    }
+
+    /**
+     * This method is called on from getCount of MediaDetailPagerFragment
+     * The viewpager will contain same number of media items as that of media elements in adapter.
+     * @return Total Media count in the adapter
+     */
+    @Override
+    public int getTotalMediaCount() {
+        if (categoryImagesListFragment.getAdapter() == null) {
+            return 0;
+        }
+        return categoryImagesListFragment.getAdapter().getCount();
+    }
+
+    /**
+     * This method is never called but it was in MediaDetailProvider Interface
+     * so it needs to be overrided.
+     */
+    @Override
+    public void notifyDatasetChanged() {
+
+    }
+
+    /**
+     * This method is never called but it was in MediaDetailProvider Interface
+     * so it needs to be overrided.
+     */
+    @Override
+    public void registerDataSetObserver(DataSetObserver observer) {
+    }
+
+    /**
+     * This method is never called but it was in MediaDetailProvider Interface
+     * so it needs to be overrided.
+     */
+    @Override
+    public void unregisterDataSetObserver(DataSetObserver observer) {
+
+    }
+
+    /**
+     * This method inflates the menu in the toolbar
+     */
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.fragment_category_detail, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    /**
+     * This method handles the logic on ItemSelect in toolbar menu
+     * Currently only 1 choice is available to open category details page in browser
+     */
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+        // Handle item selection
+        switch (item.getItemId()) {
+            case R.id.menu_browser_current_category:
+                Intent viewIntent = new Intent();
+                viewIntent.setAction(Intent.ACTION_VIEW);
+                viewIntent.setData(new PageTitle(categoryName).getCanonicalUri());
+                //check if web browser available
+                if (viewIntent.resolveActivity(this.getPackageManager()) != null) {
+                    startActivity(viewIntent);
+                } else {
+                    Toast toast = Toast.makeText(this, getString(R.string.no_web_browser), LENGTH_SHORT);
+                    toast.show();
+                }
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    /**
+     * This method is called on backPressed of anyFragment in the activity.
+     * If condition is called when mediaDetailFragment is opened.
+     */
+    @Override
+    public void onBackPressed() {
+        if (supportFragmentManager.getBackStackEntryCount() == 1){
+            // back to search so show search toolbar and hide navigation toolbar
+            tabLayout.setVisibility(View.VISIBLE);
+            viewPager.setVisibility(View.VISIBLE);
+            mediaContainer.setVisibility(View.GONE);
+        }
+        super.onBackPressed();
+    }
+}

app/src/main/java/fr/free/nrw/commons/category/CategoryImageUtils.java

@@ -8,6 +8,7 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -27,12 +28,30 @@ public static List<Media> getMediaList(NodeList childNodes) {
         List<Media> categoryImages = new ArrayList<>();
         for (int i = 0; i < childNodes.getLength(); i++) {
             Node node = childNodes.item(i);
-            categoryImages.add(getMediaFromPage(node));
+            if (getMediaFromPage(node).getFilename().substring(0,5).equals("File:")){
+                categoryImages.add(getMediaFromPage(node));
+            }
         }
 
         return categoryImages;
     }
 
+    /**
+     * The method iterates over the child nodes to return a list of Subcategory name
+     * sorted alphabetically
+     * @param childNodes
+     * @return
+     */
+    public static List<String> getSubCategoryList(NodeList childNodes) {
+        List<String> subCategories = new ArrayList<>();
+        for (int i = 0; i < childNodes.getLength(); i++) {
+            Node node = childNodes.item(i);
+            subCategories.add(getMediaFromPage(node).getFilename());
+        }
+        Collections.sort(subCategories);
+        return subCategories;
+    }
+
     /**
      * Creates a new Media object from the XML response as received by the API
      * @param node