diff --git a/app/build.gradle b/app/build.gradle index 45da29240..f2c95337d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "fr.gouv.etalab.mastodon" minSdkVersion 15 targetSdkVersion 27 - versionCode 119 - versionName "1.8.7" + versionCode 120 + versionName "1.8.7.1" } flavorDimensions "default" buildTypes { diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java index 11ca38282..82ec8d255 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java @@ -746,7 +746,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct else holder.status_reblog_count.setText(String.valueOf(status.getReblog().getReblogs_count())); } - if( type == RetrieveFeedsAsyncTask.Type.CONTEXT) { + if( getItemViewType(position) == FOCUSED_STATUS) { String fullDate_tmp = Helper.dateDiffFull(status.getCreated_at()); String fullDate = fullDate_tmp.substring(0,1).toUpperCase() + fullDate_tmp.substring(1); holder.status_toot_date.setText(fullDate); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index 0c3d79f8f..91ebbdeba 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -609,7 +609,7 @@ public class Helper { public static String dateDiffFull(Date dateToot){ - SimpleDateFormat df = (SimpleDateFormat) DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.MEDIUM, Locale.getDefault()); + SimpleDateFormat df = (SimpleDateFormat) DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.MEDIUM, Locale.getDefault()); return df.format(dateToot); }