<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
+ Copyright © 2017-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/>. -->
<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
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="wrap_content"
- android:layout_gravity="end" >
+ android:layout_width="match_parent"
+ android:layout_gravity="end">
<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"
+ <!-- A compound drawable doesn't work well because only the image view should execute the `onClick()`. -->
+ <LinearLayout
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:orientation="horizontal"
+ tools:ignore="UseCompoundDrawables" >
+
+ <ImageView
+ android:layout_height="match_parent"
+ android:layout_width="wrap_content"
+ android:layout_gravity="center_vertical"
+ 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" />
+
+ <TextView
+ android:id="@+id/bookmarks_title_textview"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:textStyle="bold"
+ android:textSize="20sp"
+ android:textColor="?android:attr/textColorPrimary"
+ android:layout_margin="10dp" />
+ </LinearLayout>
<ListView
android:id="@+id/bookmarks_drawer_listview"
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="@drawable/bookmarks_day"
+ android:tint="?attr/fabIconTintColor"
+ android:contentDescription="@string/bookmarks" />
- <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="@drawable/create_folder"
+ android:tint="?attr/fabIconTintColor"
+ android:contentDescription="@string/create_folder" />
- <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="@drawable/create_bookmark"
+ android:tint="?attr/fabIconTintColor"
+ android:contentDescription="@string/create_bookmark" />
</FrameLayout>
\ No newline at end of file