diff --git a/Habitica/res/drawable-hdpi/triangle_bad.9.png b/Habitica/res/drawable-hdpi/triangle_bad.9.png deleted file mode 100644 index 41215801d..000000000 Binary files a/Habitica/res/drawable-hdpi/triangle_bad.9.png and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/triangle_best.9.png b/Habitica/res/drawable-hdpi/triangle_best.9.png deleted file mode 100644 index c286ccf7c..000000000 Binary files a/Habitica/res/drawable-hdpi/triangle_best.9.png and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/triangle_better.9.png b/Habitica/res/drawable-hdpi/triangle_better.9.png deleted file mode 100644 index af79d95cf..000000000 Binary files a/Habitica/res/drawable-hdpi/triangle_better.9.png and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/triangle_completed.9.png b/Habitica/res/drawable-hdpi/triangle_completed.9.png deleted file mode 100644 index a5e10b32c..000000000 Binary files a/Habitica/res/drawable-hdpi/triangle_completed.9.png and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/triangle_good.9.png b/Habitica/res/drawable-hdpi/triangle_good.9.png deleted file mode 100644 index 07fadb2f6..000000000 Binary files a/Habitica/res/drawable-hdpi/triangle_good.9.png and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/triangle_neutral.9.png b/Habitica/res/drawable-hdpi/triangle_neutral.9.png deleted file mode 100644 index 2a827edbc..000000000 Binary files a/Habitica/res/drawable-hdpi/triangle_neutral.9.png and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/triangle_worse.9.png b/Habitica/res/drawable-hdpi/triangle_worse.9.png deleted file mode 100644 index bb718a4c4..000000000 Binary files a/Habitica/res/drawable-hdpi/triangle_worse.9.png and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/triangle_worst.9.png b/Habitica/res/drawable-hdpi/triangle_worst.9.png deleted file mode 100644 index 4e4732cde..000000000 Binary files a/Habitica/res/drawable-hdpi/triangle_worst.9.png and /dev/null differ diff --git a/Habitica/res/drawable-ldpi/triangle_bad.9.png b/Habitica/res/drawable-ldpi/triangle_bad.9.png deleted file mode 100644 index 6adb0efd9..000000000 Binary files a/Habitica/res/drawable-ldpi/triangle_bad.9.png and /dev/null differ diff --git a/Habitica/res/drawable-ldpi/triangle_best.9.png b/Habitica/res/drawable-ldpi/triangle_best.9.png deleted file mode 100644 index 8438c2bd6..000000000 Binary files a/Habitica/res/drawable-ldpi/triangle_best.9.png and /dev/null differ diff --git a/Habitica/res/drawable-ldpi/triangle_better.9.png b/Habitica/res/drawable-ldpi/triangle_better.9.png deleted file mode 100644 index f0116622f..000000000 Binary files a/Habitica/res/drawable-ldpi/triangle_better.9.png and /dev/null differ diff --git a/Habitica/res/drawable-ldpi/triangle_completed.9.png b/Habitica/res/drawable-ldpi/triangle_completed.9.png deleted file mode 100644 index 89af98fd7..000000000 Binary files a/Habitica/res/drawable-ldpi/triangle_completed.9.png and /dev/null differ diff --git a/Habitica/res/drawable-ldpi/triangle_good.9.png b/Habitica/res/drawable-ldpi/triangle_good.9.png deleted file mode 100644 index ebf1c7d4f..000000000 Binary files a/Habitica/res/drawable-ldpi/triangle_good.9.png and /dev/null differ diff --git a/Habitica/res/drawable-ldpi/triangle_neutral.9.png b/Habitica/res/drawable-ldpi/triangle_neutral.9.png deleted file mode 100644 index 029a7f43a..000000000 Binary files a/Habitica/res/drawable-ldpi/triangle_neutral.9.png and /dev/null differ diff --git a/Habitica/res/drawable-ldpi/triangle_worse.9.png b/Habitica/res/drawable-ldpi/triangle_worse.9.png deleted file mode 100644 index 2d42f1b70..000000000 Binary files a/Habitica/res/drawable-ldpi/triangle_worse.9.png and /dev/null differ diff --git a/Habitica/res/drawable-ldpi/triangle_worst.9.png b/Habitica/res/drawable-ldpi/triangle_worst.9.png deleted file mode 100644 index d17151748..000000000 Binary files a/Habitica/res/drawable-ldpi/triangle_worst.9.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/triangle_bad.9.png b/Habitica/res/drawable-mdpi/triangle_bad.9.png deleted file mode 100644 index 7625e9e2a..000000000 Binary files a/Habitica/res/drawable-mdpi/triangle_bad.9.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/triangle_best.9.png b/Habitica/res/drawable-mdpi/triangle_best.9.png deleted file mode 100644 index 2cc5e794f..000000000 Binary files a/Habitica/res/drawable-mdpi/triangle_best.9.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/triangle_better.9.png b/Habitica/res/drawable-mdpi/triangle_better.9.png deleted file mode 100644 index 75016b3c6..000000000 Binary files a/Habitica/res/drawable-mdpi/triangle_better.9.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/triangle_completed.9.png b/Habitica/res/drawable-mdpi/triangle_completed.9.png deleted file mode 100644 index 789dbe2f2..000000000 Binary files a/Habitica/res/drawable-mdpi/triangle_completed.9.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/triangle_good.9.png b/Habitica/res/drawable-mdpi/triangle_good.9.png deleted file mode 100644 index 00abe5d6d..000000000 Binary files a/Habitica/res/drawable-mdpi/triangle_good.9.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/triangle_neutral.9.png b/Habitica/res/drawable-mdpi/triangle_neutral.9.png deleted file mode 100644 index 00fbf1db8..000000000 Binary files a/Habitica/res/drawable-mdpi/triangle_neutral.9.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/triangle_worse.9.png b/Habitica/res/drawable-mdpi/triangle_worse.9.png deleted file mode 100644 index 4ba685543..000000000 Binary files a/Habitica/res/drawable-mdpi/triangle_worse.9.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/triangle_worst.9.png b/Habitica/res/drawable-mdpi/triangle_worst.9.png deleted file mode 100644 index a174527a1..000000000 Binary files a/Habitica/res/drawable-mdpi/triangle_worst.9.png and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/triangle_bad.9.png b/Habitica/res/drawable-xhdpi/triangle_bad.9.png deleted file mode 100644 index f20b6bdec..000000000 Binary files a/Habitica/res/drawable-xhdpi/triangle_bad.9.png and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/triangle_best.9.png b/Habitica/res/drawable-xhdpi/triangle_best.9.png deleted file mode 100644 index 692bb5bb7..000000000 Binary files a/Habitica/res/drawable-xhdpi/triangle_best.9.png and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/triangle_better.9.png b/Habitica/res/drawable-xhdpi/triangle_better.9.png deleted file mode 100644 index 90b20bea4..000000000 Binary files a/Habitica/res/drawable-xhdpi/triangle_better.9.png and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/triangle_completed.9.png b/Habitica/res/drawable-xhdpi/triangle_completed.9.png deleted file mode 100644 index dc8a9f4d6..000000000 Binary files a/Habitica/res/drawable-xhdpi/triangle_completed.9.png and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/triangle_good.9.png b/Habitica/res/drawable-xhdpi/triangle_good.9.png deleted file mode 100644 index 818df4fad..000000000 Binary files a/Habitica/res/drawable-xhdpi/triangle_good.9.png and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/triangle_neutral.9.png b/Habitica/res/drawable-xhdpi/triangle_neutral.9.png deleted file mode 100644 index 8b7f26cb5..000000000 Binary files a/Habitica/res/drawable-xhdpi/triangle_neutral.9.png and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/triangle_worse.9.png b/Habitica/res/drawable-xhdpi/triangle_worse.9.png deleted file mode 100644 index b861df10d..000000000 Binary files a/Habitica/res/drawable-xhdpi/triangle_worse.9.png and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/triangle_worst.9.png b/Habitica/res/drawable-xhdpi/triangle_worst.9.png deleted file mode 100644 index 88439d103..000000000 Binary files a/Habitica/res/drawable-xhdpi/triangle_worst.9.png and /dev/null differ diff --git a/Habitica/res/drawable/card_background_shadow.9.png b/Habitica/res/drawable/card_background_shadow.9.png deleted file mode 100644 index 5f5c28dd5..000000000 Binary files a/Habitica/res/drawable/card_background_shadow.9.png and /dev/null differ diff --git a/Habitica/res/drawable/chest.png b/Habitica/res/drawable/chest.png deleted file mode 100644 index 2fc885da1..000000000 Binary files a/Habitica/res/drawable/chest.png and /dev/null differ diff --git a/Habitica/res/drawable/female_sprites.png b/Habitica/res/drawable/female_sprites.png deleted file mode 100644 index 1456ff633..000000000 Binary files a/Habitica/res/drawable/female_sprites.png and /dev/null differ diff --git a/Habitica/res/drawable/layout_rounded_bg.xml b/Habitica/res/drawable/layout_rounded_bg.xml new file mode 100644 index 000000000..b086829ae --- /dev/null +++ b/Habitica/res/drawable/layout_rounded_bg.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_brand.xml b/Habitica/res/drawable/layout_rounded_bg_brand.xml new file mode 100644 index 000000000..7382351de --- /dev/null +++ b/Habitica/res/drawable/layout_rounded_bg_brand.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/male_sprites.png b/Habitica/res/drawable/male_sprites.png deleted file mode 100644 index 126f9b173..000000000 Binary files a/Habitica/res/drawable/male_sprites.png and /dev/null differ diff --git a/Habitica/res/drawable/shop_sprites.png b/Habitica/res/drawable/shop_sprites.png deleted file mode 100644 index c012533b1..000000000 Binary files a/Habitica/res/drawable/shop_sprites.png and /dev/null differ diff --git a/Habitica/res/drawable/spritesmith.png b/Habitica/res/drawable/spritesmith.png deleted file mode 100644 index 927196511..000000000 Binary files a/Habitica/res/drawable/spritesmith.png and /dev/null differ diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml index a7169808a..97f5a0185 100644 --- a/Habitica/res/layout/reward_item_card.xml +++ b/Habitica/res/layout/reward_item_card.xml @@ -10,30 +10,22 @@ type="Task" /> - + android:layout_height="wrap_content" + android:orientation="vertical" + android:background="@color/white"> - + android:layout_height="wrap_content"> + android:layout_height="match_parent"> - - @@ -51,6 +45,8 @@ android:layout_height="wrap_content" android:layout_alignLeft="@+id/checkedTextView" android:layout_alignStart="@+id/checkedTextView" + android:layout_alignRight="@+id/checkedTextView" + android:layout_alignEnd="@+id/checkedTextView" android:layout_below="@+id/checkedTextView" android:maxLines="3" android:minLines="2" @@ -58,22 +54,13 @@ android:paddingRight="5dp" android:text="@{reward.notes}" /> - -