sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-10 14:28:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

better formatting for tasks

Browse source
This commit is contained in:
Phillip Thelen 2015-11-24 21:21:32 +01:00
parent dba6030c25
commit 933c9cd515
5 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/res/layout/daily_item_card.xml
View file

@ -64,7 +64,7 @@
android:layout_height="wrap_content"
android:text="@{daily.text}" />
<TextView
android:id="@+id/textView6"
android:id="@+id/notesTextView"
style="@style/CardText"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
Habitica/res/layout/habit_item_card.xml
View file

@ -66,7 +66,7 @@
android:text="@{habit.text}" />
<TextView
android:id="@+id/textView6"
android:id="@+id/notesTextView"
style="@style/CardText"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
Habitica/res/layout/reward_item_card.xml
View file

@ -63,7 +63,7 @@
android:text="@{reward.text}" />
<TextView
android:id="@+id/textView6"
android:id="@+id/notesTextView"
style="@style/CardText"
android:layout_width="wrap_content"
android:layout_height="41dp"

2
Habitica/res/layout/todo_item_card.xml
View file

@ -54,7 +54,7 @@
android:text="@{todo.text}" />
<TextView
android:id="@+id/textView6"
android:id="@+id/notesTextView"
style="@style/CardText"
android:layout_width="match_parent"
android:layout_height="match_parent"

15
Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
View file

@ -176,9 +176,10 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
@Override
public long getItemId(int position) {
Task task = filteredObservableContent.get(position);
UUID uuid = new UUID(0, 0).fromString(task.getId());
return uuid.getMostSignificantBits();
if (task.getId() != null && task.getId().length() == 36) {
return UUID.fromString(task.getId()).getMostSignificantBits();
}
return UUID.randomUUID().getMostSignificantBits();
}
@Override
@ -248,6 +249,9 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
public THabitItem Item;
@InjectView(R.id.notesTextView)
TextView notesTextView;
public ViewHolder(View itemView) {
super(itemView);
@ -265,6 +269,11 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
public void bindHolder(THabitItem habitItem, int position) {
double itemvalue = habitItem.getValue();
Item = habitItem;
if (habitItem.notes.length() == 0) {
notesTextView.setHeight(0);
} else {
notesTextView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
}
}
@Override