sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-21 05:09:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed chat display

Browse source
This commit is contained in:
Keith Holliday 2016-06-22 12:49:23 -05:00
parent 46320f4ba3
commit 2baf90b9ef
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,11 +25,12 @@
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/card_large_text"
style="@style/CardView.Default">
<LinearLayout
android:id="@+id/inbox_messages"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:divider="?android:listDivider"
android:showDividers="middle">

5
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java
View file

@ -26,6 +26,7 @@ import android.support.v4.content.ContextCompat;
import android.support.v7.widget.PopupMenu;
import android.support.v7.widget.RecyclerView;
import android.text.method.LinkMovementMethod;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
@ -238,10 +239,14 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
if (userLabel != null) {
userLabel.setText(msg.user);
}
DataBindingUtils.setForegroundTintColor(userLabel, msg.getContributorForegroundColor());
if (messageText != null) {
messageText.setText(msg.parsedText);
if (msg.parsedText == null) {
messageText.setText(msg.text);
}
this.messageText.setMovementMethod(LinkMovementMethod.getInstance());
}

1
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.java
View file

@ -99,7 +99,6 @@ public class InboxFragment extends BaseMainFragment
public void onClick(View v) {
TextView entry = (TextView) v;
InboxMessageListFragment inboxMessageListFragment = new InboxMessageListFragment();
Log.v("test", entry.getText().toString());
inboxMessageListFragment.setMessages(this.messages, entry.getText().toString());
this.activity.displayFragment(inboxMessageListFragment);
}