From f36fbcaf01e5c9c10423e17a8935055dd958e46d 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] 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"