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}" />
-
-
@@ -83,16 +70,16 @@
android:layout_width="65dp"
android:padding="5dp"
android:layout_height="wrap_content"
- android:layout_above="@+id/separator"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
+ android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
+ android:layout_marginStart="5dp"
app:imageName="@{reward.id}"/>
-
+
-
+
\ No newline at end of file
diff --git a/Habitica/res/layout/value_bar.xml b/Habitica/res/layout/value_bar.xml
index 304450091..2e80ef228 100644
--- a/Habitica/res/layout/value_bar.xml
+++ b/Habitica/res/layout/value_bar.xml
@@ -6,6 +6,9 @@
+
-
-
-
+ android:orientation="vertical">
-
-
-
+ android:layout_height="wrap_content">
+
+
+
+
+
\ No newline at end of file
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index 6fcdc631b..24a01b3dc 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -1,15 +1,13 @@
- #da5353
- #fcf0f0
- #250808
- #ffcc35
- #fffbf0
- #2e2200
- #4781e7
- #eff4fd
- #051228
- #7a12f8
+
+ #36205D
+ #432874
+ #4F2A93
+ #6133B4
+ #9A62FF
+ #BDA8FF
+ @color/brand_100
#E6B8AF
@@ -43,6 +41,16 @@
#D9D9D9
#989898
+ @color/worse_100
+ #fcf0f0
+ #250808
+ @color/neutral_100
+ #fffbf0
+ #2e2200
+ @color/best_100
+ #eff4fd
+ #051228
+
#ffcf42
@@ -79,7 +87,7 @@
#1FFFFFFF
#202020
- @color/material_drawer_primary
+ @color/brand
#FFF
#ffd8dcdd
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index 95aecb4b6..2e548db83 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -11,9 +11,9 @@
14.0sp
16.0dip
- 29dp
- 25dp
+ 15dp
5dp
+ 5dp
140dp
147dp
70dp
@@ -37,5 +37,5 @@
0.5dp
14dp
- 35dp
+ 36dp
\ No newline at end of file
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index e67cf4404..7c1c108e1 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -6,8 +6,9 @@
Refresh
+
-
- XP
- HP
+ Experience
+ Health
+ Mana
%1$d-%2$d-%3$d
Task added
LVL UP!
@@ -106,7 +107,6 @@
Close
SP_last_version
- MP
Update
About
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java b/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
index b2edb026a..047963138 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
@@ -3,6 +3,9 @@ package com.habitrpg.android.habitica.ui;
import android.content.Context;
import android.databinding.BindingAdapter;
import android.databinding.DataBindingUtil;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
import android.util.Log;
import android.view.View;
import android.view.animation.Animation;
@@ -52,31 +55,25 @@ public class AvatarWithBarsViewModel {
mpBar = DataBindingUtil.bind(v.findViewById(R.id.mpBar));
- SetValueBar(hpBar, 50, 50, context.getString(R.string.HP_default),
- res.getColor(R.color.hpColor), res.getColor(R.color.hpColorBackground), res.getColor(R.color.hpColorForeground));
- SetValueBar(xpBar, 1, 1, context.getString(R.string.XP_default),
- res.getColor(R.color.xpColor), res.getColor(R.color.xpColorBackground), res.getColor(R.color.xpColorForeground));
- SetValueBar(mpBar, 100, 100, context.getString(R.string.MP_default),
- res.getColor(R.color.mpColor), res.getColor(R.color.mpColorBackground),res.getColor(R.color.mpColorForeground));
+ SetValueBar(hpBar, 50, 50, context.getString(R.string.HP_default), R.color.hpColor);
+ SetValueBar(xpBar, 1, 1, context.getString(R.string.XP_default), R.color.xpColor);
+ SetValueBar(mpBar, 100, 100, context.getString(R.string.MP_default), R.color.mpColor);
}
public void UpdateData(HabitRPGUser user)
{
Stats stats = user.getStats();
- SetValueBar(hpBar, stats.getHp().floatValue(), stats.getMaxHealth(), context.getString(R.string.HP_default),
- res.getColor(R.color.hpColor), res.getColor(R.color.hpColorBackground), res.getColor(R.color.hpColorForeground));
- SetValueBar(xpBar, stats.getExp().floatValue(), stats.getToNextLevel(), context.getString(R.string.XP_default),
- res.getColor(R.color.xpColor), res.getColor(R.color.xpColorBackground), res.getColor(R.color.xpColorForeground));
- SetValueBar(mpBar, stats.getMp().floatValue(), stats.getMaxMP(), context.getString(R.string.MP_default),
- res.getColor(R.color.mpColor), res.getColor(R.color.mpColorBackground),res.getColor(R.color.mpColorForeground));
+ SetValueBar(hpBar, stats.getHp().floatValue(), stats.getMaxHealth(), context.getString(R.string.HP_default), context.getResources().getColor(R.color.hpColor));
+ SetValueBar(xpBar, stats.getExp().floatValue(), stats.getToNextLevel(), context.getString(R.string.XP_default), context.getResources().getColor(R.color.xpColor));
+ SetValueBar(mpBar, stats.getMp().floatValue(), stats.getMaxMP(), context.getString(R.string.MP_default), context.getResources().getColor(R.color.mpColor));
new UserPicture(user, this.context).setPictureOn(image);
}
// Layout_Weight don't accepts 0.7/0.3 to have 70% filled instead it shows the 30% , so I had to switch the values
// but on a 1.0/0.0 which switches to 0.0/1.0 it shows the blank part full size...
- private void SetValueBar(ValueBarBinding valueBar, float value, float valueMax, String postString, int color, int colorBackground, int textColor)
+ private void SetValueBar(ValueBarBinding valueBar, float value, float valueMax, String description, int color)
{
double percent = Math.min(1, value / valueMax);
@@ -91,17 +88,16 @@ public class AvatarWithBarsViewModel {
valueBar.setWeightToHide((float) percent);
}
- valueBar.setText((int) value + "/" + (int) valueMax + " " + postString);
+ valueBar.setText((int) value + "/" + (int) valueMax);
+ valueBar.setDescription(description);
valueBar.setBarForegroundColor(color);
- valueBar.setBarBackgroundColor(colorBackground);
- valueBar.setTextColor(textColor);
}
@BindingAdapter("app:layout_weight")
public static void setLayoutWeight(View view, float weight) {
LinearLayout.LayoutParams layout = (LinearLayout.LayoutParams)view.getLayoutParams();
- Log.d("setLayoutWeight", weight+"");
+ Log.d("setLayoutWeight", weight + "");
layout.weight = weight;
@@ -116,6 +112,17 @@ public class AvatarWithBarsViewModel {
view.startAnimation(anim);
}
+ @BindingAdapter("app:rounded_background")
+ public static void setRoundedBackground(View view, int color) {
+ Drawable drawable = view.getResources().getDrawable(R.drawable.layout_rounded_bg);
+ drawable.setColorFilter(color, PorterDuff.Mode.MULTIPLY);
+ if(Build.VERSION.SDK_INT < 16) {
+ view.setBackgroundDrawable(drawable);
+ } else {
+ view.setBackground(drawable);
+ }
+ }
+
public static class LayoutWeightAnimation extends Animation {
float targetWeight;
float initializeWeight;