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

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

diff --git a/app/src/main/res/layout/bookmarks_drawer_top_appbar.xml b/app/src/main/res/layout/bookmarks_drawer_top_appbar.xml
index 4ebce6dd6094f23dcf0c5cb9c71ed79ed7536cdb..4f70475b47b5195bb3fe4dfacdaea1126f9502f8 100644 (file)
--- a/app/src/main/res/layout/bookmarks_drawer_top_appbar.xml
+++ b/app/src/main/res/layout/bookmarks_drawer_top_appbar.xml
@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2017-2020 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2017-2020, 2022, 2024 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android/>.
 
-  Privacy Browser is free software: you can redistribute it and/or modify
+  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
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  Privacy Browser is distributed in the hope that it will be useful,
+  Privacy Browser Android is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
 
 <FrameLayout
     android:id="@+id/bookmarks_framelayout"
     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"
@@ -41,6 +40,7 @@
             android:orientation="horizontal"
             tools:ignore="UseCompoundDrawables" >
 
+            <!-- Back arrow. -->
             <ImageView
                 android:layout_height="match_parent"
                 android:layout_width="wrap_content"
@@ -48,19 +48,30 @@
                 android:paddingStart="15dp"
                 android:paddingEnd="15dp"
                 android:src="@drawable/back"
-                android:background="?attr/selectableItemBackground"
                 android:onClick="bookmarksBack"
-                android:contentDescription="@string/back"
-                app:tint="?android:attr/textColorPrimary" />
+                android:contentDescription="@string/back" />
 
+            <!-- Bookmarks folder title. -->
             <TextView
                 android:id="@+id/bookmarks_title_textview"
                 android:layout_height="wrap_content"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
+                android:layout_weight="1"
                 android:textStyle="bold"
                 android:textSize="20sp"
                 android:textColor="?android:attr/textColorPrimary"
                 android:layout_margin="10dp" />
+
+            <!-- Pin. -->
+            <ImageView
+                android:id="@+id/bookmarks_drawer_pinned_imageview"
+                android:layout_height="match_parent"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:paddingStart="15dp"
+                android:paddingEnd="20dp"
+                android:onClick="toggleBookmarksDrawerPinned"
+                android:contentDescription="@string/pin_drawer" />
         </LinearLayout>
 
         <ListView
@@ -79,8 +90,8 @@
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="155dp"
-        android:src="@drawable/bookmarks_day"
-        android:tint="?attr/fabIconTintColor"
+        android:src="@drawable/bookmarks"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/bookmarks" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -91,7 +102,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="85dp"
         android:src="@drawable/create_folder"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_folder" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -101,6 +112,6 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
         android:src="@drawable/create_bookmark"
-        android:tint="?attr/fabIconTintColor"
+        android:tint="@color/fab_icon"
         android:contentDescription="@string/create_bookmark" />
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>