From e2c17fef90c0d6d092680376dbc83ae563fcaa9b Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 24 Apr 2019 10:17:24 +0200
Subject: [PATCH] Various style fixes

---
 Habitica/build.gradle                         |   2 +-
 ...out_rounded_bg_brand_700_yellow_border.xml |   2 +-
 .../drawable/layout_rounded_bg_yellow_10.xml  |   2 +-
 .../drawable/no_party_background_gradient.xml |   2 +-
 .../res/layout/activity_class_selection.xml   |   6 +-
 .../res/layout/activity_report_message.xml    |  17 ++-
 Habitica/res/layout/fragment_group_info.xml   |   8 +-
 Habitica/res/layout/help_header.xml           |   8 +-
 Habitica/res/values/colors.xml                |   1 +
 Habitica/res/values/dimens.xml                |   2 +-
 Habitica/res/values/strings.xml               |   8 +-
 Habitica/res/values/styles.habitica.xml       | 103 +++++-------------
 Habitica/res/values/styles.xml                |  20 +++-
 .../RealmSocialLocalRepository.kt             |   2 +-
 .../ui/activities/ClassSelectionActivity.kt   |  10 +-
 .../ui/activities/ReportMessageActivity.kt    |  13 ++-
 .../social/GroupInformationFragment.kt        |   1 +
 .../habitica/ui/helpers/MarkdownParser.kt     |   2 +-
 18 files changed, 98 insertions(+), 111 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index c3d3b0be9..695be6833 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -153,7 +153,7 @@ android {
         buildConfigField "String", "TESTING_LEVEL", "\"production\""
         multiDexEnabled true
 
-        versionCode 2097
+        versionCode 2099
         versionName "1.9"
     }
 
diff --git a/Habitica/res/drawable/layout_rounded_bg_brand_700_yellow_border.xml b/Habitica/res/drawable/layout_rounded_bg_brand_700_yellow_border.xml
index 182bbe148..dfb258934 100644
--- a/Habitica/res/drawable/layout_rounded_bg_brand_700_yellow_border.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_brand_700_yellow_border.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/gray_700" />
     <corners android:radius="@dimen/bar_radius"/>
-    <stroke android:width="2dp" android:color="@color/yellow_10" />
+    <stroke android:width="2dp" android:color="@color/yellow_5" />
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/layout_rounded_bg_yellow_10.xml b/Habitica/res/drawable/layout_rounded_bg_yellow_10.xml
index afa40b7a3..b3873fb1e 100644
--- a/Habitica/res/drawable/layout_rounded_bg_yellow_10.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_yellow_10.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/yellow_10" />
+    <solid android:color="@color/yellow_5" />
     <corners android:radius="@dimen/rounded_button_radius"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/no_party_background_gradient.xml b/Habitica/res/drawable/no_party_background_gradient.xml
index 016a162ec..792a5b12d 100644
--- a/Habitica/res/drawable/no_party_background_gradient.xml
+++ b/Habitica/res/drawable/no_party_background_gradient.xml
@@ -3,7 +3,7 @@
 
     <gradient
         android:angle="90"
-        android:centerColor="@color/transparent"
+        android:centerColor="@color/transparent_white"
         android:endColor="@color/white"
         android:startColor="@color/white"
         android:type="linear"
diff --git a/Habitica/res/layout/activity_class_selection.xml b/Habitica/res/layout/activity_class_selection.xml
index 4e24d9dfa..5ea3fa4a1 100644
--- a/Habitica/res/layout/activity_class_selection.xml
+++ b/Habitica/res/layout/activity_class_selection.xml
@@ -167,7 +167,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="@string/healer_description"
-                android:gravity="center_horizontal"/>
+                android:gravity="center_horizontal"
+                style="@style/Body2"
+                android:lineSpacingExtra="4sp"/>
             <Space
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
@@ -176,7 +178,7 @@
                 android:id="@+id/selected_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                tools:background="@drawable/layout_rounded_bg_yellow_10"
+                style="@style/HabiticaButton"
                 android:textColor="@color/white"
                 tools:text="Becoma a Healer"/>
         </LinearLayout>
diff --git a/Habitica/res/layout/activity_report_message.xml b/Habitica/res/layout/activity_report_message.xml
index c03b6be3f..17f80237a 100644
--- a/Habitica/res/layout/activity_report_message.xml
+++ b/Habitica/res/layout/activity_report_message.xml
@@ -62,17 +62,21 @@
                     android:layout_height="wrap_content"
                     tools:text="Report NAME for violation:"
                     android:textColor="@color/gray_10"
-                    android:textSize="14sp"
-                    android:textStyle="bold"
+                    style="@style/Caption1"
                     android:layout_marginBottom="@dimen/spacing_medium"
-                    android:layout_marginStart="12dp"/>
+                    android:layout_marginStart="13dp"/>
                 <TextView
                     android:id="@+id/message_text_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@drawable/border_1f000000"
                     android:textColor="@color/gray_300"
-                    android:padding="@dimen/spacing_medium"
+                    style="@style/Body2"
+                    android:lineSpacingExtra="4sp"
+                    android:paddingTop="11dp"
+                    android:paddingBottom="11dp"
+                    android:paddingStart="13dp"
+                    android:paddingEnd="13dp"
                     tools:text="This is the message that is reported" />
 
                 <com.google.android.material.textfield.TextInputLayout
@@ -87,7 +91,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/reason_for_report"
-                        android:textColor="@color/gray_50"/>
+                        android:textColor="@color/gray_50"
+                        style="@style/TextInputEditText"/>
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <TextView
@@ -96,8 +101,8 @@
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     tools:text="@string/report_explanation"
-                    android:textSize="12sp"
                     android:textColor="@color/gray_200"
+                    style="@style/Caption3"
                     />
             </LinearLayout>
             </androidx.core.widget.NestedScrollView>
diff --git a/Habitica/res/layout/fragment_group_info.xml b/Habitica/res/layout/fragment_group_info.xml
index abc7e0d84..845fcd35d 100644
--- a/Habitica/res/layout/fragment_group_info.xml
+++ b/Habitica/res/layout/fragment_group_info.xml
@@ -98,7 +98,7 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="@style/Body1"
+                        style="@style/Body2"
                         android:text="@string/no_party_description"
                         android:textColor="@color/gray_300"
                         android:gravity="center"
@@ -114,10 +114,6 @@
                         android:text="@string/create_party"
                         android:layout_marginTop="@dimen/spacing_large"/>
                 </LinearLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/gray_500"/>
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -135,7 +131,7 @@
                         android:id="@+id/join_party_description_textview"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="@style/Body1"
+                        style="@style/Body2"
                         android:text="@string/join_party_description"
                         android:textColor="@color/gray_300"
                         android:gravity="center"
diff --git a/Habitica/res/layout/help_header.xml b/Habitica/res/layout/help_header.xml
index 52f8dcf21..45ab2fa0f 100644
--- a/Habitica/res/layout/help_header.xml
+++ b/Habitica/res/layout/help_header.xml
@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/gray_700"
-    android:paddingTop="@dimen/spacing_medium"
-    android:paddingBottom="@dimen/spacing_medium"
+    android:paddingTop="@dimen/spacing_large"
+    android:paddingBottom="@dimen/spacing_large"
     android:paddingLeft="@dimen/spacing_large"
     android:paddingRight="@dimen/spacing_large">
 <TextView
@@ -22,5 +22,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         tools:text="Post a message in the [Habitica Help Guild] to have your questions answered by a fellow player."
-        android:gravity="center"/>
+        android:gravity="center"
+        style="@style/Body2"
+        android:lineSpacingExtra="4sp"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index 6772bde35..72fdd2bd5 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -96,6 +96,7 @@
     <!-- dialog -->
     <color name="primary_text_light">#000000</color>
     <color name="transparent">#00000000</color>
+    <color name="transparent_white">#00FFFFFF</color>
 
     <!--  clock styled weekdays -->
     <color name="days_gray">#ffb5b5b5</color>
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index b6043347f..a844a4b0a 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -105,7 +105,7 @@
     <dimen name="diamond_button_height">40dp</dimen>
     <dimen name="setup_customization_size">56dp</dimen>
     <dimen name="outer_inset">16dp</dimen>
-	<dimen name="rounded_button_radius">6dp</dimen>
+	<dimen name="rounded_button_radius">4dp</dimen>
     <dimen name="content_border">18dp</dimen>
 	<dimen name="content_section_spacing">21dp</dimen>
 	<dimen name="header_spacing">6dp</dimen>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 294599ff7..84ca937f7 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -355,10 +355,10 @@
     <string name="rogue">Rogue</string>
     <string name="mage">Mage</string>
     <string name="healer">Healer</string>
-    <string name="warrior_description">Warriors score more and better \“critical hits\”, which randomly give bonus Gold, Experience, and drop chance for scoring a task. They also deal heavy damage to boss monsters. Play a Warrior if you find motivation from unpredictable jackpot-style rewards, or want to dish out the hurt in boss Quests!</string>
-    <string name="mage_description">Mages learn swiftly, gaining Experience and Levels faster than other classes. They also get a great deal of Mana for using special abilities. Play a Mage if you enjoy the tactical game aspects of Habit, or if you are strongly motivated by leveling up and unlocking advanced features!</string>
-    <string name="rogue_description">Rogues love to accumulate wealth, gaining more Gold than anyone else, and are adept at finding random items. Their iconic Stealth ability lets them duck the consequences of missed Dailies. Play a Rogue if you find strong motivation from Rewards and Achievements, striving for loot and badges!</string>
-    <string name="healer_description">Healers stand impervious against harm, and extend that protection to others. Missed Dailies and bad Habits don\'t faze them much, and they have ways to recover Health from failure. Play a Healer if you enjoy assisting others in your Party, or if the idea of cheating Death through hard work inspires you!</string>
+    <string name="warrior_description">Warriors score more critical hits and deal heavy damage to Bosses. Play a Warrior if you want to defeat monsters easily! Warrior benefit from a high Strength stat.</string>
+    <string name="mage_description">Mages learn Skills that damage Bosses and boost EXP and Mana. Play a Mage if you’re motivated by leveling up quickly! Mages benefit from a high Intelligence stat.</string>
+    <string name="rogue_description">Rogues learn Skills that let them and their Party find more Gold and random drops. Play a Rogue if you want lots of items and Gold! Rogues benefit from a high Perception stat.</string>
+    <string name="healer_description">Healers learn Skills that can heal and protect themselves and their Party. Play a Healer if you enjoy assisting others or avoiding damage! Healers benefit from a high Constitution stat.</string>
     <string name="select_class">Select Class</string>
     <string name="opt_out_class">Opt Out</string>
     <string name="opt_out_description">Can\'t be bothered with classes? Want to choose later? Opt out - you\'ll be a warrior with no special abilities. You can read about the class system later on the wiki and enable classes at any time.</string>
diff --git a/Habitica/res/values/styles.habitica.xml b/Habitica/res/values/styles.habitica.xml
index 3372603f9..e8b9bec53 100644
--- a/Habitica/res/values/styles.habitica.xml
+++ b/Habitica/res/values/styles.habitica.xml
@@ -10,146 +10,103 @@
 
     <!-- Titles -->
     <style name="Title1">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">
-            @string/font_family_medium
-        </item>
+        <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="android:textSize">20sp</item>
-        <item name="android:letterSpacing" tools:targetApi="lollipop">0.071</item>
+        <item name="android:letterSpacing">0.051</item>
     </style>
 
     <style name="Title1_WideLetterSpacing"  parent="@style/Title1">
-        <item name="android:letterSpacing" tools:targetApi="lollipop">0.133</item>
+        <item name="android:letterSpacing">0.133</item>
     </style>
 
     <style name="Title2">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">
-            @string/font_family_condensed
-        </item>
+        <item name="android:fontFamily">@string/font_family_condensed</item>
         <item name="android:textSize">28sp</item>
-        <item name="android:textColor">
-            #000
-        </item>
-        <item name="android:letterSpacing" tools:targetApi="lollipop">0.05</item>
+        <item name="android:letterSpacing">0.05</item>
     </style>
 
     <!-- Headline -->
 
     <style name="Headline">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">
-            @string/font_family_condensed
-        </item>
+        <item name="android:fontFamily">@string/font_family_condensed</item>
         <item name="android:textSize">18sp</item>
-        <item name="android:letterSpacing" tools:targetApi="lollipop">0.045</item>
+        <item name="android:letterSpacing">0.03</item>
     </style>
 
     <!-- Subheader -->
     <style name="Subheader1">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">
-            @string/font_family_medium
-        </item>
+        <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="android:textSize">16sp</item>
     </style>
 
     <style name="Subheader2">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">
-            @string/font_family_regular
-        </item>
+        <item name="android:fontFamily">@string/font_family_regular</item>
         <item name="android:textSize">16sp</item>
-        <item name="android:letterSpacing" tools:targetApi="lollipop">0.08</item>
+        <item name="android:letterSpacing">0.08</item>
     </style>
 
     <style name="Subheader3">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">
-            @string/font_family_condensed
-        </item>
+        <item name="android:fontFamily">@string/font_family_condensed</item>
         <item name="android:textSize">16sp</item>
-        <item name="android:letterSpacing" tools:targetApi="lollipop">0.04</item>
+        <item name="android:letterSpacing">0.04</item>
     </style>
 
     <!-- Body -->
     <style name="Body1">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">
-            @string/font_family_medium
-        </item>
+        <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="android:textSize">14sp</item>
-        <item name="android:letterSpacing" tools:targetApi="lollipop">0.035</item>
+        <item name="android:letterSpacing">0.035</item>
     </style>
 
     <style name="Body1_Button" parent="@style/Widget.AppCompat.Button.Borderless">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">
-            @string/font_family_medium
-        </item>
+        <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="android:textSize">14sp</item>
-        <item name="android:letterSpacing" tools:targetApi="lollipop">0.035</item>
+        <item name="android:letterSpacing">0.035</item>
     </style>
 
     <style name="Body2">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">
-            @string/font_family_regular
-        </item>
+        <item name="android:fontFamily">@string/font_family_regular</item>
         <item name="android:textSize">14sp</item>
-        <item name="android:textColor">
-            #8a000000
-        </item>
-        <item name="android:letterSpacing" tools:targetApi="lollipop">0.035</item>
+        <item name="android:letterSpacing">0.035</item>
     </style>
 
     <style name="Body2_Wide" parent="Body2">
-
-        <item name="android:letterSpacing" tools:targetApi="lollipop">0.07</item>
-
+        <item name="android:letterSpacing">0.07</item>
     </style>
 
     <style name="Body3">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">
-            @string/font_family_condensed
-        </item>
+        <item name="android:fontFamily">@string/font_family_condensed</item>
         <item name="android:textSize">14sp</item>
-        <item name="android:letterSpacing" tools:targetApi="lollipop">0.035</item>
+        <item name="android:letterSpacing">0.035</item>
     </style>
 
     <!-- Captions -->
     <style name="Caption1">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">
-            @string/font_family_regular
-        </item>
+        <item name="android:fontFamily">@string/font_family_regular</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textStyle">bold</item>
     </style>
 
     <style name="Caption2">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">
-            @string/font_family_medium
-        </item>
+        <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="android:textSize">14sp</item>
-        <item name="android:letterSpacing" tools:targetApi="lollipop">0.03</item>
+        <item name="android:letterSpacing">0.03</item>
     </style>
 
     <style name="Caption2.Regular">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">
-            @string/font_family_regular
-        </item>
+        <item name="android:fontFamily">@string/font_family_regular</item>
     </style>
 
     <style name="Caption3">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">
-            @string/font_family_regular
-        </item>
+        <item name="android:fontFamily">@string/font_family_regular</item>
         <item name="android:textSize">12sp</item>
-        <item name="android:textColor">
-            #8a000000
-        </item>
-        <item name="android:letterSpacing" tools:targetApi="lollipop">0.03</item>
+        <item name="android:letterSpacing">0.03</item>
+        <item name="android:lineSpacingExtra">2sp</item>
     </style>
 
     <style name="Caption4">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">
-            @string/font_family_condensed
-        </item>
+        <item name="android:fontFamily">@string/font_family_condensed</item>
         <item name="android:textSize">12sp</item>
-        <item name="android:textColor">
-            #8a000000
-        </item>
-        <item name="android:letterSpacing" tools:targetApi="lollipop">0.035</item>
+        <item name="android:letterSpacing">0.035</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 38090c64c..1129501d3 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -24,7 +24,7 @@
         <item name="actionOverflowMenuStyle">@style/PopupTheme</item>
         <item name="android:popupMenuStyle">@style/PopupTheme</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-
+        <item name="android:textColorLink">@color/brand_400</item>
         <item name="alertDialogTheme">@style/AlertDialogTheme</item>
     </style>
 
@@ -393,6 +393,8 @@
 
     <style name="HabiticaButton" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:textAllCaps">false</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:fontFamily">@string/font_family_medium</item>
         <item name="android:minHeight">0dp</item>
         <item name="android:paddingTop">12dp</item>
         <item name="android:paddingBottom">12dp</item>
@@ -507,12 +509,24 @@
     </style>
 
     <style name="TextInputLayoutAppearance" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
+        <item name="android:gravity">top</item>
+        <item name="boxBackgroundColor">@color/taskform_gray</item>
+        <item name="android:textColor">@color/textColorLight</item>
+        <item name="android:textColorHint">@color/gray_300</item>
+        <item name="colorControlNormal">@color/gray_500</item>
+        <item name="colorControlActivated">@color/brand_400</item>
+        <item name="colorControlHighlight">@color/brand_400</item>
+    </style>
+
+    <style name="TextInputEditText">
         <!-- reference our hint & error styles -->
         <item name="android:gravity">top</item>
         <item name="boxBackgroundColor">@color/taskform_gray</item>
         <item name="android:textColor">@color/textColorLight</item>
         <item name="android:textColorHint">@color/gray_300</item>
-        <item name="colorControlNormal">@color/white</item>
+        <item name="colorControlNormal">@color/gray_500</item>
+        <item name="colorControlActivated">@color/brand_400</item>
+        <item name="colorControlHighlight">@color/brand_400</item>
     </style>
 
     <style name="TaskFormSectionheader">
@@ -541,6 +555,8 @@
         <item name="android:textSize">16sp</item>
         <item name="android:textStyle">bold</item>
         <item name="android:background">@drawable/layout_rounded_bg_gray_700</item>
+        <item name="android:paddingStart">@dimen/spacing_medium</item>
+        <item name="android:paddingEnd">@dimen/spacing_medium</item>
     </style>
 
     <style name="ToolbarDarkBackArrow" parent="Base.Theme.AppCompat.Light.DarkActionBar">
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
index d158ea35a..64449c987 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
@@ -211,7 +211,7 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
             }
             val idsToRemove = messagesToRemove.map { it.id }
             val userStylestoRemove = realm.where(UserStyles::class.java).`in`("id", idsToRemove.toTypedArray()).findAll()
-            val contributorToRemove = realm.where(ContributorInfo::class.java).`in`("id", idsToRemove.toTypedArray()).findAll()
+            val contributorToRemove = realm.where(ContributorInfo::class.java).`in`("userId", idsToRemove.toTypedArray()).findAll()
             realm.executeTransaction {
                 for (member in messagesToRemove) {
                     member.deleteFromRealm()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
index 04afc5d78..e49977583 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
@@ -105,7 +105,7 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
         }
 
         healerWrapper.setOnClickListener { newClass = "healer" }
-        mageWrapper.setOnClickListener { newClass = "mage" }
+        mageWrapper.setOnClickListener { newClass = "wizard" }
         rogueWrapper.setOnClickListener { newClass = "rogue" }
         warriorWrapper.setOnClickListener { newClass = "warrior" }
         selectedButton.setOnClickListener { displayConfirmationDialogForClass() }
@@ -196,7 +196,7 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
     private fun mageSelected() {
         className = getString(R.string.mage)
         selectedDescriptionTextView.text = getString(R.string.mage_description)
-        selectedWrapperView.setBackgroundColor(ContextCompat.getColor(this, R.color.blue_100))
+        selectedWrapperView.setBackgroundColor(ContextCompat.getColor(this, R.color.blue_10))
         selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
         selectedDescriptionTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
         selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_gray_alpha)
@@ -206,17 +206,17 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
     private fun rogueSelected() {
         className = getString(R.string.rogue)
         selectedDescriptionTextView.text = getString(R.string.rogue_description)
-        selectedWrapperView.setBackgroundColor(ContextCompat.getColor(this, R.color.brand_300))
+        selectedWrapperView.setBackgroundColor(ContextCompat.getColor(this, R.color.brand_200))
         selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
         selectedDescriptionTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
-        selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_brand_100)
+        selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_gray_alpha)
         updateButtonBackgrounds(rogueButton, getDrawable(R.drawable.layout_rounded_bg_brand_700_brand_border))
     }
 
     private fun warriorSelected() {
         className = getString(R.string.warrior)
         selectedDescriptionTextView.text = getString(R.string.warrior_description)
-        selectedWrapperView.setBackgroundColor(ContextCompat.getColor(this, R.color.red_50))
+        selectedWrapperView.setBackgroundColor(ContextCompat.getColor(this, R.color.maroon_50))
         selectedTitleTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
         selectedDescriptionTextView.setTextColor(ContextCompat.getColor(this, R.color.white))
         selectedButton.setBackgroundResource(R.drawable.layout_rounded_bg_gray_alpha)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
index cd7d265cc..84b81a2f4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
@@ -103,17 +103,24 @@ class ReportMessageActivity : BaseActivity() {
 
     @Suppress("ReturnCount")
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        val id = item.itemId
-
-        when (id) {
+        when (item.itemId) {
             R.id.menu_report -> {
                 reportMessage()
                 return true
             }
+            android.R.id.home -> {
+                finish()
+                return true
+            }
         }
         return super.onOptionsItemSelected(item)
     }
 
+    override fun onBackPressed() {
+        super.onBackPressed()
+        finish()
+    }
+
     private fun reportMessage() {
         if (isReporting) {
             return
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.kt
index ce67516f4..91ed3a764 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.kt
@@ -224,6 +224,7 @@ class GroupInformationFragment : BaseFragment() {
         groupDescriptionView.visibility = groupItemVisibility
         groupDescriptionWrapper.visibility = groupItemVisibility
 
+        groupNameView.text = group?.name
         groupDescriptionView.text = MarkdownParser.parseMarkdown(group?.description)
         groupSummaryView.text = MarkdownParser.parseMarkdown(group?.summary)
         gemCountWrapper.visibility = if (group?.balance != null && group.balance > 0) View.VISIBLE else View.GONE
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt
index 8e3b26cef..4fa8ddbe9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt
@@ -47,7 +47,7 @@ object MarkdownParser {
 
         val matcher = regex.matcher(output)
         while (matcher.find()) {
-            val colorSpan = ForegroundColorSpan(Color.parseColor("#6133b4"))
+            val colorSpan = ForegroundColorSpan(Color.parseColor("#9A62FF"))
             output.setSpan(colorSpan, matcher.start(), matcher.end(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
         }