From 07e2e1e746164eb39c20a1bacbb53bdfc3f8d2c8 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Wed, 24 Feb 2021 00:15:37 +0800
Subject: New options: hide post type and hide the number of awards. Tweak
 settings.

---
 .../adapters/PostRecyclerViewAdapter.java          | 40 +++++++++++++++++----
 .../events/ChangeHidePostTypeEvent.java            |  9 +++++
 .../events/ChangeHideTheNumberOfAwardsEvent.java   |  9 +++++
 .../infinityforreddit/fragments/PostFragment.java  | 18 ++++++++++
 .../settings/PostPreferenceFragment.java           | 42 +++++++++++++++-------
 .../utils/SharedPreferencesUtils.java              |  2 ++
 .../infinityforreddit/utils/Utils.java             | 27 ++------------
 app/src/main/res/layout/item_post_card_2_text.xml  |  2 +-
 .../res/layout/item_post_card_2_video_autoplay.xml |  2 +-
 .../res/layout/item_post_card_2_with_preview.xml   |  2 +-
 app/src/main/res/values/arrays.xml                 |  2 ++
 app/src/main/res/values/strings.xml                | 10 +++---
 app/src/main/res/xml/post_preferences.xml          | 21 ++++++++---
 13 files changed, 132 insertions(+), 54 deletions(-)
 create mode 100644 app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeHidePostTypeEvent.java
 create mode 100644 app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeHideTheNumberOfAwardsEvent.java

(limited to 'app/src/main')

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
index 04b23880..87025e50 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
@@ -208,6 +208,8 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
     private boolean mMarkPostsAsReadAfterVoting;
     private boolean mMarkPostsAsReadOnScroll;
     private boolean mHideReadPostsAutomatically;
+    private boolean mHidePostType;
+    private boolean mHideTheNumberOfAwards;
     private Drawable mCommentIcon;
     private NetworkState networkState;
     private ExoCreator mExoCreator;
@@ -279,6 +281,9 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
             mMarkPostsAsReadOnScroll = postHistorySharedPreferences.getBoolean((accountName == null ? "" : accountName) + SharedPreferencesUtils.MARK_POSTS_AS_READ_ON_SCROLL_BASE, false);
             mHideReadPostsAutomatically = postHistorySharedPreferences.getBoolean((accountName == null ? "" : accountName) + SharedPreferencesUtils.HIDE_READ_POSTS_AUTOMATICALLY_BASE, false);
 
+            mHidePostType = sharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_POST_TYPE, false);
+            mHideTheNumberOfAwards = sharedPreferences.getBoolean(SharedPreferencesUtils.HIDE_THE_NUMBER_OF_AWARDS, false);
+
             mPostLayout = postLayout;
 
             mColorPrimaryLightTheme = customThemeWrapper.getColorPrimaryLightTheme();
@@ -604,7 +609,7 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
                     Utils.setHTMLWithImageToTextView(((PostBaseViewHolder) holder).flairTextView, flair, false);
                 }
 
-                if (nAwards > 0) {
+                if (nAwards > 0 && !mHideTheNumberOfAwards) {
                     ((PostBaseViewHolder) holder).awardsTextView.setVisibility(View.VISIBLE);
                     if (nAwards == 1) {
                         ((PostBaseViewHolder) holder).awardsTextView.setText(mActivity.getString(R.string.one_award));
@@ -652,6 +657,12 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
                     ((PostBaseViewHolder) holder).saveButton.setImageResource(R.drawable.ic_bookmark_border_grey_24dp);
                 }
 
+                if (mHidePostType) {
+                    ((PostBaseViewHolder) holder).typeTextView.setVisibility(View.GONE);
+                } else {
+                    ((PostBaseViewHolder) holder).typeTextView.setVisibility(View.VISIBLE);
+                }
+
                 if (holder instanceof PostVideoAutoplayViewHolder) {
                     ((PostVideoAutoplayViewHolder) holder).previewImageView.setVisibility(View.VISIBLE);
                     Post.Preview preview = getSuitablePreview(post.getPreviews());
@@ -1082,7 +1093,7 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
                     Utils.setHTMLWithImageToTextView(((PostCompactBaseViewHolder) holder).flairTextView, flair, false);
                 }
 
-                if (nAwards > 0) {
+                if (nAwards > 0 && !mHideTheNumberOfAwards) {
                     ((PostCompactBaseViewHolder) holder).awardsTextView.setVisibility(View.VISIBLE);
                     if (nAwards == 1) {
                         ((PostCompactBaseViewHolder) holder).awardsTextView.setText(mActivity.getString(R.string.one_award));
@@ -1138,6 +1149,12 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
                     ((PostCompactBaseViewHolder) holder).crosspostImageView.setVisibility(View.VISIBLE);
                 }
 
+                if (mHidePostType) {
+                    ((PostCompactBaseViewHolder) holder).typeTextView.setVisibility(View.GONE);
+                } else {
+                    ((PostCompactBaseViewHolder) holder).typeTextView.setVisibility(View.VISIBLE);
+                }
+
                 switch (post.getPostType()) {
                     case Post.IMAGE_TYPE:
                         ((PostCompactBaseViewHolder) holder).typeTextView.setText(R.string.image);
@@ -1740,6 +1757,14 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
         mOnlyDisablePreviewInVideoAndGifPosts = onlyDisablePreviewInVideoAndGifPosts;
     }
 
+    public void setHidePostType(boolean hidePostType) {
+        mHidePostType = hidePostType;
+    }
+
+    public void setHideTheNumberOfAwards(boolean hideTheNumberOfAwards) {
+        mHideTheNumberOfAwards = hideTheNumberOfAwards;
+    }
+
     @Override
     public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
         super.onViewRecycled(holder);
@@ -1754,11 +1779,14 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
             ((PostBaseViewHolder) holder).itemView.setVisibility(View.VISIBLE);
             RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) holder.itemView.getLayoutParams();
             params.height = ViewGroup.LayoutParams.WRAP_CONTENT;
-            int marginPixel = (int) Utils.convertDpToPixel(8, mActivity);
-            if (holder instanceof PostCard2VideoAutoplayViewHolder || holder instanceof PostCard2WithPreviewViewHolder
-                    || holder instanceof PostCard2TextTypeViewHolder) {
-                ((PostBaseViewHolder) holder).itemView.setPadding(0, marginPixel, 0, 0);
+            if (holder instanceof PostCard2VideoAutoplayViewHolder || holder instanceof PostCard2WithPreviewViewHolder) {
+                int paddingPixel = (int) Utils.convertDpToPixel(16, mActivity);
+                ((PostBaseViewHolder) holder).itemView.setPadding(0, paddingPixel, 0, 0);
+            } else if (holder instanceof PostCard2TextTypeViewHolder) {
+                int paddingPixel = (int) Utils.convertDpToPixel(12, mActivity);
+                ((PostBaseViewHolder) holder).itemView.setPadding(0, paddingPixel, 0, 0);
             } else {
+                int marginPixel = (int) Utils.convertDpToPixel(8, mActivity);
                 params.topMargin = marginPixel;
                 params.bottomMargin = marginPixel;
             }
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeHidePostTypeEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeHidePostTypeEvent.java
new file mode 100644
index 00000000..da9a07be
--- /dev/null
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeHidePostTypeEvent.java
@@ -0,0 +1,9 @@
+package ml.docilealligator.infinityforreddit.events;
+
+public class ChangeHidePostTypeEvent {
+    public boolean hidePostType;
+
+    public ChangeHidePostTypeEvent(boolean hidePostType) {
+        this.hidePostType = hidePostType;
+    }
+}
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeHideTheNumberOfAwardsEvent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeHideTheNumberOfAwardsEvent.java
new file mode 100644
index 00000000..ef9330af
--- /dev/null
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/events/ChangeHideTheNumberOfAwardsEvent.java
@@ -0,0 +1,9 @@
+package ml.docilealligator.infinityforreddit.events;
+
+public class ChangeHideTheNumberOfAwardsEvent {
+    public boolean hideTheNumberOfAwards;
+
+    public ChangeHideTheNumberOfAwardsEvent(boolean hideTheNumberOfAwards) {
+        this.hideTheNumberOfAwards = hideTheNumberOfAwards;
+    }
+}
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java
index dc0fa55f..7841efc2 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/PostFragment.java
@@ -84,6 +84,8 @@ import ml.docilealligator.infinityforreddit.events.ChangeDataSavingModeEvent;
 import ml.docilealligator.infinityforreddit.events.ChangeDefaultPostLayoutEvent;
 import ml.docilealligator.infinityforreddit.events.ChangeDisableImagePreviewEvent;
 import ml.docilealligator.infinityforreddit.events.ChangeEnableSwipeActionSwitchEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeHidePostTypeEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeHideTheNumberOfAwardsEvent;
 import ml.docilealligator.infinityforreddit.events.ChangeLongPressToHideToolbarInCompactLayoutEvent;
 import ml.docilealligator.infinityforreddit.events.ChangeMuteAutoplayingVideosEvent;
 import ml.docilealligator.infinityforreddit.events.ChangeMuteNSFWVideoEvent;
@@ -1639,6 +1641,22 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
         }
     }
 
+    @Subscribe
+    public void onChangeHidePostTypeEvent(ChangeHidePostTypeEvent event) {
+        if (mAdapter != null) {
+            mAdapter.setHidePostType(event.hidePostType);
+            refreshAdapter();
+        }
+    }
+
+    @Subscribe
+    public void onChangeHideTheNumberOfAwardsEvent(ChangeHideTheNumberOfAwardsEvent event) {
+        if (mAdapter != null) {
+            mAdapter.setHideTheNumberOfAwards(event.hideTheNumberOfAwards);
+            refreshAdapter();
+        }
+    }
+
     private void refreshAdapter() {
         int previousPosition = -1;
         if (mLinearLayoutManager != null) {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/settings/PostPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/PostPreferenceFragment.java
index 08011d3a..f04c205a 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/settings/PostPreferenceFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/settings/PostPreferenceFragment.java
@@ -11,6 +11,8 @@ import org.greenrobot.eventbus.EventBus;
 import ml.docilealligator.infinityforreddit.R;
 import ml.docilealligator.infinityforreddit.events.ChangeCompactLayoutToolbarHiddenByDefaultEvent;
 import ml.docilealligator.infinityforreddit.events.ChangeDefaultPostLayoutEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeHidePostTypeEvent;
+import ml.docilealligator.infinityforreddit.events.ChangeHideTheNumberOfAwardsEvent;
 import ml.docilealligator.infinityforreddit.events.ChangeLongPressToHideToolbarInCompactLayoutEvent;
 import ml.docilealligator.infinityforreddit.events.ChangeShowAbsoluteNumberOfVotesEvent;
 import ml.docilealligator.infinityforreddit.events.ShowDividerInCompactLayoutPreferenceEvent;
@@ -23,36 +25,38 @@ public class PostPreferenceFragment extends PreferenceFragmentCompat {
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         setPreferencesFromResource(R.xml.post_preferences, rootKey);
 
-        ListPreference defaultPostLayoutSwitch = findPreference(SharedPreferencesUtils.DEFAULT_POST_LAYOUT_KEY);
-        SwitchPreference showDividerInCompactLayout = findPreference(SharedPreferencesUtils.SHOW_DIVIDER_IN_COMPACT_LAYOUT);
-        SwitchPreference showThumbnailOnTheRightInCompactLayout = findPreference(SharedPreferencesUtils.SHOW_THUMBNAIL_ON_THE_LEFT_IN_COMPACT_LAYOUT);
-        SwitchPreference showAbsoluteNumberOfVotes = findPreference(SharedPreferencesUtils.SHOW_ABSOLUTE_NUMBER_OF_VOTES);
+        ListPreference defaultPostLayoutList = findPreference(SharedPreferencesUtils.DEFAULT_POST_LAYOUT_KEY);
+        SwitchPreference showDividerInCompactLayoutSwitch = findPreference(SharedPreferencesUtils.SHOW_DIVIDER_IN_COMPACT_LAYOUT);
+        SwitchPreference showThumbnailOnTheRightInCompactLayoutSwitch = findPreference(SharedPreferencesUtils.SHOW_THUMBNAIL_ON_THE_LEFT_IN_COMPACT_LAYOUT);
+        SwitchPreference showAbsoluteNumberOfVotesSwitch = findPreference(SharedPreferencesUtils.SHOW_ABSOLUTE_NUMBER_OF_VOTES);
         SwitchPreference longPressToHideToolbarInCompactLayoutSwitch = findPreference(SharedPreferencesUtils.LONG_PRESS_TO_HIDE_TOOLBAR_IN_COMPACT_LAYOUT);
         SwitchPreference postCompactLayoutToolbarHiddenByDefaultSwitch = findPreference(SharedPreferencesUtils.POST_COMPACT_LAYOUT_TOOLBAR_HIDDEN_BY_DEFAULT);
+        SwitchPreference hidePostTypeSwitch = findPreference(SharedPreferencesUtils.HIDE_POST_TYPE);
+        SwitchPreference hideTheNumberOfAwardsSwitch = findPreference(SharedPreferencesUtils.HIDE_THE_NUMBER_OF_AWARDS);
 
-        if (defaultPostLayoutSwitch != null) {
-            defaultPostLayoutSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
+        if (defaultPostLayoutList != null) {
+            defaultPostLayoutList.setOnPreferenceChangeListener((preference, newValue) -> {
                 EventBus.getDefault().post(new ChangeDefaultPostLayoutEvent(Integer.parseInt((String) newValue)));
                 return true;
             });
         }
 
-        if (showDividerInCompactLayout != null) {
-            showDividerInCompactLayout.setOnPreferenceChangeListener((preference, newValue) -> {
+        if (showDividerInCompactLayoutSwitch != null) {
+            showDividerInCompactLayoutSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
                 EventBus.getDefault().post(new ShowDividerInCompactLayoutPreferenceEvent((Boolean) newValue));
                 return true;
             });
         }
 
-        if (showThumbnailOnTheRightInCompactLayout != null) {
-            showThumbnailOnTheRightInCompactLayout.setOnPreferenceChangeListener((preference, newValue) -> {
+        if (showThumbnailOnTheRightInCompactLayoutSwitch != null) {
+            showThumbnailOnTheRightInCompactLayoutSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
                 EventBus.getDefault().post(new ShowThumbnailOnTheRightInCompactLayoutEvent((Boolean) newValue));
                 return true;
             });
         }
 
-        if (showAbsoluteNumberOfVotes != null) {
-            showAbsoluteNumberOfVotes.setOnPreferenceChangeListener((preference, newValue) -> {
+        if (showAbsoluteNumberOfVotesSwitch != null) {
+            showAbsoluteNumberOfVotesSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
                 EventBus.getDefault().post(new ChangeShowAbsoluteNumberOfVotesEvent((Boolean) newValue));
                 return true;
             });
@@ -71,5 +75,19 @@ public class PostPreferenceFragment extends PreferenceFragmentCompat {
                 return true;
             });
         }
+
+        if (hidePostTypeSwitch != null) {
+            hidePostTypeSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
+                EventBus.getDefault().post(new ChangeHidePostTypeEvent((Boolean) newValue));
+                return true;
+            });
+        }
+
+        if (hideTheNumberOfAwardsSwitch != null) {
+            hideTheNumberOfAwardsSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
+                EventBus.getDefault().post(new ChangeHideTheNumberOfAwardsEvent((Boolean) newValue));
+                return true;
+            });
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java
index 86c562fc..965f8145 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/SharedPreferencesUtils.java
@@ -163,6 +163,8 @@ public class SharedPreferencesUtils {
     public static final String USER_DEFAULT_SORT_TYPE = "user_default_sort_type";
     public static final String USER_DEFAULT_SORT_TIME = "user_default_sort_time";
     public static final String CLICK_TO_SHOW_MEDIA_IN_GALLERY_LAYOUT = "click_to_show_media_in_gallery_layout";
+    public static final String HIDE_POST_TYPE = "hide_post_type";
+    public static final String HIDE_THE_NUMBER_OF_AWARDS = "hide_the_number_of_awards";
 
     public static final String MAIN_PAGE_TABS_SHARED_PREFERENCES_FILE = "ml.docilealligator.infinityforreddit.main_page_tabs";
     public static final String MAIN_PAGE_TAB_COUNT = "_main_page_tab_count";
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/utils/Utils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/Utils.java
index a43b0ffc..de048168 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/utils/Utils.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/Utils.java
@@ -15,6 +15,7 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.text.HtmlCompat;
 
@@ -49,30 +50,6 @@ public class Utils {
                 .replaceAll("(^|^ *|\\n *)######(?!($|\\s|#))", "$0 "));
 
         return fixSuperScript(regexed);
-        //Fix superscript
-        /*int startIndex = regexed.indexOf("^");
-        while (startIndex >= 0 && startIndex + 1 < regexed.length()) {
-            char currentChar = regexed.charAt(startIndex + 1);
-            if (currentChar == '^') {
-                regexed.insert(startIndex, '^');
-                startIndex = regexed.indexOf("^", startIndex + 1);
-            } else if (currentChar == ' ' || currentChar == '\n') {
-                regexed.insert(startIndex + 1, '^');
-                startIndex = regexed.indexOf("^", startIndex + 2);
-            } else if (currentChar == '(') {
-                int closeBracketIndex = regexed.indexOf(")", startIndex + 2);
-                if (closeBracketIndex > 0) {
-
-                }
-            } else {
-                if (startIndex + 1 == regexed.length() - 1) {
-                    regexed.append('^');
-                    startIndex++;
-                }
-                startIndex++;
-            }
-        }
-        return regexed.toString();*/
     }
 
     public static String fixSuperScript(StringBuilder regexed) {
@@ -309,7 +286,7 @@ public class Utils {
 
     @Nullable
     public static Drawable getTintedDrawable(Context context, int drawableId, int color) {
-        Drawable drawable = context.getDrawable(drawableId);
+        Drawable drawable = ContextCompat.getDrawable(context, drawableId);
         if (drawable != null) {
             Drawable wrappedDrawable = DrawableCompat.wrap(drawable).mutate();
             DrawableCompat.setTint(wrappedDrawable, color);
diff --git a/app/src/main/res/layout/item_post_card_2_text.xml b/app/src/main/res/layout/item_post_card_2_text.xml
index af8fe398..a133cd52 100644
--- a/app/src/main/res/layout/item_post_card_2_text.xml
+++ b/app/src/main/res/layout/item_post_card_2_text.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
-    android:paddingTop="8dp"
+    android:paddingTop="12dp"
     android:clickable="true"
     android:focusable="true"
     android:background="?attr/selectableItemBackground"
diff --git a/app/src/main/res/layout/item_post_card_2_video_autoplay.xml b/app/src/main/res/layout/item_post_card_2_video_autoplay.xml
index 9047c717..da85dcea 100644
--- a/app/src/main/res/layout/item_post_card_2_video_autoplay.xml
+++ b/app/src/main/res/layout/item_post_card_2_video_autoplay.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
-    android:paddingTop="8dp"
+    android:paddingTop="16dp"
     android:clickable="true"
     android:focusable="true"
     android:background="?attr/selectableItemBackground"
diff --git a/app/src/main/res/layout/item_post_card_2_with_preview.xml b/app/src/main/res/layout/item_post_card_2_with_preview.xml
index 4007aae2..07e17a71 100644
--- a/app/src/main/res/layout/item_post_card_2_with_preview.xml
+++ b/app/src/main/res/layout/item_post_card_2_with_preview.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
-    android:paddingTop="8dp"
+    android:paddingTop="16dp"
     android:clickable="true"
     android:focusable="true"
     android:background="?attr/selectableItemBackground"
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 4686b42d..132c8cbc 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -43,12 +43,14 @@
 
     <string-array name="settings_default_post_layout">
         <item>Card Layout</item>
+        <item>Card Layout 2</item>
         <item>Compact Layout</item>
         <item>Gallery Layout</item>
     </string-array>
 
     <string-array name="settings_default_post_layout_values">
         <item>0</item>
+        <item>3</item>
         <item>1</item>
         <item>2</item>
     </string-array>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e47b5201..97c0a842 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -385,8 +385,8 @@
     <string name="settings_time_format_title">Time Format</string>
     <string name="settings_category_post_title">Post</string>
     <string name="settings_default_post_layout">Default Post Layout</string>
-    <string name="settings_show_divider_in_compact_layout">Show Divider in Compact Layout</string>
-    <string name="settings_show_thumbnail_on_the_left_in_compact_layout">Show Thumbnail on the Left in Compact Layout</string>
+    <string name="settings_show_divider_in_compact_layout">Show Divider</string>
+    <string name="settings_show_thumbnail_on_the_left_in_compact_layout">Show Thumbnail on the Left</string>
     <string name="settings_number_of_columns_in_post_feed_title">The Number of Columns in Post Feed</string>
     <string name="settings_number_of_columns_in_post_feed_portrait_title">Portrait</string>
     <string name="settings_number_of_columns_in_post_feed_landscape_title">Landscape</string>
@@ -491,8 +491,8 @@
     <string name="settings_pull_to_refresh_title">Pull to Refresh</string>
     <string name="settings_security_title">Security</string>
     <string name="settings_require_authentication_to_go_to_account_section_in_navigation_drawer_title">Require Authentication to Go to Account Section in Navigation Drawer</string>
-    <string name="settings_long_press_to_hide_toolbar_in_compact_layout_title">Long Press to Hide Toolbar in Compact Layout</string>
-    <string name="settings_post_compact_layout_toolbar_hidden_by_default_title">Toolbar in Compact Layout Hidden by Default</string>
+    <string name="settings_long_press_to_hide_toolbar_in_compact_layout_title">Long Press to Hide Toolbar</string>
+    <string name="settings_post_compact_layout_toolbar_hidden_by_default_title">Hide Toolbar by Default</string>
     <string name="settings_customize_bottom_app_bar_title">Customize Bottom Navigation Bar</string>
     <string name="settings_main_activity_bottom_app_bar_group_summary">Main Page</string>
     <string name="settings_other_activities_bottom_app_bar_group_summary">Other Pages</string>
@@ -535,6 +535,8 @@
     <string name="settings_user_default_sort_type_title">User Default Sort Type</string>
     <string name="settings_user_default_sort_time_title">User Default Sort Time</string>
     <string name="settings_click_to_show_media_in_gallery_layout">Click to Show Media in Gallery Layout</string>
+    <string name="settings_hide_post_type">Hide Post Type</string>
+    <string name="settings_hide_the_number_of_awards">Hide the Number of Awards</string>
 
     <string name="no_link_available">Cannot get the link</string>
 
diff --git a/app/src/main/res/xml/post_preferences.xml b/app/src/main/res/xml/post_preferences.xml
index 6dfbff12..bafe60fd 100644
--- a/app/src/main/res/xml/post_preferences.xml
+++ b/app/src/main/res/xml/post_preferences.xml
@@ -10,6 +10,23 @@
         app:title="@string/settings_default_post_layout"
         app:useSimpleSummaryProvider="true" />
 
+    <Preference
+        app:title="@string/settings_number_of_columns_in_post_feed_title"
+        app:fragment="ml.docilealligator.infinityforreddit.settings.NumberOfColumnsInPostFeedPreferenceFragment" />
+
+    <SwitchPreference
+        app:defaultValue="false"
+        app:key="hide_post_type"
+        app:title="@string/settings_hide_post_type" />
+
+    <SwitchPreference
+        app:defaultValue="false"
+        app:key="hide_the_number_of_awards"
+        app:title="@string/settings_hide_the_number_of_awards" />
+
+    <PreferenceCategory
+        app:title="@string/post_layout_compact" />
+
     <SwitchPreference
         app:defaultValue="true"
         app:key="show_divider_in_compact_layout"
@@ -30,10 +47,6 @@
         app:key="post_compact_layout_toolbar_hidden_by_default"
         app:title="@string/settings_post_compact_layout_toolbar_hidden_by_default_title" />
 
-    <Preference
-        app:title="@string/settings_number_of_columns_in_post_feed_title"
-        app:fragment="ml.docilealligator.infinityforreddit.settings.NumberOfColumnsInPostFeedPreferenceFragment" />
-
     <PreferenceCategory
         app:title="@string/post_layout_gallery" />
 
-- 
cgit v1.2.3