X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout-w900dp%2Fbookmarks_drawer.xml;h=3d2e8148cf4e8bf01b8e41a713f8f0eb9a7b827a;hb=74655c0cd0ba72c80ac6c48df55bc3d2f5280ad2;hp=e5e9d919f4d63c8b0f2242db9e643a489220e279;hpb=3c19cff9af88a91b63363b0d7278ac3cfbd9f85a;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout-w900dp/bookmarks_drawer.xml b/app/src/main/res/layout-w900dp/bookmarks_drawer.xml
index e5e9d919..3d2e8148 100644
--- a/app/src/main/res/layout-w900dp/bookmarks_drawer.xml
+++ b/app/src/main/res/layout-w900dp/bookmarks_drawer.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017,2019-2020 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 <https://www.stoutner.com/privacy-browser>>.
 
-Privacy Browser 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 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,
-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.
+  Privacy Browser 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/>. -->
+  You should have received a copy of the GNU General Public License
+  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
 <!-- `android:layout_width="400dp"` keeps the bookmarks drawer from filling the whole screen on a tablet. -->
 <FrameLayout
@@ -28,21 +28,18 @@ along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
 
     <LinearLayout
         android:layout_height="match_parent"
-        android:layout_width="wrap_content"
-        android:orientation="vertical" >
+        android:layout_width="match_parent"
+        android:orientation="vertical"
+        android:background="?android:attr/colorBackground" >
 
         <TextView
             android:id="@+id/bookmarks_title_textview"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:paddingTop="35dp"
-            android:paddingBottom="8dp"
-            android:paddingStart="15dp"
-            android:paddingEnd="35dp"
             android:textStyle="bold"
             android:textSize="20sp"
-            android:background="?attr/navigationHeaderBackground"
-            android:textColor="?attr/navigationHeaderTextColor" />
+            android:textColor="?android:attr/textColorPrimary"
+            android:layout_margin="10dp" />
 
         <ListView
             android:id="@+id/bookmarks_drawer_listview"
@@ -53,26 +50,29 @@ along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
             android:dividerHeight="0dp" />
     </LinearLayout>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/launch_bookmarks_activity_fab"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="155dp" />
+        android:layout_marginBottom="155dp"
+        android:src="?attr/bookmarksIcon" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/create_bookmark_folder_fab"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="85dp" />
+        android:layout_marginBottom="85dp"
+        android:src="?attr/createFolderIcon" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/create_bookmark_fab"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:layout_gravity="bottom|end"
-        android:layout_margin="16dp" />
+        android:layout_margin="16dp"
+        android:src="?attr/createBookmarkIcon" />
 </FrameLayout>
\ No newline at end of file