diff --git a/Habitica/build.gradle b/Habitica/build.gradle index f17f14154..90d18be15 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -117,13 +117,13 @@ dependencies { compile 'io.reactivex:rxjava:1.2.0' //Analytics - compile 'com.amplitude:android-sdk:2.13.1' + compile 'com.amplitude:android-sdk:2.13.3' // Fresco Image Management Library - compile('com.facebook.fresco:fresco:1.0.1') { + compile('com.facebook.fresco:fresco:1.3.0') { exclude module: 'bolts-android' } - compile('com.facebook.fresco:animated-gif:1.0.1') { + compile('com.facebook.fresco:animated-gif:1.3.0') { exclude module: 'bolts-android' } //Tests @@ -162,6 +162,7 @@ android { defaultConfig { applicationId "com.habitrpg.android.habitica" vectorDrawables.useSupportLibrary = true + buildConfigField "String", "STORE", "\"google\"" } lintOptions { @@ -198,6 +199,10 @@ android { prod { } + + amazon { + buildConfigField "String", "STORE", "\"amazon\"" + } } sourceSets { @@ -294,7 +299,7 @@ if (HRPG_RES_FILE.canRead()) { } tasks.whenTaskAdded { task -> - if (task.name.equals("lint")) { + if (task.name == "lint") { task.enabled = false } } diff --git a/Habitica/res/layout/fragment_gem_purchase.xml b/Habitica/res/layout/fragment_gem_purchase.xml index 1872fab2a..7f574ca97 100644 --- a/Habitica/res/layout/fragment_gem_purchase.xml +++ b/Habitica/res/layout/fragment_gem_purchase.xml @@ -24,7 +24,25 @@ android:drawableTop="@drawable/ic_heart_large" android:textSize="14sp" android:lineSpacingExtra="4dp" /> + +