Merge remote-tracking branch 'refs/remotes/origin/master' into feedback-gamification

Author: misaochan

CONTRIBUTING.md

@@ -5,15 +5,30 @@ If you're not sure where to start head on to [this wiki page](https://github.com
 
 Here's a gist of the guidelines,
 
-# Make separate commits for logically separate changes
+1. Make separate commits for logically separate changes
 
-# Describe your changes well in the commit message
+1. Describe your changes well in the commit message
 
-The first line of the commit message should be a short description of what has
+    The first line of the commit message should be a short description of what has
 changed. It is also good to prefix the first line with "area: " where the "area"
 is a filename or identifier for the general area of the code being modified.
 The body should provide a meaningful commit message.
 
-# Write tests for your code (if possible)
+1. Write Javadocs
 
-# Make sure the Wiki pages don't become stale by updating them (if needed)
+    We require contributors to include Javadocs for all new methods and classes
+    submitted via PRs (after 1 May 2018). This is aimed at making it easier for
+    new contributors to dive into our codebase, especially those who are new to
+    Android development. A few things to note:
+
+    - This should not replace the need for code that is easily-readable in
+      and of itself
+    - Please make sure that your Javadocs are reasonably descriptive, not just
+      a copy of the method name
+    - Please do not use `@author` tags - we aim for collective code ownership,
+      and if needed, Git allows us to see who wrote something without needing
+      to add these tags (`git blame`)
+
+1. Write tests for your code (if possible)
+
+1. Make sure the Wiki pages don't become stale by updating them (if needed)

PULL_REQUEST_TEMPLATE.md

@@ -1,15 +1,15 @@
-## Description
+## Description (required)
 
-Fixes #{GitHub issue number}
+Fixes #{GitHub issue number and title}
 
 {Describe the changes made and why they were made.}
 
-## Tests performed
+## Tests performed (required)
 
 Tested on {API level & name of device/emulator}, with {build variant, e.g. ProdDebug}.
 
-{Please test your PR at least once before submitting.}
-
-## Screenshots showing what changed
+## Screenshots showing what changed (optional)
 
 {Only for user interface changes, otherwise remove this section. See [how to take a screenshot](https://android.stackexchange.com/questions/1759/how-to-take-a-screenshot-with-an-android-device)}
+
+_Note: Please ensure that you have read CONTRIBUTING.md if this is your first pull request._

app/build.gradle

@@ -25,6 +25,8 @@ dependencies {
         transitive=true
     }
 
+    implementation "com.github.deano2390:MaterialShowcaseView:1.2.0"
+
     implementation "com.android.support:support-v4:$SUPPORT_LIB_VERSION"
     implementation "com.android.support:appcompat-v7:$SUPPORT_LIB_VERSION"
     implementation "com.android.support:design:$SUPPORT_LIB_VERSION"
@@ -49,6 +51,8 @@ dependencies {
     implementation 'com.jakewharton.rxbinding2:rxbinding-appcompat-v7:2.0.0'
     implementation 'com.jakewharton.rxbinding2:rxbinding-design:2.0.0'
 
+    implementation 'org.jsoup:jsoup:1.11.3'
+
     implementation 'com.facebook.fresco:fresco:1.5.0'
     implementation 'com.facebook.stetho:stetho:1.5.0'
 

app/src/main/AndroidManifest.xml

@@ -92,8 +92,9 @@
             android:label="@string/navigation_item_notification" />
 
         <activity
-            android:name=".featured.FeaturedImagesActivity"
-            android:label="@string/title_activity_featured_images" />
+            android:name=".category.CategoryImagesActivity"
+            android:label="@string/title_activity_featured_images"
+            android:parentActivityName=".contributions.ContributionsActivity" />
 
         <service android:name=".upload.UploadService" />
 

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

@@ -135,9 +135,10 @@ public boolean onCreateOptionsMenu(Menu menu) {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.share_app_icon:
+                String shareText = "Upload photos to Wikimedia Commons on your phone\nDownload the Commons app: http://play.google.com/store/apps/details?id=fr.free.nrw.commons";
                 Intent sendIntent = new Intent();
                 sendIntent.setAction(Intent.ACTION_SEND);
-                sendIntent.putExtra(Intent.EXTRA_TEXT, "http://play.google.com/store/apps/details?id=fr.free.nrw.commons");
+                sendIntent.putExtra(Intent.EXTRA_TEXT, shareText);
                 sendIntent.setType("text/plain");
                 startActivity(Intent.createChooser(sendIntent, "Share app via..."));
                 return true;

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

@@ -61,8 +61,8 @@ public void fetch(String filename, LicenseList licenseList) throws IOException {
         }
 
         try{
-            Timber.d("Nominated for deletion: " + mediaWikiApi.pageExists("Commons:Deletion_requests/"+filename));
-            deletionStatus = mediaWikiApi.pageExists("Commons:Deletion_requests/"+filename);
+            deletionStatus = mediaWikiApi.pageExists("Commons:Deletion_requests/" + filename);
+            Timber.d("Nominated for deletion: " + deletionStatus);
         }
         catch (Exception e){
             Timber.d(e.getMessage());

app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java

@@ -47,6 +47,7 @@
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.theme.NavigationBaseActivity;
 import fr.free.nrw.commons.ui.widget.HtmlTextView;
+import fr.free.nrw.commons.utils.ViewUtil;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
@@ -109,14 +110,14 @@ public void onCreate(Bundle savedInstanceState) {
         usernameEdit.addTextChangedListener(textWatcher);
         usernameEdit.setOnFocusChangeListener((v, hasFocus) -> {
             if (!hasFocus) {
-                hideKeyboard(v);
+                ViewUtil.hideKeyboard(v);
             }
         });
 
         passwordEdit.addTextChangedListener(textWatcher);
         passwordEdit.setOnFocusChangeListener((v, hasFocus) -> {
             if (!hasFocus) {
-                hideKeyboard(v);
+                ViewUtil.hideKeyboard(v);
             }
         });
 
@@ -144,16 +145,6 @@ void onPrivacyPolicyClicked() {
         Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\\"));
     }
 
-    public void hideKeyboard(View view) {
-        if (view != null) {
-            InputMethodManager inputMethodManager = (InputMethodManager) this.getSystemService(Activity.INPUT_METHOD_SERVICE);
-            if (inputMethodManager != null) {
-                inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
-            }
-        }
-    }
-
-
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);

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

@@ -1,7 +1,6 @@
 package fr.free.nrw.commons.category;
 
 
-import android.app.Activity;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
@@ -16,7 +15,6 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -43,6 +41,7 @@
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.upload.MwVolleyApi;
 import fr.free.nrw.commons.utils.StringSortingUtils;
+import fr.free.nrw.commons.utils.ViewUtil;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
@@ -116,7 +115,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         categoriesFilter.setOnFocusChangeListener((v, hasFocus) -> {
             if (!hasFocus) {
-                hideKeyboard(v);
+                ViewUtil.hideKeyboard(v);
             }
         });
 
@@ -128,16 +127,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         return rootView;
     }
 
-    public void hideKeyboard(View view) {
-
-        if (view != null) {
-            InputMethodManager inputMethodManager = (InputMethodManager) getActivity().getSystemService(Activity.INPUT_METHOD_SERVICE);
-            if (inputMethodManager != null) {
-                inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
-            }
-        }
-    }
-
     @Override
     public void onDestroyView() {
         categoriesFilter.removeTextChangedListener(textWatcher);

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

@@ -0,0 +1,29 @@
+package fr.free.nrw.commons.category;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import fr.free.nrw.commons.Media;
+import fr.free.nrw.commons.mwapi.MediaWikiApi;
+
+@Singleton
+public class CategoryImageController {
+
+    private MediaWikiApi mediaWikiApi;
+
+    @Inject
+    public CategoryImageController(MediaWikiApi mediaWikiApi) {
+        this.mediaWikiApi = mediaWikiApi;
+    }
+
+    /**
+     * Takes a category name as input and calls the API to get a list of images for that category
+     * @param categoryName
+     * @return
+     */
+    public List<Media> getCategoryImages(String categoryName) {
+        return mediaWikiApi.getCategoryImages(categoryName);
+    }
+}