sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes #329 & fixes #162

Browse source
This commit is contained in:
Negue 2015-12-21 20:24:39 +01:00
parent 665d19bd1a
commit 433bebf109
3 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Habitica/res/layout/value_bar.xml
View file

@ -39,7 +39,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/bar_padding"
android:orientation="horizontal">
android:orientation="horizontal"
android:id="@+id/value_bar_layout">
<ImageView
android:id="@+id/ic_header"
android:layout_width="wrap_content"

3
Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java
View file

@ -95,7 +95,8 @@ public class HabiticaApplication extends Application {
@Override
public void onActivityDestroyed(Activity activity) {
currentActivity = null;
if(currentActivity == activity)
currentActivity = null;
}
});
}

40
Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
View file

@ -59,10 +59,9 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
xpBar = DataBindingUtil.bind(v.findViewById(R.id.xpBar));
mpBar = DataBindingUtil.bind(v.findViewById(R.id.mpBar));
setValueBar(hpBar, 50, 50, context.getString(R.string.HP_default), R.color.hpColor, R.drawable.ic_header_heart);
setValueBar(xpBar, 1, 1, context.getString(R.string.XP_default), R.color.xpColor, R.drawable.ic_header_exp);
setValueBar(mpBar, 100, 100, context.getString(R.string.MP_default), R.color.mpColor, R.drawable.ic_header_magic);
setHpBarData(0, 50);
setXpBarData(0, 1);
setMpBarData(0, 1);
gemsText.setClickable(true);
gemsText.setOnClickListener(this);
@ -73,18 +72,23 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
userObject = user;
Stats stats = user.getStats();
char classShort;
String userClass = "";
int gp = (stats.getGp().intValue());
int sp = (int) ((stats.getGp() - gp) * 100);
setHpBarData(hpBar, stats, context);
setValueBar(xpBar, stats.getExp().floatValue(), stats.getToNextLevel(), context.getString(R.string.XP_default), context.getResources().getColor(R.color.xpColor), R.drawable.ic_header_exp);
setValueBar(mpBar, stats.getMp().floatValue(), stats.getMaxMP(), context.getString(R.string.MP_default), context.getResources().getColor(R.color.mpColor), R.drawable.ic_header_magic);
setHpBarData(stats);
setXpBarData(stats.getExp().floatValue(), stats.getToNextLevel());
setMpBarData(stats.getMp().floatValue(), stats.getMaxMP());
new UserPicture(user, this.context).setPictureOn(image);
if (user.getStats().get_class() != null) {
userClass += user.getStats().getCleanedClassName();
if (stats.get_class() != null) {
userClass += stats.getCleanedClassName();
}
mpBar.valueBarLayout.setVisibility((stats.get_class() == null || stats.getLvl() < 10) ? View.GONE : View.VISIBLE);
lvlText.setText("Lvl" + user.getStats().getLvl() + " " + userClass);
Drawable drawable;
switch (stats.get_class()) {
@ -130,6 +134,22 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
setValueBar(valueBar, stats.getHp().floatValue(), maxHP, ctx.getString(R.string.HP_default), ctx.getResources().getColor(R.color.hpColor), R.drawable.ic_header_heart);
}
public void setHpBarData(Stats stats) {
setHpBarData(hpBar, stats, context);
}
public void setHpBarData(float value, int valueMax){
setValueBar(hpBar, value, valueMax, context.getString(R.string.HP_default), context.getResources().getColor(R.color.hpColor), R.drawable.ic_header_heart);
}
public void setXpBarData(float value, int valueMax){
setValueBar(xpBar, value, valueMax, context.getString(R.string.XP_default), context.getResources().getColor(R.color.xpColor), R.drawable.ic_header_exp);
}
public void setMpBarData(float value, int valueMax){
setValueBar(mpBar, value, valueMax, context.getString(R.string.MP_default), context.getResources().getColor(R.color.mpColor), R.drawable.ic_header_magic);
}
// 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 static void setValueBar(ValueBarBinding valueBar, float value, float valueMax, String description, int color, int icon) {