diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 7df7d48b2..99f1266dc 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -46,11 +46,11 @@ dependencies {
compile 'com.squareup.okhttp3:okhttp:3.6.0'
compile 'com.squareup.okhttp3:logging-interceptor:3.6.0'
//REST API handling
- compile('com.squareup.retrofit2:retrofit:2.1.0') {
+ compile('com.squareup.retrofit2:retrofit:2.2.0') {
exclude module: 'okhttp'
}
- compile 'com.squareup.retrofit2:converter-gson:2.1.0'
- compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
+ compile 'com.squareup.retrofit2:converter-gson:2.2.0'
+ compile 'com.squareup.retrofit2:adapter-rxjava:2.2.0'
//Crash Logging
releaseCompile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
@@ -69,10 +69,10 @@ dependencies {
compile('com.mikepenz:materialdrawer:5.3.6@aar') {
transitive = true
}
- compile 'com.android.support:appcompat-v7:25.1.1'
- compile 'com.android.support:design:25.1.1'
- compile 'com.android.support:recyclerview-v7:25.1.1'
- compile 'com.android.support:preference-v14:25.1.1'
+ compile 'com.android.support:appcompat-v7:25.3.0'
+ compile 'com.android.support:design:25.3.0'
+ compile 'com.android.support:recyclerview-v7:25.3.0'
+ compile 'com.android.support:preference-v14:25.3.0'
compile 'com.android.support:multidex:1.0.1'
//QR Code
@@ -138,10 +138,10 @@ dependencies {
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
//Push Notifications
- compile 'com.google.firebase:firebase-core:10.0.1'
- compile 'com.google.firebase:firebase-messaging:10.0.1'
+ compile 'com.google.firebase:firebase-core:10.2.0'
+ compile 'com.google.firebase:firebase-messaging:10.2.0'
- compile 'com.google.android.gms:play-services-auth:10.0.1'
+ compile 'com.google.android.gms:play-services-auth:10.2.0'
compile 'org.apmem.tools:layouts:1.10@aar'
@@ -153,7 +153,7 @@ dependencies {
android {
compileSdkVersion 25
- buildToolsVersion "24.0.3"
+ buildToolsVersion "25.0.0"
defaultConfig {
applicationId "com.habitrpg.android.habitica"
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index de5379624..95174e60e 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -55,6 +55,8 @@
#ffcf42
+ @color/brand_300
+ @color/brand_50
#FFFFFF
@color/brand_500
diff --git a/build.gradle b/build.gradle
index 744edbc25..5410a8f07 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.2.3'
+ classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.databinding:dataBinder:1.0-rc4'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath 'com.google.gms:google-services:3.0.0'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 89c1861e7..eb767318e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
-#Thu Sep 29 20:11:45 CEST 2016
+#Thu Mar 23 10:38:10 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
-
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/projectFilesBackup/.idea/workspace.xml b/projectFilesBackup/.idea/workspace.xml
new file mode 100644
index 000000000..a264fc999
--- /dev/null
+++ b/projectFilesBackup/.idea/workspace.xml
@@ -0,0 +1,6679 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @style/AppTheme
+
+
+
+
+ @style/AppTheme
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Abstraction issuesJava
+
+
+ Android > Lint > Correctness
+
+
+ Android > Lint > Correctness > Messages
+
+
+ Android > Lint > Usability
+
+
+ C/C++
+
+
+ Code style issuesJava
+
+
+ Groovy
+
+
+ ImportsJava
+
+
+ Inheritance issuesJava
+
+
+ Java
+
+
+ Logging issuesJava
+
+
+ Potentially confusing code constructsGroovy
+
+
+ Unused codeC/C++
+
+
+
+
+ StaticImport
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1461143858369
+
+
+ 1461143858369
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex/rxjava/1.1.2/c9cf013155831cfb93f93d981a1ab04a2d5d2d97/rxjava-1.1.2-sources.jar!/rx/internal/operators/OnSubscribeCombineLatest.java
+ 381
+
+
+
+
+ jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex/rxjava/1.1.2/c9cf013155831cfb93f93d981a1ab04a2d5d2d97/rxjava-1.1.2-sources.jar!/rx/internal/operators/OnSubscribeCombineLatest.java
+ 391
+
+
+
+
+ jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex/rxjava/1.1.2/c9cf013155831cfb93f93d981a1ab04a2d5d2d97/rxjava-1.1.2-sources.jar!/rx/internal/operators/OnSubscribeCombineLatest.java
+ 401
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/habitrpg/android/habitica/old/ui/activities/MainActivity.java
+ 830
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/habitrpg/android/habitica/old/APIHelper.java
+ 317
+
+
+
+
+ jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/design/23.4.0/design-23.4.0-sources.jar!/android/support/design/widget/CollapsingToolbarLayout.java
+ 662
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/androidTest/java/com/habitrpg/android/habitica/HabiticaScreenshotTestRunner.java
+ 11
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/test/java/com/habitrpg/android/habitica/api/SocialAPITests.java
+ 41
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/test/java/com/habitrpg/android/habitica/api/SocialAPITests.java
+ 43
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ContentDeserializer.java
+ 102
+
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
+ 698
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.java
+ 33
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java
+ 32
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/screenshots/HabiticaScreenshotTestRunner.java
+ 18
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/screenshots/HabiticaScreenshotTestRunner.java
+ 12
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.java
+ 276
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.java
+ 32
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
+ 106
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.java
+ 45
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.java
+ 47
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
+ 236
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
+ 242
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.java
+ 94
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
+ 248
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
+ 253
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java
+ 258
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
+ 1509
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
+ 18
+
+
+
+
+ file://$PROJECT_DIR$/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
+ 57
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/seeds-sdk/build.gradle b/seeds-sdk/build.gradle
index 6fe87be4a..ae434f810 100755
--- a/seeds-sdk/build.gradle
+++ b/seeds-sdk/build.gradle
@@ -12,10 +12,10 @@ buildscript {
android {
compileSdkVersion 25
- buildToolsVersion "24.0.3"
+ buildToolsVersion "25.0.0"
defaultConfig {
- minSdkVersion 12
+ minSdkVersion 14
versionCode 1
versionName "1.0"
@@ -46,8 +46,8 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'org.glassfish:javax.json:1.0.4'
- compile 'com.google.android.gms:play-services:10.0.1'
- compile 'com.google.code.gson:gson:2.4'
+ compile 'com.google.android.gms:play-services:10.2.0'
+ compile 'com.google.code.gson:gson:2.7'
compile 'com.android.support:multidex:1.0.1'
compile 'com.loopj.android:android-async-http:1.4.9'
compile 'org.solovyev.android:checkout:0.9.1@aar'