From 2d039f0147ff89a717fdfb9067cb0bd4fb882cf6 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 31 Mar 2021 13:14:01 +0200
Subject: [PATCH] Fixes #1522

---
 Habitica/res/layout/skill_list_item.xml             |  6 ++++--
 Habitica/res/layout/skill_task_item_card.xml        | 13 ++++++-------
 .../ui/adapter/SkillTasksRecyclerViewAdapter.kt     |  3 ++-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Habitica/res/layout/skill_list_item.xml b/Habitica/res/layout/skill_list_item.xml
index 6e3d86832..e0923e044 100644
--- a/Habitica/res/layout/skill_list_item.xml
+++ b/Habitica/res/layout/skill_list_item.xml
@@ -58,11 +58,13 @@
             <ImageView
                 android:id="@+id/button_icon_view"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"/>
             <TextView
                 android:id="@+id/price_label"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal" />
         </LinearLayout>
     </LinearLayout>
     <TextView
diff --git a/Habitica/res/layout/skill_task_item_card.xml b/Habitica/res/layout/skill_task_item_card.xml
index 1334ee324..7cd50dc92 100644
--- a/Habitica/res/layout/skill_task_item_card.xml
+++ b/Habitica/res/layout/skill_task_item_card.xml
@@ -5,14 +5,14 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:background="?attr/colorContentBackground">
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
+                android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:layout_centerVertical="true"
                 android:paddingStart="@dimen/spacing_large"
                 android:paddingEnd="@dimen/spacing_large"
                 android:paddingBottom="20dp"
@@ -31,12 +31,11 @@
             </LinearLayout>
             <View
                 android:id="@+id/rightBorderView"
-                android:layout_width="5dp"
+                android:layout_width="8dp"
                 android:layout_height="match_parent"
                 android:gravity="center"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true" />
-        </RelativeLayout>
+                android:background="@color/red_10"/>
+        </LinearLayout>
     <View
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt
index 119fe78cc..ab32d3438 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.ui.adapter
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.SkillTaskItemCardBinding
@@ -57,7 +58,7 @@ class SkillTasksRecyclerViewAdapter : BaseRecyclerViewAdapter<Task, SkillTasksRe
                 binding.notesTextView.visibility = View.VISIBLE
                 binding.notesTextView.text = task.markdownNotes { binding.notesTextView.text = it }
             }
-            binding.rightBorderView.setBackgroundResource(task.lightTaskColor)
+            binding.rightBorderView.setBackgroundColor(ContextCompat.getColor(itemView.context, task.lightTaskColor))
         }
 
         override fun onClick(v: View) {