From 45911b27433db3291fa7a6f3f5bf5459ac3e0e65 Mon Sep 17 00:00:00 2001 From: mal Date: Thu, 25 Nov 2021 16:39:05 +0100 Subject: [PATCH 1/6] local build --- fresco-loader/build.gradle | 4 ++-- glide-loader/build.gradle | 4 ++-- library/build.gradle | 4 ++-- picasso-loader/build.gradle | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fresco-loader/build.gradle b/fresco-loader/build.gradle index 87bea9b..758c6b5 100644 --- a/fresco-loader/build.gradle +++ b/fresco-loader/build.gradle @@ -56,5 +56,5 @@ ext { allLicenses = ["MIT"] } -apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' -apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' +//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' +//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' diff --git a/glide-loader/build.gradle b/glide-loader/build.gradle index 0532996..51f9def 100644 --- a/glide-loader/build.gradle +++ b/glide-loader/build.gradle @@ -59,5 +59,5 @@ ext { allLicenses = ["MIT"] } -apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' -apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' +//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' +//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' diff --git a/library/build.gradle b/library/build.gradle index 6bdaba7..077f5fa 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -55,5 +55,5 @@ ext { allLicenses = ["The MIT License"] } -apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' -apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' +//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' +//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' diff --git a/picasso-loader/build.gradle b/picasso-loader/build.gradle index c2f069b..4c7ee9d 100644 --- a/picasso-loader/build.gradle +++ b/picasso-loader/build.gradle @@ -57,5 +57,5 @@ ext { allLicenses = ["MIT"] } -apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' -apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' +//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' +//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' From 1a274b6a14cfa21aea022ce0144d1be71c0c74d3 Mon Sep 17 00:00:00 2001 From: mal Date: Thu, 25 Nov 2021 16:39:32 +0100 Subject: [PATCH 2/6] colors to see that it is used --- library/src/main/res/layout/image_fragment.xml | 6 ++++-- library/src/main/res/layout/scroll_gallery_view.xml | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/library/src/main/res/layout/image_fragment.xml b/library/src/main/res/layout/image_fragment.xml index 43d9651..2bae57b 100644 --- a/library/src/main/res/layout/image_fragment.xml +++ b/library/src/main/res/layout/image_fragment.xml @@ -2,12 +2,14 @@ + android:orientation="vertical" + android:background="@color/design_default_color_error"> + android:src="@drawable/placeholder_image" + android:background="@color/design_default_color_error"/> \ No newline at end of file diff --git a/library/src/main/res/layout/scroll_gallery_view.xml b/library/src/main/res/layout/scroll_gallery_view.xml index 5ad0e79..bea0a42 100644 --- a/library/src/main/res/layout/scroll_gallery_view.xml +++ b/library/src/main/res/layout/scroll_gallery_view.xml @@ -1,12 +1,14 @@ + android:layout_height="match_parent" + android:background="@color/design_default_color_error"> + android:layout_height="match_parent" + android:background="@color/design_default_color_error"/> Date: Thu, 2 Dec 2021 18:05:43 +0100 Subject: [PATCH 3/6] removed colors again --- library/src/main/res/layout/image_fragment.xml | 6 ++---- library/src/main/res/layout/scroll_gallery_view.xml | 7 ++----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/library/src/main/res/layout/image_fragment.xml b/library/src/main/res/layout/image_fragment.xml index 2bae57b..5d16329 100644 --- a/library/src/main/res/layout/image_fragment.xml +++ b/library/src/main/res/layout/image_fragment.xml @@ -2,14 +2,12 @@ + android:orientation="vertical"> + android:src="@drawable/placeholder_image"/> \ No newline at end of file diff --git a/library/src/main/res/layout/scroll_gallery_view.xml b/library/src/main/res/layout/scroll_gallery_view.xml index bea0a42..2b46245 100644 --- a/library/src/main/res/layout/scroll_gallery_view.xml +++ b/library/src/main/res/layout/scroll_gallery_view.xml @@ -1,14 +1,12 @@ + android:layout_height="match_parent"> + android:layout_height="match_parent"/> Date: Thu, 2 Dec 2021 18:08:14 +0100 Subject: [PATCH 4/6] setCurrentItem scrolls thumbnails after viewPager is created --- .../scrollgalleryview/ScrollGalleryView.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/com/veinhorn/scrollgalleryview/ScrollGalleryView.java b/library/src/main/java/com/veinhorn/scrollgalleryview/ScrollGalleryView.java index d098cc1..fcbcab7 100644 --- a/library/src/main/java/com/veinhorn/scrollgalleryview/ScrollGalleryView.java +++ b/library/src/main/java/com/veinhorn/scrollgalleryview/ScrollGalleryView.java @@ -11,6 +11,7 @@ import android.view.Display; import android.view.LayoutInflater; import android.view.View; +import android.view.ViewTreeObserver; import android.view.WindowManager; import android.widget.HorizontalScrollView; import android.widget.ImageView; @@ -217,7 +218,24 @@ public void onSuccess() { * @param i a zero-based index * @return */ - public ScrollGalleryView setCurrentItem(int i) { + public ScrollGalleryView setCurrentItem(final int i) { + viewPager.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { + private boolean executed = false; + + @Override + public void onGlobalLayout() { + if (!executed){ + final View view = thumbnailsContainer.getChildAt(i); + scroll(view); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { + viewPager.getViewTreeObserver().removeOnGlobalLayoutListener(this); + } + + executed = true; + } + }}); + viewPager.setCurrentItem(i, false); return this; } From 8333e5825b04345059f35b22b8daaf52f7c811e8 Mon Sep 17 00:00:00 2001 From: mal Date: Thu, 2 Dec 2021 18:10:24 +0100 Subject: [PATCH 5/6] rollback local build --- fresco-loader/build.gradle | 4 ++-- glide-loader/build.gradle | 4 ++-- library/build.gradle | 4 ++-- picasso-loader/build.gradle | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fresco-loader/build.gradle b/fresco-loader/build.gradle index 758c6b5..87bea9b 100644 --- a/fresco-loader/build.gradle +++ b/fresco-loader/build.gradle @@ -56,5 +56,5 @@ ext { allLicenses = ["MIT"] } -//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' -//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' +apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' +apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' diff --git a/glide-loader/build.gradle b/glide-loader/build.gradle index 51f9def..0532996 100644 --- a/glide-loader/build.gradle +++ b/glide-loader/build.gradle @@ -59,5 +59,5 @@ ext { allLicenses = ["MIT"] } -//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' -//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' +apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' +apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' diff --git a/library/build.gradle b/library/build.gradle index 077f5fa..6bdaba7 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -55,5 +55,5 @@ ext { allLicenses = ["The MIT License"] } -//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' -//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' +apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' +apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' diff --git a/picasso-loader/build.gradle b/picasso-loader/build.gradle index 4c7ee9d..c2f069b 100644 --- a/picasso-loader/build.gradle +++ b/picasso-loader/build.gradle @@ -57,5 +57,5 @@ ext { allLicenses = ["MIT"] } -//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' -//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' +apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' +apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' From 5c0ba095e42d40d450be86913187fe002d0f859c Mon Sep 17 00:00:00 2001 From: mal Date: Thu, 9 Dec 2021 09:24:01 +0100 Subject: [PATCH 6/6] rollback layout --- library/src/main/res/layout/image_fragment.xml | 2 +- library/src/main/res/layout/scroll_gallery_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/src/main/res/layout/image_fragment.xml b/library/src/main/res/layout/image_fragment.xml index 5d16329..43d9651 100644 --- a/library/src/main/res/layout/image_fragment.xml +++ b/library/src/main/res/layout/image_fragment.xml @@ -9,5 +9,5 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:scaleType="center" - android:src="@drawable/placeholder_image"/> + android:src="@drawable/placeholder_image" /> \ No newline at end of file diff --git a/library/src/main/res/layout/scroll_gallery_view.xml b/library/src/main/res/layout/scroll_gallery_view.xml index 2b46245..5ad0e79 100644 --- a/library/src/main/res/layout/scroll_gallery_view.xml +++ b/library/src/main/res/layout/scroll_gallery_view.xml @@ -6,7 +6,7 @@ + android:layout_height="match_parent" />