From 888e0b7cfa7852ddbe238f4a3b2cc88258b5ae6d Mon Sep 17 00:00:00 2001
From: Dan Lew <danlew42@gmail.com>
Date: Thu, 17 Dec 2015 06:42:31 -0600
Subject: [PATCH 1/4] HTML-format quest text

Some quests use HTML, this will automatically format it.
---
 Habitica/res/layout/fragment_party_info.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Habitica/res/layout/fragment_party_info.xml b/Habitica/res/layout/fragment_party_info.xml
index 4ba9b04e9..1d78c79e2 100644
--- a/Habitica/res/layout/fragment_party_info.xml
+++ b/Habitica/res/layout/fragment_party_info.xml
@@ -7,6 +7,7 @@
         <import type="com.magicmicky.habitrpgwrapper.lib.models.Group" />
         <import type="com.magicmicky.habitrpgwrapper.lib.models.QuestContent" />
         <import type="android.view.View" />
+        <import type="android.text.Html"/>
 
         <variable
             name="party"
@@ -107,7 +108,7 @@
                         <TextView android:layout_margin="5dp"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@{quest.notes}" />
+                            android:text="@{quest.notes != null ? Html.fromHtml(quest.notes) : null}" />
                     </LinearLayout>
                 </GridLayout>
 

From 9f5c219605e3d4d19638c566e0ea5364b6b8c25c Mon Sep 17 00:00:00 2001
From: Dan Lew <danlew42@gmail.com>
Date: Thu, 17 Dec 2015 06:50:55 -0600
Subject: [PATCH 2/4] Dynamically size quest image based on presence

If it's there, it's 128dp x 128dp. If it's not, the ImageView is basically
hidden.
---
 Habitica/res/layout/fragment_party_info.xml                  | 5 ++---
 Habitica/res/values/dimens.xml                               | 3 +++
 .../android/habitica/ui/helpers/DataBindingUtils.java        | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Habitica/res/layout/fragment_party_info.xml b/Habitica/res/layout/fragment_party_info.xml
index 1d78c79e2..f78259e2a 100644
--- a/Habitica/res/layout/fragment_party_info.xml
+++ b/Habitica/res/layout/fragment_party_info.xml
@@ -86,9 +86,8 @@
                         android:layout_columnWeight="1"
                         android:layout_row="1"
                         bind:imageName='@{"quest_"+ quest.key}'
-                        android:src="@drawable/ic_action_chat"
-                        android:layout_width="128dp"
-                        android:layout_height="128dp" />
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
 
                     <LinearLayout
                         android:layout_column="1"
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index 65694cc39..65bdf545f 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -30,6 +30,9 @@
 	<dimen name="row_size">58dp</dimen>
     <dimen name="btn_height_reward">50dp</dimen>
 
+    <dimen name="quest_image_width">128dp</dimen>
+    <dimen name="quest_image_height">128dp</dimen>
+
     <!-- Widget -->
     <dimen name="widget_bar_horizontal_margin">20dp</dimen>
 
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.java b/Habitica/src/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.java
index 7cdf7ce57..2a9ab831b 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.java
@@ -27,6 +27,7 @@ public class DataBindingUtils {
         if (view.getVisibility() == View.VISIBLE) {
             Picasso.with(view.getContext())
                     .load("https://habitica-assets.s3.amazonaws.com/mobileApp/images/" + imageName + ".png")
+                    .resizeDimen(R.dimen.quest_image_width, R.dimen.quest_image_height)
                     .into(view);
         }
     }

From 82fcc5c95d23f83207e9cb3fb7a52d8fad8203c0 Mon Sep 17 00:00:00 2001
From: Dan Lew <danlew42@gmail.com>
Date: Thu, 17 Dec 2015 06:58:47 -0600
Subject: [PATCH 3/4] Greatly simplified quset description layout

The GridLayout was completely unnecessary
---
 Habitica/res/layout/fragment_party_info.xml | 50 +++++++--------------
 1 file changed, 16 insertions(+), 34 deletions(-)

diff --git a/Habitica/res/layout/fragment_party_info.xml b/Habitica/res/layout/fragment_party_info.xml
index f78259e2a..943880ae8 100644
--- a/Habitica/res/layout/fragment_party_info.xml
+++ b/Habitica/res/layout/fragment_party_info.xml
@@ -64,53 +64,35 @@
                 android:layout_margin="5dp"
                 android:visibility="@{quest != null ? View.VISIBLE : View.GONE}">
 
-                <GridLayout
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:alignmentMode="alignBounds"
-                    android:columnCount="2"
-                    android:columnOrderPreserved="false"
-                    android:padding="5dp"
-                    android:rowCount="3">
+                    android:orientation="vertical"
+                    android:padding="8dp"
+                    >
 
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_column="0"
-                        android:layout_columnSpan="2"
                         android:layout_marginBottom="8dp"
-                        android:text="@{quest.text}" />
+                        android:text="@{quest.text}"
+                        android:textStyle="bold"
+                        />
 
                     <ImageView
-                        android:layout_column="0"
-                        android:layout_columnWeight="1"
-                        android:layout_row="1"
-                        bind:imageName='@{"quest_"+ quest.key}'
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
-
-                    <LinearLayout
-                        android:layout_column="1"
-                        android:layout_columnWeight="4"
-                        android:layout_row="1"
-                        android:orientation="vertical">
-
-                    </LinearLayout>
-
-                    <LinearLayout   android:layout_column="0"
-                        android:layout_columnSpan="2"
-                        android:layout_row="2"
-                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp">
+                        android:layout_marginBottom="8dp"
+                        bind:imageName='@{"quest_"+ quest.key}'
+                        />
 
-                        <TextView android:layout_margin="5dp"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@{quest.notes != null ? Html.fromHtml(quest.notes) : null}" />
-                    </LinearLayout>
-                </GridLayout>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{quest.notes != null ? Html.fromHtml(quest.notes) : null}"
+                        />
 
+                </LinearLayout>
 
             </android.support.v7.widget.CardView>
         </LinearLayout>

From eebc7fc91ce6fd9109c932751caa3bbf506d2504 Mon Sep 17 00:00:00 2001
From: Dan Lew <danlew42@gmail.com>
Date: Thu, 17 Dec 2015 07:01:39 -0600
Subject: [PATCH 4/4] Extracted string resource for "Quest"

---
 Habitica/res/layout/fragment_party_info.xml | 2 +-
 Habitica/res/values/strings.xml             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Habitica/res/layout/fragment_party_info.xml b/Habitica/res/layout/fragment_party_info.xml
index 943880ae8..7dc30041e 100644
--- a/Habitica/res/layout/fragment_party_info.xml
+++ b/Habitica/res/layout/fragment_party_info.xml
@@ -54,7 +54,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Quest"
+                android:text="@string/quest"
                 android:layout_margin="5dp"
                 android:visibility="@{quest != null ? View.VISIBLE : View.GONE}" />
 
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 5055579e8..308b337f4 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -145,4 +145,5 @@
     <string name="taskform.delete.message">Do you really want to delete?</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
+    <string name="quest">Quest</string>
 </resources>
\ No newline at end of file