From 4db989442bb6448456c0a34de3f41ea134784144 Mon Sep 17 00:00:00 2001 From: stom79 Date: Sat, 15 Sep 2018 09:33:53 +0200 Subject: [PATCH] Automatically expand hidden media --- .../java/fr/gouv/etalab/mastodon/client/API.java | 1 + .../etalab/mastodon/drawers/StatusListAdapter.java | 3 ++- .../etalab/mastodon/fragments/SettingsFragment.java | 12 ++++++++++++ .../java/fr/gouv/etalab/mastodon/helper/Helper.java | 1 + .../main/res/layout-sw600dp/fragment_settings.xml | 6 ++++++ app/src/main/res/layout/fragment_settings.xml | 7 +++++++ app/src/main/res/values/strings.xml | 1 + 7 files changed, 30 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java index a83d0e281..ed724526e 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java @@ -16,6 +16,7 @@ package fr.gouv.etalab.mastodon.client; import android.content.Context; import android.content.SharedPreferences; +import android.util.Log; import org.json.JSONArray; import org.json.JSONException; 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 e490be3cf..47283515e 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 @@ -550,6 +550,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct holder.status_privacy.setVisibility(View.VISIBLE); boolean expand_cw = sharedpreferences.getBoolean(Helper.SET_EXPAND_CW, false); + boolean expand_media = sharedpreferences.getBoolean(Helper.SET_EXPAND_MEDIA, false); if( theme == Helper.THEME_DARK || theme == Helper.THEME_BLACK){ changeDrawableColor(context, R.drawable.ic_reply,R.color.dark_icon); changeDrawableColor(context, holder.status_more, R.color.dark_icon); @@ -792,7 +793,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct holder.status_show_more.setVisibility(View.GONE); } else { //If medias are loaded without any conditions or if device is on wifi - if (!status.isSensitive() && (behaviorWithAttachments == Helper.ATTACHMENT_ALWAYS || (behaviorWithAttachments == Helper.ATTACHMENT_WIFI && isOnWifi))) { + if (expand_media || !status.isSensitive() && (behaviorWithAttachments == Helper.ATTACHMENT_ALWAYS || (behaviorWithAttachments == Helper.ATTACHMENT_WIFI && isOnWifi))) { loadAttachments(status, holder); holder.status_show_more.setVisibility(View.GONE); status.setAttachmentShown(true); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java index c325238a8..4957351ec 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java @@ -200,6 +200,18 @@ public class SettingsFragment extends Fragment { } }); + boolean expand_media = sharedpreferences.getBoolean(Helper.SET_EXPAND_MEDIA, false); + final CheckBox set_expand_media = rootView.findViewById(R.id.set_expand_image); + set_expand_media.setChecked(expand_media); + + set_expand_media.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + SharedPreferences.Editor editor = sharedpreferences.edit(); + editor.putBoolean(Helper.SET_EXPAND_MEDIA, set_expand_media.isChecked()); + editor.apply(); + } + }); boolean display_bookmark = sharedpreferences.getBoolean(Helper.SET_SHOW_BOOKMARK, true); final CheckBox set_display_bookmark = rootView.findViewById(R.id.set_display_bookmarks); 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 f47a20f69..0ba0d07d1 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 @@ -298,6 +298,7 @@ public class Helper { public static final String SET_NOTIF_HOMETIMELINE = "set_notif_hometimeline"; public static final String SET_NOTIF_SILENT = "set_notif_silent"; public static final String SET_EXPAND_CW = "set_expand_cw"; + public static final String SET_EXPAND_MEDIA = "set_expand_media"; public static final String SET_EMBEDDED_BROWSER = "set_embedded_browser"; public static final String SET_CUSTOM_TABS = "set_custom_tabs"; public static final String SET_JAVASCRIPT = "set_javascript"; diff --git a/app/src/main/res/layout-sw600dp/fragment_settings.xml b/app/src/main/res/layout-sw600dp/fragment_settings.xml index c708a1b4e..0b1f8ffc6 100644 --- a/app/src/main/res/layout-sw600dp/fragment_settings.xml +++ b/app/src/main/res/layout-sw600dp/fragment_settings.xml @@ -102,6 +102,12 @@ android:text="@string/expand_cw" android:layout_height="wrap_content" /> + + + + + Trunk API Account(s) can\'t be followed Fetching remote account + Automatically expand hidden media