redirecting to category images Actovoty instead of Nearby now

Author: ujjwalagrawal17

.travis.yml

@@ -19,12 +19,13 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-26.0.2
+    - build-tools-27.0.0
     - extra-google-m2repository
     - extra-android-m2repository
     - ${ANDROID_TARGET}
     - android-25
     - android-26
+    - android-27
     - sys-img-${ANDROID_ABI}-${ANDROID_TARGET}
   licenses:
     - 'android-sdk-license-.+'

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Wikimedia Commons for Android
 
+## v2.7.2
+- Modified subtext for "automatically get current location" setting to emphasize that it will reveal user's location
+
 ## v2.7.1
 - Fixed UI and permission issues with Nearby
 - Fixed issue with My Recent Uploads being empty

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)

ISSUE_TEMPLATE.md

@@ -1,25 +1,18 @@
-_Before creating an issue, please search the existing issues to see if a similar one has already been created. You can search issues by specific labels (e.g. `label:nearby `) or just by typing keywords into the search filter._
-
 **Summary:** 
 
 Summarize your issue in one sentence (what goes wrong, what did you expect to happen)
 
+_Before creating an issue, please search the existing issues to see if a similar one has already been created. You can search issues by specific labels (e.g. `label:nearby `) or just by typing keywords into the search filter._
+
 **Steps to reproduce:** 
 
-How can we reproduce the issue?
+How can we reproduce the issue? 
+What did you expect the app to do, and what did you see instead?
 
 **Add System logs:**
 
 Add logcat files here (if possible).
 
-**Expected behavior:** 
-
-What did you expect the App to do?
-
-**Observed behavior:** 
-
-What did you see instead?  Describe your issue in detail here.
-
 **Device and Android version:** 
 
 What make and model device (e.g., Samsung J7) did you encounter this on?  What Android
@@ -28,7 +21,7 @@ version (e.g., Android 4.0 Ice Cream Sandwich or Android 6.0 Marshmallow) are yo
 
  **Commons app version:** 
 
-You can find this information by going to the navigation drawer in the app and tapping 'About'
+You can find this information by going to the navigation drawer in the app and tapping 'About'. If you are building from our codebase instead of downloading the app, please also mention the branch and build variant (e.g. master and prodDebug).
 
 **Screen-shots:** 
 

PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,7 @@
+## Title (required)
+
+Fixes #{GitHub issue number and title (Please do not forget adding title) } 
+
 ## Description (required)
 
 Fixes #{GitHub issue number and title}
@@ -12,4 +16,4 @@ Tested on {API level & name of device/emulator}, with {build variant, e.g. ProdD
 
 {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._
+_Note: Please ensure that you have read CONTRIBUTING.md if this is your first pull request._

app/build.gradle

@@ -7,11 +7,12 @@ apply from: 'quality.gradle'
 apply plugin: 'com.getkeepsafe.dexcount'
 
 dependencies {
+    implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation 'com.prof.rssparser:rssparser:1.1'
     implementation 'com.github.nicolas-raoul:Quadtree:ac16ea8035bf07'
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
     implementation 'in.yuvi:http.fluent:1.3'
     implementation 'com.github.chrisbanes:PhotoView:2.0.0'
-    implementation 'com.android.volley:volley:1.0.0'
     implementation 'ch.acra:acra:4.9.2'
     implementation 'org.mediawiki:api:1.3'
     implementation 'commons-codec:commons-codec:1.10'
@@ -20,59 +21,57 @@ 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.mapbox.mapboxsdk:mapbox-android-sdk:5.4.1@aar'){
-        transitive=true
-    }
-
-    implementation "com.github.deano2390:MaterialShowcaseView:1.2.0"
 
+    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"
     implementation "com.android.support:customtabs:$SUPPORT_LIB_VERSION"
-
     implementation "com.android.support:cardview-v7:$SUPPORT_LIB_VERSION"
-
     implementation "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
     kapt "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
-
     implementation 'com.squareup.okhttp3:okhttp:3.9.1'
     implementation 'com.squareup.okio:okio:1.13.0'
-
     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.
     implementation 'com.android.support:multidex:1.0.3'
-
     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'
     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'
-
     implementation "com.google.dagger:dagger:$DAGGER_VERSION"
     implementation "com.google.dagger:dagger-android-support:$DAGGER_VERSION"
     kapt "com.google.dagger:dagger-android-processor:$DAGGER_VERSION"
     kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
-
-    testImplementation "org.robolectric:multidex:3.4.2"
+    testImplementation 'org.robolectric:multidex:3.4.2'
     testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
     testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     testImplementation 'junit:junit:4.12'
     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'
+    kapt 'com.github.bumptech.glide:compiler:4.7.1'
 
     androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
     androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.8.1'
     androidTestImplementation "com.android.support:support-annotations:$SUPPORT_LIB_VERSION"
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2-alpha1'
+    androidTestImplementation 'com.android.support.test:rules:1.0.2'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$LEAK_CANARY"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$LEAK_CANARY"
@@ -87,8 +86,8 @@ android {
 
     defaultConfig {
         applicationId 'fr.free.nrw.commons'
-        versionCode 84
-        versionName '2.7.1'
+        versionCode 85
+        versionName '2.7.2'
         setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
 
         minSdkVersion project.minSdkVersion
@@ -117,7 +116,7 @@ android {
     buildTypes {
         release {
             minifyEnabled false // See https://stackoverflow.com/questions/40232404/google-play-apk-and-android-studio-apk-usb-debug-behaving-differently - proguard.cfg modification alone insufficient.
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt', 'proguard-glide.txt'
         }
         debug {
             applicationIdSuffix ".debug"
@@ -129,7 +128,9 @@ android {
     flavorDimensions 'tier'
     productFlavors {
         prod {
+            buildConfigField "String", "WIKIMEDIA_API_POTD", "\"https://commons.wikimedia.org/w/api.php?action=featuredfeed&feed=potd&feedformat=rss&language=en\""
             buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.org/w/api.php\""
+            buildConfigField "String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\""
             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/\""
@@ -145,7 +146,9 @@ android {
 
         beta {
             // What values do we need to hit the BETA versions of the site / api ?
+            buildConfigField "String", "WIKIMEDIA_API_POTD", "\"https://commons.wikimedia.org/w/api.php?action=featuredfeed&feed=potd&feedformat=rss&language=en\""
             buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.beta.wmflabs.org/w/api.php\""
+            buildConfigField "String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\""
             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/\""

app/libs/java-json.jar

@@ -0,0 +1,9 @@
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
+
+# for DexGuard only
+-keepresourcexmlelements manifest/application/meta-data@value=GlideModule

app/proguard-glide.txt

@@ -1,5 +1,4 @@
 -dontobfuscate
 -keep class org.apache.http.** { *; }
 -dontwarn org.apache.http.**
--keep class fr.free.nrw.commons.upload.MwVolleyApi$Page {*;}
 -keep class android.support.v7.widget.ShareActionProvider { *; }

app/proguard-rules.txt

@@ -18,7 +18,7 @@ task checkstyle(type: Checkstyle) {
     reports {
         html {
             enabled true
-            destination "${project.buildDir}/reports/checkstyle/checkstyle.html"
+            destination file("${project.buildDir}/reports/checkstyle/checkstyle.html")
         }
     }
 }
@@ -36,10 +36,10 @@ task pmd(type: Pmd) {
         xml.enabled = false
         html.enabled = true
         xml {
-            destination "${project.buildDir}/reports/pmd/pmd.xml"
+            destination file("${project.buildDir}/reports/pmd/pmd.xml")
         }
         html {
-            destination "${project.buildDir}/reports/pmd/pmd.html"
+            destination file("${project.buildDir}/reports/pmd/pmd.html")
         }
     }
 }