Migrate to AndroidX from the Android Support Library. https://redmine.stoutner.com...

[PrivacyBrowserAndroid.git] / app / src / main / res / layout / find_on_page_app_bar.xml

diff --git a/app/src/main/res/layout/find_on_page_app_bar.xml b/app/src/main/res/layout/find_on_page_app_bar.xml
index 56f0c1e76212abc27cc2d6dd3b32c1bc3bda1360..8b2a510ebaa56d472c628f0501a1e8594074dff6 100644 (file)
--- a/app/src/main/res/layout/find_on_page_app_bar.xml
+++ b/app/src/main/res/layout/find_on_page_app_bar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017,2019 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -21,13 +21,14 @@
 <!-- `LinearLayout` is initially `visibility="gone"` so the `url_app_bar` is visible. -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/find_on_page_linearlayout"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:orientation="horizontal"
     android:visibility="gone" >
 
-    <!-- `android:imeOptions="actionGo"` sets the keyboard to have a `go` key instead of a `new line` key. -->
+    <!-- `android:imeOptions="actionDone"` sets the keyboard to have a `check mark` key instead of a `new line` key. -->
     <EditText
         android:id="@+id/find_on_page_edittext"
         android:layout_height="wrap_content"
@@ -37,8 +38,17 @@
         android:layout_marginEnd="4dp"
         android:hint="@string/find_on_page"
         android:lines="1"
-        android:imeOptions="actionGo"
-        android:inputType="text" />
+        android:imeOptions="actionDone"
+        android:inputType="text"
+        tools:ignore="Autofill" />
+
+    <TextView
+        android:id="@+id/find_on_page_count_textview"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:text="@string/zero_of_zero" />
 
     <ImageView
         android:id="@+id/find_previous"
@@ -48,7 +58,9 @@
         android:layout_marginStart="4dp"
         android:layout_marginEnd="4dp"
         android:layout_gravity="center_vertical"
-        android:contentDescription="@string/previous" />
+        android:tint="?attr/findOnPageIconTintColor"
+        android:contentDescription="@string/previous"
+        android:onClick="findPreviousOnPage" />
 
     <ImageView
         android:id="@+id/find_next"
@@ -58,16 +70,19 @@
         android:layout_marginStart="4dp"
         android:layout_marginEnd="4dp"
         android:layout_gravity="center_vertical"
-        android:contentDescription="@string/next" />
+        android:tint="?attr/findOnPageIconTintColor"
+        android:contentDescription="@string/next"
+        android:onClick="findNextOnPage" />
 
     <ImageView
         android:id="@+id/close_find"
-        android:src="@drawable/close"
+        android:src="@drawable/close_light"
         android:layout_width="35dp"
         android:layout_height="35dp"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="8dp"
         android:layout_gravity="center_vertical"
+        android:tint="?attr/findOnPageIconTintColor"
         android:contentDescription="@string/close"
         android:onClick="closeFindOnPage" />
 </LinearLayout>
\ No newline at end of file