Merge remote-tracking branch 'upstream/master'

Author: albendz

CONTRIBUTING.md

@@ -32,3 +32,7 @@ The body should provide a meaningful commit message.
 1. Write tests for your code (if possible)
 
 1. Make sure the Wiki pages don't become stale by updating them (if needed)
+
+### Further reading
+
+* [Importance of good commit messages](https://blog.oozou.com/commit-messages-matter-60309983c227?gi=c550a10d0f67)

app/build.gradle

@@ -21,11 +21,13 @@ dependencies {
     implementation 'com.jakewharton.timber:timber:4.5.1'
     implementation 'info.debatty:java-string-similarity:0.24'
     implementation 'com.borjabravo:readmoretextview:2.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
     implementation('com.mapbox.mapboxsdk:mapbox-android-sdk:5.5.0@aar') {
         transitive = true
     }
     implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
+    //noinspection GradleCompatible
     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"
@@ -58,6 +60,7 @@ dependencies {
     testImplementation 'org.robolectric:robolectric:3.7.1'
     testImplementation 'com.nhaarman:mockito-kotlin:1.5.0'
     testImplementation 'com.squareup.okhttp3:mockwebserver:3.8.1'
+    implementation 'com.dinuscxj:circleprogressbar:1.1.1'
 
     implementation 'com.caverock:androidsvg:1.2.1'
     implementation 'com.github.bumptech.glide:glide:4.7.1'
@@ -73,6 +76,9 @@ dependencies {
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$LEAK_CANARY"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$LEAK_CANARY"
     testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$LEAK_CANARY"
+
+    implementation 'com.borjabravo:readmoretextview:2.1.0'
+    implementation 'com.dinuscxj:circleprogressbar:1.1.1'
 }
 
 android {

app/src/main/AndroidManifest.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="fr.free.nrw.commons">
 
@@ -17,6 +18,7 @@
     <uses-permission android:name="android.permission.READ_LOGS"/>
     <uses-permission android:name="android.permission.SET_WALLPAPER"/>
 
+
     <!-- Needed only if your app targets Android 5.0 (API level 21) or higher. -->
     <uses-feature android:name="android.hardware.location.gps" />
 
@@ -35,6 +37,7 @@
         <activity android:name=".auth.LoginActivity">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER" />
+
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
@@ -45,7 +48,7 @@
             android:name=".upload.ShareActivity"
             android:icon="@drawable/ic_launcher"
             android:label="@string/app_name">
-            <intent-filter>
+            <intent-filter android:label="@string/intent_share_upload_label">
                 <action android:name="android.intent.action.SEND" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="image/*" />
@@ -57,7 +60,7 @@
             android:name=".upload.MultipleShareActivity"
             android:icon="@drawable/ic_launcher"
             android:label="@string/app_name">
-            <intent-filter>
+            <intent-filter android:label="@string/intent_share_upload_label">
                 <action android:name="android.intent.action.SEND_MULTIPLE" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="image/*" />
@@ -92,21 +95,40 @@
             android:name=".notification.NotificationActivity"
             android:label="@string/navigation_item_notification" />
 
+        <activity android:name=".quiz.QuizActivity"
+            android:label="@string/quiz"/>
+
+        <activity android:name=".quiz.QuizResultActivity"
+            android:label="@string/result"/>
+
         <activity
             android:name=".category.CategoryImagesActivity"
             android:label="@string/title_activity_featured_images"
             android:parentActivityName=".contributions.ContributionsActivity" />
 
-        <service android:name=".upload.UploadService" />
+        <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"
+            />
+
+        <activity
+            android:name=".achievements.AchievementsActivity"
+            android:label="@string/Achievements" />
+
+        <service android:name=".upload.UploadService" />
         <service
             android:name=".auth.WikiAccountAuthenticatorService"
             android:exported="true"
             android:process=":auth">
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
-
             <meta-data
                 android:name="android.accounts.AccountAuthenticator"
                 android:resource="@xml/authenticator" />
@@ -165,6 +187,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" />
@@ -177,4 +206,4 @@
 
     </application>
 
-</manifest>
+</manifest>

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/MediaWikiImageView.java

@@ -51,10 +51,16 @@ public void setMedia(Media media) {
             return;
         }
 
-        if (thumbnailUrlCache.get(media.getFilename()) != null) {
-            setImageUrl(thumbnailUrlCache.get(media.getFilename()));
-        } else {
-            setImageUrl(null);
+        if(media.getFilename() != null) {
+            if (thumbnailUrlCache.get(media.getFilename()) != null) {
+                setImageUrl(thumbnailUrlCache.get(media.getFilename()));
+            } else {
+                setImageUrl(null);
+                currentThumbnailTask = new ThumbnailFetchTask(media, mwApi);
+                currentThumbnailTask.execute(media.getFilename());
+            }
+        } else { // local image
+            setImageUrl(media.getLocalUri().toString());
             currentThumbnailTask = new ThumbnailFetchTask(media, mwApi);
             currentThumbnailTask.execute(media.getFilename());
         }

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

@@ -2,11 +2,13 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Bitmap;
 import android.net.Uri;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.customtabs.CustomTabsIntent;
 import android.support.v4.content.ContextCompat;
+import android.view.View;
 import android.widget.Toast;
 
 import org.apache.commons.codec.binary.Hex;
@@ -76,7 +78,11 @@ public static String urlEncode(String url) {
      * @return string with capitalized first character
      */
     public static String capitalize(String string) {
-        return string.substring(0, 1).toUpperCase(Locale.getDefault()) + string.substring(1);
+        if(string.length() > 0) {
+            return string.substring(0, 1).toUpperCase(Locale.getDefault()) + string.substring(1);
+        } else {
+            return string;
+        }
     }
 
     /**
@@ -146,7 +152,7 @@ public static String getAppLogs() {
         StringBuilder stringBuilder = new StringBuilder();
 
         try {
-            String[] command = new String[] {"logcat","-d","-v","threadtime"};
+            String[] command = new String[]{"logcat","-d","-v","threadtime"};
 
             Process process = Runtime.getRuntime().exec(command);
 
@@ -195,4 +201,18 @@ public static void handleWebUrl(Context context, Uri url) {
         customTabsIntent.launchUrl(context, url);
     }
 
+    /**
+     * To take screenshot of the screen and return it in Bitmap format
+     *
+     * @param view
+     * @return
+     */
+    public static Bitmap getScreenShot(View view) {
+        View screenView = view.getRootView();
+        screenView.setDrawingCacheEnabled(true);
+        Bitmap bitmap = Bitmap.createBitmap(screenView.getDrawingCache());
+        screenView.setDrawingCacheEnabled(false);
+        return bitmap;
+    }
+
 }

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

@@ -9,6 +9,7 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import fr.free.nrw.commons.quiz.QuizActivity;
 import fr.free.nrw.commons.theme.BaseActivity;
 
 public class WelcomeActivity extends BaseActivity {
@@ -17,6 +18,7 @@ public class WelcomeActivity extends BaseActivity {
     @BindView(R.id.welcomePagerIndicator) CirclePageIndicator indicator;
 
     private WelcomePagerAdapter adapter = new WelcomePagerAdapter();
+    private boolean isQuiz;
 
     /**
      * Initialises exiting fields and dependencies
@@ -28,6 +30,15 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_welcome);
 
+        if(getIntent() != null) {
+            Bundle bundle = getIntent().getExtras();
+            if (bundle != null) {
+                isQuiz = bundle.getBoolean("isQuiz");
+            }
+        } else{
+            isQuiz = false;
+        }
+
         ButterKnife.bind(this);
 
         pager.setAdapter(adapter);
@@ -40,6 +51,10 @@ public void onCreate(Bundle savedInstanceState) {
      */
     @Override
     public void onDestroy() {
+        if(isQuiz){
+            Intent i = new Intent(WelcomeActivity.this, QuizActivity.class);
+            startActivity(i);
+        }
         adapter.setCallback(null);
         super.onDestroy();
     }