From 6bde959ba30da08b5b919bd46e7b9a69be89b1e6 Mon Sep 17 00:00:00 2001 From: anandwana001 Date: Mon, 24 May 2021 02:52:07 +0530 Subject: [PATCH 1/4] pinview host update --- app/build.gradle | 2 +- third_party/versions.bzl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ac56bf57d8f..203ac3c71c6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -110,7 +110,7 @@ dependencies { 'androidx.multidex:multidex:2.0.1', 'androidx.recyclerview:recyclerview:1.0.0', 'androidx.work:work-runtime-ktx:2.4.0', - 'com.chaos.view:pinview:1.4.4', + 'io.github.chaosleung:pinview:1.4.4', 'com.github.bumptech.glide:glide:4.11.0', 'com.google.android:flexbox:2.0.1', 'com.google.android.material:material:1.2.0-alpha02', diff --git a/third_party/versions.bzl b/third_party/versions.bzl index ecd07917347..6843ae399ad 100644 --- a/third_party/versions.bzl +++ b/third_party/versions.bzl @@ -43,7 +43,7 @@ MAVEN_PRODUCTION_DEPENDENCY_VERSIONS = { "androidx.work:work-runtime": "2.4.0", "androidx.work:work-runtime-ktx": "2.4.0", "com.android.support:support-annotations": "28.0.0", - "com.chaos.view:pinview": "1.4.4", + "io.github.chaosleung:pinview": "1.4.4", "com.crashlytics.sdk.android:crashlytics": "2.9.8", "com.github.bumptech.glide:compiler": "4.11.0", "com.github.bumptech.glide:glide": "4.11.0", From 0716240f0b38c7ce441de4dcbb4c225db6342386 Mon Sep 17 00:00:00 2001 From: anandwana001 Date: Mon, 24 May 2021 02:59:49 +0530 Subject: [PATCH 2/4] nit fixes --- app/BUILD.bazel | 4 ++-- third_party/versions.bzl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/BUILD.bazel b/app/BUILD.bazel index 2409ca162b0..b101df4eca3 100644 --- a/app/BUILD.bazel +++ b/app/BUILD.bazel @@ -495,10 +495,10 @@ android_library( "//third_party:androidx_viewpager2_viewpager2", "//third_party:androidx_viewpager_viewpager", "//third_party:circularimageview_circular_image_view", - "//third_party:com_chaos_view_pinview", "//third_party:com_google_android_flexbox", "//third_party:com_google_android_material_material", "//third_party:de_hdodenhof_circleimageview", + "//third_party:io_github_chaosleung_pinview", "//third_party:javax_annotation_javax_annotation-api_jar", "//third_party:nl_dionsegijn_konfetti", ], @@ -605,8 +605,8 @@ android_library( "//third_party:androidx_lifecycle_lifecycle-livedata-core", "//third_party:androidx_lifecycle_lifecycle-livedata-ktx", "//third_party:circularimageview_circular_image_view", - "//third_party:com_chaos_view_pinview", "//third_party:com_google_android_material_material", + "//third_party:io_github_chaosleung_pinview", "//utility", ], ) diff --git a/third_party/versions.bzl b/third_party/versions.bzl index 6843ae399ad..363702697f1 100644 --- a/third_party/versions.bzl +++ b/third_party/versions.bzl @@ -43,7 +43,6 @@ MAVEN_PRODUCTION_DEPENDENCY_VERSIONS = { "androidx.work:work-runtime": "2.4.0", "androidx.work:work-runtime-ktx": "2.4.0", "com.android.support:support-annotations": "28.0.0", - "io.github.chaosleung:pinview": "1.4.4", "com.crashlytics.sdk.android:crashlytics": "2.9.8", "com.github.bumptech.glide:compiler": "4.11.0", "com.github.bumptech.glide:glide": "4.11.0", @@ -61,6 +60,7 @@ MAVEN_PRODUCTION_DEPENDENCY_VERSIONS = { "com.squareup.retrofit2:retrofit": "2.9.0", "de.hdodenhof:circleimageview": "3.0.1", "io.fabric.sdk.android:fabric": "1.4.7", + "io.github.chaosleung:pinview": "1.4.4", "javax.annotation:javax.annotation-api:jar": "1.3.2", "javax.inject:javax.inject": "1", "nl.dionsegijn:konfetti": "1.2.5", From 2ed5d5b63c2700cb69cf2bdc2df01f2485ef661c Mon Sep 17 00:00:00 2001 From: anandwana001 Date: Mon, 24 May 2021 04:04:55 +0530 Subject: [PATCH 3/4] Trigger Build From 885d9b4a4e5a8e4f7b35178433e065738e493c17 Mon Sep 17 00:00:00 2001 From: anandwana001 Date: Mon, 24 May 2021 06:39:09 +0530 Subject: [PATCH 4/4] nit fix --- app/BUILD.bazel | 1 + .../org/oppia/android/testing/espresso/BUILD.bazel | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/app/BUILD.bazel b/app/BUILD.bazel index 9047f75f031..5200dfc73ba 100644 --- a/app/BUILD.bazel +++ b/app/BUILD.bazel @@ -690,6 +690,7 @@ TEST_DEPS = [ "//testing", "//testing/src/main/java/org/oppia/android/testing/espresso:edit_text_input_action", "//testing/src/main/java/org/oppia/android/testing/espresso:generic_view_matchers", + "//testing/src/main/java/org/oppia/android/testing/espresso:image_view_matcher", "//testing/src/main/java/org/oppia/android/testing/espresso:konfetti_view_matcher", "//testing/src/main/java/org/oppia/android/testing/mockito", "//testing/src/main/java/org/oppia/android/testing/robolectric:is_on_robolectric", diff --git a/testing/src/main/java/org/oppia/android/testing/espresso/BUILD.bazel b/testing/src/main/java/org/oppia/android/testing/espresso/BUILD.bazel index a034aed2425..97ff8eb1200 100644 --- a/testing/src/main/java/org/oppia/android/testing/espresso/BUILD.bazel +++ b/testing/src/main/java/org/oppia/android/testing/espresso/BUILD.bazel @@ -45,4 +45,16 @@ kt_android_library( ], ) +kt_android_library( + name = "image_view_matcher", + testonly = True, + srcs = [ + "ImageViewMatcher.kt", + ], + visibility = ["//:oppia_testing_visibility"], + deps = [ + "//third_party:androidx_test_espresso_espresso-core", + ], +) + dagger_rules()