Adds option to hide media previews if reduced data usage is desired Closes #56.

app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java

@@ -95,9 +95,27 @@ public class NotificationsFragment extends SFragment implements
         recyclerView.addItemDecoration(divider);
 
         adapter = new NotificationsAdapter(this, this);
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(
+                getActivity());
+        boolean mediaPreviewEnabled = preferences.getBoolean("mediaPreviewEnabled", true);
+        adapter.setMediaPreviewEnabled(mediaPreviewEnabled);
         recyclerView.setAdapter(adapter);
 
-        TabLayout layout = (TabLayout) getActivity().findViewById(R.id.tab_layout);
+        timelineReceiver = new TimelineReceiver(adapter);
+        LocalBroadcastManager.getInstance(context.getApplicationContext())
+                .registerReceiver(timelineReceiver, TimelineReceiver.getFilter(null));
+
+        return rootView;
+    }
+
+    @Override
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        MainActivity activity = (MainActivity) getActivity();
+
+        // MainActivity's layout is guaranteed to be inflated until onCreate returns.
+        TabLayout layout = (TabLayout) activity.findViewById(R.id.tab_layout);
         onTabSelectedListener = new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {}
@@ -112,22 +130,10 @@ public class NotificationsFragment extends SFragment implements
         };
         layout.addOnTabSelectedListener(onTabSelectedListener);
 
-        timelineReceiver = new TimelineReceiver(adapter);
-        LocalBroadcastManager.getInstance(context.getApplicationContext())
-                .registerReceiver(timelineReceiver, TimelineReceiver.getFilter(null));
-
-        return rootView;
-    }
-
-    @Override
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
         /* This is delayed until onActivityCreated solely because MainActivity.composeButton isn't
          * guaranteed to be set until then.
          * Use a modified scroll listener that both loads more notifications as it goes, and hides
          * the compose button on down-scroll. */
-        MainActivity activity = (MainActivity) getActivity();
         final FloatingActionButton composeButton = activity.composeButton;
         final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(
                 activity);
@@ -167,7 +173,9 @@ public class NotificationsFragment extends SFragment implements
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (listCall != null) listCall.cancel();
+        if (listCall != null) {
+            listCall.cancel();
+        }
     }
 
     @Override
@@ -195,7 +203,8 @@ public class NotificationsFragment extends SFragment implements
 
         listCall.enqueue(new Callback<List<Notification>>() {
             @Override
-            public void onResponse(Call<List<Notification>> call, Response<List<Notification>> response) {
+            public void onResponse(Call<List<Notification>> call,
+                    Response<List<Notification>> response) {
                 if (response.isSuccessful()) {
                     onFetchNotificationsSuccess(response.body(), fromId);
                 } else {
@@ -231,7 +240,9 @@ public class NotificationsFragment extends SFragment implements
 
                 // Set last update id for pull notifications so that we don't get notified
                 // about things we already loaded here
-                SharedPreferences preferences = getActivity().getSharedPreferences(getString(R.string.preferences_file_key), Context.MODE_PRIVATE);
+                SharedPreferences preferences = getActivity()
+                        .getSharedPreferences(getString(R.string.preferences_file_key),
+                                Context.MODE_PRIVATE);
                 SharedPreferences.Editor editor = preferences.edit();
                 editor.putString("lastUpdateId", notifications.get(0).id);
                 editor.apply();
@@ -309,8 +320,22 @@ public class NotificationsFragment extends SFragment implements
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if(key.equals("fabHide")) {
-            hideFab = sharedPreferences.getBoolean("fabHide", false);
+        switch (key) {
+            case "fabHide": {
+                hideFab = sharedPreferences.getBoolean("fabHide", false);
+                break;
+            }
+            case "mediaPreviewEnabled": {
+                boolean enabled = sharedPreferences.getBoolean("mediaPreviewEnabled", true);
+                adapter.setMediaPreviewEnabled(enabled);
+                fullyRefresh();
+                break;
+            }
         }
     }
+
+    private void fullyRefresh() {
+        adapter.clear();
+        sendFetchNotificationsRequest(null, null);
+    }
 }

app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java

@@ -98,7 +98,6 @@ public class TimelineFragment extends SFragment implements
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
              Bundle savedInstanceState) {
-
         Bundle arguments = getArguments();
         kind = Kind.valueOf(arguments.getString("kind"));
         if (kind == Kind.TAG || kind == Kind.USER) {
@@ -123,22 +122,18 @@ public class TimelineFragment extends SFragment implements
         divider.setDrawable(drawable);
         recyclerView.addItemDecoration(divider);
         adapter = new TimelineAdapter(this);
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(
+                getActivity());
+        preferences.registerOnSharedPreferenceChangeListener(this);
+        boolean mediaPreviewEnabled = preferences.getBoolean("mediaPreviewEnabled", true);
+        adapter.setMediaPreviewEnabled(mediaPreviewEnabled);
         recyclerView.setAdapter(adapter);
 
         timelineReceiver = new TimelineReceiver(adapter, this);
         LocalBroadcastManager.getInstance(context.getApplicationContext())
                 .registerReceiver(timelineReceiver, TimelineReceiver.getFilter(kind));
-        return rootView;
-    }
 
-    private void onLoadMore(RecyclerView view) {
-        TimelineAdapter adapter = (TimelineAdapter) view.getAdapter();
-        Status status = adapter.getItem(adapter.getItemCount() - 2);
-        if (status != null) {
-            sendFetchTimelineRequest(status.id, null);
-        } else {
-            sendFetchTimelineRequest(null, null);
-        }
+        return rootView;
     }
 
     @Override
@@ -171,7 +166,6 @@ public class TimelineFragment extends SFragment implements
             final FloatingActionButton composeButton = activity.composeButton;
             final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(
                     activity);
-            preferences.registerOnSharedPreferenceChangeListener(this);
             hideFab = preferences.getBoolean("fabHide", false);
             scrollListener = new EndlessOnScrollListener(layoutManager) {
                 @Override
@@ -218,6 +212,102 @@ public class TimelineFragment extends SFragment implements
         super.onDestroyView();
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        setFiltersFromSettings();
+    }
+
+    @Override
+    public void onRefresh() {
+        Status status = adapter.getItem(0);
+        if (status != null) {
+            sendFetchTimelineRequest(null, status.id);
+        } else {
+            sendFetchTimelineRequest(null, null);
+        }
+    }
+
+    @Override
+    public void onReply(int position) {
+        super.reply(adapter.getItem(position));
+    }
+
+    @Override
+    public void onReblog(final boolean reblog, final int position) {
+        super.reblog(adapter.getItem(position), reblog, adapter, position);
+    }
+
+    @Override
+    public void onFavourite(final boolean favourite, final int position) {
+        super.favourite(adapter.getItem(position), favourite, adapter, position);
+    }
+
+    @Override
+    public void onMore(View view, final int position) {
+        super.more(adapter.getItem(position), view, adapter, position);
+    }
+
+    @Override
+    public void onViewMedia(String[] urls, int urlIndex, Status.MediaAttachment.Type type) {
+        super.viewMedia(urls, urlIndex, type);
+    }
+
+    @Override
+    public void onViewThread(int position) {
+        super.viewThread(adapter.getItem(position));
+    }
+
+    @Override
+    public void onViewTag(String tag) {
+        if (kind == Kind.TAG && hashtagOrId.equals(tag)) {
+            // If already viewing a tag page, then ignore any request to view that tag again.
+            return;
+        }
+        super.viewTag(tag);
+    }
+
+    @Override
+    public void onViewAccount(String id) {
+        if (kind == Kind.USER && hashtagOrId.equals(id)) {
+            /* If already viewing an account page, then any requests to view that account page
+             * should be ignored. */
+            return;
+        }
+        super.viewAccount(id);
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        switch (key) {
+            case "fabHide": {
+                hideFab = sharedPreferences.getBoolean("fabHide", false);
+                break;
+            }
+            case "mediaPreviewEnabled": {
+                boolean enabled = sharedPreferences.getBoolean("mediaPreviewEnabled", true);
+                adapter.setMediaPreviewEnabled(enabled);
+                fullyRefresh();
+                break;
+            }
+        }
+    }
+
+    private void onLoadMore(RecyclerView view) {
+        TimelineAdapter adapter = (TimelineAdapter) view.getAdapter();
+        Status status = adapter.getItem(adapter.getItemCount() - 2);
+        if (status != null) {
+            sendFetchTimelineRequest(status.id, null);
+        } else {
+            sendFetchTimelineRequest(null, null);
+        }
+    }
+
+    private void fullyRefresh() {
+        adapter.clear();
+        sendFetchTimelineRequest(null, null);
+    }
+
     private boolean jumpToTopAllowed() {
         return kind != Kind.TAG && kind != Kind.FAVOURITES;
     }
@@ -310,17 +400,10 @@ public class TimelineFragment extends SFragment implements
         filterRemoveReblogs = (kind == Kind.HOME && !preferences.getBoolean("tabFilterHomeBoosts", true));
 
         if (adapter.getItemCount() > 1 && (oldRemoveReblogs != filterRemoveReblogs || oldRemoveReplies != filterRemoveReplies)) {
-            adapter.clear();
-            sendFetchTimelineRequest(null, null);
+            fullyRefresh();
         }
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        setFiltersFromSettings();
-    }
-
     public void onFetchTimelineSuccess(List<Status> statuses, String fromId) {
         filterStatuses(statuses);
         if (fromId != null) {
@@ -342,70 +425,4 @@ public class TimelineFragment extends SFragment implements
         swipeRefreshLayout.setRefreshing(false);
         Log.e(TAG, "Fetch Failure: " + exception.getMessage());
     }
-
-    @Override
-    public void onRefresh() {
-        Status status = adapter.getItem(0);
-        if (status != null) {
-            sendFetchTimelineRequest(null, status.id);
-        } else {
-            sendFetchTimelineRequest(null, null);
-        }
-    }
-
-    @Override
-    public void onReply(int position) {
-        super.reply(adapter.getItem(position));
-    }
-
-    @Override
-    public void onReblog(final boolean reblog, final int position) {
-        super.reblog(adapter.getItem(position), reblog, adapter, position);
-    }
-
-    @Override
-    public void onFavourite(final boolean favourite, final int position) {
-        super.favourite(adapter.getItem(position), favourite, adapter, position);
-    }
-
-    @Override
-    public void onMore(View view, final int position) {
-        super.more(adapter.getItem(position), view, adapter, position);
-    }
-
-    @Override
-    public void onViewMedia(String[] urls, int urlIndex, Status.MediaAttachment.Type type) {
-        super.viewMedia(urls, urlIndex, type);
-    }
-
-    @Override
-    public void onViewThread(int position) {
-        super.viewThread(adapter.getItem(position));
-    }
-
-    @Override
-    public void onViewTag(String tag) {
-        if (kind == Kind.TAG && hashtagOrId.equals(tag)) {
-            // If already viewing a tag page, then ignore any request to view that tag again.
-            return;
-        }
-        super.viewTag(tag);
-    }
-
-    @Override
-    public void onViewAccount(String id) {
-        if (kind == Kind.USER && hashtagOrId.equals(id)) {
-            /* If already viewing an account page, then any requests to view that account page
-             * should be ignored. */
-            return;
-        }
-        super.viewAccount(id);
-    }
-
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if(key.equals("fabHide")) {
-            hideFab = sharedPreferences.getBoolean("fabHide", false);
-        }
-    }
 }

app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java

@@ -16,8 +16,10 @@
 package com.keylesspalace.tusky.fragment;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
 import android.support.v4.content.ContextCompat;
@@ -89,6 +91,10 @@ public class ViewThreadFragment extends SFragment implements
         recyclerView.addItemDecoration(new ConversationLineItemDecoration(context,
                 ContextCompat.getDrawable(context, R.drawable.conversation_divider_dark)));
         adapter = new ThreadAdapter(this);
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(
+                getActivity());
+        boolean mediaPreviewEnabled = preferences.getBoolean("mediaPreviewEnabled", true);
+        adapter.setMediaPreviewEnabled(mediaPreviewEnabled);
         recyclerView.setAdapter(adapter);
 
         mastodonApi = null;