Merge branch 'master' into Fixes-commons-app#1198

Author: Vivek Maskara

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

@@ -48,8 +48,11 @@ dependencies {
     compile 'com.facebook.fresco:fresco:1.3.0'
     compile 'com.facebook.stetho:stetho:1.5.0'
 
+    compile 'com.android.support:multidex:1.0.3'
+
     testCompile 'junit:junit:4.12'
     testCompile 'org.robolectric:robolectric:3.7.1'
+    testCompile "org.robolectric:multidex:3.4.2"
 
     testCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
     androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
@@ -94,6 +97,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"
+
+    compile 'com.borjabravo:readmoretextview:2.1.0'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
 }
 
 android {
@@ -149,6 +155,7 @@ android {
             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'
         }
 
@@ -163,6 +170,7 @@ android {
             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,57 @@
 package fr.free.nrw.commons;
 
+import android.annotation.SuppressLint;
 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.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;
 
     /**
      * 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 +64,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,5 +87,8 @@ 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\\"));
+    }
+}

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;
@@ -49,7 +50,7 @@ public class CommonsApplication extends Application {
     @Inject @Named("application_preferences") SharedPreferences applicationPrefs;
     @Inject @Named("prefs") SharedPreferences otherPrefs;
 
-    public static final String DEFAULT_EDIT_SUMMARY = "Uploaded using Android Commons app";
+    public static final String DEFAULT_EDIT_SUMMARY = "Uploaded using [[COM:MOA|Commons Mobile App]]";
 
     public static final String FEEDBACK_EMAIL = "commons-app-android@googlegroups.com";
 
@@ -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;
         }

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

@@ -7,6 +7,7 @@
 import android.support.annotation.NonNull;
 import android.support.customtabs.CustomTabsIntent;
 import android.support.v4.content.ContextCompat;
+import android.widget.Toast;
 
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.codec.digest.DigestUtils;
@@ -15,7 +16,6 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
-import java.net.URL;
 import java.net.URLEncoder;
 import java.util.Locale;
 import java.util.regex.Matcher;
@@ -24,6 +24,8 @@
 import fr.free.nrw.commons.settings.Prefs;
 import timber.log.Timber;
 
+import static android.widget.Toast.LENGTH_SHORT;
+
 public class Utils {
 
     /**
@@ -165,7 +167,24 @@ public static String getAppLogs() {
         return stringBuilder.toString();
     }
 
+    public static void rateApp(Context context) {
+        final String appPackageName = BuildConfig.class.getPackage().getName();
+        try {
+            context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + appPackageName)));
+        }
+        catch (android.content.ActivityNotFoundException anfe) {
+            context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + appPackageName)));
+        }
+    }
+
     public static void handleWebUrl(Context context,Uri url){
+        Intent browserIntent = new Intent(Intent.ACTION_VIEW, url);
+        if (browserIntent.resolveActivity(context.getPackageManager()) == null) {
+            Toast toast = Toast.makeText(context, context.getString(R.string.no_web_browser), LENGTH_SHORT);
+            toast.show();
+            return;
+        }
+
         CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
         builder.setToolbarColor(ContextCompat.getColor(context, R.color.primaryColor));
         builder.setSecondaryToolbarColor(ContextCompat.getColor(context, R.color.primaryDarkColor));

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

@@ -5,6 +5,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -54,10 +55,18 @@ public boolean isViewFromObject(View view, Object object) {
     public Object instantiateItem(ViewGroup container, int position) {
         LayoutInflater inflater = LayoutInflater.from(container.getContext());
         ViewGroup layout = (ViewGroup) inflater.inflate(PAGE_LAYOUTS[position], container, false);
-
-        if (position == PAGE_FINAL) {
+        if( BuildConfig.FLAVOR == "beta"){
+            TextView textView = (TextView) layout.findViewById(R.id.welcomeYesButton);
+            if( textView.getVisibility() != View.VISIBLE){
+                textView.setVisibility(View.VISIBLE);
+            }
             ViewHolder holder = new ViewHolder(layout);
             layout.setTag(holder);
+        } else {
+            if (position == PAGE_FINAL) {
+                ViewHolder holder = new ViewHolder(layout);
+                layout.setTag(holder);
+            }
         }
         container.addView(layout);
         return layout;
@@ -92,5 +101,6 @@ void onClicked() {
                 callback.onYesClicked();
             }
         }
+
     }
 }