Combine drawable files. https://redmine.stoutner.com/issues/794

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

diff --git a/app/src/main/res/layout/main_framelayout_bottom_appbar.xml b/app/src/main/res/layout/main_framelayout_bottom_appbar.xml
index 521c03f8b78ef11f2f29f5d9ebfad07b47735046..694c810fe19592ebd8c045e1c134edc390794180 100644 (file)
--- a/app/src/main/res/layout/main_framelayout_bottom_appbar.xml
+++ b/app/src/main/res/layout/main_framelayout_bottom_appbar.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2015-2017,2019-2021 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2017,2019-2022 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/root_framelayout"
@@ -76,11 +76,10 @@
                             android:layout_gravity="center_vertical"
                             android:paddingStart="10dp"
                             android:paddingEnd="10dp"
-                            android:src="@drawable/close_day"
+                            android:src="@drawable/close"
                             android:background="?attr/selectableItemBackground"
                             android:onClick="closeTab"
-                            android:contentDescription="@string/close_tab"
-                            app:tint="?attr/addTabIconTintColor" />
+                            android:contentDescription="@string/close_tab" />
 
                         <com.google.android.material.tabs.TabLayout
                             android:id="@+id/tablayout"
@@ -99,8 +98,7 @@
                             android:src="@drawable/add"
                             android:background="?attr/selectableItemBackground"
                             android:onClick="addTab"
-                            android:contentDescription="@string/add_tab"
-                            app:tint="?attr/addTabIconTintColor" />
+                            android:contentDescription="@string/add_tab" />
                     </LinearLayout>
 
                     <!-- The find on page linear layout.  It is initially `visibility="gone"` so it doesn't display while the blocklists are loading. -->
@@ -164,7 +162,7 @@
                         <!-- `android:background="?attr/selectableItemBackground"` adds a ripple animation on touch. -->
                         <ImageView
                             android:id="@+id/close_find"
-                            android:src="@drawable/close_day"
+                            android:src="@drawable/close"
                             android:layout_width="35dp"
                             android:layout_height="35dp"
                             android:layout_marginStart="4dp"