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

Use a briefer date format (9 Feb instead of 09/02/2014, for example).

Browse Source
This commit is contained in:
akwizgran
2014-02-10 11:15:42 +00:00
parent 209b1bdf1f
commit e582e1d59f
5 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,6 @@ import static android.widget.RelativeLayout.ALIGN_PARENT_TOP;
import static android.widget.RelativeLayout.BELOW;
import static android.widget.RelativeLayout.LEFT_OF;
import static android.widget.RelativeLayout.RIGHT_OF;
import static java.text.DateFormat.SHORT;
import java.util.ArrayList;
@@ -56,8 +55,8 @@ class ConversationAdapter extends ArrayAdapter<ConversationItem> {
date.setTextSize(14);
date.setBackgroundColor(background);
date.setPadding(pad, pad, pad, 0);
long then = header.getTimestamp(), now = System.currentTimeMillis();
date.setText(DateUtils.formatSameDayTime(then, now, SHORT, SHORT));
long timestamp = header.getTimestamp();
date.setText(DateUtils.getRelativeTimeSpanString(ctx, timestamp));
View content;
if(item.getBody() == null) {

4
briar-android/src/org/briarproject/android/contact/ReadPrivateMessageActivity.java
View File

@@ -4,7 +4,6 @@ import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_VERTICAL;
import static android.widget.LinearLayout.HORIZONTAL;
import static android.widget.LinearLayout.VERTICAL;
import static java.text.DateFormat.SHORT;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP;
@@ -129,8 +128,7 @@ implements OnClickListener {
TextView date = new TextView(this);
date.setTextSize(14);
date.setPadding(0, pad, pad, pad);
long now = System.currentTimeMillis();
date.setText(DateUtils.formatSameDayTime(timestamp, now, SHORT, SHORT));
date.setText(DateUtils.getRelativeTimeSpanString(this, timestamp));
header.addView(date);
message.addView(header);

5
briar-android/src/org/briarproject/android/groups/GroupAdapter.java
View File

@@ -4,7 +4,6 @@ import static android.view.Gravity.CENTER_HORIZONTAL;
import static android.view.Gravity.CENTER_VERTICAL;
import static android.widget.LinearLayout.HORIZONTAL;
import static android.widget.LinearLayout.VERTICAL;
import static java.text.DateFormat.SHORT;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP_1;
import java.util.ArrayList;
@@ -65,8 +64,8 @@ class GroupAdapter extends ArrayAdapter<GroupItem> {
TextView date = new TextView(ctx);
date.setTextSize(14);
date.setPadding(0, pad, pad, pad);
long then = header.getTimestamp(), now = System.currentTimeMillis();
date.setText(DateUtils.formatSameDayTime(then, now, SHORT, SHORT));
long timestamp = header.getTimestamp();
date.setText(DateUtils.getRelativeTimeSpanString(ctx, timestamp));
headerLayout.addView(date);
layout.addView(headerLayout);

5
briar-android/src/org/briarproject/android/groups/GroupListAdapter.java
View File

@@ -3,7 +3,6 @@ package org.briarproject.android.groups;
import static android.text.TextUtils.TruncateAt.END;
import static android.view.Gravity.CENTER;
import static android.widget.LinearLayout.HORIZONTAL;
import static java.text.DateFormat.SHORT;
import static org.briarproject.android.groups.GroupListItem.MANAGE;
import static org.briarproject.android.util.CommonLayoutParams.WRAP_WRAP_1;
@@ -104,8 +103,8 @@ class GroupListAdapter extends BaseAdapter {
TextView date = new TextView(ctx);
date.setTextSize(14);
date.setPadding(pad, 0, pad, pad);
long then = item.getTimestamp(), now = System.currentTimeMillis();
date.setText(DateUtils.formatSameDayTime(then, now, SHORT, SHORT));
long timestamp = item.getTimestamp();
date.setText(DateUtils.getRelativeTimeSpanString(ctx, timestamp));
layout.addView(date);
}

4
briar-android/src/org/briarproject/android/groups/ReadGroupPostActivity.java
View File

@@ -4,7 +4,6 @@ import static android.view.Gravity.CENTER;
import static android.view.Gravity.CENTER_VERTICAL;
import static android.widget.LinearLayout.HORIZONTAL;
import static android.widget.LinearLayout.VERTICAL;
import static java.text.DateFormat.SHORT;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static org.briarproject.android.util.CommonLayoutParams.MATCH_WRAP;
@@ -126,8 +125,7 @@ implements OnClickListener {
TextView date = new TextView(this);
date.setTextSize(14);
date.setPadding(0, pad, pad, pad);
long now = System.currentTimeMillis();
date.setText(DateUtils.formatSameDayTime(timestamp, now, SHORT, SHORT));
date.setText(DateUtils.getRelativeTimeSpanString(this, timestamp));
header.addView(date);
message.addView(header);