From 2619dd89264e18d53dabe7d98ba675fd43a243d0 Mon Sep 17 00:00:00 2001
From: Daniel Gomez Rico <danielgomezrico@gmail.com>
Date: Sat, 7 Oct 2017 11:55:13 -0500
Subject: [PATCH 1/4] Fix missing + on id definition for some layouts

If you have it without the + it can cause errors after modifing the layout orders, so it's better to define them with +
---
 Habitica/res/layout/activity_fixcharacter.xml        | 12 ++++++------
 Habitica/res/layout/daily_item_card.xml              |  3 ++-
 Habitica/res/layout/dialog_purchase_content_gear.xml |  4 ++--
 Habitica/res/layout/dialog_purchase_content_item.xml |  4 ++--
 .../res/layout/dialog_purchase_content_quest.xml     |  4 ++--
 Habitica/res/layout/dialog_yesterdaily_task.xml      |  2 +-
 Habitica/res/layout/item_item.xml                    |  6 +++---
 Habitica/res/layout/reward_item_card.xml             |  2 +-
 Habitica/res/layout/value_bar.xml                    |  2 +-
 9 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Habitica/res/layout/activity_fixcharacter.xml b/Habitica/res/layout/activity_fixcharacter.xml
index 73c5f2140..a8b63e48d 100644
--- a/Habitica/res/layout/activity_fixcharacter.xml
+++ b/Habitica/res/layout/activity_fixcharacter.xml
@@ -58,7 +58,7 @@
                                 android:labelFor="@+id/healthEditText"/>
 
                             <EditText
-                                android:id="@id/healthEditText"
+                                android:id="@+id/healthEditText"
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
@@ -78,7 +78,7 @@
                                 android:labelFor="@+id/experienceEditText" />
 
                             <EditText
-                                android:id="@id/experienceEditText"
+                                android:id="@+id/experienceEditText"
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
@@ -98,7 +98,7 @@
                                 android:labelFor="@+id/goldEditText"/>
 
                             <EditText
-                                android:id="@id/goldEditText"
+                                android:id="@+id/goldEditText"
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
@@ -118,7 +118,7 @@
                                 android:labelFor="@+id/manaEditText"/>
 
                             <EditText
-                                android:id="@id/manaEditText"
+                                android:id="@+id/manaEditText"
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
@@ -138,7 +138,7 @@
                                 android:labelFor="@+id/levelEditText"/>
 
                             <EditText
-                                android:id="@id/levelEditText"
+                                android:id="@+id/levelEditText"
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
@@ -167,7 +167,7 @@
                                 android:labelFor="@+id/streakEditText"/>
 
                             <EditText
-                                android:id="@id/streakEditText"
+                                android:id="@+id/streakEditText"
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index c42810922..e30cee50c 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -58,7 +58,8 @@
                     style="@style/Subheader3"
                     android:textColor="#000"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical"
                     tools:text="Daily Title" />
 
                 <net.pherth.android.emoji_library.EmojiTextView
diff --git a/Habitica/res/layout/dialog_purchase_content_gear.xml b/Habitica/res/layout/dialog_purchase_content_gear.xml
index b43712cb9..8b7f0ba11 100644
--- a/Habitica/res/layout/dialog_purchase_content_gear.xml
+++ b/Habitica/res/layout/dialog_purchase_content_gear.xml
@@ -15,7 +15,7 @@
         android:layout_width="@dimen/shopitem_image_size"
         android:layout_height="@dimen/shopitem_image_size" />
     <TextView
-        android:id="@id/titleTextView"
+        android:id="@+id/titleTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/Headline"
@@ -24,7 +24,7 @@
         android:layout_marginTop="14dp"
         android:layout_marginBottom="4dp"/>
     <TextView
-        android:id="@id/notesTextView"
+        android:id="@+id/notesTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/Body2"
diff --git a/Habitica/res/layout/dialog_purchase_content_item.xml b/Habitica/res/layout/dialog_purchase_content_item.xml
index ae2e77e45..0235fb975 100644
--- a/Habitica/res/layout/dialog_purchase_content_item.xml
+++ b/Habitica/res/layout/dialog_purchase_content_item.xml
@@ -15,7 +15,7 @@
         android:layout_width="@dimen/shopitem_image_size"
         android:layout_height="@dimen/shopitem_image_size" />
     <TextView
-        android:id="@id/titleTextView"
+        android:id="@+id/titleTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/Headline"
@@ -24,7 +24,7 @@
         android:layout_marginTop="14dp"
         android:layout_marginBottom="4dp"/>
     <TextView
-        android:id="@id/notesTextView"
+        android:id="@+id/notesTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/Body2"
diff --git a/Habitica/res/layout/dialog_purchase_content_quest.xml b/Habitica/res/layout/dialog_purchase_content_quest.xml
index af04fe760..840a9a969 100644
--- a/Habitica/res/layout/dialog_purchase_content_quest.xml
+++ b/Habitica/res/layout/dialog_purchase_content_quest.xml
@@ -15,7 +15,7 @@
         android:layout_width="@dimen/shopitem_image_size"
         android:layout_height="@dimen/shopitem_image_size" />
     <TextView
-        android:id="@id/titleTextView"
+        android:id="@+id/titleTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/Headline"
@@ -24,7 +24,7 @@
         android:layout_marginTop="14dp"
         android:layout_marginBottom="4dp"/>
     <TextView
-        android:id="@id/notesTextView"
+        android:id="@+id/notesTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/Body2"
diff --git a/Habitica/res/layout/dialog_yesterdaily_task.xml b/Habitica/res/layout/dialog_yesterdaily_task.xml
index 027547d2f..c6ebf6365 100644
--- a/Habitica/res/layout/dialog_yesterdaily_task.xml
+++ b/Habitica/res/layout/dialog_yesterdaily_task.xml
@@ -47,7 +47,7 @@
         android:background="@color/gray_500"
         android:visibility="gone"/>
     <LinearLayout
-        android:id="@id/checklistView"
+        android:id="@+id/checklistView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"/>
diff --git a/Habitica/res/layout/item_item.xml b/Habitica/res/layout/item_item.xml
index 066949ca3..3e68c8900 100644
--- a/Habitica/res/layout/item_item.xml
+++ b/Habitica/res/layout/item_item.xml
@@ -7,7 +7,7 @@
     style="@style/RowWrapper"
     android:clickable="true">
     <com.facebook.drawee.view.SimpleDraweeView
-        android:id="@id/imageView"
+        android:id="@+id/imageView"
         android:layout_width="@dimen/gear_image_size"
         android:layout_height="@dimen/gear_image_size"
         bind:actualImageScaleType="fitCenter"
@@ -18,13 +18,13 @@
         android:orientation="vertical"
         android:layout_gravity="center_vertical">
         <TextView
-            android:id="@id/titleTextView"
+            android:id="@+id/titleTextView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="Title"
             style="@style/RowTitle"/>
         <TextView
-            android:id="@id/ownedTextView"
+            android:id="@+id/ownedTextView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:text="Value"
diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index 0b947f41c..c0c381a9c 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -71,7 +71,7 @@
                 android:layout_height="22dp"
                 android:paddingBottom="8dp"/>
             <TextView
-                android:id="@id/priceLabel"
+                android:id="@+id/priceLabel"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textColor="@color/yellow_10"
diff --git a/Habitica/res/layout/value_bar.xml b/Habitica/res/layout/value_bar.xml
index 8ecf30511..461a89d98 100644
--- a/Habitica/res/layout/value_bar.xml
+++ b/Habitica/res/layout/value_bar.xml
@@ -19,7 +19,7 @@
         android:contentDescription="Bar Icon"
         android:visibility="gone"/>
     <LinearLayout
-        android:id="@id/bar_full"
+        android:id="@+id/bar_full"
         android:layout_toRightOf="@id/ic_header"
         android:layout_toEndOf="@id/ic_header"
         android:layout_width="match_parent"

From 9ab1cf059f51fbed741fdebaadd8af1fba67eb4c Mon Sep 17 00:00:00 2001
From: Daniel Gomez Rico <danielgomezrico@gmail.com>
Date: Sat, 7 Oct 2017 12:21:41 -0500
Subject: [PATCH 2/4] Fix travis to use sdk 26

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5131ae9a0..d50b37e38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,10 +32,10 @@ android:
     - tools
 
     # The BuildTools version used by your project
-    - build-tools-25.0.3
+    - build-tools-26.0.1
 
     # The SDK version used to compile your project
-    - android-25
+    - android-26
 
     # Additional components
     - extra-google-google_play_services

From 8248b91505fb6753d3b05fb299d8aace25bd7fce Mon Sep 17 00:00:00 2001
From: Daniel Gomez Rico <danielgomezrico@gmail.com>
Date: Sat, 7 Oct 2017 13:02:44 -0500
Subject: [PATCH 3/4] Reverse change on item

---
 Habitica/res/layout/daily_item_card.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index e30cee50c..c42810922 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -58,8 +58,7 @@
                     style="@style/Subheader3"
                     android:textColor="#000"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center_vertical"
+                    android:layout_height="wrap_content"
                     tools:text="Daily Title" />
 
                 <net.pherth.android.emoji_library.EmojiTextView

From 99ef013584db9976f66fb3e765743d74b59fafea Mon Sep 17 00:00:00 2001
From: Daniel Gomez Rico <danielgomezrico@gmail.com>
Date: Sun, 8 Oct 2017 11:31:48 -0500
Subject: [PATCH 4/4] Move build_tools/sdk version to main gralde

- Helps avoiding issues between submodules and travis setup.
- It works only if all modules uses the same dependencies.
---
 Habitica/build.gradle  | 5 +++--
 build.gradle           | 3 +++
 seeds-sdk/build.gradle | 5 ++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index cf261da75..8d81a4249 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -138,8 +138,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.1"
+    compileSdkVersion sdk_version
+    buildToolsVersion build_tools_version
 
     defaultConfig {
         applicationId "com.habitrpg.android.habitica"
@@ -181,6 +181,7 @@ android {
     productFlavors {
         dev {
             minSdkVersion 21
+            buildConfigField "String", "STAGING_KEY", "\"1dcf9ed3-3b14-45b3-9e7e-acdfff68a368\""
         }
 
         prod {
diff --git a/build.gradle b/build.gradle
index c73556b04..6fd6b6ed6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,6 +2,9 @@
 
 buildscript {
     ext.kotlin_version = '1.1.51'
+    ext.build_tools_version = '26.0.1'
+    ext.sdk_version = 26
+
     repositories {
         jcenter()
         maven { url "https://plugins.gradle.org/m2/" }
diff --git a/seeds-sdk/build.gradle b/seeds-sdk/build.gradle
index 44750b4b1..656e2e235 100755
--- a/seeds-sdk/build.gradle
+++ b/seeds-sdk/build.gradle
@@ -28,9 +28,8 @@ repositories {
 }
 
 android {
-    compileSdkVersion 25
-
-    buildToolsVersion "25.0.3"
+    compileSdkVersion sdk_version
+    buildToolsVersion build_tools_version
 
     defaultConfig {
         minSdkVersion 14