From 0e7a2ccb5d3fc39462922f963978b2992810122e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 2 Jul 2021 15:24:45 +0000 Subject: [PATCH 1/5] Update dependency androidx.test:core to v1.4.0 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index f184bcc6..20b5502f 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -249,7 +249,7 @@ dependencies { testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0' androidTestImplementation 'org.junit.jupiter:junit-jupiter:5.7.2' - androidTestImplementation 'androidx.test:core:1.3.0' + androidTestImplementation 'androidx.test:core:1.4.0' androidTestImplementation 'com.android.support:support-annotations:28.0.0' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation "androidx.room:room-testing:2.3.0" From 7a8b5c715ba7e19cff5944c5d4c35ff6b864245f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 2 Jul 2021 15:24:50 +0000 Subject: [PATCH 2/5] Update dependency androidx.test:core-ktx to v1.4.0 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index f184bcc6..51a843f0 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -243,7 +243,7 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter:5.7.2' testImplementation "androidx.test.ext:junit-ktx:1.1.2" - testImplementation "androidx.test:core-ktx:1.3.0" + testImplementation "androidx.test:core-ktx:1.4.0" testImplementation "androidx.arch.core:core-testing:2.1.0" testImplementation "org.robolectric:robolectric:4.5.1" testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0' From 778e6b432ead60e0b2fd5b882e5864f1de8a6bed Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 2 Jul 2021 20:03:15 +0000 Subject: [PATCH 3/5] Update dependency org.robolectric:robolectric to v4.6 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 25ddf57f..abf7bed8 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -245,7 +245,7 @@ dependencies { testImplementation "androidx.test.ext:junit-ktx:1.1.2" testImplementation "androidx.test:core-ktx:1.3.0" testImplementation "androidx.arch.core:core-testing:2.1.0" - testImplementation "org.robolectric:robolectric:4.5.1" + testImplementation "org.robolectric:robolectric:4.6" testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0' androidTestImplementation 'org.junit.jupiter:junit-jupiter:5.7.2' From d4b6ca23cd3c7f4340d6c3fc5ebd6a6fd0b95522 Mon Sep 17 00:00:00 2001 From: Austin Huang Date: Sat, 3 Jul 2021 14:14:22 -0400 Subject: [PATCH 4/5] remove slider video view count those don't exist anymore --- .../fragments/PostViewV2Fragment.java | 38 ++++++------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/awais/instagrabber/fragments/PostViewV2Fragment.java b/app/src/main/java/awais/instagrabber/fragments/PostViewV2Fragment.java index 9a987981..acb1a7e6 100644 --- a/app/src/main/java/awais/instagrabber/fragments/PostViewV2Fragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/PostViewV2Fragment.java @@ -116,7 +116,7 @@ public class PostViewV2Fragment extends Fragment implements EditTextDialogFragme private DialogPostViewBinding binding; private Context context; private boolean detailsVisible = true; - private boolean video; +// private boolean video; private VideoPlayerViewHelper videoPlayerViewHelper; private SliderItemsAdapter sliderItemsAdapter; private int sliderPosition = -1; @@ -996,30 +996,13 @@ public class PostViewV2Fragment extends Fragment implements EditTextDialogFragme final String text = (position + 1) + "/" + size; binding.mediaCounter.setText(text); final Media childMedia = media.getCarouselMedia().get(position); - // final View view = binding.sliderParent.getChildAt(0); - // if (prevPosition != -1) { - // if (view instanceof RecyclerView) { - // final RecyclerView.ViewHolder viewHolder = ((RecyclerView) view).findViewHolderForAdapterPosition(prevPosition); - // if (viewHolder instanceof SliderVideoViewHolder) { - // ((SliderVideoViewHolder) viewHolder).removeCallbacks(); - // } - // } - // } - video = false; - if (childMedia.getType() == MediaItemType.MEDIA_TYPE_VIDEO) { - // if (view instanceof RecyclerView) { - // final RecyclerView.ViewHolder viewHolder = ((RecyclerView) view).findViewHolderForAdapterPosition(position); - // if (viewHolder instanceof SliderVideoViewHolder) { - // ((SliderVideoViewHolder) viewHolder).resetPlayerTimeline(); - // } - // } - // enablePlayerControls(true); - video = true; - viewModel.setViewCount(childMedia.getViewCount()); - return; - } - viewModel.setViewCount(null); - // enablePlayerControls(false); +// video = false; +// if (childMedia.getType() == MediaItemType.MEDIA_TYPE_VIDEO) { +// video = true; +// viewModel.setViewCount(childMedia.getViewCount()); +// return; +// } +// viewModel.setViewCount(null); } private void pausePlayerAtPosition(final int position, final RecyclerView view) { @@ -1058,7 +1041,7 @@ public class PostViewV2Fragment extends Fragment implements EditTextDialogFragme } private void setupVideo() { - video = true; +// video = true; final Media media = viewModel.getMedia(); binding.mediaCounter.setVisibility(View.GONE); final Context context = getContext(); @@ -1396,7 +1379,8 @@ public class PostViewV2Fragment extends Fragment implements EditTextDialogFragme bottom.like.setVisibility(View.VISIBLE); bottom.save.setVisibility(View.VISIBLE); } - if (video) { + // if (video) { + if (media.getType() == MediaItemType.MEDIA_TYPE_VIDEO) { // binding.playerControlsToggle.setVisibility(View.VISIBLE); bottom.viewsCount.setVisibility(View.VISIBLE); } From 33c331906fe5ae889ca8509e28ab5271135193bc Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 3 Jul 2021 18:28:24 +0000 Subject: [PATCH 5/5] Update dependency androidx.test.ext:junit-ktx to v1.1.3 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 4c304bb7..7d84f032 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -242,7 +242,7 @@ dependencies { githubImplementation 'io.sentry:sentry-android:5.0.1' testImplementation 'org.junit.jupiter:junit-jupiter:5.7.2' - testImplementation "androidx.test.ext:junit-ktx:1.1.2" + testImplementation "androidx.test.ext:junit-ktx:1.1.3" testImplementation "androidx.test:core-ktx:1.4.0" testImplementation "androidx.arch.core:core-testing:2.1.0" testImplementation "org.robolectric:robolectric:4.5.1"