Merge "Refactor SearchViewObserver from PdfViewer." into androidx-platform-dev
diff --git a/pdf/pdf-viewer/src/main/java/androidx/pdf/viewer/PdfViewer.java b/pdf/pdf-viewer/src/main/java/androidx/pdf/viewer/PdfViewer.java
index 7d8e888..e12db23 100644
--- a/pdf/pdf-viewer/src/main/java/androidx/pdf/viewer/PdfViewer.java
+++ b/pdf/pdf-viewer/src/main/java/androidx/pdf/viewer/PdfViewer.java
@@ -1030,18 +1030,7 @@
{ // Listen to searchModel.
mSearchQueryObserver =
- new ValueObserver<String>() {
- @Override
- public void onChange(String oldQuery, String newQuery) {
- mPaginatedView.clearAllOverlays();
- }
-
- @NonNull
- @Override
- public String toString() {
- return TAG + "#searchQueryObserver";
- }
- };
+ new SearchQueryObserver(mPaginatedView);
mSelectedMatchObserver =
new ValueObserver<SelectedMatch>() {
@@ -1195,7 +1184,7 @@
return true;
}
- /** */
+ /** */
public void gotoPageDest(@NonNull GotoLinkDestination destination) {
if (destination.getPageNumber() >= mPaginationModel.getSize()) {
diff --git a/pdf/pdf-viewer/src/main/java/androidx/pdf/viewer/SearchQueryObserver.java b/pdf/pdf-viewer/src/main/java/androidx/pdf/viewer/SearchQueryObserver.java
new file mode 100644
index 0000000..081e10d
--- /dev/null
+++ b/pdf/pdf-viewer/src/main/java/androidx/pdf/viewer/SearchQueryObserver.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.pdf.viewer;
+
+import androidx.annotation.RestrictTo;
+import androidx.pdf.util.ObservableValue;
+
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+class SearchQueryObserver implements ObservableValue.ValueObserver<String> {
+ private final PaginatedView mPaginatedView;
+
+ SearchQueryObserver(PaginatedView paginatedView) {
+ mPaginatedView = paginatedView;
+ }
+
+ @Override
+ public void onChange(String oldQuery, String newQuery) {
+ mPaginatedView.clearAllOverlays();
+ }
+}
diff --git a/pdf/pdf-viewer/src/test/java/androidx/pdf/viewer/SearchQueryObserverTest.java b/pdf/pdf-viewer/src/test/java/androidx/pdf/viewer/SearchQueryObserverTest.java
new file mode 100644
index 0000000..d726676
--- /dev/null
+++ b/pdf/pdf-viewer/src/test/java/androidx/pdf/viewer/SearchQueryObserverTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.pdf.viewer;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import androidx.test.filters.SmallTest;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+
+@SmallTest
+@RunWith(RobolectricTestRunner.class)
+public class SearchQueryObserverTest {
+
+ private final PaginatedView mMockPaginatedView = mock(PaginatedView.class);
+
+ @Test
+ public void onChange() {
+ SearchQueryObserver searchQueryObserver = new SearchQueryObserver(mMockPaginatedView);
+ searchQueryObserver.onChange("oldQuery", "newQuery");
+ verify(mMockPaginatedView).clearAllOverlays();
+ }
+}
