1
0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-30 13:12:25 -05:00

show the date and time in a single view on a single line

This commit is contained in:
Jesse Vincent 2013-02-08 21:26:19 -05:00
parent 648a6eed86
commit fd19704fe5

View File

@ -104,12 +104,10 @@ public class MessageHeader extends ScrollView implements OnClickListener {
mAdditionalHeadersView = (TextView) findViewById(R.id.additional_headers_view); mAdditionalHeadersView = (TextView) findViewById(R.id.additional_headers_view);
mChip = findViewById(R.id.chip); mChip = findViewById(R.id.chip);
mDateView = (TextView) findViewById(R.id.date); mDateView = (TextView) findViewById(R.id.date);
mTimeView = (TextView) findViewById(R.id.time);
mFlagged = (CheckBox) findViewById(R.id.flagged); mFlagged = (CheckBox) findViewById(R.id.flagged);
defaultSubjectColor = mSubjectView.getCurrentTextColor(); defaultSubjectColor = mSubjectView.getCurrentTextColor();
mFontSizes.setViewTextSize(mSubjectView, mFontSizes.getMessageViewSubject()); mFontSizes.setViewTextSize(mSubjectView, mFontSizes.getMessageViewSubject());
mFontSizes.setViewTextSize(mTimeView, mFontSizes.getMessageViewTime());
mFontSizes.setViewTextSize(mDateView, mFontSizes.getMessageViewDate()); mFontSizes.setViewTextSize(mDateView, mFontSizes.getMessageViewDate());
mFontSizes.setViewTextSize(mAdditionalHeadersView, mFontSizes.getMessageViewAdditionalHeaders()); mFontSizes.setViewTextSize(mAdditionalHeadersView, mFontSizes.getMessageViewAdditionalHeaders());
@ -244,12 +242,11 @@ public class MessageHeader extends ScrollView implements OnClickListener {
mFromView.setText(from); mFromView.setText(from);
if (date != null) { if (date != null) {
mDateView.setText(date); mDateView.setText(time + " - " + date);
mDateView.setVisibility(View.VISIBLE);
} else { } else {
mDateView.setVisibility(View.GONE); mDateView.setText(time);
}
} }
mTimeView.setText(time);
updateAddressField(mToView, to, mToLabel); updateAddressField(mToView, to, mToLabel);
updateAddressField(mCcView, cc, mCcLabel); updateAddressField(mCcView, cc, mCcLabel);
mAnsweredIcon.setVisibility(message.isSet(Flag.ANSWERED) ? View.VISIBLE : View.GONE); mAnsweredIcon.setVisibility(message.isSet(Flag.ANSWERED) ? View.VISIBLE : View.GONE);