Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 11:49:04 +01:00
Code Issues Projects Releases Wiki Activity

Updated group conversation view to resemble private conversation view.

Browse Source
This commit is contained in:
akwizgran
2014-02-08 17:36:17 +00:00
parent 4c6d79c474
commit 97fb9c8c3e
7 changed files with 181 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/src/org/briarproject/android/contact/ConversationActivity.java
View File

@@ -50,7 +50,7 @@ import android.widget.ListView;
public class ConversationActivity extends BriarActivity
implements EventListener, OnClickListener, OnItemClickListener {
private static final int REQUEST_READ_MESSAGE = 2;
private static final int REQUEST_READ = 2;
private static final Logger LOG =
Logger.getLogger(ConversationActivity.class.getName());
@@ -239,7 +239,7 @@ implements EventListener, OnClickListener, OnItemClickListener {
@Override
protected void onActivityResult(int request, int result, Intent data) {
super.onActivityResult(request, result, data);
if(request == REQUEST_READ_MESSAGE && result == RESULT_PREV_NEXT) {
if(request == REQUEST_READ && result == RESULT_PREV_NEXT) {
int position = data.getIntExtra("briar.POSITION", -1);
if(position >= 0 && position < adapter.getCount())
displayMessage(position);
@@ -296,6 +296,6 @@ implements EventListener, OnClickListener, OnItemClickListener {
i.putExtra("briar.CONTENT_TYPE", header.getContentType());
i.putExtra("briar.TIMESTAMP", header.getTimestamp());
i.putExtra("briar.POSITION", position);
startActivityForResult(i, REQUEST_READ_MESSAGE);
startActivityForResult(i, REQUEST_READ);
}
}

1
briar-android/src/org/briarproject/android/contact/ConversationAdapter.java
View File

@@ -56,6 +56,7 @@ class ConversationAdapter extends ArrayAdapter<ConversationItem> {
authorView.init(header.getAuthor().getName(), VERIFIED);
headerLayout.addView(authorView);
// FIXME: Factor this out into a TimestampView
TextView date = new TextView(ctx);
date.setTextSize(14);
date.setPadding(0, pad, pad, pad);

5
briar-android/src/org/briarproject/android/contact/ConversationItemComparator.java
View File

@@ -2,10 +2,9 @@ package org.briarproject.android.contact;
import java.util.Comparator;
public class ConversationItemComparator
implements Comparator<ConversationItem> {
class ConversationItemComparator implements Comparator<ConversationItem> {
public static final ConversationItemComparator INSTANCE =
static final ConversationItemComparator INSTANCE =
new ConversationItemComparator();
public int compare(ConversationItem a, ConversationItem b) {