Merge remote-tracking branch 'refs/remotes/commons-app/master'

Author: misaochan

ISSUE_TEMPLATE.md

@@ -33,3 +33,7 @@ You can find this information by going to the navigation drawer in the app and t
 **Screen-shots:** 
 
 Can be created by pressing the Volume Down and Power Button at the same time on Android 4.0 and higher.
+
+**Would you like to work on the issue?**
+
+Please let us know whether you want to fix the issue by yourself. If not, anyone can get the issue assigned to them.

PULL_REQUEST_TEMPLATE.md

@@ -4,6 +4,12 @@ Fixes #{GitHub issue number}
 
 {Describe the changes made and why they were made.}
 
+## Tests performed
+
+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
 
 {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)}

app/build.gradle

@@ -39,26 +39,10 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
     // Because RxAndroid releases are few and far between, it is recommended you also
     // explicitly depend on RxJava's latest version for bug fixes and new features.
-    compile 'io.reactivex.rxjava2:rxjava:2.1.2'
-    compile 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
-    compile 'com.jakewharton.rxbinding2:rxbinding-support-v4:2.0.0'
-    compile 'com.jakewharton.rxbinding2:rxbinding-appcompat-v7:2.0.0'
-    compile 'com.jakewharton.rxbinding2:rxbinding-design:2.0.0'
-
-    compile 'com.facebook.fresco:fresco:1.3.0'
-    compile 'com.facebook.stetho:stetho:1.5.0'
-
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.7.1'
-
-    testCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
-    androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
-    androidTestCompile "com.android.support:support-annotations:${project.SUPPORT_LIB_VERSION}"
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.1'
-
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
-    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
+    implementation 'com.android.support:multidex:1.0.3'
+
+    testImplementation "org.robolectric:multidex:3.4.2"
+
     implementation 'io.reactivex.rxjava2:rxjava:2.1.2'
     implementation 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
     implementation 'com.jakewharton.rxbinding2:rxbinding-support-v4:2.0.0'
@@ -94,6 +78,9 @@ dependencies {
     implementation "com.google.dagger:dagger-android-support:$DAGGER_VERSION"
     kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
     kapt "com.google.dagger:dagger-android-processor:$DAGGER_VERSION"
+
+    implementation 'com.borjabravo:readmoretextview:2.1.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
 }
 
 android {
@@ -116,6 +103,12 @@ android {
         multiDexEnabled true
     }
 
+    testOptions {
+        unitTests.all {
+            jvmArgs '-noverify'
+        }
+    }
+
     sourceSets {
         // use kotlin only in tests (for now)
         test.java.srcDirs += 'src/test/kotlin'
@@ -144,11 +137,13 @@ android {
             buildConfigField "String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\""
             buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.wikimedia.org/wikipedia/commons\""
             buildConfigField "String", "HOME_URL", "\"https://commons.wikimedia.org/wiki/\""
+            buildConfigField "String", "COMMONS_URL", "\"https://commons.wikimedia.org\""
             buildConfigField "String", "MOBILE_HOME_URL", "\"https://commons.m.wikimedia.org/wiki/\""
             buildConfigField "String", "EVENTLOG_URL", "\"https://www.wikimedia.org/beacon/event\""
             buildConfigField "String", "EVENTLOG_WIKI", "\"commonswiki\""
             buildConfigField "String", "SIGNUP_LANDING_URL", "\"https://commons.m.wikimedia.org/w/index.php?title=Special:CreateAccount&returnto=Main+Page&returntoquery=welcome%3Dyes\""
             buildConfigField "String", "SIGNUP_SUCCESS_REDIRECTION_URL", "\"https://commons.m.wikimedia.org/w/index.php?title=Main_Page&welcome=yes\""
+            buildConfigField "String", "FORGOT_PASSWORD_URL", "\"https://commons.wikimedia.org/wiki/Special:PasswordReset\""
             dimension 'tier'
         }
 
@@ -158,11 +153,13 @@ android {
             buildConfigField "String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\""
             buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.beta.wmflabs.org/wikipedia/commons\""
             buildConfigField "String", "HOME_URL", "\"https://commons.wikimedia.beta.wmflabs.org/wiki/\""
+            buildConfigField "String", "COMMONS_URL", "\"https://commons.wikimedia.beta.wmflabs.org\""
             buildConfigField "String", "MOBILE_HOME_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/wiki/\""
             buildConfigField "String", "EVENTLOG_URL", "\"https://commons.wikimedia.beta.wmflabs.org/beacon/event\""
             buildConfigField "String", "EVENTLOG_WIKI", "\"commonswiki\""
             buildConfigField "String", "SIGNUP_LANDING_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/w/index.php?title=Special:CreateAccount&returnto=Main+Page&returntoquery=welcome%3Dyes\""
             buildConfigField "String", "SIGNUP_SUCCESS_REDIRECTION_URL", "\"https://commons.m.wikimedia.beta.wmflabs.org/w/index.php?title=Main_Page&welcome=yes\""
+            buildConfigField "String", "FORGOT_PASSWORD_URL", "\"https://commons.wikimedia.beta.wmflabs.org/wiki/Special:PasswordReset\""
             dimension 'tier'
         }
     }

app/src/androidTest/java/fr/free/nrw/commons/SettingsActivityTest.java

@@ -5,6 +5,7 @@
 import android.support.test.espresso.Espresso;
 import android.support.test.espresso.action.ViewActions;
 import android.support.test.espresso.assertion.ViewAssertions;
+import android.support.test.espresso.matcher.PreferenceMatchers;
 import android.support.test.espresso.matcher.ViewMatchers;
 import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
@@ -61,7 +62,7 @@ protected void afterActivityFinished() {
     @Test
     public void oneLicenseIsChecked() {
         // click "License" (the first item)
-        Espresso.onData(Matchers.anything())
+        Espresso.onData(PreferenceMatchers.withKey("defaultLicense"))
                 .inAdapterView(ViewMatchers.withId(android.R.id.list))
                 .atPosition(0)
                 .perform(ViewActions.click());
@@ -74,7 +75,7 @@ public void oneLicenseIsChecked() {
     @Test
     public void afterClickingCcby4ItWillStay() {
         // click "License" (the first item)
-        Espresso.onData(Matchers.anything())
+        Espresso.onData(PreferenceMatchers.withKey("defaultLicense"))
                 .inAdapterView(ViewMatchers.withId(android.R.id.list))
                 .atPosition(0)
                 .perform(ViewActions.click());
@@ -85,7 +86,7 @@ public void afterClickingCcby4ItWillStay() {
         ).perform(ViewActions.click());
 
         // click "License" (the first item)
-        Espresso.onData(Matchers.anything())
+        Espresso.onData(PreferenceMatchers.withKey("defaultLicense"))
                 .inAdapterView(ViewMatchers.withId(android.R.id.list))
                 .atPosition(0)
                 .perform(ViewActions.click());
@@ -96,4 +97,4 @@ public void afterClickingCcby4ItWillStay() {
                         ViewMatchers.withText(R.string.license_name_cc_by_four)
                 ));
     }
-}
+}

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

@@ -1,48 +1,72 @@
 package fr.free.nrw.commons;
 
+import android.annotation.SuppressLint;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.SpannableString;
+import android.text.style.UnderlineSpan;
+import android.util.Log;
 import android.support.customtabs.CustomTabsIntent;
 import android.support.v4.content.ContextCompat;
 import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import fr.free.nrw.commons.theme.NavigationBaseActivity;
 import fr.free.nrw.commons.ui.widget.HtmlTextView;
 
+import static android.widget.Toast.LENGTH_SHORT;
+
 /**
  * Represents about screen of this app
  */
 public class AboutActivity extends NavigationBaseActivity {
     @BindView(R.id.about_version) TextView versionText;
     @BindView(R.id.about_license) HtmlTextView aboutLicenseText;
+    @BindView(R.id.about_faq) TextView faqText;
+
+    String language[] = { "Kazakh", "Afrikaans", "Arabic", "Bengali", "Asturianu", "azərbaycanca", "Bikol Central",
+    "Bulgarain", "বাংলা", "Bosanski", "Brezhoneg","català","کوردی", " čeština", " kaszëbsczi", "Cymraeg", "dansk", "Deutsch"
+    ,"Zazaki", "डोटेली","Ελληνικά","euskara","español","فارسی","suomi", "français" ,"Nordfriisk", "galego", "Hawaiʻi"
+    ,"हिन्दी","Hunsrik","עברית","hornjoserbsce","magyar","interlingua","Bahasa Indonesia", "íslenska","Italian","japanese",
+    "Basa Jawa", "ქართული", " ភាសាខ្មែរ","ಕನ್ನಡ", "한국어","къарачай-малкъар","Кыргызча", "latina", "Lëtzebuergesch", "lietuvių",
+    "latviešu", "Malagasy", "македонски"," മലയാളം","монгол","मराठी","Bahasa Melayu","Malti", "नेपाली",  "norsk bokmål",
+    " Nederlands","occitan","ଓଡ଼ିଆ","ਪੰਜਾਬੀ","polsk","Piemontèis","پښتو","português","română","русский"," سنڌي", " සිංහල",
+    "slovenčina"," سرائیکی", "svenska", "தமிழ்", "ತುಳು"," తెలుగు"," ไทย", "Türkçe","українська", "اردو", "Tiếng Việt",
+    " მარგალური","ייִדיש",};
 
     /**
      * This method helps in the creation About screen
      *
      * @param savedInstanceState Data bundle
      */
     @Override
+    @SuppressLint("StringFormatInvalid")
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
 
         ButterKnife.bind(this);
-
         String aboutText = getString(R.string.about_license);
         aboutLicenseText.setHtmlText(aboutText);
-
+        SpannableString content = new SpannableString(getString(R.string.about_faq));
+        content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
+        faqText.setText(content);
         versionText.setText(BuildConfig.VERSION_NAME);
         initDrawer();
     }
 
     @OnClick(R.id.facebook_launch_icon)
     public void launchFacebook(View view) {
-
         Intent intent;
         try {
             intent = new Intent(Intent.ACTION_VIEW, Uri.parse("fb://page/" + "1921335171459985"));
@@ -55,14 +79,19 @@ public void launchFacebook(View view) {
 
     @OnClick(R.id.github_launch_icon)
     public void launchGithub(View view) {
-        Utils.handleWebUrl(this,Uri.parse("https://commons-app.github.io/\\"));
+        Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons\\"));
     }
 
     @OnClick(R.id.website_launch_icon)
     public void launchWebsite(View view) {
         Utils.handleWebUrl(this,Uri.parse("https://commons-app.github.io/\\"));
     }
 
+    @OnClick(R.id.about_rate_us)
+    public void launchRatings(View view){
+        Utils.rateApp(this);
+    }
+
     @OnClick(R.id.about_credits)
     public void launchCredits(View view) {
         Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/blob/master/CREDITS/\\"));
@@ -73,4 +102,43 @@ public void launchPrivacyPolicy(View view) {
         Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\\"));
     }
 
-}
+
+    @OnClick(R.id.about_faq)
+    public void launchFrequentlyAskedQuesions(View view) {
+        Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Frequently-Asked-Questions\\"));
+    }
+
+    @OnClick(R.id.about_translate)
+    public void launchTranslate(View view) {
+        final ArrayAdapter<String> languageAdapter = new ArrayAdapter<String>(AboutActivity.this,
+                android.R.layout.simple_spinner_item, language);
+        final Spinner spinner = new Spinner(AboutActivity.this);
+        spinner.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
+        spinner.setAdapter(languageAdapter);
+        spinner.setGravity(17);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(AboutActivity.this);
+        builder.setView(spinner);
+        builder.setTitle(R.string.about_translate_title)
+                .setMessage(R.string.about_translate_message)
+                .setPositiveButton(R.string.about_translate_proceed, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        String languageSelected = spinner.getSelectedItem().toString();
+                        TokensTranslations tokensTranslations = new TokensTranslations();
+                        tokensTranslations.initailize();
+                        String token = tokensTranslations.getTranslationToken(languageSelected);
+                        Utils.handleWebUrl(AboutActivity.this,Uri.parse("https://translatewiki.net/w/i.php?title=Special:Translate&language="+token+"&group=commons-android-strings&filter=%21translated&action=translate ?"));
+                    }
+                });
+        builder.setNegativeButton(R.string.about_translate_cancel, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                finish();
+            }
+        });
+        builder.create().show();
+
+    }
+
+}

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

@@ -4,8 +4,10 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
+import android.support.multidex.MultiDexApplication;
 
 import com.facebook.drawee.backends.pipeline.Fresco;
+import com.facebook.imagepipeline.core.ImagePipelineConfig;
 import com.facebook.stetho.Stetho;
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.RefWatcher;
@@ -24,7 +26,6 @@
 import fr.free.nrw.commons.contributions.ContributionDao;
 import fr.free.nrw.commons.data.DBOpenHelper;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
-import fr.free.nrw.commons.di.CommonsApplicationComponent;
 import fr.free.nrw.commons.modifications.ModifierSequenceDao;
 import fr.free.nrw.commons.utils.FileUtils;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -40,7 +41,7 @@
         resDialogCommentPrompt = R.string.crash_dialog_comment_prompt,
         resDialogOkToast = R.string.crash_dialog_ok_toast
 )
-public class CommonsApplication extends Application {
+public class CommonsApplication extends MultiDexApplication {
 
     @Inject SessionManager sessionManager;
     @Inject DBOpenHelper dbOpenHelper;
@@ -71,8 +72,11 @@ public void onCreate() {
                 .getInstance(this)
                 .getCommonsApplicationComponent()
                 .inject(this);
-
-        Fresco.initialize(this);
+//        Set DownsampleEnabled to True to downsample the image in case it's heavy
+        ImagePipelineConfig config = ImagePipelineConfig.newBuilder(this)
+                .setDownsampleEnabled(true)
+                .build();
+        Fresco.initialize(this,config);
         if (setupLeakCanary() == RefWatcher.DISABLED) {
             return;
         }