From d6e927a8bee5eda0e33c3e3af68de0b22a45befa Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Sun, 27 Sep 2020 00:37:22 +0900 Subject: [PATCH 1/3] Fix wrong dimensions calculated due to last minute variable name change --- app/src/main/java/awais/instagrabber/utils/NumberUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/awais/instagrabber/utils/NumberUtils.java b/app/src/main/java/awais/instagrabber/utils/NumberUtils.java index f5f59c89..69db8011 100644 --- a/app/src/main/java/awais/instagrabber/utils/NumberUtils.java +++ b/app/src/main/java/awais/instagrabber/utils/NumberUtils.java @@ -59,7 +59,7 @@ public final class NumberUtils { public static Pair calculateWidthHeight(final int height, final int width, final int maxHeight, final int maxWidth) { int tempWidth = NumberUtils.getResultingWidth(maxHeight, height, width); int tempHeight = maxHeight; - if (width > maxWidth) { + if (tempWidth > maxWidth) { tempHeight = NumberUtils.getResultingHeight(maxWidth, height, width); tempWidth = maxWidth; } From 548211c5a0d368fea57f87107cd608efca3d4252 Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Sun, 27 Sep 2020 00:38:35 +0900 Subject: [PATCH 2/3] Fix weird NavDirections compilation error --- .../directmessages/DirectMessageSettingsFragment.java | 10 +++++++--- .../directmessages/DirectMessageThreadFragment.java | 5 ++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageSettingsFragment.java b/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageSettingsFragment.java index 05ae26a1..355fede3 100644 --- a/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageSettingsFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageSettingsFragment.java @@ -21,7 +21,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.AppCompatButton; import androidx.appcompat.widget.AppCompatImageView; import androidx.fragment.app.Fragment; -import androidx.navigation.NavDirections; import androidx.navigation.fragment.NavHostFragment; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -35,6 +34,7 @@ import java.util.Arrays; import java.util.List; import awais.instagrabber.BuildConfig; +import awais.instagrabber.ProfileNavGraphDirections; import awais.instagrabber.R; import awais.instagrabber.adapters.DirectMessageMembersAdapter; import awais.instagrabber.asyncs.direct_messages.DirectMessageInboxThreadFetcher; @@ -92,7 +92,9 @@ public class DirectMessageSettingsFragment extends Fragment implements SwipeRefr final Object tag = v.getTag(); if (tag instanceof ProfileModel) { ProfileModel model = (ProfileModel) tag; - final NavDirections action = DirectMessageThreadFragmentDirections.actionGlobalProfileFragment("@" + model.getUsername()); + final ProfileNavGraphDirections.ActionGlobalProfileFragment action = DirectMessageThreadFragmentDirections + .actionGlobalProfileFragment(); + action.setUsername("@" + model.getUsername()); NavHostFragment.findNavController(this).navigate(action); } }; @@ -109,7 +111,9 @@ public class DirectMessageSettingsFragment extends Fragment implements SwipeRefr }); final DialogInterface.OnClickListener clickListener = (d, w) -> { if (w == 0) { - final NavDirections action = DirectMessageThreadFragmentDirections.actionGlobalProfileFragment("@" + model.getUsername()); + final ProfileNavGraphDirections.ActionGlobalProfileFragment action = DirectMessageThreadFragmentDirections + .actionGlobalProfileFragment(); + action.setUsername("@" + model.getUsername()); NavHostFragment.findNavController(this).navigate(action); } else if (w == 1) { new ChangeSettings(titleText.getText().toString()).execute("remove_users", model.getId()); diff --git a/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageThreadFragment.java b/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageThreadFragment.java index e76ed0d1..3289e364 100644 --- a/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageThreadFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageThreadFragment.java @@ -51,6 +51,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; +import awais.instagrabber.ProfileNavGraphDirections; import awais.instagrabber.R; import awais.instagrabber.adapters.DirectMessageItemsAdapter; import awais.instagrabber.asyncs.ImageUploader; @@ -520,7 +521,9 @@ public class DirectMessageThreadFragment extends Fragment { } private void searchUsername(final String text) { - final NavDirections action = DirectMessageThreadFragmentDirections.actionGlobalProfileFragment("@" + text); + final ProfileNavGraphDirections.ActionGlobalProfileFragment action = DirectMessageThreadFragmentDirections + .actionGlobalProfileFragment(); + action.setUsername("@" + text); NavHostFragment.findNavController(this).navigate(action); } From a4e1ee69af17c3f358d8fc5d850039024f746913 Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Sun, 27 Sep 2020 00:39:11 +0900 Subject: [PATCH 3/3] Fix double requestLayout --- .../viewholder/directmessages/DirectMessageMediaViewHolder.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectMessageMediaViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectMessageMediaViewHolder.java index 2dd96e9e..8d7e0cd7 100644 --- a/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectMessageMediaViewHolder.java +++ b/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectMessageMediaViewHolder.java @@ -43,7 +43,6 @@ public class DirectMessageMediaViewHolder extends DirectMessageItemViewHolder { layoutParams.width = widthHeight.first != null ? widthHeight.first : 0; layoutParams.height = widthHeight.second != null ? widthHeight.second : 0; binding.ivMediaPreview.requestLayout(); - 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