Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Prepares release 1.8.5

This commit is contained in:
stom79 2018-04-02 09:59:31 +02:00
parent 04c20569ac
commit 391a74d8f9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -7,8 +7,8 @@ android {
applicationId "fr.gouv.etalab.mastodon" applicationId "fr.gouv.etalab.mastodon"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 27 targetSdkVersion 27
versionCode 116 versionCode 117
versionName "1.8.4" versionName "1.8.5"
} }
flavorDimensions "default" flavorDimensions "default"
buildTypes { buildTypes {

3
app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
View File

@ -816,7 +816,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
if (!status.getReblog().isSensitive() && (behaviorWithAttachments == Helper.ATTACHMENT_ALWAYS || (behaviorWithAttachments == Helper.ATTACHMENT_WIFI && isOnWifi))) { if (!status.getReblog().isSensitive() && (behaviorWithAttachments == Helper.ATTACHMENT_ALWAYS || (behaviorWithAttachments == Helper.ATTACHMENT_WIFI && isOnWifi))) {
loadAttachments(status.getReblog(), holder); loadAttachments(status.getReblog(), holder);
holder.status_show_more.setVisibility(View.GONE); holder.status_show_more.setVisibility(View.GONE);
status.getReblog().setAttachmentShown(true); status.setAttachmentShown(true);
} else { } else {
//Text depending if toots is sensitive or not //Text depending if toots is sensitive or not
String textShowMore = (status.getReblog().isSensitive()) ? context.getString(R.string.load_sensitive_attachment) : context.getString(R.string.load_attachment); String textShowMore = (status.getReblog().isSensitive()) ? context.getString(R.string.load_sensitive_attachment) : context.getString(R.string.load_attachment);
@ -839,6 +839,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
status.getReblog().setSensitive(true); status.getReblog().setSensitive(true);
else else
status.setSensitive(true); status.setSensitive(true);
if( theme == Helper.THEME_DARK) if( theme == Helper.THEME_DARK)
changeDrawableColor(context, R.drawable.ic_photo,R.color.dark_text); changeDrawableColor(context, R.drawable.ic_photo,R.color.dark_text);
else else