From 4f44bd44b57c05f35607fbae62e061bae5ea07aa Mon Sep 17 00:00:00 2001
From: Negue <eugen.bolz@gmail.com>
Date: Sun, 30 Aug 2015 19:56:46 +0200
Subject: [PATCH] List Tavern Messages, Send / Delete them, Toggle Sleep

---
 Habitica/AndroidManifest.xml                  |  16 +-
 Habitica/Habitica.iml                         |   6 +-
 Habitica/assets/paperboy/changelog.json       |  11 +-
 Habitica/build.gradle                         |   5 +
 Habitica/res/drawable-hdpi/ic_action_chat.png | Bin 0 -> 172 bytes
 .../ic_action_delete_white_24.png             | Bin 0 -> 161 bytes
 .../res/drawable-hdpi/ic_action_launch.png    | Bin 0 -> 282 bytes
 .../res/drawable-hdpi/ic_action_more_vert.png | Bin 0 -> 138 bytes
 .../res/drawable-hdpi/ic_action_warning.png   | Bin 0 -> 334 bytes
 Habitica/res/drawable-mdpi/ic_action_chat.png | Bin 0 -> 133 bytes
 .../ic_action_delete_white_24.png             | Bin 0 -> 115 bytes
 .../res/drawable-mdpi/ic_action_launch.png    | Bin 0 -> 188 bytes
 .../res/drawable-mdpi/ic_action_more_vert.png | Bin 0 -> 110 bytes
 .../res/drawable-mdpi/ic_action_warning.png   | Bin 0 -> 244 bytes
 .../res/drawable-xhdpi/ic_action_chat.png     | Bin 0 -> 209 bytes
 .../ic_action_delete_white_24.png             | Bin 0 -> 156 bytes
 .../res/drawable-xhdpi/ic_action_launch.png   | Bin 0 -> 285 bytes
 .../drawable-xhdpi/ic_action_more_vert.png    | Bin 0 -> 162 bytes
 .../res/drawable-xhdpi/ic_action_warning.png  | Bin 0 -> 390 bytes
 .../res/drawable-xxhdpi/ic_action_chat.png    | Bin 0 -> 294 bytes
 .../ic_action_delete_white_24.png             | Bin 0 -> 200 bytes
 .../res/drawable-xxhdpi/ic_action_launch.png  | Bin 0 -> 385 bytes
 .../drawable-xxhdpi/ic_action_more_vert.png   | Bin 0 -> 222 bytes
 .../res/drawable-xxhdpi/ic_action_warning.png | Bin 0 -> 523 bytes
 .../res/drawable-xxxhdpi/ic_action_chat.png   | Bin 0 -> 384 bytes
 .../ic_action_delete_white_24.png             | Bin 0 -> 243 bytes
 .../res/drawable-xxxhdpi/ic_action_launch.png | Bin 0 -> 494 bytes
 .../drawable-xxxhdpi/ic_action_more_vert.png  | Bin 0 -> 315 bytes
 .../drawable-xxxhdpi/ic_action_warning.png    | Bin 0 -> 656 bytes
 Habitica/res/drawable/npc_daniel.png          | Bin 0 -> 5110 bytes
 Habitica/res/layout/activity_tavern.xml       |  30 +-
 Habitica/res/layout/avatar_with_bars.xml      |   3 +-
 Habitica/res/layout/tavern_chat_item.xml      |  75 +++++
 .../res/layout/tavern_chat_new_entry_item.xml |  36 +++
 Habitica/res/layout/tavern_daniel_item.xml    |  28 ++
 Habitica/res/menu/chat_message.xml            |  28 ++
 Habitica/res/values/colors.contributor.xml    |  15 +
 Habitica/res/values/styles.xml                |  11 +-
 .../android/habitica/MainActivity.java        |  31 +--
 .../android/habitica/TavernActivity.java      | 165 ++++++++++-
 .../habitica/events/ToggledInnStateEvent.java |   8 +
 .../commands/CopyChatAsTodoCommand.java       |   7 +
 .../commands/DeleteChatMessageCommand.java    |  16 ++
 .../commands/FlagChatMessageCommand.java      |   8 +
 .../commands/OpenNewPMActivityCommand.java    |   7 +
 .../commands/SendNewGroupMessageCommand.java  |  14 +
 .../events/commands/ToggleInnCommand.java     |   7 +
 .../habitica/ui/AvatarWithBarsViewModel.java  |   5 +
 .../adapter/HabitItemRecyclerViewAdapter.java |   8 +
 .../ui/adapter/TavernRecyclerViewAdapter.java | 261 ++++++++++++++++++
 .../habitrpgwrapper/lib/api/ApiService.java   |  13 +
 .../lib/models/ChatMessage.java               |  91 ++++++
 .../lib/models/Contributor.java               |  11 +
 .../lib/models/PostChatMessageResult.java     |   8 +
 build.gradle                                  |   2 +-
 55 files changed, 877 insertions(+), 49 deletions(-)
 create mode 100644 Habitica/res/drawable-hdpi/ic_action_chat.png
 create mode 100644 Habitica/res/drawable-hdpi/ic_action_delete_white_24.png
 create mode 100644 Habitica/res/drawable-hdpi/ic_action_launch.png
 create mode 100644 Habitica/res/drawable-hdpi/ic_action_more_vert.png
 create mode 100644 Habitica/res/drawable-hdpi/ic_action_warning.png
 create mode 100644 Habitica/res/drawable-mdpi/ic_action_chat.png
 create mode 100644 Habitica/res/drawable-mdpi/ic_action_delete_white_24.png
 create mode 100644 Habitica/res/drawable-mdpi/ic_action_launch.png
 create mode 100644 Habitica/res/drawable-mdpi/ic_action_more_vert.png
 create mode 100644 Habitica/res/drawable-mdpi/ic_action_warning.png
 create mode 100644 Habitica/res/drawable-xhdpi/ic_action_chat.png
 create mode 100644 Habitica/res/drawable-xhdpi/ic_action_delete_white_24.png
 create mode 100644 Habitica/res/drawable-xhdpi/ic_action_launch.png
 create mode 100644 Habitica/res/drawable-xhdpi/ic_action_more_vert.png
 create mode 100644 Habitica/res/drawable-xhdpi/ic_action_warning.png
 create mode 100644 Habitica/res/drawable-xxhdpi/ic_action_chat.png
 create mode 100644 Habitica/res/drawable-xxhdpi/ic_action_delete_white_24.png
 create mode 100644 Habitica/res/drawable-xxhdpi/ic_action_launch.png
 create mode 100644 Habitica/res/drawable-xxhdpi/ic_action_more_vert.png
 create mode 100644 Habitica/res/drawable-xxhdpi/ic_action_warning.png
 create mode 100644 Habitica/res/drawable-xxxhdpi/ic_action_chat.png
 create mode 100644 Habitica/res/drawable-xxxhdpi/ic_action_delete_white_24.png
 create mode 100644 Habitica/res/drawable-xxxhdpi/ic_action_launch.png
 create mode 100644 Habitica/res/drawable-xxxhdpi/ic_action_more_vert.png
 create mode 100644 Habitica/res/drawable-xxxhdpi/ic_action_warning.png
 create mode 100644 Habitica/res/drawable/npc_daniel.png
 create mode 100644 Habitica/res/layout/tavern_chat_item.xml
 create mode 100644 Habitica/res/layout/tavern_chat_new_entry_item.xml
 create mode 100644 Habitica/res/layout/tavern_daniel_item.xml
 create mode 100644 Habitica/res/menu/chat_message.xml
 create mode 100644 Habitica/res/values/colors.contributor.xml
 create mode 100644 Habitica/src/com/habitrpg/android/habitica/events/ToggledInnStateEvent.java
 create mode 100644 Habitica/src/com/habitrpg/android/habitica/events/commands/CopyChatAsTodoCommand.java
 create mode 100644 Habitica/src/com/habitrpg/android/habitica/events/commands/DeleteChatMessageCommand.java
 create mode 100644 Habitica/src/com/habitrpg/android/habitica/events/commands/FlagChatMessageCommand.java
 create mode 100644 Habitica/src/com/habitrpg/android/habitica/events/commands/OpenNewPMActivityCommand.java
 create mode 100644 Habitica/src/com/habitrpg/android/habitica/events/commands/SendNewGroupMessageCommand.java
 create mode 100644 Habitica/src/com/habitrpg/android/habitica/events/commands/ToggleInnCommand.java
 create mode 100644 Habitica/src/com/habitrpg/android/habitica/ui/adapter/TavernRecyclerViewAdapter.java
 create mode 100644 Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java
 create mode 100644 Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/Contributor.java
 create mode 100644 Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/PostChatMessageResult.java

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 60df13b3f..b54a34509 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,10 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.habitrpg.android.habitica"
     android:versionCode="2"
-    android:versionName="0.0.2" >
+    android:versionName="0.0.2">
 
     <uses-sdk
-        android:minSdkVersion="13"
+        android:minSdkVersion="14"
         android:targetSdkVersion="22" />
 
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -23,11 +23,11 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
-            android:windowSoftInputMode="stateHidden|adjustResize" >
+            android:windowSoftInputMode="stateHidden|adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -37,7 +37,7 @@
         <activity
             android:name=".prefs.PrefsActivity"
             android:label="@string/PS_param_title"
-            android:theme="@style/AppThemeWithActionBar" >
+            android:theme="@style/AppThemeWithActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -46,7 +46,7 @@
             android:name=".LoginActivity"
             android:label="@string/LoginActivityName"
             android:theme="@style/AppThemeWithActionBarBlackText"
-            android:windowSoftInputMode="adjustResize" >
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -55,7 +55,7 @@
         <receiver
             android:name=".widget.SimpleWidget"
             android:icon="@mipmap/ic_launcher"
-            android:label="Habitica Simple Widget" >
+            android:label="Habitica Simple Widget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -78,7 +78,7 @@
             android:name=".TaskFormActivity"
             android:label="@string/title_activity_task_form"
             android:parentActivityName=".MainActivity"
-            android:theme="@style/AppThemeWithActionBarBlackText" >
+            android:theme="@style/AppThemeWithActionBarBlackText">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.habitrpg.android.habitica.MainActivity" />
diff --git a/Habitica/Habitica.iml b/Habitica/Habitica.iml
index 95096f444..f40a4a54d 100644
--- a/Habitica/Habitica.iml
+++ b/Habitica/Habitica.iml
@@ -113,8 +113,8 @@
     <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
     <orderEntry type="library" exported="" name="library-1.0.18" level="project" />
     <orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
-    <orderEntry type="library" exported="" name="okhttp-2.3.0" level="project" />
     <orderEntry type="library" exported="" name="kenburnsview-1.0.6" level="project" />
+    <orderEntry type="library" exported="" name="okhttp-2.3.0" level="project" />
     <orderEntry type="library" exported="" name="rxjava-1.0.10" level="project" />
     <orderEntry type="library" exported="" name="antlr4-4.5" level="project" />
     <orderEntry type="library" exported="" name="crashlytics-core-2.3.0" level="project" />
@@ -130,8 +130,8 @@
     <orderEntry type="library" exported="" name="DBFlow-2.2.1" level="project" />
     <orderEntry type="library" exported="" name="compilerCommon-1.0-rc1" level="project" />
     <orderEntry type="library" exported="" name="compiler-1.0-rc1" level="project" />
-    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="mimecraft-1.1.1" level="project" />
+    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="guava-18.0" level="project" />
     <orderEntry type="library" exported="" name="iconics-1.1.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
@@ -142,8 +142,8 @@
     <orderEntry type="library" exported="" name="gridlayout-v7-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="commons-codec-1.10" level="project" />
     <orderEntry type="library" exported="" name="javawriter-2.5.0" level="project" />
-    <orderEntry type="library" exported="" name="commons-lang3-3.3.2" level="project" />
     <orderEntry type="library" exported="" name="kotlin-stdlib-0.12.613" level="project" />
+    <orderEntry type="library" exported="" name="commons-lang3-3.3.2" level="project" />
     <orderEntry type="library" exported="" name="design-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="cardview-v7-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="kotlin-runtime-0.12.613" level="project" />
diff --git a/Habitica/assets/paperboy/changelog.json b/Habitica/assets/paperboy/changelog.json
index 856c8bc37..153fe387f 100644
--- a/Habitica/assets/paperboy/changelog.json
+++ b/Habitica/assets/paperboy/changelog.json
@@ -1,6 +1,15 @@
 [
   {
-    "name": "Verison 0.0.2",
+    "name": "Version 0.0.3",
+    "items":[
+      {
+        "type": "F",
+        "title": "Tavern :)"
+      }
+    ]
+  },
+  {
+    "name": "Version 0.0.2",
     "items": [
        {
         "type": "F",
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 8bed35020..1d0ec30f5 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -98,10 +98,15 @@ android {
         release
     }
 
+    dexOptions{
+        preDexLibraries = false
+    }
+
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
             debuggable true
+
         }
         release {
             signingConfig signingConfigs.release
diff --git a/Habitica/res/drawable-hdpi/ic_action_chat.png b/Habitica/res/drawable-hdpi/ic_action_chat.png
new file mode 100644
index 0000000000000000000000000000000000000000..da67e13a33a248f03356d1c74ce941b367640cc1
GIT binary patch
literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8v8Rh;NX4z>1c`SK?0^67{D1$y
zx@Zl{t0ZUBj7RlF2VFv%?@i9VP#w~&!QgyCVNp_LhLp?R19=Ked>0KCO}m~kPocfh
z@$e1_$rX#X^-Hns{eQnbPF68h;FOlfD+y-v6^);?W?LO=;LTd#r@W{!QRD#=Lu<;q
V?MGQJ?gCoR;OXk;vd$@?2>^MoKimKS

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-hdpi/ic_action_delete_white_24.png b/Habitica/res/drawable-hdpi/ic_action_delete_white_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..484ed5656b72d14d9ee11c9dd17f4a231f37b0b9
GIT binary patch
literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8hNp{TNX4z>1PNA=hW|4Ewf~tb
z9PIip^F(s<V|%L`j#~m9sykVEozEz|Iu^#9=rPC9r6I7{jaSMv<H~}CsTb^<p8Zih
zx1gAX*UEX0quKxc4@{q3uGdcLuAlk;rv>-FKmRW+J}dc&f#K)gg?bl4l$?QfGI+ZB
KxvX<aXaWEhygX?D

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-hdpi/ic_action_launch.png b/Habitica/res/drawable-hdpi/ic_action_launch.png
new file mode 100644
index 0000000000000000000000000000000000000000..2982f68455a3ebbf2f2f9def1d1cf9b72a9a23bf
GIT binary patch
literal 282
zcmV+#0p<RQP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0002tNkl<Zc-rmN
zO%B2!5Cvf1BE}PV1rK2Ai7@CfT==tg;}Low;}xDwZLNi27^oYK^EOR}d?^q>sefe@
z3@TVSBB~A5S#~|8`j3XWB3924RJjnUfX_g-ZPbFP?QrKHH*Q2@aNz$)1`W(@3N$c#
zY|9~o<BQS$csVp?R4L>$g^<C?V~QY(36h3HOd1k0Daha)Wir-?V=^F~5ko0P49&Yk
z8DC=Y)D{iJ?Nr8M&)5xjQ!lnJgf`6OPo-|h+Ynl#q*fuMnFlgfmtkMuXRV`8HWl0a
gjiyfj#QZSy0M?Vfx(S1Zt^fc407*qoM6N<$f|(g{n*aa+

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-hdpi/ic_action_more_vert.png b/Habitica/res/drawable-hdpi/ic_action_more_vert.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed56f6a7989cc2e616802f789b77e8b7a6cddc63
GIT binary patch
literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8pr?ytNX4zUmp1YqP!M1_*vs=&
zS@PntMz$QLFT62n?@qYuZ+Y-Hf9A2208gna72kK8X0Tl`&0zVG5x~15BOt2&@^#bJ
l(@!lu*k3BhE@`$&mp`K!QXlEIiW6u!gQu&X%Q~loCIBc3FDd{4

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-hdpi/ic_action_warning.png b/Habitica/res/drawable-hdpi/ic_action_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..36dd77192eb8c7d5fa48f2844b6fce03695daa99
GIT binary patch
literal 334
zcmV-U0kQsxP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003MNkl<Zc-rmJ
zFHAx~9Ki7>V{B{$f(9uPAZfxz)JVh#QKCd?7&T(ls8O3Xh%`--q);SaAh6*WgRcX}
zc)oY{-u<!3H{R|(xBH#r{O2f8_zNaRmv>_JP>n_BwoHoA5*o2<2i>#k&W6deZcg5m
ziSUZM7b0d*1#hP&Op;F@G$5%DT_dWY%N#HjLR0qjpcb;4I?Rdt<Z{JbQI(0)3xs;a
z)u4;tZ}CA;S7Fk8g+gQY!l6g+bOjJRgfYkdZxTXq6vRa7C_`^V<xmx!&ScCELoH~?
zwivoaw;K_2$V|LjGNVN^a$aVOw(Qyf2-;q#jA<n|lb~-5eUMl~SJ-s9VzNxEpb42D
g=o#CdoJ|US13#hMTd9(OkpKVy07*qoM6N<$g8B%KB>(^b

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-mdpi/ic_action_chat.png b/Habitica/res/drawable-mdpi/ic_action_chat.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f9459c06a9b43e0a07b8c891530e4c8f5293905
GIT binary patch
literal 133
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1A5Ry@kcwN$2@AM?$p85NwBG5#
z)%yAtwnL{JAE-JpPi!dSwfO5{%6s^t=auUYzh|g1#7$WC@MwK}2`}%FbcIV(noUh6
gOmmf%U=w6uP`b-owXNV>KhRtTPgg&ebxsLQ0Qfa7LjV8(

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-mdpi/ic_action_delete_white_24.png b/Habitica/res/drawable-mdpi/ic_action_delete_white_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..64a4178238e070a1657720f96e7b397822a8076e
GIT binary patch
literal 115
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1D^C~4kcwN$2@-!E>_7CM{eR+v
zgY~R6ULP4=Whfl~yJVLAs>BdxJ>K;jR@FB~H~;@Xea5N(zxh7d@H058Pdd2NT8Iy5
O3WKMspUXO@geCwh`YDtE

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-mdpi/ic_action_launch.png b/Habitica/res/drawable-mdpi/ic_action_launch.png
new file mode 100644
index 0000000000000000000000000000000000000000..84612f7ccfdf6c1de4c54e2363165581df06535d
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iW=|K#kcwN$2@-1_)Iaz?{eK`M
zvp`apfq{bt&r=rD1FQxMZv0=pB%?uNzsnl78AXDROdO`fvuLF&xG`@kQZiYf<=%9|
z^g&2pEVIu}gGo*{eoY$t8y3m*v(>FR_3@U0WOotM!Xw?PT%I1@S1x^cWv}>wDb$%^
lnoQ%WJK~|t7bkp^VsLxbvSnMjYZ=fv44$rjF6*2UngE<|L=OM}

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-mdpi/ic_action_more_vert.png b/Habitica/res/drawable-mdpi/ic_action_more_vert.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a0e9a5c728025f64a7bd01ef8093a90e27defb9
GIT binary patch
literal 110
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Q%@JikcwN$2@>lRIv$!H)@G}J
zWV$Eq2Y-ux=k*U<YaX(Gl={=SY=6QBS>B}=1El&Ey7)3MIR8|gAhA8h3TOa>r>mdK
II;Vst0Io?R+W-In

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-mdpi/ic_action_warning.png b/Habitica/res/drawable-mdpi/ic_action_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad526d4b32d2650f756fab3d0a636b8704397c5e
GIT binary patch
literal 244
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i-JULvAr-gI_U+|uN)T}1<YX0{
zS{9YHcB|e2CaVU$1<WrX)Cq>D?6phFq5=aaOh|7~sA-wM`O@{+cY9A~-s(Sa?4O(Y
zj>4l8*o&Rgg7$Vwv+D6iZct5BzWAGEzQTfV`8g+w)?7aRL^AZHTK|o%WizbPDmVC?
zOJj<d@-lbNp#zIUW!_vqK9!-&_16R~w#wM&L6UPWUQJl_u2{d-XVb2utIaBsmL8Pi
pT<!AyQ8&|kKN$-T%Z&dgq}ikv7j)laeG2pjgQu&X%Q~loCIDKkWLE$H

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/ic_action_chat.png b/Habitica/res/drawable-xhdpi/ic_action_chat.png
new file mode 100644
index 0000000000000000000000000000000000000000..d870dd759885a797d5246fb429f614a28bbf5221
GIT binary patch
literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D8J;eVAr-gYUXSK;Fc4`;T&;O}
zi$dq=Ljqqr6qTHAO+O|%-C}dYfA1}FQm(tic@4QrcI=W96^g&Npz%r+e<RN%?brok
ztZTS=7BR#mgeVAb{OcAGV7II2R{N$Nq#&|D{?p^_FZvns*q-o5HqK@|%~qrraQFj5
z_npb*4I%%29y~jr!R;SI!6)kjr}7!}_cNXO!&LBj7rQw#U#Z@<!lNZKfo^2*boFyt
I=akR{01VPhPXGV_

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/ic_action_delete_white_24.png b/Habitica/res/drawable-xhdpi/ic_action_delete_white_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3aa07e6695172500004bd21352b5a712330ee06
GIT binary patch
literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DWKS2zkcwMxuN~w(pdjE9xSDfX
zru!rjF{WpBW&$0%JDWb$Gk#9^n84xU9CRso<@-P4PUjf@F^g6H-g}-Is2>CjxC>@~
z>z1|faoENj82<Us%Cny<dv1l^>tFn4mU`AYCaEXRs#?a;<sh}5u6{1-oD!M<c*Hf#

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/ic_action_launch.png b/Habitica/res/drawable-xhdpi/ic_action_launch.png
new file mode 100644
index 0000000000000000000000000000000000000000..7245664269ccce91ad7a08b3dcbc2d1b3f211493
GIT binary patch
literal 285
zcmV+&0pk9NP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002wNkl<Zc-rmP
zO$x#=5QgDE?;;+-g~w1gUeA522P;zDS@=vrZ2FUSGWoI)GqV!P``A=LjmeXTJlLW_
zgQYQ_m0V-jxG!w}j<tybDj+S;qy}a#5bYUlN?@EP1AV?t0l4`S9~kBh8yM%wz%)+<
z`uyvgCj#?%8sN*50DpdVLxI42DB$LgvJZ0zpvZ>+l6=HNmc4s5AUzx<;N}mDC$0kI
zc@?k^$g6+?7ja&BL>(c^s~>WKo$zaw>}N{`eh7GiF%Lg*qX1>xACR@FvGD^PakaOo
jKb&%yp91vFz#jl__Z=8-Iu^<h00000NkvXXu0mjfWxsQ9

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/ic_action_more_vert.png b/Habitica/res/drawable-xhdpi/ic_action_more_vert.png
new file mode 100644
index 0000000000000000000000000000000000000000..c63cbf8f83c266a9db8c026b565f28c6013d05e4
GIT binary patch
literal 162
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DOivfbkcwMxr#NyoD2TA$&ve?g
zM`fNiS81&MiUX++?jJdGe}ANgGUEa9v{chjRo3}GV~^L)Zdcm>`MU07*0sV@J~qA5
z^_Z*BC(crRE4}XOlaKvPwz(U-?LIqnX9(&pas^XNKdjYr-KWV&JZQfUw3NZq)z4*}
HQ$iB}wM#oZ

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/ic_action_warning.png b/Habitica/res/drawable-xhdpi/ic_action_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..d25d2ee0949caf4518511bcc52c9ef3d714b8e14
GIT binary patch
literal 390
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}cwPF#3ABIEGZ*dV76iE|a0iv5&$+
ztfHbN0Zy{7QW(V=7!w)|7<3%iJj6WM8W<PwnNGPdv8#)TvsOan!o$y-?{BVk6|wUc
zQSY8#B2qt5rT_27g=_tkEEk>DNNQdB>kO~NgFV;xG-#EHC$xLn9bjKqeV#evVFhzv
zMHl~>iT8BOF0}6R^I6d1%NDVE`Nal7AL(OEuWm>;+GZ6t=m-4nVcc_I+w*`04XvU-
z!pxf*>|$QGGNk^oXk5GNDes=l__Er%{TuZ!9BE{gx$uE`+05&SYz>|K7tHqLb1}#U
zMa!r%NCs8Q`~;J#41z)7KsJa}HEz2i>wYp#W<mFa(wGL#zDcQ0r@EEjyPLI55qIZY
z&^krh-3~~~yW16r2i3`_dbfrMxu2}EI?%Z|W&4DnLZ15;yeW?*_T2}vdp36dv7dFk
elHost1><8WqvHKP`HFzy%i!ti=d#Wzp$PzmPnMDZ

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/ic_action_chat.png b/Habitica/res/drawable-xxhdpi/ic_action_chat.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce49de46e03742bc23c72abc3c4dc4d738a1c273
GIT binary patch
literal 294
zcmV+>0oneEP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0002(Nkl<Zc-rmS
zK@Ng25Czb#@D6xHL-Yuq&O|g4J&B2laiM<M3QTJZ%t!fuR;+jl?Id&>f}$wSL52cb
zTrhNQ*kgqm!h1Cyk)wiVPMF6)84mEyv3{!wT7Z$I4cbsZI~#PSfUY*^4o*zaLm+{s
z0t!8qKmrM*K9mAIe+5KaLjnmj8IbzW-#12qrVD~VUxH}cULb)48v4+alX7gJVqBmq
zHd<hC^4RdjcPW?k$I9a4sqU<M`|J3i(jZq(8syALf!sN95P=f|Q8+e;#IZm$PB)0i
s=>kzXZ4jB$1kpL|s}=$YBv9Y=0vx%XC6Km0iU0rr07*qoM6N<$f+75Nv;Y7A

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/ic_action_delete_white_24.png b/Habitica/res/drawable-xxhdpi/ic_action_delete_white_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a9c20320c4b9ee9a95faf93ed51e88a0f3f5ba3
GIT binary patch
literal 200
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw`aNA7Ln>~)y>Xhe!9jo}(0^8Q
zoKJv>pQwxS4GppUT((6y+I6dxDtMTgC#Sl&Jn`7t^o?uP{3AQ3mvj`1dWy4f2q^qI
z^t9^MHwGpU+o6Gh5sC34cEQz0opu*87{A&Dq%)e@1uRsZX{=dZw@UkL=bTG_ZS=2X
m1=#FA_3CQGa%Yz>>&<xQi}T0ZMzjN+#^CAd=d#Wzp$P!5T13bI

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/ic_action_launch.png b/Habitica/res/drawable-xxhdpi/ic_action_launch.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9793e7588df1f357f7fcbd732c46b4c7c40b77b
GIT binary patch
literal 385
zcmV-{0e=38P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0003<Nkl<Zc-rmR
zO-{ow5Cveb;+z4gM?@8@kT_Kr&|aabDkR`0AjIxbwTrgGNv7lZ@nYVrEqzLCk0wbe
z5{X12lpte?Extfcx+vbNV<nVofp^>*MNnpNR6$FiEzr;!=({!0<N{`8ytD)w<2ZrF
zIWC|njsxgFXXObhaXLRxnUlOg8Lvf-6KI^{0-EADfTlU-pgE2)Xr5yVqHqjBG>#c4
zV@=}BloUvaBLx!U$bbYn5+G4dJxG{S3*vFqj(yL3I!d4(8|KSW0r5F1pc;+>sE#8J
zs^tiS>N&!oXMt-_6x3Z!p1fOGcn_UP+$JG@%1$JH&r-ODIy_ah&?dg11t>rP3eYW}
zUs&ab2HKl}1{&zm40KNe_4qX5yp{Ul*e}ix1I`_Fay`wY57-?xoz7Ms4lk>tkJ7Fc
fpa2CZK;HESk2JcH)Ok<900000NkvXXu0mjfO~alw

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/ic_action_more_vert.png b/Habitica/res/drawable-xxhdpi/ic_action_more_vert.png
new file mode 100644
index 0000000000000000000000000000000000000000..8eb37bd8d0a79d369a7202f9d44916523460f803
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawmU_B4hE&{oJI$M`*+GEyzTRYO
z7n?@{AEyP1D_M5!@U~)Unt#(?CA7A2(acOQCI*Hd<?FIcGdf>h)!12@W&1Vi?2=Qv
z=dL{${_>G<7QfZ}oxfY!76m*Pj_PtUcC!Dq=)z(3D<Z9%{56iM-+$e6E`Pm6^JTy1
z&-Pu_eCH?5U)i^P^4{Bw3|$kGmPly2fhooY1Y6UMfuUjZXSTMYz(3Ac6?}jWX7F_N
Kb6Mw<&;$Tt7Fmb@

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/ic_action_warning.png b/Habitica/res/drawable-xxhdpi/ic_action_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..2135d3c75f03cf8d3086cfd3b3fa89a669c271d8
GIT binary patch
literal 523
zcmV+m0`&cfP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0005fNkl<Zc-rmR
zF-`(O7{zg7Vqs;aot9c_4Hwu8=mGEocmTZs9sn<Z2Y>@;t+kfgX+=drLY|8WW`)_E
z@6CKOvnKN<p&%3TZ%BUG?R4_;^8Uq8l&7O{RDJ}zc*AS?*_xnhtTt#%&>?0&K{Fh*
zBj_IMjoJ`&j^%IA5@+dyo>1Lm>Yz((?jmK-9zM2$-pg;31>M55n^Zx^m>YxUI7$=r
zfVz!S1ohCgZtS2Pyfg+qmp7sYUBR|~%%FXIS%W^yThW5<AlWch&?y$8pao9i1Wh5`
zBt}pHW<}_r6;_$iuyw;Kvq8w9HCCCCuyw^Mvr(v^Dpsqj-Z71WtvgobK@@C#uqqEC
zVC#cbCP)lhKdj1w#IW_lDib7xtuI#PK|<L2V^tm`f~`MRnIHjdHLxlV62Mjit4xp;
zwi;Mvf~>IB!74KgY_+h;Y~mVJAk+$%AQr1iu+_w>3T!p8ssdXLta5*Q3v4;8Y6jK7
zmcy!MPz`K3tm+0CVas7vJIDZA4y)Qh2H0{~)!!CuIjn}*xGAWI6zkRn*|8dCe_+dD
zHPrg1APH7OtpZ#2$!e$#H-kc8)d{v?vFZR@o!8`wCkN%A9F&7npKrx9LM`ueQ+xmb
N002ovPDHLkV1j|&=J@~s

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxxhdpi/ic_action_chat.png b/Habitica/res/drawable-xxxhdpi/ic_action_chat.png
new file mode 100644
index 0000000000000000000000000000000000000000..630ff85f1c5b4c103dc2a0bc74f76c92ca19614c
GIT binary patch
literal 384
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7!07Jj;uunK>+NlCzrzL+M?Su}
zwR^!TnTgs8a*i@=7R=pBeFya(KFr+a;rC|6CM)?r$9J!JCjL{=)$h8X6Nlo=7eRaP
znZCLsxm;}Tw^yH(|5vPbSG81qnV1#IdE-@NU*$=`qK4|7%hof-%<!FeUpO<KE#|ak
zdFp}HrVrNg{Mf+8lX^hmy$GW+&_N6g8JsVq_!;Jdm<hZa>`ySvk^b=YI^(x)36K!O
z9F`w_brTpFE=XLcn#jb!@WAB&KLbN9<2QCmpllPf5Ca3Z<RWIii;U(Q89jI3Xt+JA
zd;Pu!_1s5Hm%e;6FP*;sui3f7TT05mUVlHm`0Ag>?@n#xO9-!*J+R@QR72|Ds)o$J
zQ4P6&tr`mdN;Q=JH9D}Tjx!;?UQ%GeKOqH|zm*OXeib(ueEr<u@U^%h;Oq0c<E&tZ
b{bwy;v0Nu@l{ndH4@kh%)z4*}Q$iB}y+NK`

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxxhdpi/ic_action_delete_white_24.png b/Habitica/res/drawable-xxxhdpi/ic_action_delete_white_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d322aa9baba09c58b0058760fb7d53a392b63a1
GIT binary patch
literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgc6quuhE&{od*w9mAp-%|!1oIz
zUAkW?IxdlN5p^sPGLtM@^D{+9cy9DT>q|G5dQ4KuY+ck{{`y~aU3Uxr^X+awlIm)m
zLim6tF)Yw+SYp*L31Z?03ltA1m;Rr_zhgPmvYG>yq8FYs_ibEqHvUn-r*1=DgDFx+
z?bd02*59bTR4g&(=Y(kztIpQ%Z4JJY^zZNE9?f4`+x0ysZP__5=_$iXi`hvQAj>>m
L{an^LB{Ts5t^ZVx

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxxhdpi/ic_action_launch.png b/Habitica/res/drawable-xxxhdpi/ic_action_launch.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6c794a9af1ddf63f84ee1f49c9d42f66e3d7361
GIT binary patch
literal 494
zcmV<K0TKR*P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0005CNkl<Zc-rmS
zK}y3=5XSNBYUx>u6jbn>D$SyY5ZsG+h>E?0;>vFF8Br)|lf0MA%$t#K-ah^RLh?dM
zs*1zma5x+ehtoM&p~en-jGgM&k~+@!s?fLQ*kI}u1kCXWL<Vet$bc0P8&F3F?4kqq
z(E*7E5L}mdiwx+`cMllKcMcfNcMV9%cMLe5{~86*m46Wf(4AjJ0QBVt0QBd(2Mpyq
z2Mp)C2BhRW2BhV?1*GOX1*GS@1a#$}Px*a2KwiE(KyJP>Kz_a}z?l5xr4LZe*9R!)
zYXj8tbpZzXnt<c^FS7Z10Hb^@fLXo{KqkM~gG}n|7Xrv#JVgMK*M0$j?5%4KkluNW
z0rDHCDWEI=Y{Cw22++tk1nA_O0krbX0C!6HW`G4ARPqh)fu97aeA8X%K#<Efehz#Q
zB=gOm#0%Vt=7)I6M*sl?5I_I{1pH%w)Q7J!^PUfQb_Lkx1J<qpSNVWbG;Z=6Eb{?!
zAK*`)>oG4lDxCcJ!(L|YF&hW?B-Dj3q^3RlvvIGO4)?+hp4x59e&gJ>x9)QMJF*~)
k00IagfB*srAYj7!07VvUY=PWfkN^Mx07*qoM6N<$f;AN24*&oF

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxxhdpi/ic_action_more_vert.png b/Habitica/res/drawable-xxxhdpi/ic_action_more_vert.png
new file mode 100644
index 0000000000000000000000000000000000000000..8924112dc885e82bdfea1259fbaebb80f399971d
GIT binary patch
literal 315
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z{uq3;uunK>+KCkz9s{K)`vGc
z+ZB&&=F;Rom(<gK;DBcWbDyD}$_3s@FIE0u=RU)o+o;Y2)Xng}Y+_WEWNE3;k`JbT
zBBf^5Ut3aWWdGP+>~a0IyWTBnrGLJ2*?s%BXQvu}`ocbz8B4wF9prgG_}Cwi;586<
zP!Mb4FuSfnfVaTc-eKYNr{7FxRaXe-#4lOeZ(g`eo;UmP{U=YJW@}ttZlG)C|1$m0
z`^Xhvwwk`k`ugG-6GMac7pG~DFLU2~S6ihR{l$spMrYiKfAKToPV5U=DDL%G=K?n)
zgUn*_O)~T2PL#a|DqJM4binV6)3^VJfW%U+y#Z3`jd2`6e;imC*N_~+vcgR;6yz;W
LS3j3^P6<r_Hf4lY

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxxhdpi/ic_action_warning.png b/Habitica/res/drawable-xxxhdpi/ic_action_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..883cade481c6a632c15b6c45ec09f87e68f3830e
GIT binary patch
literal 656
zcmV;B0&o3^P)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@00074Nkl<Zc-rmT
zJx&5)5XNz0Vqs;aot9c_4Hw`7Z~(jj9sn<Z2fz#90q_7=YptbrT2WDuka01=5ZsS<
z=ACDE-ejIlD9ncBUy)xXwpu=)&*$^OM&0abAs^_M(;>anTlSf3z%6YyOf}$?7QX=t
zI!QC&fwr5Z7;sJNzkoGer5Er_yPKyL(5L<NQVKYt&wl|Q*<X_hxTCy{QVBSxWp2Qd
z&e8~Yq@qnz2<TAR+SUUO=(RN9C40kkzztPxU^(EJzAFR1vbW3z+*8QLRs$|+6%??d
z3!4E?6uOzkfG%;?wHC0!BWG&R)WsubLrVc$JaVQ4O>I1KHn9@0i$~5>ps9~X&gK>Z
z`V_NX(*b#S<SZJR7(8+|YBHb*kDNt96NN|4rcDKONNepT0;=%1|2_zsI6QI!BA|)G
zBQHP<O&lJ10b*$4@W>4iLKBBaZh#P)I6U$LM9{?HQ4%14CJv9100A^{c$5XOp^3wz
zEPxG793G_sOlacpC=Fmj6Ng8601KKpJjMhtpozm{OaKF#b>a~M&3f?&fM(rzREMSp
z9#IQ|rq1ONwSh)J$mJ2W0BCAm9#I>|283Q7QLBWe-sMsEhb$PHnwLjRKm{~4FOR5z
zQfTU49x(x>(A2#=q5?{wseO6G1e8Ei`|^kiD1@f|<q;E52u;N05w%`uK<woawOnXo
zE{~{<LIUc>V<a>!;4uoCHt-k$O&fTOfTk5ZilJ!*k78)r!J`nGcJL^KrUo9H*sPxa
q<g4NF01xm05AXmF@Bj~pczyu1J@$y{7y3K^0000<MNUMnLSTaJ78DWy

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable/npc_daniel.png b/Habitica/res/drawable/npc_daniel.png
new file mode 100644
index 0000000000000000000000000000000000000000..b12dd9e254884e968ddf5f9abc3836deabb24d63
GIT binary patch
literal 5110
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
Y|7h4gfw7d?3jhEB07*qoM6N<$f~aYu5&!@I

literal 0
HcmV?d00001

diff --git a/Habitica/res/layout/activity_tavern.xml b/Habitica/res/layout/activity_tavern.xml
index 053b28cf5..59be56cf7 100644
--- a/Habitica/res/layout/activity_tavern.xml
+++ b/Habitica/res/layout/activity_tavern.xml
@@ -1,37 +1,47 @@
 <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"
-    android:id="@+id/drawer_layout"
     tools:context=".TavernActivity">
 
     <LinearLayout
         android:id="@+id/layout_main"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
         android:fitsSystemWindows="true"
-        android:layout_marginTop="25dp">
+        android:orientation="vertical">
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
-            android:layout_height="wrap_content"
             android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/colorPrimary"
             android:minHeight="?attr/actionBarSize"
-            android:background="?attr/colorPrimary" />
+
+            />
 
         <!-- As the main content view, the view below consumes the entire
              space available using match_parent in both dimensions. -->
-        <FrameLayout
+        <LinearLayout
             android:id="@+id/content_frame"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/white">
+            android:background="@color/white"
+            android:orientation="vertical">
 
-            <TextView android:text="Text" android:layout_width="wrap_content"
+            <include
+                android:id="@+id/avatar"
+                layout="@layout/avatar_with_bars"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
-            </FrameLayout>
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/tavern.list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </LinearLayout>
     </LinearLayout>
 </android.support.v4.widget.DrawerLayout>
diff --git a/Habitica/res/layout/avatar_with_bars.xml b/Habitica/res/layout/avatar_with_bars.xml
index 649e63158..9e9504439 100644
--- a/Habitica/res/layout/avatar_with_bars.xml
+++ b/Habitica/res/layout/avatar_with_bars.xml
@@ -12,7 +12,8 @@
     android:orientation="horizontal"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingEnd="@dimen/activity_horizontal_margin"
-    android:paddingTop="8dp">
+    android:paddingTop="8dp"
+    android:background="@color/brand">
 
     <ImageView
         android:id="@+id/IMG_ProfilePicture"
diff --git a/Habitica/res/layout/tavern_chat_item.xml b/Habitica/res/layout/tavern_chat_item.xml
new file mode 100644
index 000000000..010408efb
--- /dev/null
+++ b/Habitica/res/layout/tavern_chat_item.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <import type="com.magicmicky.habitrpgwrapper.lib.models.ChatMessage" />
+
+        <variable
+            name="msg"
+            type="ChatMessage" />
+    </data>
+
+    <GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:layout_columnWeight="5"
+            android:layout_gravity="center|left"
+            android:background="@drawable/layout_rounded_bg"
+            app:rounded_background_int="@{msg.getContributorColor()}">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="5dp"
+                style="@style/ChatMessageUserTextViewStyle"
+                android:text="@{msg.user}"
+                app:foregroundColor="@{msg.getContributorForegroundColor()}" />
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_columnSpan="2"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:layout_marginTop="5dp"
+            android:layout_weight="8"
+            android:text="@{msg.text}" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_column="1"
+            android:layout_columnWeight="5"
+            android:layout_gravity="right"
+            android:layout_margin="5dp"
+            android:layout_row="0">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center|right"
+
+                android:text="@{msg.getAgoString()}" />
+
+            <ImageView
+                android:id="@+id/btn_options"
+                android:layout_width="wrap_content"
+                android:layout_height="40dp"
+                android:layout_margin="5dp"
+                android:layout_weight="1"
+                android:src="@drawable/ic_action_more_vert" />
+        </LinearLayout>
+
+    </GridLayout>
+
+</layout>
+
diff --git a/Habitica/res/layout/tavern_chat_new_entry_item.xml b/Habitica/res/layout/tavern_chat_new_entry_item.xml
new file mode 100644
index 000000000..a18b421de
--- /dev/null
+++ b/Habitica/res/layout/tavern_chat_new_entry_item.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="7dp"
+        android:text="Chat"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textColor="@color/material_drawer_primary_text" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.rengwuxian.materialedittext.MaterialEditText
+            android:id="@+id/edit.new.message.text"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+
+            android:hint="Write Message"
+            app:met_floatingLabel="normal"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/btn.send.message"
+            android:layout_width="50dp"
+            android:layout_height="50dp" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/tavern_daniel_item.xml b/Habitica/res/layout/tavern_daniel_item.xml
new file mode 100644
index 000000000..f720c3255
--- /dev/null
+++ b/Habitica/res/layout/tavern_daniel_item.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="120dp"
+        android:src="@drawable/npc_daniel"
+        android:layout_margin="10dp"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center|center_horizontal">
+
+        <Button
+            android:id="@+id/btn.toggle.inn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Sleep"
+            android:layout_gravity="center"
+
+            android:backgroundTint="@color/brand"/>
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/Habitica/res/menu/chat_message.xml b/Habitica/res/menu/chat_message.xml
new file mode 100644
index 000000000..11e0fbc68
--- /dev/null
+++ b/Habitica/res/menu/chat_message.xml
@@ -0,0 +1,28 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+    <item
+        android:id="@+id/menu.chat.copy.as.todo"
+        android:icon="@drawable/ic_action_launch"
+
+        android:title="Copy as ToDo" />
+    <item
+        android:id="@+id/menu.chat.send.pm"
+        android:icon="@drawable/ic_action_chat"
+
+        android:title="Send PM" />
+    <group>
+
+        <item
+            android:id="@+id/menu.chat.flag"
+            android:icon="@drawable/ic_action_warning"
+            android:showAsAction="always|withText"
+            android:title="Flag" />
+
+        <item
+            android:id="@+id/menu.chat.delete"
+            android:icon="@drawable/ic_action_delete_white_24"
+
+            android:title="Delete" />
+    </group>
+</menu>
diff --git a/Habitica/res/values/colors.contributor.xml b/Habitica/res/values/colors.contributor.xml
new file mode 100644
index 000000000..e65b5cfb0
--- /dev/null
+++ b/Habitica/res/values/colors.contributor.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="contributor.0">#aaa</color>
+    <color name="contributor.1">#f57a9d</color>
+    <color name="contributor.2">#b93030</color>
+    <color name="contributor.3">#ff3300</color>
+    <color name="contributor.4">#ff9500</color>
+    <color name="contributor.5">#fff700</color>
+    <color name="contributor.6">#5eff00</color>
+    <color name="contributor.7">#00aaff</color>
+    <color name="contributor.mod">#130ead</color>
+    <color name="contributor.staff">#88108f</color>
+    <color name="contributor.npc">#000</color>
+    <color name="contributor.npc.font">#00FF00</color>
+</resources>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 3708899ec..52b5eb4fe 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -32,8 +32,9 @@
         <item name="material_drawer_selected_text">@color/brand</item>
         <item name="material_drawer_header_selection_text">@color/material_drawer_header_selection_text</item>
 
-
+        <item name="popupMenuStyle">@style/PopupTheme</item>
         <item name="actionOverflowMenuStyle">@style/PopupTheme</item>
+        <item name="android:popupMenuStyle">@style/PopupTheme</item>
     </style>
 
     <style name="AppThemeWithOwnActionBar" parent="AppTheme">
@@ -58,6 +59,8 @@
         <item name="android:popupBackground">@color/accent_color</item>
     </style>
 
+
+
     <style name="CardText">
         <item name="android:textSize">@dimen/card_small_text</item>
         <item name="android:textColor">@color/card_text</item>
@@ -107,4 +110,10 @@
         <item name="color">@color/drawerArrowColor</item>
     </style>
 
+    <style name="ChatMessageUserTextViewStyle">
+        <item name="android:shadowColor">#000000</item>
+        <item name="android:shadowDx">1</item>
+        <item name="android:shadowDy">1</item>
+        <item name="android:shadowRadius">1</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
index 0b843692d..90486b10c 100644
--- a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
@@ -29,6 +29,7 @@ import com.habitrpg.android.habitica.events.TaskLongPressedEvent;
 import com.habitrpg.android.habitica.events.TaskSaveEvent;
 import com.habitrpg.android.habitica.events.TaskTappedEvent;
 import com.habitrpg.android.habitica.events.TodoCheckedEvent;
+import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
 import com.habitrpg.android.habitica.prefs.PrefsActivity;
 import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
 import com.habitrpg.android.habitica.ui.EditTextDrawer;
@@ -198,9 +199,12 @@ public class MainActivity extends InstabugAppCompatActivity implements HabitRPGU
     protected void onResume() {
         super.onResume();
 
-        this.mAPIHelper = new APIHelper(this, hostConfig);
+        if(mAPIHelper == null)
+        {
+            this.mAPIHelper = new APIHelper(this, hostConfig);
 
-        mAPIHelper.retrieveUser(new HabitRPGUserCallback(this));
+            mAPIHelper.retrieveUser(new HabitRPGUserCallback(this));
+        }
     }
 
     @Override
@@ -325,6 +329,12 @@ public class MainActivity extends InstabugAppCompatActivity implements HabitRPGU
         }
     }
 
+    public void onEvent(ToggledInnStateEvent event) {
+        User.getPreferences().setSleep(event.Inn);
+
+        updateUserAvatars();
+    }
+
     private void notifyUser(double xp, double hp, double gold,
                             double lvl, double delta) {
         StringBuilder message = new StringBuilder();
@@ -471,24 +481,7 @@ public class MainActivity extends InstabugAppCompatActivity implements HabitRPGU
                 filterDrawer.openDrawer();
 
                 return true;
-            case R.id.action_toggle_sleep:
-                mAPIHelper.toggleSleep(new Callback<Void>() {
-                    @Override
-                    public void success(Void aVoid, Response response) {
 
-                    }
-
-                    @Override
-                    public void failure(RetrofitError error) {
-
-                    }
-                });
-
-                User.getPreferences().setSleep(!User.getPreferences().getSleep());
-
-                updateUserAvatars();
-
-                return true;
         }
 
         return super.onOptionsItemSelected(item);
diff --git a/Habitica/src/com/habitrpg/android/habitica/TavernActivity.java b/Habitica/src/com/habitrpg/android/habitica/TavernActivity.java
index df10fa2c4..1e29bd7a8 100644
--- a/Habitica/src/com/habitrpg/android/habitica/TavernActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/TavernActivity.java
@@ -1,22 +1,62 @@
 package com.habitrpg.android.habitica;
 
+import android.content.Context;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.support.design.widget.Snackbar;
+import android.support.v4.app.Fragment;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
+import android.view.View;
+import android.widget.LinearLayout;
 
+import com.habitrpg.android.habitica.events.commands.CopyChatAsTodoCommand;
+import com.habitrpg.android.habitica.events.commands.DeleteChatMessageCommand;
+import com.habitrpg.android.habitica.events.commands.FlagChatMessageCommand;
+import com.habitrpg.android.habitica.events.commands.OpenNewPMActivityCommand;
+import com.habitrpg.android.habitica.events.commands.SendNewGroupMessageCommand;
+import com.habitrpg.android.habitica.events.commands.ToggleInnCommand;
+import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
+import com.habitrpg.android.habitica.prefs.PrefsActivity;
+import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
 import com.habitrpg.android.habitica.ui.MainDrawerBuilder;
+import com.habitrpg.android.habitica.ui.adapter.TavernRecyclerViewAdapter;
+import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
+import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.magicmicky.habitrpgwrapper.lib.models.PostChatMessageResult;
 import com.mikepenz.materialdrawer.Drawer;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+
+import java.util.List;
 
 import butterknife.ButterKnife;
 import butterknife.InjectView;
+import de.greenrobot.event.EventBus;
+import retrofit.Callback;
+import retrofit.RetrofitError;
+import retrofit.client.Response;
 
-public class TavernActivity extends AppCompatActivity {
+public class TavernActivity extends AppCompatActivity implements Callback<List<ChatMessage>> {
 
     @InjectView(R.id.toolbar)
     Toolbar toolbar;
 
+    @InjectView(R.id.avatar)
+    LinearLayout avatarHeader;
+
+    @InjectView(R.id.tavern_list)
+    RecyclerView recyclerView;
+
+    private AvatarWithBarsViewModel avatarInHeader;
+    private APIHelper mAPIHelper;
+    private HabitRPGUser User;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -26,17 +66,20 @@ public class TavernActivity extends AppCompatActivity {
 
         setSupportActionBar(toolbar);
 
+
+        // Receive Events
+        EventBus.getDefault().register(this);
+
         ActionBar actionBar = getSupportActionBar();
 
-        // Enable Backbutton
         if (actionBar != null) {
-            actionBar.setTitle(R.string.about_title);
             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setDisplayShowHomeEnabled(false);
             actionBar.setDisplayShowTitleEnabled(true);
             actionBar.setDisplayUseLogoEnabled(false);
             actionBar.setHomeButtonEnabled(false);
-            actionBar.setElevation(0);
+
+            toolbar.setTitleTextColor(this.getResources().getColor(R.color.white));
         }
 
         Drawer drawer = MainDrawerBuilder.CreateDefaultBuilderSettings(this, toolbar)
@@ -44,9 +87,100 @@ public class TavernActivity extends AppCompatActivity {
                 .withTranslucentStatusBar(false)
                 .withDisplayBelowStatusBar(false)
                 .withDisplayBelowToolbar(false)
-                .withActionBarDrawerToggle(false)
                 .withSelectedItem(2)
                 .build();
+
+        avatarInHeader = new AvatarWithBarsViewModel(this, avatarHeader);
+
+        HostConfig hostConfig = PrefsActivity.fromContext(this);
+        User = new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(hostConfig.getUser())).querySingle();
+
+        avatarInHeader.UpdateData(User);
+
+        mAPIHelper = new APIHelper(this, hostConfig);
+
+        mAPIHelper.apiService.listGroupChat("habitrpg", this);
+    }
+
+    private void showSnackbar(String msg, boolean negative){
+        Snackbar snackbar = Snackbar.make(recyclerView, msg, Snackbar.LENGTH_LONG);
+
+        if (negative) {
+            View snackbarView = snackbar.getView();
+
+            //change Snackbar's background color;
+            snackbarView.setBackgroundColor(getResources().getColor(R.color.red));
+        }
+
+        snackbar.show();
+    }
+
+    public void onEvent(FlagChatMessageCommand cmd){
+        showSnackbar("Not yet implemented!", false);
+    }
+
+    public void onEvent(OpenNewPMActivityCommand cmd){
+        showSnackbar("Not yet implemented!", false);
+    }
+
+    public void onEvent(CopyChatAsTodoCommand cmd){
+        showSnackbar("Not yet implemented!", false);
+    }
+
+    public void onEvent(final DeleteChatMessageCommand cmd) {
+        mAPIHelper.apiService.deleteMessage(cmd.groupId, cmd.chatMessage.id, new Callback<Void>() {
+            @Override
+            public void success(Void aVoid, Response response) {
+                if (currentChatMessages != null) {
+                    currentChatMessages.remove(cmd.chatMessage);
+
+                    TavernActivity.this.success(currentChatMessages, null);
+                }
+            }
+
+            @Override
+            public void failure(RetrofitError error) {
+
+            }
+        });
+    }
+
+    public void onEvent(SendNewGroupMessageCommand cmd) {
+        mAPIHelper.apiService.postGroupChat(cmd.TargetGroupId, cmd.Message, new Callback<PostChatMessageResult>() {
+            @Override
+            public void success(PostChatMessageResult msg, Response response) {
+                if (currentChatMessages != null) {
+                    currentChatMessages.add(0, msg.message);
+
+                    TavernActivity.this.success(currentChatMessages, null);
+                }
+            }
+
+            @Override
+            public void failure(RetrofitError error) {
+
+            }
+        });
+    }
+
+    public void onEvent(ToggleInnCommand event) {
+        mAPIHelper.toggleSleep(new Callback<Void>() {
+            @Override
+            public void success(Void aVoid, Response response) {
+                ToggledInnStateEvent innState = new ToggledInnStateEvent();
+                innState.Inn = !User.getPreferences().getSleep();
+
+                User.getPreferences().setSleep(innState.Inn);
+
+                avatarInHeader.UpdateData(User);
+                EventBus.getDefault().post(innState);
+            }
+
+            @Override
+            public void failure(RetrofitError error) {
+
+            }
+        });
     }
 
     @Override
@@ -65,4 +199,25 @@ public class TavernActivity extends AppCompatActivity {
         return super.onOptionsItemSelected(item);
     }
 
+    private List<ChatMessage> currentChatMessages;
+
+    @Override
+    public void success(List<ChatMessage> chatMessages, Response response) {
+        currentChatMessages = chatMessages;
+
+        TavernRecyclerViewAdapter tavernAdapter = new TavernRecyclerViewAdapter(chatMessages, this, User.getId());
+
+        LinearLayoutManager layoutManager = new LinearLayoutManager(this);
+
+        recyclerView.setLayoutManager(layoutManager);
+        //recyclerView.setHasFixedSize(true);
+        recyclerView.setAdapter(tavernAdapter);
+    }
+
+    @Override
+    public void failure(RetrofitError error) {
+
+        showSnackbar(error.getMessage(), true);
+    }
+
 }
diff --git a/Habitica/src/com/habitrpg/android/habitica/events/ToggledInnStateEvent.java b/Habitica/src/com/habitrpg/android/habitica/events/ToggledInnStateEvent.java
new file mode 100644
index 000000000..ec4eeee7f
--- /dev/null
+++ b/Habitica/src/com/habitrpg/android/habitica/events/ToggledInnStateEvent.java
@@ -0,0 +1,8 @@
+package com.habitrpg.android.habitica.events;
+
+/**
+ * Created by Negue on 24.08.2015.
+ */
+public class ToggledInnStateEvent {
+    public boolean Inn;
+}
diff --git a/Habitica/src/com/habitrpg/android/habitica/events/commands/CopyChatAsTodoCommand.java b/Habitica/src/com/habitrpg/android/habitica/events/commands/CopyChatAsTodoCommand.java
new file mode 100644
index 000000000..72071acce
--- /dev/null
+++ b/Habitica/src/com/habitrpg/android/habitica/events/commands/CopyChatAsTodoCommand.java
@@ -0,0 +1,7 @@
+package com.habitrpg.android.habitica.events.commands;
+
+/**
+ * Created by Negue on 30.08.2015.
+ */
+public class CopyChatAsTodoCommand {
+}
diff --git a/Habitica/src/com/habitrpg/android/habitica/events/commands/DeleteChatMessageCommand.java b/Habitica/src/com/habitrpg/android/habitica/events/commands/DeleteChatMessageCommand.java
new file mode 100644
index 000000000..110584a07
--- /dev/null
+++ b/Habitica/src/com/habitrpg/android/habitica/events/commands/DeleteChatMessageCommand.java
@@ -0,0 +1,16 @@
+package com.habitrpg.android.habitica.events.commands;
+
+import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
+
+/**
+ * Created by Negue on 30.08.2015.
+ */
+public class DeleteChatMessageCommand {
+    public String groupId;
+    public ChatMessage chatMessage;
+
+    public DeleteChatMessageCommand(String groupId, ChatMessage chatMessage){
+        this.groupId = groupId;
+        this.chatMessage = chatMessage;
+    }
+}
diff --git a/Habitica/src/com/habitrpg/android/habitica/events/commands/FlagChatMessageCommand.java b/Habitica/src/com/habitrpg/android/habitica/events/commands/FlagChatMessageCommand.java
new file mode 100644
index 000000000..7e755d4f5
--- /dev/null
+++ b/Habitica/src/com/habitrpg/android/habitica/events/commands/FlagChatMessageCommand.java
@@ -0,0 +1,8 @@
+package com.habitrpg.android.habitica.events.commands;
+
+/**
+ * Created by Negue on 30.08.2015.
+ */
+public class FlagChatMessageCommand {
+
+}
diff --git a/Habitica/src/com/habitrpg/android/habitica/events/commands/OpenNewPMActivityCommand.java b/Habitica/src/com/habitrpg/android/habitica/events/commands/OpenNewPMActivityCommand.java
new file mode 100644
index 000000000..2dda0a9da
--- /dev/null
+++ b/Habitica/src/com/habitrpg/android/habitica/events/commands/OpenNewPMActivityCommand.java
@@ -0,0 +1,7 @@
+package com.habitrpg.android.habitica.events.commands;
+
+/**
+ * Created by Negue on 30.08.2015.
+ */
+public class OpenNewPMActivityCommand {
+}
diff --git a/Habitica/src/com/habitrpg/android/habitica/events/commands/SendNewGroupMessageCommand.java b/Habitica/src/com/habitrpg/android/habitica/events/commands/SendNewGroupMessageCommand.java
new file mode 100644
index 000000000..2950ba434
--- /dev/null
+++ b/Habitica/src/com/habitrpg/android/habitica/events/commands/SendNewGroupMessageCommand.java
@@ -0,0 +1,14 @@
+package com.habitrpg.android.habitica.events.commands;
+
+/**
+ * Created by Negue on 24.08.2015.
+ */
+public class SendNewGroupMessageCommand {
+    public String Message;
+    public String TargetGroupId;
+
+    public SendNewGroupMessageCommand(String targetGroupId, String message){
+        TargetGroupId = targetGroupId;
+        Message = message;
+    }
+}
diff --git a/Habitica/src/com/habitrpg/android/habitica/events/commands/ToggleInnCommand.java b/Habitica/src/com/habitrpg/android/habitica/events/commands/ToggleInnCommand.java
new file mode 100644
index 000000000..ea85f64ce
--- /dev/null
+++ b/Habitica/src/com/habitrpg/android/habitica/events/commands/ToggleInnCommand.java
@@ -0,0 +1,7 @@
+package com.habitrpg.android.habitica.events.commands;
+
+/**
+ * Created by Negue on 24.08.2015.
+ */
+public class ToggleInnCommand {
+}
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java b/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
index 047963138..608ecfca1 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
@@ -123,6 +123,11 @@ public class AvatarWithBarsViewModel {
         }
     }
 
+    @BindingAdapter("app:rounded_background_int")
+    public static void setRoundedBackgroundInt(View view, int color) {
+        setRoundedBackground(view, view.getResources().getColor(color));
+    }
+
     public static class LayoutWeightAnimation extends Animation {
         float targetWeight;
         float initializeWeight;
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
index 8732ce30b..b4c19d475 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
@@ -17,6 +17,7 @@ import android.widget.CheckBox;
 import android.widget.CheckedTextView;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.databinding.DailyItemCardBinding;
@@ -197,6 +198,8 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
         handler.postDelayed(reloadContentRunable, 200);
     }
 
+    // TODO Move them to a separate class
+
     @BindingAdapter("bind:imageName")
     public static void loadImage(ImageView view, String imageName) {
         Picasso.with(view.getContext()).load("https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_"+ imageName +".png").into(view);
@@ -222,6 +225,11 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
         view.setBackgroundColor(view.getResources().getColor(color));
     }
 
+    @BindingAdapter("app:foregroundColor")
+    public static void setForegroundTintColor(TextView view, int color) {
+        view.setTextColor(view.getResources().getColor(color));
+    }
+
     public abstract class ViewHolder<THabitItem extends Task> extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
 
         protected android.content.res.Resources resources;
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/TavernRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/TavernRecyclerViewAdapter.java
new file mode 100644
index 000000000..5ef89afab
--- /dev/null
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/TavernRecyclerViewAdapter.java
@@ -0,0 +1,261 @@
+package com.habitrpg.android.habitica.ui.adapter;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.support.v7.widget.AppCompatEditText;
+import android.support.v7.widget.PopupMenu;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.databinding.TavernChatItemBinding;
+import com.habitrpg.android.habitica.events.commands.CopyChatAsTodoCommand;
+import com.habitrpg.android.habitica.events.commands.DeleteChatMessageCommand;
+import com.habitrpg.android.habitica.events.commands.FlagChatMessageCommand;
+import com.habitrpg.android.habitica.events.commands.OpenNewPMActivityCommand;
+import com.habitrpg.android.habitica.events.commands.SendNewGroupMessageCommand;
+import com.habitrpg.android.habitica.events.commands.ToggleInnCommand;
+import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
+import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
+import com.mikepenz.iconics.Iconics;
+import com.mikepenz.iconics.typeface.FontAwesome;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+import butterknife.ButterKnife;
+import butterknife.InjectView;
+import butterknife.Optional;
+import de.greenrobot.event.EventBus;
+
+/**
+ * Created by Negue on 20.08.2015.
+ */
+public class TavernRecyclerViewAdapter extends RecyclerView.Adapter<TavernRecyclerViewAdapter.TavernRecyclerViewHolder> {
+    static final int TYPE_DANIEL = 0;
+    static final int TYPE_NEW_MESSAGE = 1;
+    static final int TYPE_MESSAGE = 2;
+
+    private List<ChatMessage> messages;
+    private Context viewContext;
+    private String uuid;
+
+    public TavernRecyclerViewAdapter(List<ChatMessage> messages, Context viewContext, String uuid) {
+        this.messages = messages;
+        this.viewContext = viewContext;
+        this.uuid = uuid;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        switch (position) {
+            case 0: {
+                return TYPE_DANIEL;
+            }
+            case 1: {
+                return TYPE_NEW_MESSAGE;
+            }
+            default: {
+                return TYPE_MESSAGE;
+            }
+        }
+    }
+
+    @Override
+    public TavernRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        int rLayout = R.layout.tavern_chat_item;;
+
+        switch (viewType) {
+            case TYPE_DANIEL: {
+                rLayout = R.layout.tavern_daniel_item;
+
+                break;
+            }
+
+            case TYPE_NEW_MESSAGE: {
+                rLayout = R.layout.tavern_chat_new_entry_item;
+
+                break;
+            }
+        }
+
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(rLayout, parent, false);
+
+        return new TavernRecyclerViewHolder(view, viewType, viewContext, uuid);
+    }
+
+    @Override
+    public void onBindViewHolder(TavernRecyclerViewHolder holder, int position) {
+        if (position > 1) {
+            holder.bind(messages.get(position - 2));
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return messages.size() + 2;
+    }
+
+    public class TavernRecyclerViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, PopupMenu.OnMenuItemClickListener {
+
+        private int layoutType;
+        private String uuid;
+
+        private TavernChatItemBinding chatItemBinding;
+
+        // Toggle Inn State
+        @InjectView(R.id.btn_toggle_inn)
+        @Optional
+        Button btnToggleInn;
+
+        // New Msg
+        @InjectView(R.id.edit_new_message_text)
+        @Optional
+        AppCompatEditText textNewMessage;
+
+        @InjectView(R.id.btn_send_message)
+        @Optional
+        Button btnSendNewMessage;
+
+        Context context;
+
+        public TavernRecyclerViewHolder(View itemView, int layoutType, Context viewContext, String uuid) {
+            super(itemView);
+            this.layoutType = layoutType;
+            this.uuid = uuid;
+
+            ButterKnife.inject(this, itemView);
+
+            context = viewContext;
+
+            switch (layoutType) {
+                case TYPE_DANIEL: {
+                    btnToggleInn.setOnClickListener(this);
+
+                    ViewHelper.SetBackgroundTint(btnToggleInn, itemView.getResources().getColor(R.color.brand));
+
+                    break;
+                }
+
+                case TYPE_NEW_MESSAGE: {
+                    btnSendNewMessage.setOnClickListener(this);
+                    int color = itemView.getResources().getColor(R.color.brand);
+
+                    // Using the Iconics buttons, it is unable to tint the background
+                    btnSendNewMessage.setTypeface(Iconics.findFont(FontAwesome.Icon.faw_comment).getTypeface(context));
+                    btnSendNewMessage.setText(new Iconics.IconicsBuilder().ctx(context).on("{faw-comment}").build());
+
+                    ViewHelper.SetBackgroundTint(btnSendNewMessage, color);
+
+                    break;
+                }
+
+                default: {
+                    chatItemBinding = DataBindingUtil.bind(itemView);
+
+                    chatItemBinding.btnOptions.setClickable(true);
+                    chatItemBinding.btnOptions.setOnClickListener(this);
+                }
+            }
+        }
+
+        public void bind(ChatMessage msg) {
+            if (layoutType != TYPE_DANIEL && layoutType != TYPE_NEW_MESSAGE) {
+                chatItemBinding.setMsg(msg);
+            }
+        }
+
+        @Override
+        public void onClick(View v) {
+            if (chatItemBinding != null && chatItemBinding.btnOptions == v) {
+                PopupMenu popupMenu = new PopupMenu(context, v);
+
+                //set my own listener giving the View that activates the event onClick (i.e. YOUR ImageView)
+                popupMenu.setOnMenuItemClickListener(this);
+                //inflate your PopUpMenu
+                popupMenu.getMenuInflater().inflate(R.menu.chat_message, popupMenu.getMenu());
+
+                // Force icons to show
+                Object menuHelper = null;
+                Class[] argTypes;
+                try {
+                    Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
+                    fMenuHelper.setAccessible(true);
+                    menuHelper = fMenuHelper.get(popupMenu);
+                    argTypes = new Class[]{boolean.class};
+                    menuHelper.getClass().getDeclaredMethod("setForceShowIcon", argTypes).invoke(menuHelper, true);
+                } catch (Exception e) {
+                }
+
+                ChatMessage chatMsg = chatItemBinding.getMsg();
+                if (!chatMsg.uuid.equals(uuid)) {
+                    popupMenu.getMenu().findItem(R.id.menu_chat_delete).setVisible(false);
+                }
+
+                popupMenu.show();
+
+                // Try to force some horizontal offset
+                try {
+                    Field fListPopup = menuHelper.getClass().getDeclaredField("mPopup");
+                    fListPopup.setAccessible(true);
+                    Object listPopup = fListPopup.get(menuHelper);
+                    argTypes = new Class[]{int.class};
+                    Class listPopupClass = listPopup.getClass();
+
+                    // Get the width of the popup window
+                    int width = (Integer) listPopupClass.getDeclaredMethod("getWidth").invoke(listPopup);
+
+                    // Invoke setHorizontalOffset() with the negative width to move left by that distance
+                    listPopupClass.getDeclaredMethod("setHorizontalOffset", argTypes).invoke(listPopup, -width);
+
+                    // Invoke show() to update the window's position
+                    listPopupClass.getDeclaredMethod("show").invoke(listPopup);
+                } catch (Exception e) {
+
+                }
+            } else if (v == btnToggleInn) {
+                EventBus.getDefault().post(new ToggleInnCommand());
+            } else {
+                String text = textNewMessage.getText().toString();
+
+                EventBus.getDefault().post(new SendNewGroupMessageCommand("habitrpg", text));
+
+                textNewMessage.setText("");
+            }
+        }
+
+        @Override
+        public boolean onMenuItemClick(MenuItem item) {
+            switch (item.getItemId()) {
+                case R.id.menu_chat_delete: {
+                    EventBus.getDefault().post(new DeleteChatMessageCommand("habitrpg", chatItemBinding.getMsg()));
+
+                    break;
+                }
+                case R.id.menu_chat_flag: {
+                    EventBus.getDefault().post(new FlagChatMessageCommand());
+
+                    break;
+                }
+                case R.id.menu_chat_copy_as_todo: {
+                    EventBus.getDefault().post(new CopyChatAsTodoCommand());
+
+                    break;
+                }
+
+                case R.id.menu_chat_send_pm: {
+                    EventBus.getDefault().post(new OpenNewPMActivityCommand());
+
+                    break;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
index 92db00211..4250d72ae 100644
--- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
+++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
@@ -1,7 +1,9 @@
 package com.magicmicky.habitrpgwrapper.lib.api;
 
+import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
 import com.magicmicky.habitrpgwrapper.lib.models.ContentResult;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.magicmicky.habitrpgwrapper.lib.models.PostChatMessageResult;
 import com.magicmicky.habitrpgwrapper.lib.models.Status;
 import com.magicmicky.habitrpgwrapper.lib.models.Tag;
 import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
@@ -9,6 +11,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.UserAuth;
 import com.magicmicky.habitrpgwrapper.lib.models.UserAuthResponse;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.squareup.okhttp.Call;
 
 import java.util.List;
 
@@ -19,6 +22,7 @@ import retrofit.http.GET;
 import retrofit.http.POST;
 import retrofit.http.PUT;
 import retrofit.http.Path;
+import retrofit.http.Query;
 
 /**
  * Created by MagicMicky on 10/06/2014.
@@ -81,6 +85,15 @@ public interface ApiService {
     @POST("/user/sleep")
     void sleep(Callback<Void> voidCallback);
 
+    @GET("/groups/{gid}/chat")
+    void listGroupChat(@Path("gid") String groupId, Callback<List<ChatMessage>> cb);
+
+    @POST("/groups/{gid}/chat")
+    void postGroupChat(@Path("gid") String groupId, @Query("message") String message, Callback<PostChatMessageResult> cb);
+
+    @DELETE("/groups/{gid}/chat/{messageId}")
+    void deleteMessage(@Path("gid") String groupId, @Path("messageId") String messageId, Callback<Void> cb);
+
 /*
     @GET("/content")
     void getContent();//Check Callback
diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java
new file mode 100644
index 000000000..ad3d14be0
--- /dev/null
+++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java
@@ -0,0 +1,91 @@
+package com.magicmicky.habitrpgwrapper.lib.models;
+
+import com.habitrpg.android.habitica.R;
+
+import java.util.Date;
+import java.util.Dictionary;
+import java.util.HashMap;
+
+
+/**
+ * Created by Negue on 22.08.2015.
+ */
+public class ChatMessage {
+
+    static HashMap<Integer, Integer> contributorColorDict;
+
+    static {
+        contributorColorDict = new HashMap<>();
+        contributorColorDict.put(0, R.color.contributor_0);
+        contributorColorDict.put(1, R.color.contributor_1);
+        contributorColorDict.put(2, R.color.contributor_2);
+        contributorColorDict.put(3, R.color.contributor_3);
+        contributorColorDict.put(4, R.color.contributor_4);
+        contributorColorDict.put(5, R.color.contributor_5);
+        contributorColorDict.put(6, R.color.contributor_6);
+        contributorColorDict.put(7, R.color.contributor_7);
+        contributorColorDict.put(8, R.color.contributor_mod);
+    }
+
+
+    public String id;
+
+    public String text;
+
+    public long timestamp;
+
+    // TODO LIKES
+
+    // TODO Flags
+
+    public String uuid;
+
+    public Contributor contributor;
+
+    public String user;
+
+    public int getContributorColor() {
+        int rColor = android.R.color.black;
+
+
+        if (contributor != null) {
+            if (contributor.admin) {
+                rColor = R.color.contributor_staff;
+            } else {
+                if (contributorColorDict.containsKey(contributor.level))
+                    rColor = contributorColorDict.get(contributor.level);
+            }
+        }
+
+        return rColor;
+    }
+
+    public int getContributorForegroundColor() {
+        int rColor = android.R.color.white;
+
+        if (contributor != null && contributor.level == 8) {
+            rColor = R.color.contributor_npc_font;
+        }
+
+        return rColor;
+    }
+
+    public String getAgoString() {
+        long diff = new Date().getTime() - timestamp;
+
+        long diffMinutes = diff / (60 * 1000) % 60;
+        long diffHours = diff / (60 * 60 * 1000) % 24;
+        long diffDays = diff / (24 * 60 * 60 * 1000);
+
+        if (diffDays != 0) {
+            return diffDays + " days ago";
+        }
+
+        if (diffHours != 0) {
+            return diffHours + " hours ago";
+        }
+
+        return diffMinutes + " minutes ago";
+    }
+}
+
diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/Contributor.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/Contributor.java
new file mode 100644
index 000000000..66f6f0f2b
--- /dev/null
+++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/Contributor.java
@@ -0,0 +1,11 @@
+package com.magicmicky.habitrpgwrapper.lib.models;
+
+public class Contributor {
+    public boolean admin;
+
+    public String contributions;
+
+    public int level;
+
+    public String text;
+}
diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/PostChatMessageResult.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/PostChatMessageResult.java
new file mode 100644
index 000000000..9191d746b
--- /dev/null
+++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/PostChatMessageResult.java
@@ -0,0 +1,8 @@
+package com.magicmicky.habitrpgwrapper.lib.models;
+
+/**
+ * Created by Negue on 30.08.2015.
+ */
+public class PostChatMessageResult {
+    public ChatMessage message;
+}
diff --git a/build.gradle b/build.gradle
index 08fb97d15..fa0774f3b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0-beta1'
+        classpath 'com.android.tools.build:gradle:1.3.0'
         classpath 'com.android.databinding:dataBinder:1.0-rc1'
 
         //Class path for the plugin to auto download sources