dm media layout finalization

app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectMessageMediaShareViewHolder.java

@@ -53,41 +53,12 @@ public class DirectMessageMediaShareViewHolder extends DirectMessageItemViewHold
                 maxWidth
         );
         final ViewGroup.LayoutParams layoutParams = binding.ivMediaPreview.getLayoutParams();
-        layoutParams.width = widthHeight.first != null ? widthHeight.first : 0;
         layoutParams.height = widthHeight.second != null ? widthHeight.second : 0;
+        layoutParams.width = widthHeight.first != null ? widthHeight.first : 0;
         binding.ivMediaPreview.requestLayout();
         binding.ivMediaPreview.setImageURI(mediaModel.getThumbUrl());
         final MediaItemType modelMediaType = mediaModel.getMediaType();
         binding.typeIcon.setVisibility(modelMediaType == MediaItemType.MEDIA_TYPE_VIDEO
                                                || modelMediaType == MediaItemType.MEDIA_TYPE_SLIDER ? View.VISIBLE : View.GONE);
     }
-
-    private class WidthHeight {
-        private final DirectItemMediaModel mediaModel;
-        private int height;
-        private int width;
-
-        public WidthHeight(final DirectItemMediaModel mediaModel) {this.mediaModel = mediaModel;}
-
-        public int getHeight() {
-            return height;
-        }
-
-        public int getWidth() {
-            return width;
-        }
-
-        public WidthHeight invoke() {
-            height = mediaModel.getHeight();
-            width = mediaModel.getWidth();
-            // make height 500dp regardless
-            width = NumberUtils.getResultingWidth(maxHeight, height, width);
-            height = maxHeight;
-            if (width > maxWidth) {
-                height = NumberUtils.getResultingHeight(maxWidth, height, width);
-                width = maxWidth;
-            }
-            return this;
-        }
-    }
 }

app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java

@@ -841,7 +841,6 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
     }
 
     private void fetchPosts() {
-        Log.d("austin_debug", "fp");
         stopCurrentExecutor();
         binding.swipeRefreshLayout.setRefreshing(true);
         currentlyExecuting = new PostsFetcher(profileModel.getId(), PostItemType.MAIN, endCursor, postsFetchListener)

app/src/main/java/awais/instagrabber/utils/NumberUtils.java

@@ -57,8 +57,8 @@ public final class NumberUtils {
 
     @NonNull
     public static Pair<Integer, Integer> calculateWidthHeight(final int height, final int width, final int maxHeight, final int maxWidth) {
-        int tempWidth = NumberUtils.getResultingWidth(maxHeight, height, width);
+        int tempWidth = width;
-        int tempHeight = maxHeight;
+        int tempHeight = height > maxHeight ? maxHeight : height;
         if (tempWidth > maxWidth) {
             tempHeight = NumberUtils.getResultingHeight(maxWidth, height, width);
             tempWidth = maxWidth;

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

@@ -11,7 +11,6 @@
         android:id="@+id/swipeRefreshLayout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-
         android:layout_weight="1">
 
         <androidx.recyclerview.widget.RecyclerView

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

@@ -6,6 +6,7 @@
 
     <com.facebook.drawee.view.SimpleDraweeView
         android:id="@+id/ivMediaPreview"
+        android:layout_gravity="center"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
 

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

@@ -22,6 +22,7 @@
             android:id="@+id/ivMediaPreview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_gravity="center"
             android:adjustViewBounds="true"
             android:maxHeight="@dimen/dm_media_img_max_height"
             app:actualImageScaleType="fitCenter" />

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

@@ -20,6 +20,7 @@
             android:id="@+id/ivMediaPreview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:adjustViewBounds="true"
             android:maxHeight="@dimen/dm_media_img_max_height" />
 

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

@@ -13,6 +13,7 @@
             android:id="@+id/ivMediaPreview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:adjustViewBounds="true"
             android:maxHeight="@dimen/dm_media_img_max_height" />