First wrong button text in View Headers in night theme. https://redmine.stoutner...

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

diff --git a/app/src/main/res/layout/logcat_bottom_appbar.xml b/app/src/main/res/layout/logcat_bottom_appbar.xml
index 69b04087056f8b8f08517778e13392d44b0ce57f..1db3a353301721fa33bb6f0340a9b557f0bf1529 100644 (file)
--- a/app/src/main/res/layout/logcat_bottom_appbar.xml
+++ b/app/src/main/res/layout/logcat_bottom_appbar.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2018-2023 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2018-2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
   Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent"
     android:layout_width="match_parent" >
 
@@ -37,18 +38,10 @@
             android:layout_width="match_parent"
             android:layout_weight="1" >
 
-            <ScrollView
-                android:id="@+id/scrollview"
+            <WebView
+                android:id="@+id/logcat_webview"
                 android:layout_height="wrap_content"
-                android:layout_width="match_parent" >
-
-                <TextView
-                    android:id="@+id/logcat_textview"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:layout_margin="10dp"
-                    android:textIsSelectable="true" />
-            </ScrollView>
+                android:layout_width="match_parent" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <!-- The app bar theme must be specified here because the activity uses a `NoActionBar` theme. -->
@@ -62,6 +55,79 @@
                 android:id="@+id/toolbar"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent" />
+
+            <!-- The search linear layout.  It is initially `visibility="gone"` and is only displayed when requested. -->
+            <LinearLayout
+                android:id="@+id/search_linearlayout"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:orientation="horizontal"
+                android:visibility="gone" >
+
+                <!-- `android:imeOptions="actionDone"` sets the keyboard to have a `check mark` key instead of a `new line` key. -->
+                <EditText
+                    android:id="@+id/search_edittext"
+                    android:layout_height="wrap_content"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="4dp"
+                    android:hint="@string/search"
+                    android:lines="1"
+                    android:imeOptions="actionDone"
+                    android:inputType="text"
+                    tools:ignore="Autofill" />
+
+                <TextView
+                    android:id="@+id/search_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" />
+
+                <!-- `android:background="?attr/selectableItemBackground"` adds a ripple animation on touch. -->
+                <ImageView
+                    android:id="@+id/search_previous"
+                    android:layout_height="35dp"
+                    android:layout_width="35dp"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="4dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/previous"
+                    android:background="?attr/selectableItemBackground"
+                    android:contentDescription="@string/previous"
+                    android:onClick="searchPrevious"
+                    app:tint="@color/blue_icon" />
+
+                <!-- `android:background="?attr/selectableItemBackground"` adds a ripple animation on touch. -->
+                <ImageView
+                    android:id="@+id/search_next"
+                    android:layout_height="35dp"
+                    android:layout_width="35dp"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="4dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/next"
+                    android:background="?attr/selectableItemBackground"
+                    android:contentDescription="@string/next"
+                    android:onClick="searchNext"
+                    app:tint="@color/blue_icon" />
+
+                <!-- `android:background="?attr/selectableItemBackground"` adds a ripple animation on touch. -->
+                <ImageView
+                    android:id="@+id/close_search"
+                    android:layout_height="35dp"
+                    android:layout_width="35dp"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="8dp"
+                    android:layout_gravity="center_vertical"
+                    android:src="@drawable/close"
+                    android:background="?attr/selectableItemBackground"
+                    android:contentDescription="@string/close"
+                    android:onClick="closeSearch"
+                    app:tint="@color/blue_icon" />
+            </LinearLayout>
         </com.google.android.material.appbar.AppBarLayout>
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>