From 96d93a70f7df7202ee34b2fcc3c82f3b4d97947b Mon Sep 17 00:00:00 2001 From: Austin Huang Date: Sun, 14 Mar 2021 23:34:46 -0400 Subject: [PATCH] close #782, close #787 --- .../viewholder/feed/FeedPhotoViewHolder.java | 2 +- .../viewholder/feed/FeedSliderViewHolder.java | 2 +- .../viewholder/feed/FeedVideoViewHolder.java | 2 +- .../layout/dialog_post_layout_preferences.xml | 2 +- app/src/main/res/layout/item_feed_bottom.xml | 26 +++++++++++++++---- 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedPhotoViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedPhotoViewHolder.java index c77e96e9..22724897 100644 --- a/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedPhotoViewHolder.java +++ b/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()) diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedSliderViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedSliderViewHolder.java index 22f3c898..b9271d6f 100644 --- a/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedSliderViewHolder.java +++ b/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; diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedVideoViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedVideoViewHolder.java index dd37e6e1..33ae8757 100644 --- a/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedVideoViewHolder.java +++ b/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"); diff --git a/app/src/main/res/layout/dialog_post_layout_preferences.xml b/app/src/main/res/layout/dialog_post_layout_preferences.xml index 938efd8c..b53b0f78 100644 --- a/app/src/main/res/layout/dialog_post_layout_preferences.xml +++ b/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" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_feed_bottom.xml b/app/src/main/res/layout/item_feed_bottom.xml index 5700b687..9ffc0599 100755 --- a/app/src/main/res/layout/item_feed_bottom.xml +++ b/app/src/main/res/layout/item_feed_bottom.xml @@ -37,13 +37,29 @@ tools:text="690000" /> - + android:gravity="center" + android:orientation="horizontal" + android:padding="4dp"> + + + + +