Fixed UI issues in posts and comments. Version 1.4.0.

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "ml.docilealligator.infinityforreddit"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 18
+        versionCode 19
-        versionName "1.3.1"
+        versionName "1.4.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/java/ml/docilealligator/infinityforreddit/Activity/LinkResolverActivity.java

@@ -36,9 +36,9 @@ public class LinkResolverActivity extends AppCompatActivity {
 
     private static final String POST_PATTERN = "/r/\\w+/comments/\\w+/{0,1}\\w+/{0,1}";
     private static final String COMMENT_PATTERN = "/r/\\w+/comments/\\w+/{0,1}\\w+/\\w+/{0,1}";
-    private static final String SUBREDDIT_PATTERN = "/r/\\w+/{0,1}";
+    private static final String SUBREDDIT_PATTERN = "/[rR]/\\w+/{0,1}";
     private static final String USER_PATTERN_1 = "/user/\\w+/{0,1}";
-    private static final String USER_PATTERN_2 = "/u/\\w+/{0,1}";
+    private static final String USER_PATTERN_2 = "/[uU]/\\w+/{0,1}";
 
     @Inject
     SharedPreferences mSharedPreferences;

app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java

@@ -582,6 +582,11 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
             String authorPrefixed = "u/" + comment.getAuthor();
             ((CommentViewHolder) holder).authorTextView.setText(authorPrefixed);
 
+            if (comment.getAuthorFlair() != null && !comment.getAuthorFlair().equals("")) {
+                ((CommentViewHolder) holder).authorFlairTextView.setVisibility(View.VISIBLE);
+                ((CommentViewHolder) holder).authorFlairTextView.setText(comment.getAuthorFlair());
+            }
+
             if (comment.isSubmitter()) {
                 ((CommentViewHolder) holder).authorTextView.setTextColor(ContextCompat.getColor(mActivity, R.color.submitter));
                 ((CommentViewHolder) holder).authorTypeImageView.setVisibility(View.VISIBLE);
@@ -1374,6 +1379,7 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
             ((CommentViewHolder) holder).authorTextView.setTextColor(
                     ContextCompat.getColor(mActivity, R.color.colorPrimaryDarkDayNightTheme));
             mGlide.clear(((CommentViewHolder) holder).authorTypeImageView);
+            ((CommentViewHolder) holder).authorFlairTextView.setVisibility(View.GONE);
             ((CommentViewHolder) holder).authorTypeImageView.setVisibility(View.GONE);
             ((CommentViewHolder) holder).moreButton.setVisibility(View.GONE);
             ((CommentViewHolder) holder).expandButton.setVisibility(View.GONE);
@@ -1691,6 +1697,8 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
     class CommentViewHolder extends RecyclerView.ViewHolder {
         @BindView(R.id.author_text_view_item_post_comment)
         TextView authorTextView;
+        @BindView(R.id.author_flair_text_view_item_post_comment)
+        TextView authorFlairTextView;
         @BindView(R.id.author_type_image_view_item_comment)
         ImageView authorTypeImageView;
         @BindView(R.id.comment_time_text_view_item_post_comment)

app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/PostRecyclerViewAdapter.java

@@ -11,7 +11,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -247,7 +246,7 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
                     ((DataViewHolder) holder).nameTextView.setTextColor(mContext.getResources().getColor(R.color.colorAccent));
                     ((DataViewHolder) holder).nameTextView.setText(subredditNamePrefixed);
 
-                    ((DataViewHolder) holder).iconNameLinearLayout.setOnClickListener(view -> {
+                    ((DataViewHolder) holder).nameTextView.setOnClickListener(view -> {
                         if (canStartActivity) {
                             canStartActivity = false;
                             if (post.getSubredditNamePrefixed().startsWith("u/")) {
@@ -263,6 +262,9 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
                             }
                         }
                     });
+
+                    ((DataViewHolder) holder).iconGifImageView.setOnClickListener(view ->
+                            ((DataViewHolder) holder).nameTextView.performClick());
                 } else {
                     if (post.getAuthorIconUrl() == null) {
                         String authorName = post.getAuthor().equals("[deleted]") ? post.getSubredditNamePrefixed().substring(2) : post.getAuthor();
@@ -300,7 +302,7 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
                     ((DataViewHolder) holder).nameTextView.setTextColor(mContext.getResources().getColor(R.color.colorPrimaryDarkDayNightTheme));
                     ((DataViewHolder) holder).nameTextView.setText(authorPrefixed);
 
-                    ((DataViewHolder) holder).iconNameLinearLayout.setOnClickListener(view -> {
+                    ((DataViewHolder) holder).nameTextView.setOnClickListener(view -> {
                         if (canStartActivity) {
                             canStartActivity = false;
                             Intent intent = new Intent(mContext, ViewUserDetailActivity.class);
@@ -308,6 +310,9 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
                             mContext.startActivity(intent);
                         }
                     });
+
+                    ((DataViewHolder) holder).iconGifImageView.setOnClickListener(view ->
+                            ((DataViewHolder) holder).nameTextView.performClick());
                 }
 
                 ((DataViewHolder) holder).postTimeTextView.setText(postTime);
@@ -807,8 +812,6 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
     class DataViewHolder extends RecyclerView.ViewHolder {
         @BindView(R.id.card_view_item_post)
         MaterialCardView cardView;
-        @BindView(R.id.icon_name_linear_layout_view_item_post)
-        LinearLayout iconNameLinearLayout;
         @BindView(R.id.icon_gif_image_view_item_post)
         AspectRatioGifImageView iconGifImageView;
         @BindView(R.id.name_text_view_item_post)

app/src/main/java/ml/docilealligator/infinityforreddit/CommentData.java

@@ -23,6 +23,7 @@ public class CommentData implements Parcelable {
     private String id;
     private String fullName;
     private String author;
+    private String authorFlair;
     private String linkAuthor;
     private String commentTime;
     private String commentContent;
@@ -47,13 +48,14 @@ public class CommentData implements Parcelable {
     private boolean isLoadingMoreChildren;
     private boolean loadMoreChildrenFailed;
 
-    public CommentData(String id, String fullName, String author, String linkAuthor, String commentTime,
+    public CommentData(String id, String fullName, String author, String authorFlair, String linkAuthor, String commentTime,
                        String commentContent, String linkId, String subredditName, String parentId, int score,
                        int voteType, boolean isSubmitter, String distinguished, String permalink,
                        int depth, boolean collapsed, boolean hasReply, boolean scoreHidden, boolean saved) {
         this.id = id;
         this.fullName = fullName;
         this.author = author;
+        this.authorFlair = authorFlair;
         this.linkAuthor = linkAuthor;
         this.commentTime = commentTime;
         this.commentContent = commentContent;
@@ -87,6 +89,7 @@ public class CommentData implements Parcelable {
         id = in.readString();
         fullName = in.readString();
         author = in.readString();
+        authorFlair = in.readString();
         linkAuthor = in.readString();
         commentTime = in.readString();
         commentContent = in.readString();
@@ -127,6 +130,10 @@ public class CommentData implements Parcelable {
         this.author = author;
     }
 
+    public String getAuthorFlair() {
+        return authorFlair;
+    }
+
     public String getLinkAuthor() {
         return linkAuthor;
     }
@@ -308,6 +315,7 @@ public class CommentData implements Parcelable {
         parcel.writeString(id);
         parcel.writeString(fullName);
         parcel.writeString(author);
+        parcel.writeString(authorFlair);
         parcel.writeString(linkAuthor);
         parcel.writeString(commentTime);
         parcel.writeString(commentContent);

app/src/main/java/ml/docilealligator/infinityforreddit/JSONUtils.java

@@ -16,6 +16,7 @@ public class JSONUtils {
     public static final String SELFTEXT_KEY = "selftext";
     public static final String SELFTEXT_HTML_KEY = "selftext_html";
     public static final String AUTHOR_KEY = "author";
+    public static final String AUTHOR_FLAIR_TEXT_KEY = "author_flair_text";
     public static final String LINK_AUTHOR_KEY = "link_author";
     public static final String LINK_FLAIR_TEXT_KEY = "link_flair_text";
     public static final String SCORE_KEY = "score";

app/src/main/java/ml/docilealligator/infinityforreddit/ParseComment.java

@@ -112,6 +112,12 @@ public class ParseComment {
         String id = singleCommentData.getString(JSONUtils.ID_KEY);
         String fullName = singleCommentData.getString(JSONUtils.NAME_KEY);
         String author = singleCommentData.getString(JSONUtils.AUTHOR_KEY);
+        String authorFlair;
+        if (!singleCommentData.has(JSONUtils.AUTHOR_FLAIR_TEXT_KEY) || singleCommentData.isNull(JSONUtils.AUTHOR_FLAIR_TEXT_KEY)) {
+            authorFlair = "";
+        } else {
+            authorFlair = singleCommentData.getString(JSONUtils.AUTHOR_FLAIR_TEXT_KEY);
+        }
         String linkAuthor = singleCommentData.has(JSONUtils.LINK_AUTHOR_KEY) ? singleCommentData.getString(JSONUtils.LINK_AUTHOR_KEY) : null;
         String linkId = singleCommentData.getString(JSONUtils.LINK_ID_KEY).substring(3);
         String subredditName = singleCommentData.getString(JSONUtils.SUBREDDIT_KEY);
@@ -147,9 +153,9 @@ public class ParseComment {
         boolean collapsed = singleCommentData.getBoolean(JSONUtils.COLLAPSED_KEY);
         boolean hasReply = !(singleCommentData.get(JSONUtils.REPLIES_KEY) instanceof String);
 
-        return new CommentData(id, fullName, author, linkAuthor, formattedSubmitTime, commentContent,
+        return new CommentData(id, fullName, author, authorFlair, linkAuthor, formattedSubmitTime,
-                linkId, subredditName, parentId, score, voteType, isSubmitter, distinguished,
+                commentContent, linkId, subredditName, parentId, score, voteType, isSubmitter,
-                permalink, depth, collapsed, hasReply, scoreHidden, saved);
+                distinguished, permalink, depth, collapsed, hasReply, scoreHidden, saved);
     }
 
     @Nullable

app/src/main/res/drawable/ic_comment_white_24dp.xml

@@ -1,5 +1,9 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:height="24dp"
-    <path android:fillColor="#FF000000" android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18zM20,4v13.17L18.83,16L4,16L4,4h16zM6,12h12v2L6,14zM6,9h12v2L6,11zM6,6h12v2L6,8z"/>
 </vector>

app/src/main/res/drawable/ic_insert_comment_white_24dp.xml

@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#FFFFFF" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
-</vector>

app/src/main/res/layout/item_comment.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/linear_layout_item_comment"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -23,40 +22,65 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:paddingStart="16dp"
-            android:layout_marginEnd="16dp">
+            android:paddingEnd="16dp">
-
-            <TextView
-                android:id="@+id/author_text_view_item_post_comment"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/colorPrimaryDarkDayNightTheme"
-                android:textSize="?attr/font_default"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
 
             <ImageView
                 android:id="@+id/author_type_image_view_item_comment"
                 android:layout_width="?attr/font_default"
                 android:layout_height="?attr/font_default"
-                android:layout_marginStart="4dp"
+                android:layout_marginEnd="4dp"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="@id/author_flair_text_view_item_post_comment"
+                app:layout_constraintEnd_toStartOf="@id/author_text_view_item_post_comment"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/author_text_view_item_post_comment"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:ellipsize="end"
+                android:maxLines="2"
+                android:textColor="@color/colorPrimaryDarkDayNightTheme"
+                android:textSize="?attr/font_default"
+                app:layout_constraintBottom_toTopOf="@id/author_flair_text_view_item_post_comment"
+                app:layout_constraintEnd_toStartOf="@+id/barrier"
+                app:layout_constraintStart_toEndOf="@id/author_type_image_view_item_comment"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/author_flair_text_view_item_post_comment"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:ellipsize="end"
+                android:maxLines="2"
+                android:textColor="@color/authorFlairTextColor"
+                android:textSize="?attr/font_default"
                 android:visibility="gone"
-                app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/author_text_view_item_post_comment" />
+                app:layout_constraintEnd_toStartOf="@+id/barrier"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/author_text_view_item_post_comment" />
 
             <TextView
                 android:id="@+id/comment_time_text_view_item_post_comment"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
+                android:gravity="end"
                 android:textSize="?attr/font_default"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/author_type_image_view_item_comment"
+                app:layout_constraintTop_toTopOf="parent" />
-                app:layout_constraintTop_toTopOf="parent"
+
-                app:layout_constraintHorizontal_bias="1" />
+            <androidx.constraintlayout.widget.Barrier
+                android:id="@+id/barrier"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:barrierDirection="start"
+                app:constraint_referenced_ids="comment_time_text_view_item_post_comment" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -71,127 +95,6 @@
             android:textColor="@color/primaryTextColor"
             android:textSize="?attr/content_font_default" />
 
-        <!--<androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/bottom_constraint_layout_item_post_comment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="4dp"
-            android:paddingEnd="4dp">
-
-            <ImageView
-                android:id="@+id/up_vote_button_item_post_comment"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:src="@drawable/ic_arrow_upward_grey_24dp"
-                app:layout_constraintEnd_toStartOf="@id/score_text_view_item_post_comment"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent" />
-
-            <TextView
-                android:id="@+id/score_text_view_item_post_comment"
-                android:layout_width="64dp"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:textSize="?attr/font_12"
-                android:textStyle="bold"
-                app:layout_constraintEnd_toStartOf="@+id/down_vote_button_item_post_comment"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"/>
-
-            <ImageView
-                android:id="@+id/down_vote_button_item_post_comment"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:src="@drawable/ic_arrow_downward_grey_24dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent" />
-
-            <ImageView
-                android:id="@+id/more_button_item_post_comment"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:src="@drawable/ic_more_vert_grey_24dp"
-                android:visibility="gone"
-                app:layout_constraintStart_toEndOf="@+id/expand_button_item_post_comment"
-                app:layout_constraintEnd_toStartOf="@id/up_vote_button_item_post_comment"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintHorizontal_bias="0" />
-
-            <ImageView
-                android:id="@+id/expand_button_item_post_comment"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:src="@drawable/ic_expand_less_grey_24dp"
-                android:visibility="gone"
-                app:layout_constraintStart_toEndOf="@+id/save_button_item_post_comment"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"/>
-
-            <ImageView
-                android:id="@+id/save_button_item_post_comment"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                app:layout_constraintStart_toEndOf="@+id/reply_button_item_post_comment"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"/>
-
-            <ImageView
-                android:id="@+id/reply_button_item_post_comment"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:src="@drawable/ic_reply_grey_24dp"
-                app:layout_constraintStart_toEndOf="@id/share_button_item_post_comment"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"/>
-
-            <ImageView
-                android:id="@+id/share_button_item_post_comment"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:src="@drawable/ic_share_grey_24dp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"/>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>-->
-
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/bottom_constraint_layout_item_post_comment"
             android:layout_width="match_parent"

app/src/main/res/layout/item_post.xml

@@ -17,60 +17,62 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                android:id="@+id/icon_name_linear_layout_view_item_post"
-                android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-                android:padding="16dp"
+            android:padding="16dp">
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post"
-                app:layout_constraintTop_toTopOf="parent">
 
             <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
                 android:id="@+id/icon_gif_image_view_item_post"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                    android:layout_gravity="center"/>
+                android:layout_gravity="center"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
                 android:id="@+id/name_text_view_item_post"
-                    android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
                 android:layout_gravity="center"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="8dp"
                 android:textColor="#E91E63"
-                    android:textSize="?attr/font_default" />
+                android:textSize="?attr/font_default"
-
+                app:layout_constraintBottom_toBottomOf="parent"
-            </LinearLayout>
+                app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_item_post"
+                app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post"
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <ImageView
                 android:id="@+id/stickied_post_image_view_item_post"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:layout_marginStart="8dp"
                 android:layout_marginEnd="8dp"
                 android:tint="@color/backgroundColorPrimaryDark"
                 android:visibility="gone"
-                app:layout_constraintStart_toEndOf="@id/icon_name_linear_layout_view_item_post"
-                app:layout_constraintEnd_toStartOf="@+id/post_time_text_view_best_item_post"
                 app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@id/name_text_view_item_post"
+                app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
                 android:id="@+id/post_time_text_view_best_item_post"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="16dp"
                 android:gravity="end"
                 android:textSize="?attr/font_default"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/stickied_post_image_view_item_post"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/guideline2"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/guideline2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.6" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <TextView
@@ -256,95 +258,6 @@
             android:background="@color/grey"
             android:visibility="gone"/>
 
-        <!--<androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:id="@+id/plus_button_item_post"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_arrow_upward_grey_24dp"
-                android:tint="@android:color/tab_indicator_text"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/score_text_view_item_post" />
-
-            <TextView
-                android:id="@+id/score_text_view_item_post"
-                android:layout_width="64dp"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:textSize="?attr/font_12"
-                android:textStyle="bold"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/minus_button_item_post" />
-
-            <ImageView
-                android:id="@+id/minus_button_item_post"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_arrow_downward_grey_24dp"
-                android:tint="@android:color/tab_indicator_text"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
-
-            <TextView
-                android:id="@+id/comments_count_item_post"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:gravity="center_vertical"
-                android:textSize="?attr/font_12"
-                android:textStyle="bold"
-                android:drawableStart="@drawable/ic_comment_grey_24dp"
-                android:drawablePadding="12dp"
-                app:layout_constraintHorizontal_bias="0"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/save_button_item_post"
-                app:layout_constraintEnd_toStartOf="@id/plus_button_item_post" />
-
-            <ImageView
-                android:id="@+id/save_button_item_post"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:tint="@android:color/tab_indicator_text"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                app:layout_constraintHorizontal_bias="0"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/share_button_item_post" />
-
-            <ImageView
-                android:id="@+id/share_button_item_post"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_share_grey_24dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintHorizontal_bias="1" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>-->
-
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/bottom_constraint_layout_item_post"
             android:layout_width="match_parent"

app/src/main/res/layout/item_post_detail.xml

@@ -7,63 +7,69 @@
     android:background="?attr/cardViewBackgroundColor">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/relative_layout_item_post_detail"
+        android:id="@+id/constraint_layout_item_post_detail"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <RelativeLayout
-            android:id="@+id/subreddit_icon_name_relative_layout_item_post_detail"
-            android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-            android:padding="16dp"
+        android:padding="16dp">
-            app:layout_constrainedWidth="true"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/post_time_text_view_item_post_detail"
-            app:layout_constraintTop_toTopOf="parent">
 
         <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
             android:id="@+id/icon_gif_image_view_item_post_detail"
             android:layout_width="24dp"
             android:layout_height="24dp"
-                android:layout_centerVertical="true" />
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/subreddit_text_view_item_post_detail"
-                android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-                android:layout_alignParentTop="true"
+            android:layout_marginEnd="8dp"
-                android:layout_toEndOf="@id/icon_gif_image_view_item_post_detail"
             android:textColor="@color/colorAccent"
-                android:textSize="?attr/font_default" />
+            android:textSize="?attr/font_default"
+            android:maxLines="2"
+            android:ellipsize="end"
+            app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_detail"
+            app:layout_constraintEnd_toStartOf="@id/guideline"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintHorizontal_bias="0" />
 
         <TextView
             android:id="@+id/user_text_view_item_post_detail"
-                android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-                android:layout_alignParentBottom="true"
+            android:layout_marginEnd="8dp"
-                android:layout_below="@id/subreddit_text_view_item_post_detail"
-                android:layout_toEndOf="@id/icon_gif_image_view_item_post_detail"
             android:textColor="@color/colorPrimaryDarkDayNightTheme"
-                android:textSize="?attr/font_default" />
+            android:textSize="?attr/font_default"
-
+            android:maxLines="2"
-        </RelativeLayout>
+            android:ellipsize="end"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/icon_gif_image_view_item_post_detail"
+            app:layout_constraintEnd_toStartOf="@id/guideline"
+            app:layout_constraintTop_toBottomOf="@+id/subreddit_text_view_item_post_detail"
+            app:layout_constraintHorizontal_bias="0" />
 
         <TextView
             android:id="@+id/post_time_text_view_item_post_detail"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginEnd="16dp"
             android:gravity="end"
             android:textSize="?attr/font_default"
+            app:layout_constraintHorizontal_bias="1"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/subreddit_icon_name_relative_layout_item_post_detail"
+            app:layout_constraintStart_toEndOf="@id/guideline"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="0.6" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <TextView

app/src/main/res/menu/view_post_detail_activity.xml

@@ -5,7 +5,7 @@
         android:id="@+id/action_comment_view_post_detail_activity"
         android:orderInCategory="1"
         android:title="@string/action_add_comment"
-        android:icon="@drawable/ic_insert_comment_white_24dp"
+        android:icon="@drawable/ic_comment_white_24dp"
         app:showAsAction="ifRoom"
         android:visible="false" />
 

app/src/main/res/values/colors.xml

@@ -77,4 +77,6 @@
     <color name="spoilerBackgroundColor">#EE02EB</color>
 
     <color name="flairBackgroundColor">#00AA8C</color>
+
+    <color name="authorFlairTextColor">#EE02C4</color>
 </resources>