Merge branch 'release/6.7'

.gitignore

@@ -59,3 +59,4 @@ freeline_project_description.json
 
 # Fabric
 fabric.properties
+ajcore.*.txt

CHANGELOG.md

@@ -1,6 +1,17 @@
 Release Notes
 =============
 
+Version 6.7
+-----------
+ * Lots more data for designers, artists, publishers, mechanics, and categories
+ * UI changes
+ * View and edit inventory location
+ * H-index includes rational value indicating how close you are to the next number
+ * Improve search usability
+ * Ability to specify negative scores more easily
+ * Show collection status of expansion and base games
+ * Lots of under the hood improvements
+
 Version 6.6.7
 -------------
  * Bug fixes

CONTRIBUTING.md

@@ -0,0 +1,21 @@
+# How To Contribute
+This project uses Firebase and therefore relies on a `google-services.json` configuration file. This file is not included in this repo and every contributor is encouraged to generate it's own.
+
+When importing the project in Android Studio the build task will fail with the following error:
+
+`org.gradle.api.GradleException: File google-services.json is missing. The Google Services Plugin cannot function without it.`
+
+Or something similar depending on the Android Studio version you're using.
+
+In order to generate a `google-services.json` configuration file follow these steps (Note: requires a Google account):
+
+- Open the [Firebase Console](https://console.firebase.google.com/).
+- Login with your Google account.
+- Create a new project (name doesn't matter).
+- Select "_Add Firebase to your Android app_".
+- Provide package name:  `com.boardgamegeek`.
+- Register app.
+- Download `google-services.json` file.
+- Follow instructions to add file to project.
+- Skip "_Add Firebase SDK step_".
+- Run app to verify that the configuration is picked up correctly.

README.md

@@ -1,10 +1,14 @@
 # BoardGameGeek for Android
 This is an unofficial BoardGameGeek application for Android.
 
+<a href='https://play.google.com/store/apps/details?id=com.boardgamegeek&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height=70px/></a>
+
 This app searches and syncs data from BoardGameGeek.com. It's not a game itself - it's a reference tool that provides information about board games.
 
 See what's changed in the [Change Log](/CHANGELOG.md).
 
 See what we're planning for on our [Trello board](https://trello.com/b/pRZWIOOv).
 
-The installer is available through the Play Store. If you are interested in Beta (or maybe even Alpha releases), please join the [Google+ Community](https://plus.google.com/communities/109617005048169697217), or opt in at the [Play Store](https://play.google.com/apps/testing/com.boardgamegeek).
+The installer is available through the Play Store. If you are interested in Beta (or maybe even Alpha releases), please join the [Google+ Community](https://plus.google.com/communities/109617005048169697217), or opt in at the [Play Store](https://play.google.com/apps/testing/com.boardgamegeek).
+
+If you are interested in contributing to this project please refer to the [How To Contribute](/CONTRIBUTING.md) page.

app/build.gradle

@@ -1,18 +1,19 @@
 buildscript {
     repositories {
+        google()
         mavenCentral()
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
         classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1'
-        classpath 'io.fabric.tools:gradle:1.25.4'
+        classpath 'io.fabric.tools:gradle:1.31.2'
     }
 }
 
 def versionMajor = 6
-def versionMinor = 6
-def versionPatch = 7
-def versionBuild = 6
+def versionMinor = 7
+def versionPatch = 0
+def versionBuild = 4
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
@@ -48,8 +49,8 @@ def gitBranchName = { ->
 }
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     lintOptions {
         baseline file("lint-baseline.xml")
@@ -66,8 +67,8 @@ android {
     defaultConfig {
         applicationId "com.boardgamegeek"
 
-        minSdkVersion 15
-        targetSdkVersion 27
+        minSdkVersion 16
+        targetSdkVersion 28
         multiDexEnabled true
 
         versionCode versionMajor * 1000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
@@ -86,10 +87,21 @@ android {
     }
 
     buildTypes {
+        applicationVariants.all { variant ->
+            variant.outputs.all { output ->
+                def branchName = gitBranchName().replace('/', "-")
+                if (branchName == "master") branchName = ""
+                outputFileName = output.outputFile.name.replace(".apk", "-" + defaultConfig.versionName + "_" + branchName + ".apk")
+            }
+        }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            if (gitBranchName() != "master") {
+            if (gitBranchName() == "master") {
+                versionNameSuffix ""
+            } else if (gitBranchName().startsWith("feature")) {
+                versionNameSuffix " (${gitBranchName()})"
+            } else {
                 versionNameSuffix " RC${versionBuild}"
             }
         }
@@ -102,81 +114,87 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    implementation "com.android.support:appcompat-v7:$support_version"
-    implementation "com.android.support:cardview-v7:$support_version"
-    implementation "com.android.support:design:$support_version"
-    implementation "com.android.support:palette-v7:$support_version"
-    implementation "com.android.support:percent:$support_version"
-    implementation "com.android.support:recyclerview-v7:$support_version"
-    implementation "com.android.support:support-annotations:$support_version"
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'androidx.core:core-ktx:1.1.0'
 
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0-beta01'
+    implementation 'androidx.palette:palette:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha4'
+    implementation 'androidx.preference:preference:1.1.0'
+
+    implementation 'androidx.multidex:multidex:2.0.1'
 
     implementation "org.jetbrains.anko:anko-support-v4-commons:$anko_version"
     implementation "org.jetbrains.anko:anko-commons:$anko_version"
     implementation "org.jetbrains.anko:anko-design:$anko_version"
 
-    implementation 'com.google.firebase:firebase-core:16.0.1'
-    implementation 'com.google.firebase:firebase-config:16.0.0'
-    implementation 'com.google.firebase:firebase-messaging:17.0.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.1.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata:2.1.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
+
+    implementation 'com.google.firebase:firebase-core:17.2.0'
+    implementation 'com.google.firebase:firebase-config:19.0.3'
+    implementation 'com.google.firebase:firebase-messaging:20.0.0'
 
-    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.google.code.gson:gson:2.8.6'
 
-    implementation 'com.squareup.retrofit2:retrofit:2.4.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
-    implementation('com.squareup.retrofit2:converter-simplexml:2.4.0') {
+    implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
+    implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
+    implementation("com.squareup.retrofit2:converter-simplexml:$retrofit_version") {
         exclude group: 'stax', module: 'stax-api'
         exclude group: 'stax', module: 'stax'
         exclude group: 'xpp3', module: 'xpp3'
     }
 
-    implementation 'com.squareup.okhttp3:okhttp:3.11.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0'
+    implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
+    implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version"
 
     implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
 
     implementation 'com.squareup.picasso:picasso:2.5.2'
 
-    implementation 'se.emilsjolander:stickylistheaders:2.7.0'
-
-    implementation 'com.jakewharton:butterknife:8.8.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+    implementation "com.jakewharton:butterknife:$butterknife_version"
+    annotationProcessor "com.jakewharton:butterknife-compiler:$butterknife_version"
 
     implementation 'com.jakewharton.timber:timber:4.7.1'
 
-    implementation 'com.github.chrisbanes.photoview:library:1.2.4'
+    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
+
+    implementation 'com.github.rhlff:NestedScrollWebView:v1.0.2'
 
-    implementation('com.crashlytics.sdk.android:crashlytics:2.9.4@aar') {
+    implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
         transitive = true
     }
 
-    implementation('com.mikepenz:aboutlibraries:6.0.6@aar') {
+    implementation('com.mikepenz:aboutlibraries:7.0.3@aar') {
         transitive = true
     }
 
     implementation 'org.greenrobot:eventbus:3.1.1'
     annotationProcessor 'org.greenrobot:eventbus-annotation-processor:3.1.1'
 
-    implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
+    implementation 'com.github.PhilJay:MPAndroidChart:3.1.0'
 
-    implementation 'com.appyvet:materialrangebar:1.4.3'
+    implementation 'com.appyvet:materialrangebar:1.4.6'
 
-    implementation 'com.facebook.stetho:stetho:1.5.0'
-    implementation 'com.facebook.stetho:stetho-okhttp3:1.5.0'
+    implementation "com.facebook.stetho:stetho:$stetho_version"
+    implementation "com.facebook.stetho:stetho-okhttp3:$stetho_version"
 
     implementation 'com.github.amlcurran.showcaseview:library:5.4.3'
 
-    implementation 'org.jsoup:jsoup:1.11.3'
+    implementation 'org.jsoup:jsoup:1.12.1'
 
     implementation 'io.reactivex:rxandroid:1.2.1'
     implementation 'io.reactivex:rxjava:1.3.8'
@@ -185,9 +203,9 @@ dependencies {
     compileOnly 'frankiesardo:icepick-processor:3.2.0'
     annotationProcessor 'frankiesardo:icepick-processor:3.2.0'
 
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
-    releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
-    testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
+    debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
+    releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version"
+    testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version"
 }
 
 apply plugin: 'com.google.gms.google-services'