Merge remote-tracking branch 'origin/develop' into create_challenges

Conflicts: Habitica/res/values/strings.xml Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
2026-05-22 13:48:55 +00:00 · 2017-04-23 15:28:37 +02:00 · 2017-04-23 15:28:37 +02:00 · a490fdb38a
commit a490fdb38a
parent bcc9b13602 e99059b298
501 changed files with 3221 additions and 2500 deletions
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    package="com.habitrpg.android.habitica"
-    android:versionCode="168"
-    android:versionName="1.0"
+    android:versionCode="181"
+    android:versionName="1.0.1"
    android:screenOrientation="portrait"
    android:installLocation="auto" >

--- a/Habitica/assets/migrations/Habitica/36.sql
+++ b/Habitica/assets/migrations/Habitica/36.sql
@ -0,0 +1 @@
+ALTER TABLE Customization ADD COLUMN isBuyable bool;
--- a/Habitica/res/anim/fab_slide_in.xml
+++ b/Habitica/res/anim/fab_slide_in.xml
@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<translate android:fromYDelta="100%" android:toYDelta="0%"/>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+	android:duration="200">
+	<translate
+		android:fromYDelta="100%"
+		android:toYDelta="0%"/>
 </set>
--- a/Habitica/res/anim/fab_slide_out.xml
+++ b/Habitica/res/anim/fab_slide_out.xml
@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<translate android:fromYDelta="0%" android:toYDelta="100%"/>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+	android:duration="200">
+	<translate android:fromYDelta="0%"
+		android:toYDelta="100%"
+		/>
 </set>
--- a/Habitica/res/drawable-hdpi/add_daily.png
+++ b/Habitica/res/drawable-hdpi/add_daily.png
--- a/Habitica/res/drawable-hdpi/add_habit.png
+++ b/Habitica/res/drawable-hdpi/add_habit.png
--- a/Habitica/res/drawable-hdpi/add_rewards.png
+++ b/Habitica/res/drawable-hdpi/add_rewards.png
--- a/Habitica/res/drawable-hdpi/add_todo.png
+++ b/Habitica/res/drawable-hdpi/add_todo.png
--- a/Habitica/res/drawable-hdpi/custom_reward.png
+++ b/Habitica/res/drawable-hdpi/custom_reward.png
--- a/Habitica/res/drawable-hdpi/fab_add_purple.png
+++ b/Habitica/res/drawable-hdpi/fab_add_purple.png
--- a/Habitica/res/drawable-hdpi/ic_add_purple_300_36dp.png
+++ b/Habitica/res/drawable-hdpi/ic_add_purple_300_36dp.png
--- a/Habitica/res/drawable-hdpi/ic_close_purple_300_24dp.png
+++ b/Habitica/res/drawable-hdpi/ic_close_purple_300_24dp.png
--- a/Habitica/res/drawable-hdpi/ic_close_purple_300_36dp.png
+++ b/Habitica/res/drawable-hdpi/ic_close_purple_300_36dp.png
--- a/Habitica/res/drawable-hdpi/ic_create_grey_400_18dp.png
+++ b/Habitica/res/drawable-hdpi/ic_create_grey_400_18dp.png
--- a/Habitica/res/drawable-hdpi/justin_textbox.png
+++ b/Habitica/res/drawable-hdpi/justin_textbox.png
--- a/Habitica/res/drawable-hdpi/speechbubble_caret.png
+++ b/Habitica/res/drawable-hdpi/speechbubble_caret.png
--- a/Habitica/res/drawable-mdpi/add_daily.png
+++ b/Habitica/res/drawable-mdpi/add_daily.png
--- a/Habitica/res/drawable-mdpi/add_habit.png
+++ b/Habitica/res/drawable-mdpi/add_habit.png
--- a/Habitica/res/drawable-mdpi/add_rewards.png
+++ b/Habitica/res/drawable-mdpi/add_rewards.png
--- a/Habitica/res/drawable-mdpi/add_todo.png
+++ b/Habitica/res/drawable-mdpi/add_todo.png
--- a/Habitica/res/drawable-mdpi/custom_reward.png
+++ b/Habitica/res/drawable-mdpi/custom_reward.png
--- a/Habitica/res/drawable-mdpi/fab_add_purple.png
+++ b/Habitica/res/drawable-mdpi/fab_add_purple.png
--- a/Habitica/res/drawable-mdpi/ic_add_purple_300_36dp.png
+++ b/Habitica/res/drawable-mdpi/ic_add_purple_300_36dp.png
--- a/Habitica/res/drawable-mdpi/ic_close_purple_300_24dp.png
+++ b/Habitica/res/drawable-mdpi/ic_close_purple_300_24dp.png
--- a/Habitica/res/drawable-mdpi/ic_close_purple_300_36dp.png
+++ b/Habitica/res/drawable-mdpi/ic_close_purple_300_36dp.png
--- a/Habitica/res/drawable-mdpi/ic_create_grey_400_18dp.png
+++ b/Habitica/res/drawable-mdpi/ic_create_grey_400_18dp.png
--- a/Habitica/res/drawable-mdpi/justin_textbox.png
+++ b/Habitica/res/drawable-mdpi/justin_textbox.png
--- a/Habitica/res/drawable-mdpi/speechbubble_caret.png
+++ b/Habitica/res/drawable-mdpi/speechbubble_caret.png
--- a/Habitica/res/drawable-xhdpi/add_daily.png
+++ b/Habitica/res/drawable-xhdpi/add_daily.png
--- a/Habitica/res/drawable-xhdpi/add_habit.png
+++ b/Habitica/res/drawable-xhdpi/add_habit.png
--- a/Habitica/res/drawable-xhdpi/add_rewards.png
+++ b/Habitica/res/drawable-xhdpi/add_rewards.png
--- a/Habitica/res/drawable-xhdpi/add_todo.png
+++ b/Habitica/res/drawable-xhdpi/add_todo.png
--- a/Habitica/res/drawable-xhdpi/custom_reward.png
+++ b/Habitica/res/drawable-xhdpi/custom_reward.png
--- a/Habitica/res/drawable-xhdpi/fab_add_purple.png
+++ b/Habitica/res/drawable-xhdpi/fab_add_purple.png
--- a/Habitica/res/drawable-xhdpi/ic_add_purple_300_36dp.png
+++ b/Habitica/res/drawable-xhdpi/ic_add_purple_300_36dp.png
--- a/Habitica/res/drawable-xhdpi/ic_close_purple_300_24dp.png
+++ b/Habitica/res/drawable-xhdpi/ic_close_purple_300_24dp.png
--- a/Habitica/res/drawable-xhdpi/ic_close_purple_300_36dp.png
+++ b/Habitica/res/drawable-xhdpi/ic_close_purple_300_36dp.png
--- a/Habitica/res/drawable-xhdpi/ic_create_grey_400_18dp.png
+++ b/Habitica/res/drawable-xhdpi/ic_create_grey_400_18dp.png
--- a/Habitica/res/drawable-xhdpi/justin_textbox.png
+++ b/Habitica/res/drawable-xhdpi/justin_textbox.png
--- a/Habitica/res/drawable-xhdpi/speechbubble_caret.png
+++ b/Habitica/res/drawable-xhdpi/speechbubble_caret.png
--- a/Habitica/res/drawable-xxhdpi/add_daily.png
+++ b/Habitica/res/drawable-xxhdpi/add_daily.png
--- a/Habitica/res/drawable-xxhdpi/add_habit.png
+++ b/Habitica/res/drawable-xxhdpi/add_habit.png
--- a/Habitica/res/drawable-xxhdpi/add_rewards.png
+++ b/Habitica/res/drawable-xxhdpi/add_rewards.png
--- a/Habitica/res/drawable-xxhdpi/add_todo.png
+++ b/Habitica/res/drawable-xxhdpi/add_todo.png
--- a/Habitica/res/drawable-xxhdpi/custom_reward.png
+++ b/Habitica/res/drawable-xxhdpi/custom_reward.png
--- a/Habitica/res/drawable-xxhdpi/fab_add_purple.png
+++ b/Habitica/res/drawable-xxhdpi/fab_add_purple.png
--- a/Habitica/res/drawable-xxhdpi/ic_add_purple_300_36dp.png
+++ b/Habitica/res/drawable-xxhdpi/ic_add_purple_300_36dp.png
--- a/Habitica/res/drawable-xxhdpi/ic_close_purple_300_24dp.png
+++ b/Habitica/res/drawable-xxhdpi/ic_close_purple_300_24dp.png
--- a/Habitica/res/drawable-xxhdpi/ic_close_purple_300_36dp.png
+++ b/Habitica/res/drawable-xxhdpi/ic_close_purple_300_36dp.png
--- a/Habitica/res/drawable-xxhdpi/ic_create_grey_400_18dp.png
+++ b/Habitica/res/drawable-xxhdpi/ic_create_grey_400_18dp.png
--- a/Habitica/res/drawable-xxhdpi/justin_textbox.png
+++ b/Habitica/res/drawable-xxhdpi/justin_textbox.png
--- a/Habitica/res/drawable-xxhdpi/speechbubble_caret.png
+++ b/Habitica/res/drawable-xxhdpi/speechbubble_caret.png
--- a/Habitica/res/drawable-xxxhdpi/ic_add_purple_300_36dp.png
+++ b/Habitica/res/drawable-xxxhdpi/ic_add_purple_300_36dp.png
--- a/Habitica/res/drawable-xxxhdpi/ic_close_purple_300_36dp.png
+++ b/Habitica/res/drawable-xxxhdpi/ic_close_purple_300_36dp.png
--- a/Habitica/res/drawable-xxxhdpi/ic_create_grey_400_18dp.png
+++ b/Habitica/res/drawable-xxxhdpi/ic_create_grey_400_18dp.png
--- a/Habitica/res/drawable/layout_rounded_bg_lighter_gray.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_lighter_gray.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/black_10_alpha" />
+    <corners android:radius="@dimen/bar_radius"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>
--- a/Habitica/res/layout/activity_intro.xml
+++ b/Habitica/res/layout/activity_intro.xml
@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_height="match_parent"
-    android:layout_width="match_parent">
+    android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:background="@color/brand">
    <android.support.v4.view.ViewPager
        android:id="@+id/view_pager"
        android:layout_width="match_parent"
@ -45,6 +47,8 @@
            android:layout_marginBottom="6dp"
            android:background="@color/transparent"
            android:textColor="@android:color/white"
-            android:visibility="gone" />
+            android:textSize="16sp"
+            android:visibility="gone"
+            tools:visibility="visible"/>
    </RelativeLayout>
 </FrameLayout>
--- a/Habitica/res/layout/activity_login.xml
+++ b/Habitica/res/layout/activity_login.xml
@ -19,6 +19,7 @@
            android:background="@drawable/login_gradient"
            android:clipChildren="false"
            android:clipToPadding="false"
+            android:layout_marginRight="-2dp"
            >
            <ImageView
                android:id="@+id/city_view"
@ -33,7 +34,7 @@
                android:layout_height="0dp"
                android:layout_centerHorizontal="true"
                android:visibility="invisible"
-                android:layout_below="@id/city_view" />
+                android:layout_above="@id/city_view" />
            <ImageView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
@ -41,10 +42,9 @@
                android:id="@+id/left_cloud_view"
                android:layout_toLeftOf="@id/cloud_anchor"
                android:layout_marginRight="150dp"
-                android:layout_below="@id/cloud_anchor"
-                android:layout_alignParentLeft="false"
+                android:layout_alignParentBottom="true"
                android:scaleType="centerCrop"
-                android:layout_marginTop="150dp"
+                android:paddingBottom="460dp"
                />
            <ImageView
                android:layout_width="wrap_content"
@ -53,10 +53,9 @@
                android:id="@+id/right_cloud_view"
                android:layout_toRightOf="@id/cloud_anchor"
                android:layout_marginLeft="170dp"
-                android:layout_below="@id/cloud_anchor"
-                android:layout_alignParentLeft="false"
+                android:layout_alignParentBottom="true"
                android:scaleType="centerCrop"
-                android:layout_marginTop="240dp"
+                android:paddingBottom="400dp"
                />


@ -72,7 +71,9 @@
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="match_parent"
-            android:padding="@dimen/spacing_large"
+            android:paddingTop="@dimen/spacing_large"
+            android:paddingLeft="@dimen/spacing_large"
+            android:paddingRight="@dimen/spacing_large"
            android:id="@+id/login_intro_view"
            android:orientation="vertical"
            android:background="@color/transparent"
@ -92,7 +93,7 @@
                android:id="@+id/new_game_button"
                android:layout_width="@dimen/login_intro_button_size"
                android:layout_height="@dimen/login_intro_button_size"
-                android:text="@string/new_game"
+                android:text="@string/register_btn"
                android:layout_gravity="center_vertical|center_horizontal"
                android:textColor="@color/white"
                android:layout_marginTop="@dimen/spacing_large"
@ -116,6 +117,7 @@
                android:id="@+id/login_scrollview"
                android:scrollIndicators="none"
                tools:visibility="visible"
+                android:padding="0dp"
                >

                <LinearLayout
--- a/Habitica/res/layout/activity_main.xml
+++ b/Habitica/res/layout/activity_main.xml
@ -1,107 +1,110 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:app="http://schemas.android.com/apk/res-auto"
-             xmlns:tools="http://schemas.android.com/tools"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
    <android.support.design.widget.CoordinatorLayout
-            android:id="@+id/coordinatorLayout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:context=".ui.activities.MainActivity"
-            android:fitsSystemWindows="false">
+        android:id="@+id/coordinatorLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".ui.activities.MainActivity"
+        android:fitsSystemWindows="false">

        <FrameLayout
-                android:id="@+id/fragment_container"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+            android:id="@+id/fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />

        <android.support.design.widget.AppBarLayout
-                android:id="@+id/appbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+            android:id="@+id/appbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">

            <android.support.design.widget.CollapsingToolbarLayout
-                    android:id="@+id/collapsing_toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:titleEnabled="false"
-                    app:contentScrim="?attr/colorPrimary"
-                    app:expandedTitleMarginEnd="?attr/actionBarSize"
-                    app:expandedTitleMarginStart="0dp"
-                    app:layout_scrollFlags="scroll|exitUntilCollapsed">
+                android:id="@+id/collapsing_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:titleEnabled="false"
+                app:contentScrim="?attr/colorPrimary"
+                app:expandedTitleMarginEnd="?attr/actionBarSize"
+                app:expandedTitleMarginStart="0dp"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">

                <include
-                        android:id="@+id/avatar_with_bars"
-                        layout="@layout/avatar_with_bars"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="?attr/actionBarSize"
-                        app:layout_collapseMode="parallax" />
+                    android:id="@+id/avatar_with_bars"
+                    layout="@layout/avatar_with_bars"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="?attr/actionBarSize"
+                    app:layout_collapseMode="parallax" />

                <android.support.v7.widget.Toolbar
-                        android:id="@+id/toolbar"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:minHeight="?attr/actionBarSize"
-                        android:theme="@style/Toolbar"
-                        app:layout_collapseMode="pin"
-                        app:popupTheme="@style/Theme.AppCompat.Light"
-                        android:fitsSystemWindows="true"/>
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="?attr/actionBarSize"
+                    android:theme="@style/Toolbar"
+                    app:layout_collapseMode="pin"
+                    app:popupTheme="@style/Theme.AppCompat.Light" />
            </android.support.design.widget.CollapsingToolbarLayout>

            <android.support.design.widget.TabLayout
-                    android:id="@+id/detail_tabs"
-                    android:layout_width="match_parent"
-                    android:layout_height="54dp"
-                    android:layout_gravity="bottom"
-                    android:background="@color/brand_200"
-                    android:elevation="0dp"
-                    android:fillViewport="false"
+                android:id="@+id/detail_tabs"
+                android:layout_width="match_parent"
+                android:layout_height="54dp"
+                android:layout_gravity="bottom"
+                android:background="@color/brand_200"
+                android:elevation="0dp"
+                android:fillViewport="false"

-                    android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-                    app:layout_anchor="@+id/collapsing_toolbar"
-                    app:layout_anchorGravity="bottom"
+                android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+                app:layout_anchor="@+id/collapsing_toolbar"
+                app:layout_anchorGravity="bottom"

-                    app:layout_collapseMode="pin"
-                    app:tabGravity="fill"
-                    app:tabIndicatorColor="@android:color/white"
-                    app:tabMode="fixed"
-                    android:fitsSystemWindows="true" />
+                app:layout_collapseMode="pin"
+                app:tabGravity="fill"
+                app:tabIndicatorColor="@android:color/white"
+                app:tabMode="fixed" />
        </android.support.design.widget.AppBarLayout>

        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_gravity="bottom|center_horizontal"
+            android:layout_alignParentBottom="true"
+            app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
+            android:padding="0dp">
+            <android.support.design.widget.CoordinatorLayout
+                android:id="@+id/floating_menu_wrapper"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_gravity="bottom|center"
-                android:layout_alignParentBottom="true">
-            <android.support.design.widget.CoordinatorLayout
-                    android:id="@+id/floating_menu_wrapper"
-                    app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom|right"
-                    android:layout_marginBottom="-5dp"
-                    />
+                android:layout_gravity="bottom|right"
+                android:layout_marginBottom="-5dp"
+                />
            <com.roughike.bottombar.BottomBar
-                    android:id="@+id/bottom_navigation"
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:background="@color/brand_100"
-                    app:bb_tabXmlResource="@xml/main_menu_tasks"
-                    app:bb_inActiveTabColor="@color/brand_500"
-                    app:bb_activeTabColor="@color/white"
-                    app:bb_behavior="underNavbar"
-                    />
+                android:id="@+id/bottom_navigation"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:background="@color/brand_100"
+                app:bb_tabXmlResource="@xml/main_menu_tasks"
+                app:bb_inActiveTabColor="@color/brand_500"
+                app:bb_activeTabColor="@color/white"
+                app:bb_behavior="underNavbar"
+                app:bb_badgesHideWhenActive="true"
+                app:bb_badgeBackgroundColor="@color/brand_400"
+                android:layout_gravity="bottom"
+                android:layout_margin="0dp"
+                />

        </LinearLayout>
    </android.support.design.widget.CoordinatorLayout>
    <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:id="@+id/overlayFrameLayout"
-            android:clickable="false"
-            android:fitsSystemWindows="true"
-            />
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/overlayFrameLayout"
+        android:clickable="false"
+        android:fitsSystemWindows="true"
+        />
 </FrameLayout>
--- a/Habitica/res/layout/avatar_with_bars.xml
+++ b/Habitica/res/layout/avatar_with_bars.xml
@ -8,7 +8,6 @@
              android:layout_height="wrap_content"
              android:layout_centerHorizontal="true"
              android:adjustViewBounds="true"
-              android:fitsSystemWindows="true"
              android:focusable="true"
              android:focusableInTouchMode="true"
              android:orientation="vertical"
--- a/Habitica/res/layout/button_list_item.xml
+++ b/Habitica/res/layout/button_list_item.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/textView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="@dimen/card_padding"/>
--- a/Habitica/res/layout/dialog_edit_tag.xml
+++ b/Habitica/res/layout/dialog_edit_tag.xml
@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <EditText
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/tagEditText" android:layout_gravity="center_horizontal"
-            android:focusable="true"
-            android:maxLines="1"/>
-    <Button
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/edit_tag_btn_delete"
-            android:textColor="@color/white"
-            android:id="@+id/btnDelete"
-            android:drawableEnd="@drawable/ic_action_delete_white_24"
-            android:drawableRight="@drawable/ic_action_delete_white_24"/>
-</LinearLayout>
--- a/Habitica/res/layout/dialog_login_incentive.xml
+++ b/Habitica/res/layout/dialog_login_incentive.xml
@ -1,24 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:orientation="vertical"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    >
+    android:gravity="center_horizontal">

    <com.facebook.drawee.view.SimpleDraweeView
        android:layout_width="60dp"
        android:layout_height="60dp"
-        android:layout_centerHorizontal="true"
        android:id="@+id/imageView" />

-
    <TextView
        android:text=""
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_below="@+id/imageView"
-        android:layout_centerHorizontal="true"
        android:layout_marginTop="50dp"
        android:layout_marginLeft="25dp"
        android:layout_marginRight="25dp"
@ -28,8 +23,6 @@
        android:text=""
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_below="@+id/you_earned_message"
-        android:layout_centerHorizontal="true"
        android:layout_marginTop="50dp"
        android:id="@+id/next_unlock_message" />

@ -37,10 +30,8 @@
        android:text="@string/see_you_tomorrow"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_below="@+id/next_unlock_message"
-        android:layout_centerHorizontal="true"
        android:layout_marginTop="50dp"
        android:id="@+id/confirm_button"
        style="@style/Widget.AppCompat.Button.Borderless.Colored" />

-</RelativeLayout>
+</LinearLayout>
--- a/Habitica/res/layout/dialog_task_filter.xml
+++ b/Habitica/res/layout/dialog_task_filter.xml
@ -8,12 +8,15 @@
    android:layout_width="match_parent"
    android:layout_height="2dp"
    android:background="@color/pill_gray"
-        android:layout_marginTop="6dp"/>
+        android:layout_marginTop="16dp"/>

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_margin="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginBottom="16dp"
        android:orientation="vertical">
        <TextView
            android:id="@+id/task_type_title"
@ -60,7 +63,9 @@
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp">

            <TextView
                android:id="@+id/tags_title"
@ -80,7 +85,9 @@
                    android:layout_gravity="right"
                    android:text="@string/edit_tag_btn_edit"
                    android:textColor="#6133b4"
-                    android:textSize="16sp" />
+                    android:textSize="16sp"
+                    android:gravity="right|center_vertical"
+                    android:paddingRight="0dp"/>
        </LinearLayout>
        <ScrollView
            android:layout_width="match_parent"
--- a/Habitica/res/layout/edit_tag_item.xml
+++ b/Habitica/res/layout/edit_tag_item.xml
@ -1,17 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-<EditText
-    android:id="@+id/edit_text"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"/>
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_vertical">
    <Button
        android:id="@+id/delete_button"
        android:layout_width="45dp"
        android:layout_height="wrap_content"
-        android:drawableRight="@drawable/ic_delete_black_24dp"
        android:padding="0dp"
+        android:drawableLeft="@drawable/ic_close_purple_300_36dp"
        style="@style/Base.Widget.AppCompat.Button.Borderless"/>
+    <EditText
+        android:id="@+id/edit_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_marginLeft="8dp"
+        android:drawableRight="@drawable/ic_create_grey_400_18dp"
+        tools:text="hello"
+        style="@style/TagEditTextTheme"
+        android:paddingBottom="14dp"
+        />
 </LinearLayout>
--- a/Habitica/res/layout/equipment_overview_list.xml
+++ b/Habitica/res/layout/equipment_overview_list.xml
@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools">
    <data>
        <import type="java.util.Map"/>
-        <import type="com.magicmicky.habitrpgwrapper.lib.models.Outfit" />
+        <import type="com.habitrpg.android.habitica.models.user.Outfit" />
        <variable name="categorytitle" type="String"/>
        <variable name="outfit" type="Outfit"/>
        <variable
--- a/Habitica/res/layout/floating_menu_tasks.xml
+++ b/Habitica/res/layout/floating_menu_tasks.xml
@ -1,90 +1,88 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <com.github.clans.fab.FloatingActionMenu xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:fab="http://schemas.android.com/apk/res-auto"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/fab.menu"
-        app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
+<com.github.clans.fab.FloatingActionMenu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:fab="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/fab.menu"
+    app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom|right"
+    android:layout_alignParentBottom="true"
+    android:layout_alignParentRight="true"
+    android:layout_marginBottom="16dp"
+    android:layout_marginRight="8dp"
+    fab:menu_fab_size="normal"
+    fab:menu_colorNormal="@color/brand_400"
+    fab:menu_colorPressed="@color/brand_500"
+    fab:menu_colorRipple="#FFFFFF"
+    fab:menu_animationDelayPerItem="50"
+    fab:menu_icon="@drawable/fab_add"
+    fab:menu_buttonSpacing="2dp"
+    fab:menu_labels_margin="4dp"
+    fab:menu_fab_show_animation="@anim/fab_slide_in"
+    fab:menu_fab_hide_animation="@anim/fab_slide_out">
+
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.habit"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|right"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginBottom="16dp"
-        android:layout_marginRight="8dp"
-        fab:menu_fab_size="normal"
-        fab:menu_labels_paddingTop="8dp"
-        fab:menu_labels_paddingRight="8dp"
-        fab:menu_labels_paddingBottom="8dp"
-        fab:menu_labels_paddingLeft="8dp"

-        fab:menu_colorNormal="@color/brand"
-        fab:menu_colorPressed="@color/brand_400"
-        fab:menu_colorRipple="#FFFFFF"
-        fab:menu_animationDelayPerItem="50"
-        fab:menu_icon="@drawable/fab_add"
-        fab:menu_buttonSpacing="2dp">
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"

-        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/fab.new.habit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"
+        android:src="@drawable/add_habit"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_habit" />

-            fab:fab_colorNormal="@color/brand"
-            fab:fab_colorPressed="@color/brand_400"
-            fab:fab_colorRipple="#FFFFFF"
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.daily"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"

-            fab:fab_shadowColor="#000"
-            fab:fab_elevationCompat="6dp"
-            android:src="@drawable/fab_add"
-            fab:fab_size="mini"
-            fab:fab_label="@string/new_habit" />
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"

-        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/fab.new.daily"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"

-            fab:fab_colorNormal="@color/brand"
-            fab:fab_colorPressed="@color/brand_400"
-            fab:fab_colorRipple="#FFFFFF"
+        android:src="@drawable/add_daily"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_daily" />

-            fab:fab_shadowColor="#000"
-            fab:fab_elevationCompat="6dp"
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.todo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"

-            android:src="@drawable/fab_add"
-            fab:fab_size="mini"
-            fab:fab_label="@string/new_daily" />
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"

-        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/fab.new.todo"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"

-            fab:fab_colorNormal="@color/brand"
-            fab:fab_colorPressed="@color/brand_400"
-            fab:fab_colorRipple="#FFFFFF"
+        android:src="@drawable/add_todo"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_todo" />

-            fab:fab_shadowColor="#000"
-            fab:fab_elevationCompat="6dp"
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.reward"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"

-            android:src="@drawable/fab_add"
-            fab:fab_size="mini"
-            fab:fab_label="@string/new_todo" />
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"

-        <com.github.clans.fab.FloatingActionButton
-            android:id="@+id/fab.new.reward"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"

-            fab:fab_colorNormal="@color/brand"
-            fab:fab_colorPressed="@color/brand_400"
-            fab:fab_colorRipple="#FFFFFF"
+        android:src="@drawable/add_rewards"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_reward" />

-            fab:fab_shadowColor="#000"
-            fab:fab_elevationCompat="6dp"
-
-            android:src="@drawable/fab_add"
-            fab:fab_size="mini"
-            fab:fab_label="@string/new_reward" />
-
-    </com.github.clans.fab.FloatingActionMenu>
+</com.github.clans.fab.FloatingActionMenu>
--- a/Habitica/res/layout/fragment_avatar_overview.xml
+++ b/Habitica/res/layout/fragment_avatar_overview.xml
@ -3,7 +3,7 @@
    xmlns:android="http://schemas.android.com/apk/res/android">

    <data>
-        <import type="com.magicmicky.habitrpgwrapper.lib.models.Preferences" />
+        <import type="com.habitrpg.android.habitica.models.user.Preferences" />
        <import type="android.view.View" />

        <variable
@ -11,19 +11,18 @@
            type="Preferences" />
    </data>

-
    <android.support.v4.widget.NestedScrollView
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:scrollbarSize="3dp"
        android:scrollbarThumbVertical="@color/md_grey_500"
-        android:paddingBottom="?attr/actionBarSize"
        android:scrollbars="vertical">

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingBottom="?attr/actionBarSize">

            <TextView
                android:layout_width="wrap_content"
--- a/Habitica/res/layout/fragment_equipment_overview.xml
+++ b/Habitica/res/layout/fragment_equipment_overview.xml
@ -4,7 +4,7 @@

    <data>
        <import type="java.util.Map"/>
-        <import type="com.magicmicky.habitrpgwrapper.lib.models.Outfit" />
+        <import type="com.habitrpg.android.habitica.models.user.Outfit" />
        <import type="android.view.View" />

        <variable
--- a/Habitica/res/layout/fragment_faq_detail.xml
+++ b/Habitica/res/layout/fragment_faq_detail.xml
@ -5,13 +5,13 @@
    android:layout_height="match_parent"
    android:scrollbarSize="3dp"
    android:scrollbarThumbVertical="@color/md_grey_500"
-    android:paddingBottom="?attr/actionBarSize"
    android:scrollbars="vertical">

    <LinearLayout
        android:orientation="vertical"
        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:paddingBottom="?attr/actionBarSize">

        <TextView
            android:layout_width="match_parent"
--- a/Habitica/res/layout/fragment_group_info.xml
+++ b/Habitica/res/layout/fragment_group_info.xml
@ -4,10 +4,10 @@
    xmlns:android="http://schemas.android.com/apk/res/android">

    <data>
-        <import type="com.magicmicky.habitrpgwrapper.lib.models.Group" />
-        <import type="com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent" />
-        <import type="com.magicmicky.habitrpgwrapper.lib.models.invitations.PartyInvite" />
-        <import type="com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser" />
+        <import type="com.habitrpg.android.habitica.models.social.Group" />
+        <import type="com.habitrpg.android.habitica.models.inventory.QuestContent" />
+        <import type="com.habitrpg.android.habitica.models.invitations.PartyInvite" />
+        <import type="com.habitrpg.android.habitica.models.user.HabitRPGUser" />
        <import type="android.view.View" />
        <import type="android.text.Html"/>

--- a/Habitica/res/layout/fragment_guild_recyclerview.xml
+++ b/Habitica/res/layout/fragment_guild_recyclerview.xml
@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_height="fill_parent"
-        android:layout_width="fill_parent"
-        android:orientation="vertical">
-
-    <android.support.design.widget.CoordinatorLayout
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/coordinatorLayout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-
-        <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
-                android:id="@+id/recyclerView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scrollbarSize="3dp"
-                android:scrollbarThumbVertical="@color/md_grey_500"
-                android:scrollbars="vertical" />
-
-        <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/empty_view"
-                style="@style/EmptyView"/>
-
-    </android.support.design.widget.CoordinatorLayout>
-</LinearLayout>
--- a/Habitica/res/layout/fragment_recyclerview.xml
+++ b/Habitica/res/layout/fragment_recyclerview.xml
@ -19,6 +19,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:id="@+id/empty_view"
-        style="@style/EmptyView"/>
+        style="@style/EmptyView"
+        android:visibility="gone"/>

 </android.support.design.widget.CoordinatorLayout>
--- a/Habitica/res/layout/fragment_refresh_recyclerview.xml
+++ b/Habitica/res/layout/fragment_refresh_recyclerview.xml
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/refresh.layout"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
@ -20,10 +21,38 @@
            android:clipToPadding="false"
            android:paddingBottom="?attr/actionBarSize" />

-        <TextView
+        <LinearLayout
+            android:id="@+id/empty_view"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:id="@+id/empty_view"
-            style="@style/EmptyView"/>
+            android:orientation="vertical"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:visibility="gone">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                style="@style/EmptyView">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/empty_view_title"
+                    tools:text="No Items"
+                    android:textSize="@dimen/card_medium_text"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/empty_view_description"
+                    tools:text="No Items" />
+            </LinearLayout>
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/justin_textbox"
+                android:layout_marginTop="16dp"
+                />
+        </LinearLayout>
+
    </FrameLayout>
 </android.support.v4.widget.SwipeRefreshLayout>
--- a/Habitica/res/layout/fragment_setup_avatar.xml
+++ b/Habitica/res/layout/fragment_setup_avatar.xml
@ -45,10 +45,10 @@
            />

    <com.habitrpg.android.habitica.ui.SpeechBubbleView
+        android:id="@+id/speech_bubble"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            app:namePlate="Justin"
-            app:text="@string/avatar_setup_description"
            app:npcDrawable="@drawable/justin_textbox"
            android:layout_marginLeft="@dimen/content_inset"
            android:layout_marginRight="@dimen/content_inset"
--- a/Habitica/res/layout/fragment_setup_tasks.xml
+++ b/Habitica/res/layout/fragment_setup_tasks.xml
@ -43,10 +43,10 @@
            android:padding="17dp"/>

    <com.habitrpg.android.habitica.ui.SpeechBubbleView
+        android:id="@+id/speech_bubble"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            app:namePlate="Justin"
-            app:text="@string/task_setup_description"
            app:npcDrawable="@drawable/justin_textbox"
            android:layout_marginLeft="@dimen/content_inset"
            android:layout_marginRight="@dimen/content_inset"
--- a/Habitica/res/layout/fragment_skills.xml
+++ b/Habitica/res/layout/fragment_skills.xml
@ -6,5 +6,4 @@
    android:layout_height="match_parent"
    android:scrollbarSize="3dp"
    android:scrollbarThumbVertical="@color/md_grey_500"
-
    android:scrollbars="vertical" />
--- a/Habitica/res/layout/fragment_welcome.xml
+++ b/Habitica/res/layout/fragment_welcome.xml
@ -1,11 +1,12 @@
 <?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:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="@color/light_gray_bg"
-              android:gravity="center_vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/light_gray_bg"
+    android:gravity="center_vertical">
    <RelativeLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content">
@ -54,10 +55,10 @@
                android:layout_marginTop="18dp"/>
    </RelativeLayout>
    <com.habitrpg.android.habitica.ui.SpeechBubbleView
+        android:id="@+id/speech_bubble"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            app:namePlate="Justin"
-            app:text="@string/welcome_text"
            android:layout_marginLeft="@dimen/content_inset"
            android:layout_marginRight="@dimen/content_inset"/>
 </LinearLayout>
--- a/Habitica/res/layout/overlay_tutorial.xml
+++ b/Habitica/res/layout/overlay_tutorial.xml
@ -1,26 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_height="match_parent"
-                android:layout_width="match_parent"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:clickable="true"
-                android:fitsSystemWindows="true"
-                android:id="@+id/background">
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:clickable="true"
+    android:fitsSystemWindows="true"
+    android:id="@+id/background">
    <View android:layout_height="match_parent"
-          android:layout_width="match_parent"
-          android:background="@android:color/black"
-          android:alpha="0.6"/>
+        android:layout_width="match_parent"
+        android:background="@android:color/black"
+        android:alpha="0.6"/>
    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="24dp"
+        android:layout_alignParentBottom="true"
+        android:fitsSystemWindows="true"
+        android:layout_marginBottom="?actionBarSize">
+        <com.habitrpg.android.habitica.ui.SpeechBubbleView
+            android:id="@+id/speech_bubble"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:padding="16dp"
-            android:layout_alignParentBottom="true"
-            android:fitsSystemWindows="true"
-            android:layout_marginBottom="?actionBarSize">
-        <com.habitrpg.android.habitica.ui.SpeechBubbleView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:namePlate="Justin"
-                app:npcDrawable="@drawable/justin_textbox"/>
+            app:namePlate="Justin"
+            app:npcDrawable="@drawable/justin_textbox"/>
    </FrameLayout>
 </RelativeLayout>
--- a/Habitica/res/layout/qr_code.xml
+++ b/Habitica/res/layout/qr_code.xml
@ -11,6 +11,7 @@
        android:text="@string/qr_section_title"
        style="@style/SectionTitle"
        android:layout_gravity="center"
+        android:layout_marginTop="40dp"
         />

    <FrameLayout
--- a/Habitica/res/layout/qr_dialogue.xml
+++ b/Habitica/res/layout/qr_dialogue.xml
@ -10,7 +10,7 @@
        android:id="@+id/dialogButtonOK"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:text="@string/profile_achievement_ok"
+        android:text="@string/profile_qrcode_close"
        android:layout_marginTop="5dp"
        android:layout_marginRight="5dp"
        android:layout_centerHorizontal="true"
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@ -2,7 +2,8 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:background="@color/white">

    <LinearLayout
        android:id="@+id/gearElementsLayout"
@ -16,7 +17,9 @@
            android:layout_width="60dp"
            android:layout_height="60dp"
            android:layout_gravity="center_vertical"
-            android:padding="5dp" />
+            android:layout_margin="12dp"
+            android:scaleType="center"
+            tools:src="@drawable/custom_reward"/>

        <LinearLayout
            android:id="@+id/textReward"
@ -27,9 +30,7 @@
            android:orientation="vertical"
            android:paddingBottom="@dimen/task_top_bottom_padding"
            android:paddingEnd="@dimen/reward_spacing"
-            android:paddingLeft="@dimen/task_text_padding"
            android:paddingRight="@dimen/reward_spacing"
-            android:paddingStart="@dimen/task_text_padding"
            android:paddingTop="@dimen/task_top_bottom_padding">

            <net.pherth.android.emoji_library.EmojiTextView
--- a/Habitica/res/layout/skill_list_item.xml
+++ b/Habitica/res/layout/skill_list_item.xml
@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/CardView.Default"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/RowWrapper"
    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout
-        style="@style/CardContent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">

        <com.facebook.drawee.view.SimpleDraweeView
            android:id="@+id/skill_image"
@ -21,6 +17,7 @@
            android:layout_height="wrap_content"
            android:layout_gravity="center_vertical"
            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
            android:layout_weight="1"
            android:gravity="center_vertical"
            android:orientation="vertical">
@ -29,27 +26,32 @@
                android:id="@+id/skill_text"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
+                tools:text="Spell Name"
+                style="@style/Subheader1"/>

            <TextView
                android:id="@+id/skill_notes"
                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                style="@style/Caption2.Regular"
+                tools:text="This is the spell description"/>
        </LinearLayout>
-
-        <Button
-            android:id="@+id/price_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:background="@color/brand_100"
-            android:drawableLeft="@drawable/ic_header_magic"
-            android:drawableStart="@drawable/ic_header_magic"
-            android:paddingLeft="16dp"
-            android:paddingStart="16dp"
-            android:paddingRight="24dp"
-            android:paddingEnd="24dp"
-            android:textColor="@android:color/white" />
-    </LinearLayout>
-
-</android.support.v7.widget.CardView>
+    <Button
+        android:id="@+id/price_button"
+        android:layout_width="wrap_content"
+        android:layout_height="32dp"
+        android:minWidth="64dp"
+        android:layout_gravity="center_vertical"
+        android:gravity="left|center_vertical"
+        android:drawablePadding="5dp"
+        android:background="@drawable/rounded_purple_square"
+        android:paddingLeft="12dp"
+        android:paddingStart="12dp"
+        android:paddingRight="12dp"
+        android:paddingEnd="12dp"
+        android:textColor="@color/white"
+        tools:text="150"
+        android:textSize="15sp"
+        android:drawableLeft="@drawable/ic_header_magic"
+        android:drawableStart="@drawable/ic_header_magic" />
+</LinearLayout>
--- a/Habitica/res/layout/skill_task_item_card.xml
+++ b/Habitica/res/layout/skill_task_item_card.xml
@ -4,7 +4,7 @@

    <data>

-        <import type="com.magicmicky.habitrpgwrapper.lib.models.tasks.Task" />
+        <import type="com.habitrpg.android.habitica.models.tasks.Task" />
        <import type="android.view.View"/>

        <variable
--- a/Habitica/res/layout/speechbubble.xml
+++ b/Habitica/res/layout/speechbubble.xml
@ -14,51 +14,64 @@
            android:layout_marginRight="30dp"/>

    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="46dp"
+        android:background="@drawable/white_rounded_bg"
+        android:orientation="vertical"
+        android:paddingBottom="16dp"
+        android:paddingLeft="21dp"
+        android:paddingRight="21dp"
+        android:paddingTop="24dp"
+        android:layout_marginBottom="10dp">
+
+        <com.habitrpg.android.habitica.ui.views.Typewriter
+            android:id="@+id/textView"
+            style="@style/Subheader1"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:background="@drawable/white_rounded_bg"
-            android:paddingLeft="21dp"
-            android:paddingTop="16dp"
-            android:paddingRight="21dp"
-            android:paddingBottom="14dp"
-            android:layout_marginTop="56dp"
-            android:orientation="vertical">
-        <TextView
-                android:id="@+id/textView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+            tools:text="@string/welcome_text" />

-                style="@style/Body1"
-                tools:text="@string/welcome_text"/>
        <LinearLayout
-                android:id="@+id/confirmation_buttons"
-                android:orientation="horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                style="?android:attr/buttonBarStyle" >
+            android:id="@+id/confirmation_buttons"
+            style="?android:attr/buttonBarStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            android:layout_marginTop="8dp"
+            android:layout_gravity="right">

            <Button
-                    android:layout_width="0px"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/dismiss_tutorial"
-                    android:id="@+id/dismissButton"
-                    android:layout_gravity="center_vertical"
-                    android:theme="@style/DialogButton"
-                    style="?android:attr/buttonBarButtonStyle" />
+                android:id="@+id/dismissButton"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="0px"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:text="@string/dismiss_tutorial"
+                android:theme="@style/DialogButton"/>

            <Button
-                    android:layout_width="0px"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/complete_tutorial"
-                    android:id="@+id/completeButton"
-                    android:layout_gravity="center_vertical"
-                    android:theme="@style/DialogButton"
-                    style="?android:attr/buttonBarButtonStyle" />
+                android:id="@+id/completeButton"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="0px"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:text="@string/complete_tutorial"
+                android:theme="@style/DialogButton" />
        </LinearLayout>
    </LinearLayout>

+    <ImageView
+        android:id="@+id/continue_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/speechbubble_caret"
+        android:layout_gravity="bottom|center"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
    <TextView
            android:id="@+id/name_plate"
            android:layout_width="wrap_content"
@ -68,6 +81,6 @@
            android:gravity="center_vertical"
            android:textColor="@color/white"
            android:layout_marginLeft="21dp"
-            android:layout_marginTop="42dp"
+            android:layout_marginTop="32dp"
            android:textStyle="bold" />
 </FrameLayout>
--- a/Habitica/res/layout/tavern_chat_new_entry_item.xml
+++ b/Habitica/res/layout/tavern_chat_new_entry_item.xml
@ -3,13 +3,13 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:layout_margin="8dp">

    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_margin="7dp"
-        android:text="Chat"
+        android:text="@string/chat"
        android:textAppearance="?android:attr/textAppearanceLarge"
        android:textColor="@color/material_drawer_primary_text" />

@ -20,17 +20,17 @@

        <ImageButton
            android:id="@+id/emoji.toggle.btn"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
            android:src="@drawable/ic_emoticon_grey600_24dp"
            android:scaleType="center"
            android:backgroundTint="@color/transparent"
-            android:contentDescription="Toogle Emojis" />
+            android:contentDescription="Toogle Emojis"
+            android:layout_gravity="center"/>

        <android.support.design.widget.TextInputLayout
            android:layout_width="0dp"
            android:layout_height="wrap_content"
-            android:minHeight="72dp"
            android:layout_weight="1"
            app:hintTextAppearance="@style/TextAppearance.AppCompat">

@ -51,7 +51,13 @@
            android:layout_height="50dp"
            android:textColor="@color/white"
            android:text="@string/post"
-            android:drawableTint="@color/white"/>
+            android:drawableTint="@color/white"
+            android:layout_gravity="center"/>
    </LinearLayout>
-
+    <TextView
+        android:id="@+id/community_guidelines_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/read_community_guidelines"
+        style="@style/Caption3" />
 </LinearLayout>
--- a/Habitica/res/values-bg/strings.profile.xml
+++ b/Habitica/res/values-bg/strings.profile.xml
@ -13,5 +13,6 @@
    <string name="profile_private_message">Лично съобщение</string>
    <string name="profile_achievements">Постижения</string>
    <string name="profile_achievement_ok">Добре</string>
+    <string name="profile_qrcode_close">Затваряне</string>

 </resources>
--- a/Habitica/res/values-bg/strings.tutorial.xml
+++ b/Habitica/res/values-bg/strings.tutorial.xml
@ -1,9 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Отбелязвайте положителните си навици, за да получавате злато и опит! Отрицателните навици ще наранят героя Ви, ако ги докоснете, така че ги избягвайте в истинския живот!</string>
-  <string name="tutorial_dailies">Побеждавайте своите повтарящи се ежедневни задачи, за да печелите злато и опит. Внимание! Ежедневните задачи ще наранят героя Ви, ако не ги изпълните навреме.</string>
-  <string name="tutorial_todos">Завършвайте задачите си за изпълнение в истинския живот, а след това ги отбелязвайте тук за ЗЛАТО и ОПИТ; така ще можете да отключвате награди и нови функционалности!</string>
-  <string name="tutorial_rewards">Това са наградите Ви! Печелете злато като изпълнявате истинските си навици, ежедневни задачи и задачи за изпълнение. След това го харчете за награди в играта или персонализирани такива за истинския живот!</string>
+  <string name="tutorial_overview">Готово! Въведох няколко задачи, според интересите Ви. Опитайте да добавите още няколко, ако искате. Можете да редактирате всяка задача като докоснете заглавието ѝ.</string>
+  <string name="tutorial_habits_1">Първо, навиците. Те могат да са положителни — тоест такива, каквито искате да си създадете или затвърдите, и отрицателни — от които искате да се откажете.</string>
+  <string name="tutorial_habits_2">Всеки път, когато извършите нещо, което е положителен навик, докоснете знака +, за да получите опит и злато!</string>
+  <string name="tutorial_habits_3">Ако се отпуснете и направите нещо, което е лош навик, докоснете знака - и героят Ви ще загуби малко здраве — това ще Ви държи отговорни за действията си.</string>
+  <string name="tutorial_habits_4">Опитайте! Можете да разгледате и другите видове задачи чрез бутоните отдолу.</string>
+  <string name="tutorial_dailies_1">Създайте ежедневни задачи за онези неща, които трябва да се правят редовно или по график.</string>
+  <string name="tutorial_dailies_2">Внимавайте! Ако пропуснете някоя ежедневна задача, героят Ви ще загуби здраве в края на деня. Не пропускайте да ги отмятайте и ако сте постоянен/а, ще получите страхотни награди!</string>
+  <string name="tutorial_todos_1">Използвайте задачите за изпълнение, за да следите онези неща, които трябва да извършите само веднъж.</string>
+  <string name="tutorial_todos_2">Ако дадена задача трябва да бъде изпълнена навреме, задайте ѝ краен срок. Изглежда можете да отметнете една още сега. Направете го!</string>
+  <string name="tutorial_rewards_1">Купувайте екипировка за героя си със златото, което печелите!</string>
+  <string name="tutorial_rewards_2">Можете и да си създадете реални персонализирани награди, в зависимост от това какво Ви мотивира.</string>
+  <string name="tutorial_tasks_complete">Това е всичко засега. Ако искате да си припомните нещо, погледнете раздела с ЧЗВ.</string>
  <string name="tutorial_equipment">Когато купувате екипировка, тя се появява тук. Бойното снаряжение променя показателите Ви, а костюмът (ако е включен) променя вида на героя Ви.</string>
  <string name="tutorial_items">Печелете предмети като изпълнявате задачи и качвате нива. Докоснете предмет, за да го използвате!</string>
  <string name="tutorial_pets">Когато изпълнявате задачите си в истинския живот, имате шанс на случаен принцип да Ви се паднат яйца и отвари. Комбинирайте ги, за да излюпите любимци.</string>
--- a/Habitica/res/values-bg/strings.xml
+++ b/Habitica/res/values-bg/strings.xml
@ -38,9 +38,9 @@
  <string name="preference_push_invited_to_quest">Получихте покана за мисия</string>
  <!--Adding tasks-->
  <string name="task_value">Стойност</string>
-  <string name="new_todo">Нова задача за изпълнение</string>
+  <string name="new_todo">Нова задача</string>
  <string name="new_reward">Нова награда</string>
-  <string name="new_daily">Нова ежедневна задача</string>
+  <string name="new_daily">Нова ежедневна</string>
  <string name="new_habit">Нов навик</string>
  <string name="action_edit">Редактиране</string>
  <string name="action_delete">Изтриване</string>
@ -187,8 +187,8 @@
  <string name="intro_2_subtitle">Напредък в играта</string>
  <string name="intro_2_title">Напредък в живота</string>
  <string name="intro_2_description">Отключвайте функционалности в играта като отбелязвате завършените задачи в истинския си живот. За изпълнението на целите си ще получавате екипировка, любимци и най-различни други награди.</string>
-  <string name="intro_3_subtitle">Общувайте</string>
-  <string name="intro_3_title">Бийте се с чудовища</string>
+  <string name="intro_3_subtitle">Бийте се с чудовища</string>
+  <string name="intro_3_title">Общувайте</string>
  <string name="intro_3_description">Приятелите Ви могат да Ви помогнат да постигнете целите си. Подкрепяйте се взаимно в живота и битките, за да израснете заедно!</string>
  <string name="intro_finish_button">Да започваме!</string>
  <string name="previous_button">Назад</string>
@ -197,8 +197,10 @@
  <string name="setup_welcome_description">Добре дошли в Хабитика, където напредването в играта ще подобри истинския Ви живот! Докато изпълнявате реалните си цели, ще отключвате екипировка, любимци, мисии и още.</string>
  <string name="setup_welcome_title">Добре дошли</string>
  <string name="avatar_setup_description">Е, как искате да изглеждате? Не се притеснявайте, по-късно ще можете да промените това.</string>
+  <string name="task_setup_description">Страхотно! И така, върху какво искате да поработите по време на това пътешествие?</string>
  <string name="setup_group_work">Работа</string>
  <string name="setup_group_exercise">Упражнения</string>
+  <string name="setup_group_health">Здраве</string>
  <string name="setup_group_school">Училище</string>
  <string name="setup_group_teams">Екипи</string>
  <string name="setup_group_chores">Домакинска работа</string>
@ -238,7 +240,7 @@
  <string name="delete">Изтриване</string>
  <string name="name">Име</string>
  <string name="description">Описание</string>
-  <string name="add_tag">Добавяне на етикет</string>
+  <string name="add_tag">Добавяне на нов етикет</string>
  <string name="privacy">Поверителност</string>
  <string name="write_message">Напишете съобщение</string>
  <string name="post">Изпр.</string>
@ -395,7 +397,7 @@
  <string name="all_dailies_completed">Изпълнихте всичките си ежедневни задачи. Добра работа!</string>
  <string name="widget_habit_button">Извършване на навик в Хабитика</string>
  <string name="widget_dailies">Ежедневни задачи в Хабитика</string>
-  <string name="widget_todo_list">Задачи за изпълнение в Хабитика</string>
+  <string name="widget_todo_list">Списък за изпълнение в Хабитика</string>
  <string name="widget_add_task">Добавяне на задача в Хабитика</string>
  <string name="google_services_missing">Услугите за „Google play“ не могат да бъдат намерени.</string>
  <string name="gem.purchase.toolbartitle">Купуване</string>
@ -519,8 +521,22 @@
  <string name="avatar_wheelchair">Инвалидна количка</string>
  <string name="weak">Слаби</string>
  <string name="strong">Силни</string>
-  <string name="gray">Сиви</string>
+  <string name="gray">Изпълнени</string>
  <string name="dated">С дата</string>
  <string name="completed">Завършени</string>
  <string name="setuP_group_other">Други</string>
+  <string name="clear">Изчистване</string>
+  <string name="empty_title_habits">Нямате навици</string>
+  <string name="empty_description_habits">Навиците са задачи, които не се влияят от времето. Можете да ги отмятате много пъти през деня или пък да ги пропуснете.</string>
+  <string name="empty_title_dailies">Нямате ежедневни задачи</string>
+  <string name="empty_description_dailies">Ежедневните задачи са такива, които се повтарят през определено време. Изберете кога трябва де ги изпълнявате.</string>
+  <string name="empty_title_todos">Нямате задачи за изпълнение</string>
+  <string name="empty_description_todos">Задачите за изпълнение трябва да бъдат изпълнение само веднъж. Към тях можете да добавите подзадачи, като така ще увеличите стойността им.</string>
+  <string name="empty_title_rewards">Нямате награди</string>
+  <string name="reset_walkthrough">Нулиране на съветите на Джъстин</string>
+  <string name="read_community_guidelines">Моля, прочетете Обществените правила, преди да публикувате</string>
+  <string name="maintenance">Профилактика</string>
+  <string name="reload_content">Презареждане на съдържанието</string>
+  <string name="dailyDueDefaultView">Ежедневните по подразбиране да са неизпълнени</string>
+  <string name="dailyDueDefaultViewDescription">Ако това е избрано, ежедневните задачи по подразбиране ще се появяват в раздела с неизпълнени, вместо в този с всички задачи</string>
 </resources>
--- a/Habitica/res/values-de/strings.profile.xml
+++ b/Habitica/res/values-de/strings.profile.xml
@ -13,5 +13,4 @@
    <string name="profile_private_message">Private Nachricht</string>
    <string name="profile_achievements">Erfolge</string>
    <string name="profile_achievement_ok">Okay</string>
-
-</resources>
+    </resources>
--- a/Habitica/res/values-de/strings.tutorial.xml
+++ b/Habitica/res/values-de/strings.tutorial.xml
@ -1,9 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Schließe positive Gewohnheiten ab, um Gold und Erfahrung zu erhalten! Negative Gewohnheiten fügen Deinem Avatar beim Antippen Schaden zu, versuche diese also im echten Leben zu vermeiden!</string>
-  <string name="tutorial_dailies">Besiege Deine täglichen Aufgaben um Gold und Erfahrung zu erhalten. Vorsicht! Tägliche Aufgaben fügen Dir Schaden zu, wenn Du sie nicht rechtzeitig schaffst.</string>
-  <string name="tutorial_todos">Erledige Deine To-Dos im echten Leben und hake diese ab, um GOLD und ERFAHRUNG zu erhalten und so Belohnungen und neue Features freizuschalten!</string>
-  <string name="tutorial_rewards">Dies sind Deine Belohnungen! Erwirb Gold, indem Du reale Gewohnheiten, tägliche Aufgaben und To-Dos abschließt. Gib dieses hinterher für Belohnungen im Spiel oder selbsterstellte Belohnungen in der Realität aus!</string>
  <string name="tutorial_equipment">Wenn Du Ausrüstung kaufst, taucht diese hier auf. Deine Kampfausrüstung beeinflusst Deine Spielerstatistiken und Dein Kostüm (falls aktiviert) beeinflusst Dein Aussehen.</string>
  <string name="tutorial_items">Verdiene Gegenstände indem Du Aufgaben erledigst und Stufen aufsteigst. Tippe auf einen Gegenstand um ihn zu benutzen!</string>
  <string name="tutorial_pets">Wenn du Aufgaben abschließt, hast Du eine Chance, Eier und Tränke zu finden. Kombiniere sie, um Haustiere auszubrüten.</string>
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@ -16,7 +16,6 @@
  <string name="Language_summary">Habiticas Sprache ändern</string>
  <string name="SP_user_qr_code">Dein QR Code</string>
  <string name="PS_contact_title">Kontaktiere mich</string>
-  <string name="unknown_error">Ein Fehler ist aufgetreten...</string>
  <string name="pref_account_header">Konto</string>
  <string name="pref_first_day_of_the_week_title">Erster Tag der Woche</string>
  <string name="pref_first_day_of_the_week_summary">Erster Tag der Woche in allen Kalendern</string>
@ -38,10 +37,6 @@
  <string name="preference_push_invited_to_quest">Zur Quest eingeladen</string>
  <!--Adding tasks-->
  <string name="task_value">Wert</string>
-  <string name="new_todo">Neuer To-Do-Eintrag</string>
-  <string name="new_reward">Neue Belohnung</string>
-  <string name="new_daily">Neue tägliche Aufgabe</string>
-  <string name="new_habit">Neue Gewohnheit</string>
  <string name="action_edit">Bearbeiten</string>
  <string name="action_delete">Löschen</string>
  <string name="action_cancel">Abbrechen</string>
@ -187,7 +182,6 @@
  <string name="intro_2_subtitle">Fortschritt im Spiel</string>
  <string name="intro_2_title">Fortschritt im Leben</string>
  <string name="intro_2_description">Schalte Spielinhalte durch das Erledigen und Abhaken deiner realen Aufgaben frei. Bekomme Rüstungen, Tiere und vieles mehr als Belohnungen für das Erfüllen deiner Ziele.</string>
-  <string name="intro_3_title">Bekämpfe Monster</string>
  <string name="intro_3_description">Behalte Deine Ziele im Auge mit Hilfe Deiner Freunde. Unterstützt Euch gegenseitig im Leben und im Kampf, während Ihr Euch gemeinsam verbessert!</string>
  <string name="intro_finish_button">Fangen wir an!</string>
  <string name="previous_button">Zurück</string>
@ -198,6 +192,7 @@
  <string name="avatar_setup_description">Also, wie möchtest Du aussehen? Keine Sorge, Du kannst das jederzeit ändern.</string>
  <string name="setup_group_work">Arbeit</string>
  <string name="setup_group_exercise">Bewegung</string>
+  <string name="setup_group_health">Gesundheit</string>
  <string name="setup_group_school">Schule</string>
  <string name="setup_group_teams">Teams</string>
  <string name="setup_group_chores">Hausarbeit</string>
@ -231,13 +226,11 @@
  <string name="join">Beitreten</string>
  <string name="leader">Anführer</string>
  <string name="gems">Edelsteine</string>
-  <string name="copy_as_todo">Als To-Do kopieren</string>
  <string name="send_pm">PN senden</string>
  <string name="flag">Melden</string>
  <string name="delete">Löschen</string>
  <string name="name">Name</string>
  <string name="description">Beschreibung</string>
-  <string name="add_tag">Tag hinzufügen</string>
  <string name="privacy">Privatsphäre</string>
  <string name="write_message">Nachricht schreiben</string>
  <string name="post">posten</string>
@ -394,7 +387,6 @@
  <string name="all_dailies_completed">Du hast alle deine täglichen Aufgaben erledigt. Gut gemacht!</string>
  <string name="widget_habit_button">Habitica: Gewohnheit</string>
  <string name="widget_dailies">Habitica: Tägliche Aufgaben</string>
-  <string name="widget_todo_list">Habitica-To-Do-Liste</string>
  <string name="widget_add_task">Habitica: Neue Aufgabe</string>
  <string name="google_services_missing">Google Play Dienste konnten nicht gefunden werden</string>
  <string name="gem.purchase.toolbartitle">Kaufen</string>
@ -498,6 +490,7 @@
  <string name="done">Fertig</string>
  <string name="group_tasks_edit_description">Gruppenaufgaben können nicht bearbeitet werden.</string>
  <string name="group_tasks_edit_title">Aufgabe kann nicht bearbeitet werden</string>
+  <string name="groups">Gruppen</string>
  <string name="all">Alles</string>
  <string name="none">Nichts</string>
  <string name="owned">Im Besitz</string>
@ -514,5 +507,14 @@
  <string name="avatar_wheelchair">Rollstuhl</string>
  <string name="weak">Schwach</string>
  <string name="strong">Stark</string>
-  <string name="gray">Grau</string>
+  <string name="completed">Vervollständigt</string>
+  <string name="setuP_group_other">Anderes</string>
+  <string name="clear">löschen</string>
+  <string name="empty_title_habits">Du hast keine Gewohnheiten</string>
+  <string name="empty_description_habits">Gewohnheiten sind Aufgaben ohne festen Zeitplan. Du kannst sie mehrmals am Tag oder gar nicht abhaken.</string>
+  <string name="empty_title_dailies">Du hast keine täglichen Aufgaben</string>
+  <string name="empty_description_dailies">Tägliche Aufgaben sind sich regelmäßig wiederholende Aufgaben. Such Dir den Zeitplan aus, der Dir am besten passt!</string>
+  <string name="empty_title_todos">Du hast keine To-Dos</string>
+  <string name="empty_description_todos">To-Dos sind Aufgaben, die nur einmal abgehakt werden. Füge Unteraufgaben zu To-Dos hinzu, um deren Wert zu steigern.</string>
+  <string name="empty_title_rewards">Du hast keine Belohnungen</string>
 </resources>
--- a/Habitica/res/values-es/strings.profile.xml
+++ b/Habitica/res/values-es/strings.profile.xml
@ -13,5 +13,4 @@
    <string name="profile_private_message">Mensaje privado</string>
    <string name="profile_achievements">Logros</string>
    <string name="profile_achievement_ok">Ok</string>
-
-</resources>
+    </resources>
--- a/Habitica/res/values-es/strings.tutorial.xml
+++ b/Habitica/res/values-es/strings.tutorial.xml
@ -1,9 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Cumple con tus hábitos positivos para ganar oro y experiencia. Si pulsas en los hábitos negativos, tu personaje sufrirá daños, así que ¡evítalos en la vida real!</string>
-  <string name="tutorial_dailies">Vence a tus tareas diarias, día tras día, para ganar oro y experiencia. Pero ten cuidado: si no completas a tiempo una tarea diaria, hará daño a tu personaje.</string>
-  <string name="tutorial_todos">Completa tus tareas pendientes en la vida real y márcalas para obtener ORO y EXPERIENCIA con los que obtener recompensas y desbloquear nuevas funciones.</string>
-  <string name="tutorial_rewards">¡Estas son tus recompensas! Consigue oro completando tareas, hábitos y tareas diarias en el mundo real. Luego, podrás gastarlo en recompensas de dentro o fuera del juego.</string>
  <string name="tutorial_equipment">Cuando compres artículos de equipamiento, aparecerán aquí. El equipo de batalla que elijas afectará a tus estadísticas, y el disfraz (si lo habilitas) será lo que lleve tu personaje.</string>
  <string name="tutorial_items">Consigue artículos completando tareas y subiendo de nivel. Pulsa en un artículo para usarlo.</string>
  <string name="tutorial_pets">A medida que completes tareas del mundo real, a partir de ahora, podrás encontrar huevos y pociones al azar. Combínalos para que nazca una mascota.</string>
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@ -16,7 +16,6 @@
  <string name="Language_summary">Cambiar el idioma de Habitica</string>
  <string name="SP_user_qr_code">Tu código QR</string>
  <string name="PS_contact_title">Contactar</string>
-  <string name="unknown_error">Se produjo un error...</string>
  <string name="pref_account_header">Cuenta</string>
  <string name="pref_first_day_of_the_week_title">Primer día de la semana</string>
  <string name="pref_first_day_of_the_week_summary">Primer día de la semana en todos los calendarios</string>
@ -38,10 +37,6 @@
  <string name="preference_push_invited_to_quest">Invitado a una misión</string>
  <!--Adding tasks-->
  <string name="task_value">Valor</string>
-  <string name="new_todo">Nueva tarea</string>
-  <string name="new_reward">Nueva recompensa</string>
-  <string name="new_daily">Nueva tarea diaria</string>
-  <string name="new_habit">Nuevo hábito</string>
  <string name="action_edit">Editar</string>
  <string name="action_delete">Borrar</string>
  <string name="action_cancel">Cancelar</string>
@ -222,13 +217,11 @@
  <string name="join">Unirse</string>
  <string name="leader">Líder</string>
  <string name="gems">Gemas</string>
-  <string name="copy_as_todo">Copiar como tarea</string>
  <string name="send_pm">Enviar mensaje privado</string>
  <string name="flag">Marcar</string>
  <string name="delete">Borrar</string>
  <string name="name">Nombre</string>
  <string name="description">Descripción</string>
-  <string name="add_tag">Añadir etiqueta</string>
  <string name="privacy">Privacidad</string>
  <string name="write_message">Escribir mensaje</string>
  <string name="post">Publicar</string>
@ -385,7 +378,6 @@
  <string name="all_dailies_completed">Ha completado todas las tareas diarias. ¡Buen trabajo!</string>
  <string name="widget_habit_button">Hábitos Habitica</string>
  <string name="widget_dailies">Tareas diarias Habitica</string>
-  <string name="widget_todo_list">Lista de Tareas de Habítica.</string>
  <string name="widget_add_task">Añade tareas Habitica</string>
  <string name="google_services_missing">Los servidores de Google Play no pueden ser encontrados.</string>
  <string name="gem.purchase.toolbartitle">Comprar</string>
--- a/Habitica/res/values-fr/strings.profile.xml
+++ b/Habitica/res/values-fr/strings.profile.xml
@ -13,5 +13,4 @@
    <string name="profile_private_message">Message privé</string>
    <string name="profile_achievements">Succès</string>
    <string name="profile_achievement_ok">Ok</string>
-
-</resources>
+    </resources>
--- a/Habitica/res/values-fr/strings.tutorial.xml
+++ b/Habitica/res/values-fr/strings.tutorial.xml
@ -1,9 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Réalisez vos Bonnes Habitudes afin de gagner de l\'or et de l\'expérience. Les Mauvaises Habitudes blesseront votre avatar si vous tapez sur elles, alors essayez de les éviter dans la vie réelle !</string>
-  <string name="tutorial_dailies">Accomplissez vos Tâches Quotidiennes afin de gagner de l\'or et de l\'expérience. Attention ! Les Tâches Quotidiennes blesseront votre avatar si vous ne les accomplissez pas à temps.</string>
-  <string name="tutorial_todos">Effectuez vos tâches À Faire dans la vraie vie, puis cochez-les pour gagner de l\'OR et de l\'EXPERIENCE, afin de récupérer des Récompenses et de débloquer du nouveau contenu !</string>
-  <string name="tutorial_rewards">Voici vos Récompenses !  Gagnez de l\'or en effectuant des Habitudes, des Tâches Quotidiennes et des Tâches à Faire dans le monde réel. Puis, dépensez-le en Récompenses dans le jeu ou en Récompenses personnalisées dans le monde réel.</string>
  <string name="tutorial_equipment">Quand vous achetez de l\'équipement, il apparaît ici. Votre Equipement de Combat affecte vos caractéristiques, et votre Costume (si utilisé) change l\'apparence de votre avatar.</string>
  <string name="tutorial_items">Gagnez des objets en accomplissant des tâches et en changeant de niveau. Tapez sur un objet pour l\'utiliser !</string>
  <string name="tutorial_pets">En accomplissant des tâches dans le monde réel, vous avez désormais une chance de trouver des œufs et des potions. Combinez-les pour faire éclore des familiers</string>
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@ -38,10 +38,10 @@
  <string name="preference_push_invited_to_quest">Invitation à une quête</string>
  <!--Adding tasks-->
  <string name="task_value">Valeur</string>
-  <string name="new_todo">Nouvelle tâche</string>
-  <string name="new_reward">Nouvelle récompense</string>
-  <string name="new_daily">Nouvelle tâche quotidienne</string>
-  <string name="new_habit">Nouvelle habitude</string>
+  <string name="new_todo">Nouvelle tâche À Faire</string>
+  <string name="new_reward">Nouvelle Récompense</string>
+  <string name="new_daily">Nouvelle Quotidienne</string>
+  <string name="new_habit">Nouvelle Habitude</string>
  <string name="action_edit">Modifier</string>
  <string name="action_delete">Supprimer</string>
  <string name="action_cancel">Annuler</string>
@ -187,8 +187,7 @@
  <string name="intro_2_subtitle">Progrès en jeu</string>
  <string name="intro_2_title">Progrès dans la vie</string>
  <string name="intro_2_description">Débloquez des fonctionnalités en jeu en validant vos tâches dans la vraie vie. Obtenez des équipements, des familiers, et d\'autres récompenses pour l\'accomplissement de vos objectifs.</string>
-  <string name="intro_3_subtitle">Sociabilisez-vous</string>
-  <string name="intro_3_title">Combattez des monstres</string>
+  <string name="intro_3_subtitle">Combattez des monstres</string>
  <string name="intro_3_description">Restez sur les rails de l\'accomplissement de vos buts avez l\'aide de vos amis. Épaulez-vous dans la vie et dans la bataille en vous améliorant ensemble !</string>
  <string name="intro_finish_button">C\'est parti !</string>
  <string name="previous_button">Précédent</string>
@ -197,8 +196,10 @@
  <string name="setup_welcome_description">Bienvenue sur Habitica, où progresser dans le jeu améliorera votre vie quotidienne ! En accomplissant vos buts dans le monde réel, vous débloquerez de l’expérience, des animaux, des quêtes, et bien plus encore.</string>
  <string name="setup_welcome_title">Bienvenue</string>
  <string name="avatar_setup_description">Alors, à quoi voudriez-vous ressembler ? Ne vous inquiétez pas, vous pourrez changer d\'apparence plus tard.</string>
+  <string name="task_setup_description">Bien ! Maintenant, que voudriez-vous travailler pendant cette aventure ?</string>
  <string name="setup_group_work">Travailler</string>
  <string name="setup_group_exercise">Faire de l\'exercice</string>
+  <string name="setup_group_health">Santé</string>
  <string name="setup_group_school">Ecole</string>
  <string name="setup_group_teams">Equipes</string>
  <string name="setup_group_chores">Tâches ménagères</string>
@ -232,13 +233,12 @@
  <string name="join">Rejoindre</string>
  <string name="leader">Responsable</string>
  <string name="gems">Gemmes</string>
-  <string name="copy_as_todo">Copier comme tâche À Faire</string>
+  <string name="copy_as_todo">Copier comme une tâche À Faire</string>
  <string name="send_pm">Envoyer un MP</string>
  <string name="flag">Signaler</string>
  <string name="delete">Supprimer</string>
  <string name="name">Nom</string>
  <string name="description">Description</string>
-  <string name="add_tag">Ajouter une étiquette</string>
  <string name="privacy">Sécurité</string>
  <string name="write_message">Écrire un message</string>
  <string name="post">Envoyer</string>
@ -395,7 +395,6 @@
  <string name="all_dailies_completed">Vous avez accompli toutes vos tâches quotidiennes. Bravo !</string>
  <string name="widget_habit_button">Réaliser une tâche Habitica</string>
  <string name="widget_dailies">Quotidiennes Habitica</string>
-  <string name="widget_todo_list">Liste des tâches À faire Habitica</string>
  <string name="widget_add_task">Ajouter une tâche Habitica</string>
  <string name="google_services_missing">Le service Google Play n\'a pas pu être trouvé.</string>
  <string name="gem.purchase.toolbartitle">Acheter</string>
@ -519,8 +518,15 @@
  <string name="avatar_wheelchair">Fauteuil roulant</string>
  <string name="weak">Faibles</string>
  <string name="strong">Fortes</string>
-  <string name="gray">Grisées</string>
  <string name="dated">Datées</string>
  <string name="completed">Terminé</string>
  <string name="setuP_group_other">Autre</string>
+  <string name="clear">Effacer</string>
+  <string name="empty_title_habits">Vous n\'avez aucune habitude</string>
+  <string name="empty_description_habits">Les habitudes sont des tâches qui n\'ont pas de planning défini. Vous pouvez les valider plusieurs fois par jour, ou pas du tout.</string>
+  <string name="empty_title_dailies">Vous n\'avez aucune tâche quotidienne</string>
+  <string name="empty_description_dailies">Les quotidiennes sont des tâches qui se répètent de façon régulière. Choisissez la planification qui vous convient !</string>
+  <string name="empty_title_todos">Vous n\'avez aucune tâche à faire</string>
+  <string name="empty_description_todos">Les tâches à faire sont des tâches qui ne doivent être validées qu\'une seule fois. Ajoutez des listes de vérifications pour augmenter leur valeur.</string>
+  <string name="empty_title_rewards">Vous n\'avez aucune récompense</string>
 </resources>
--- a/Habitica/res/values-in/strings.tutorial.xml
+++ b/Habitica/res/values-in/strings.tutorial.xml
@ -1,9 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Lakukan Kebiasaan Baik untuk mendapatkan emas dan pengalaman! Kebiasaan Buruk akan menyakiti avatarmu jika kamu mengetuknya, jadi hindari melakukannya di dunia nyata!</string>
-  <string name="tutorial_dailies">Kalahkan tugas harianmu yang berulang untuk mendapatkan emas dan pengalaman. Bahaya! Keseharian akan menyakiti avatarmu jika kamu tidak menyelesaikannya tepat waktu.</string>
-  <string name="tutorial_todos">Lakukan Tugasmu di dunia nyata, lalu ceklis daftar untuk EMAS dan PENGALAMAN sehingga kamu bisa mendapatkan Hadiah dan membuka fitur baru!</string>
-  <string name="tutorial_rewards">Ini adalah Hadiahmu! Dapatkan emas dengan menyelesaikan Tugas dunia-nyata, Keseharian, dan Daftar Tugas. Kemudian habiskan untuk Hadiah dalam game atau Hadiah dunia nyata kustom!</string>
  <string name="tutorial_equipment">Perlengkapan yang kamu beli akan muncul di sini. Perlengkapan Bertarung milikmu akan mempengaruhi status, dan Kostum (jika dicentang) hanya mempengaruhi apa yang avatarmu kenakan.</string>
  <string name="tutorial_items">Dapatkan item dengan menyelesaikan tugas dan meningkatkan level. Ketuk pada item untuk menggunakannya!</string>
  <string name="tutorial_pets">Seiring kamu menyelesaikan tugas dunia-nyata, kamu sekarang memiliki kesempatan acak untuk menemukan telur dan ramuan. Campurkan mereka untuk menetaskan peliharaan</string>
--- a/Habitica/res/values-in/strings.xml
+++ b/Habitica/res/values-in/strings.xml
@ -16,7 +16,6 @@
  <string name="Language_summary">Ganti bahasa dalam Habitica</string>
  <string name="SP_user_qr_code">QR Kodemu</string>
  <string name="PS_contact_title">Kontak saya</string>
-  <string name="unknown_error">Terjadi kesalahan...</string>
  <string name="pref_account_header">Akun</string>
  <string name="pref_first_day_of_the_week_title">Hari Pertama dalam Minggu</string>
  <string name="pref_first_day_of_the_week_summary">Hari pertama dalam minggu di semua kalender</string>
@ -38,10 +37,6 @@
  <string name="preference_push_invited_to_quest">Terundang ke Tugas</string>
  <!--Adding tasks-->
  <string name="task_value">Nilai</string>
-  <string name="new_todo">Tugas baru</string>
-  <string name="new_reward">Hadiah baru</string>
-  <string name="new_daily">Keseharian baru</string>
-  <string name="new_habit">Kebiasaan baru</string>
  <string name="action_edit">Edit</string>
  <string name="action_delete">Hapus</string>
  <string name="action_cancel">Batal</string>
@ -222,13 +217,11 @@
  <string name="join">Gabung</string>
  <string name="leader">Ketua</string>
  <string name="gems">Permata</string>
-  <string name="copy_as_todo">Salin sebagai Tugas</string>
  <string name="send_pm">Kirim PM</string>
  <string name="flag">Tandai</string>
  <string name="delete">Hapus</string>
  <string name="name">Nama </string>
  <string name="description">Deskripsi</string>
-  <string name="add_tag">Beri Label</string>
  <string name="privacy">Privasi</string>
  <string name="write_message">Tulis Pesan</string>
  <string name="post">Kirim</string>
@ -384,7 +377,6 @@
  <string name="all_dailies_completed">Anda telah menyelesaikan semua keseharianmu. Selamat!</string>
  <string name="widget_habit_button">Habitica Melakukan Kebiasaan</string>
  <string name="widget_dailies">Keseharian Habitica</string>
-  <string name="widget_todo_list">Daftar Tugas Habitica</string>
  <string name="widget_add_task">Habitica Menambahkan Tugas</string>
  <string name="google_services_missing">Google play services tidak dapat ditemukan.</string>
  <string name="gem.purchase.toolbartitle">Bayar</string>
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`ALTER TABLE Customization ADD COLUMN isBuyable bool;`