public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use system setting to format times as 12 or 24 hours

Browse source
This commit is contained in:
Mark Anderson 2014-02-11 22:38:34 +00:00
parent f48201d662
commit f9be85ba28
4 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.java
View file

@ -308,7 +308,7 @@ public class ReadingItemFragment extends Fragment implements ClassifierDialogFra
}
itemTitle.setText(Html.fromHtml(story.title));
itemDate.setText(StoryUtils.formatLongDate(story.date));
itemDate.setText(StoryUtils.formatLongDate(getActivity(), story.date));
if (!TextUtils.isEmpty(story.authors)) {
itemAuthors.setText("• " + story.authors);

40
clients/android/NewsBlur/src/com/newsblur/util/StoryUtils.java
View file

@ -1,5 +1,8 @@
package com.newsblur.util;
import android.content.Context;
import android.text.format.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
@ -44,7 +47,14 @@ public class StoryUtils {
}
};
public static String formatLongDate(Date storyDate) {
private static final ThreadLocal<SimpleDateFormat> twentyFourHourFormat = new ThreadLocal<SimpleDateFormat>() {
@Override
protected SimpleDateFormat initialValue() {
return new SimpleDateFormat("HH:mm");
}
};
public static String formatLongDate(Context context, Date storyDate) {
Date midnightToday = midnightToday();
Date midnightYesterday = midnightYesterday();
@ -54,18 +64,20 @@ public class StoryUtils {
storyCalendar.setTime(storyDate);
int month = storyCalendar.get(Calendar.DAY_OF_MONTH);
SimpleDateFormat timeFormat = getTimeFormat(context);
if (storyDate.getTime() > midnightToday.getTime()) {
// Today, January 1st 00:00
return "Today, " + todayLongFormat.get().format(storyDate) + getDayOfMonthSuffix(month) + " " + twelveHourFormat.get().format(storyDate);
return "Today, " + todayLongFormat.get().format(storyDate) + getDayOfMonthSuffix(month) + " " + timeFormat.format(storyDate);
} else if (storyDate.getTime() > midnightYesterday.getTime()) {
// Yesterday, January 1st 00:00
return "Yesterday, " + todayLongFormat.get().format(storyDate) + getDayOfMonthSuffix(month) + " " + twelveHourFormat.get().format(storyDate);
return "Yesterday, " + todayLongFormat.get().format(storyDate) + getDayOfMonthSuffix(month) + " " + timeFormat.format(storyDate);
} else if (storyDate.getTime() > beginningOfMonth.getTime()) {
// Monday, January 1st 00:00
return monthLongFormat.get().format(storyDate) + getDayOfMonthSuffix(month) + " " + twelveHourFormat.get().format(storyDate);
return monthLongFormat.get().format(storyDate) + getDayOfMonthSuffix(month) + " " + timeFormat.format(storyDate);
} else {
// Monday, January 1st 2014 00:00
return monthLongFormat.get().format(storyDate) + getDayOfMonthSuffix(month) + " " + yearLongFormat.get().format(storyDate) + " " + twelveHourFormat.get().format(storyDate);
return monthLongFormat.get().format(storyDate) + getDayOfMonthSuffix(month) + " " + yearLongFormat.get().format(storyDate) + " " + timeFormat.format(storyDate);
}
}
@ -90,6 +102,14 @@ public class StoryUtils {
return month.getTime();
}
private static SimpleDateFormat getTimeFormat(Context context) {
if (DateFormat.is24HourFormat(context)) {
return twentyFourHourFormat.get();
} else {
return twelveHourFormat.get();
}
}
/**
* From http://stackoverflow.com/questions/4011075/how-do-you-format-the-day-of-the-month-to-say-11th-21st-or-23rd-in-java
*/
@ -105,20 +125,22 @@ public class StoryUtils {
}
}
public static String formatShortDate(Date storyDate) {
public static String formatShortDate(Context context, Date storyDate) {
Date midnightToday = midnightToday();
Date midnightYesterday = midnightYesterday();
SimpleDateFormat timeFormat = getTimeFormat(context);
if (storyDate.getTime() > midnightToday.getTime()) {
// 00:00
return twelveHourFormat.get().format(storyDate);
return timeFormat.format(storyDate);
} else if (storyDate.getTime() > midnightYesterday.getTime()) {
// Yesterday, 00:00
return "Yesterday, " + twelveHourFormat.get().format(storyDate);
return "Yesterday, " + timeFormat.format(storyDate);
} else {
// 1 Jan 2014, 00:00
return shortDateFormat.get().format(storyDate) +", " + twelveHourFormat.get().format(storyDate);
return shortDateFormat.get().format(storyDate) +", " + timeFormat.format(storyDate);
}
}
}

2
clients/android/NewsBlur/src/com/newsblur/view/FeedItemViewBinder.java
View file

@ -72,7 +72,7 @@ public class FeedItemViewBinder implements ViewBinder {
((TextView) view).setText(Html.fromHtml(cursor.getString(columnIndex)));
return true;
} else if (TextUtils.equals(columnName, DatabaseConstants.STORY_DATE)) {
((TextView) view).setText(StoryUtils.formatShortDate(new Date(cursor.getLong(columnIndex))));
((TextView) view).setText(StoryUtils.formatShortDate(context, new Date(cursor.getLong(columnIndex))));
return true;
}

4
clients/android/NewsBlur/src/com/newsblur/view/SocialItemViewBinder.java
View file

@ -21,10 +21,12 @@ import java.util.Date;
public class SocialItemViewBinder implements ViewBinder {
private final Context context;
private ImageLoader imageLoader;
private boolean ignoreIntel;
public SocialItemViewBinder(final Context context, boolean ignoreIntel) {
this.context = context;
this.imageLoader = ((NewsBlurApplication) context.getApplicationContext()).getImageLoader();
this.ignoreIntel = ignoreIntel;
}
@ -76,7 +78,7 @@ public class SocialItemViewBinder implements ViewBinder {
((TextView) view).setText(Html.fromHtml(cursor.getString(columnIndex)));
return true;
} else if (TextUtils.equals(columnName, DatabaseConstants.STORY_DATE)) {
((TextView) view).setText(StoryUtils.formatShortDate(new Date(cursor.getLong(columnIndex))));
((TextView) view).setText(StoryUtils.formatShortDate(context, new Date(cursor.getLong(columnIndex))));
return true;
}
return false;