Merge branch 'master' into pr/753

app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedPhotoViewHolder.java

@@ -31,7 +31,7 @@ public class FeedPhotoViewHolder extends FeedItemViewHolder {
         super(binding.getRoot(), binding.itemFeedTop, binding.itemFeedBottom, feedItemCallback);
         this.binding = binding;
         this.feedItemCallback = feedItemCallback;
-        binding.itemFeedBottom.tvVideoViews.setVisibility(View.GONE);
+        binding.itemFeedBottom.btnViews.setVisibility(View.GONE);
         // binding.itemFeedBottom.btnMute.setVisibility(View.GONE);
         binding.imageViewer.setAllowTouchInterceptionWhileZoomed(false);
         final GenericDraweeHierarchy hierarchy = new GenericDraweeHierarchyBuilder(itemView.getContext().getResources())

app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedSliderViewHolder.java

@@ -29,7 +29,7 @@ public class FeedSliderViewHolder extends FeedItemViewHolder {
         super(binding.getRoot(), binding.itemFeedTop, binding.itemFeedBottom, feedItemCallback);
         this.binding = binding;
         this.feedItemCallback = feedItemCallback;
-        binding.itemFeedBottom.tvVideoViews.setVisibility(View.GONE);
+        binding.itemFeedBottom.btnViews.setVisibility(View.GONE);
         // binding.itemFeedBottom.btnMute.setVisibility(View.GONE);
         final ViewGroup.LayoutParams layoutParams = binding.mediaList.getLayoutParams();
         layoutParams.height = Utils.displayMetrics.widthPixels + 1;

app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedVideoViewHolder.java

@@ -50,7 +50,7 @@ public class FeedVideoViewHolder extends FeedItemViewHolder {
         super(binding.getRoot(), binding.itemFeedTop, binding.itemFeedBottom, feedItemCallback);
         this.binding = binding;
         this.feedItemCallback = feedItemCallback;
-        binding.itemFeedBottom.tvVideoViews.setVisibility(View.VISIBLE);
+        binding.itemFeedBottom.btnViews.setVisibility(View.VISIBLE);
         handler = new Handler(Looper.getMainLooper());
         final Context context = binding.getRoot().getContext();
         dataSourceFactory = new DefaultDataSourceFactory(context, "instagram");

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

@@ -312,7 +312,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:visibility="visible"
-            app:constraint_referenced_ids="label_col_count,col_count_toggle,label_show_avatar_toggle,show_avatar_toggle,label_show_names_toggle,show_names_toggle"
+            app:constraint_referenced_ids="label_col_count,col_count_toggle,label_show_avatar_toggle,show_avatar_toggle,label_show_names_toggle,show_names_toggle,label_avatar_size,avatar_size_toggle"
             tools:visibility="visible" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>

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

@@ -37,13 +37,29 @@
                 tools:text="690000" />
         </LinearLayout>
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tvVideoViews"
+        <LinearLayout
+            android:id="@+id/btnViews"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:textAppearance="?attr/textAppearanceCaption"
-            tools:text="690000 views" />
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:padding="4dp">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="4dp"
+                app:srcCompat="@drawable/ic_outline_views_24"
+                app:tint="?android:textColorPrimary" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvVideoViews"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:textAppearance="?attr/textAppearanceButton"
+                tools:text="690000" />
+        </LinearLayout>
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tvPostDate"