From babe5d7d9bf3846c1f7960f8ed1f58dd3f755905 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Mon, 11 Feb 2019 15:57:23 -0800
Subject: [PATCH] For #355 - Adds favicon and menu placeholder

---
 .../drawable/history_favicon_background.xml   |  9 ++++++
 app/src/main/res/layout/history_list_item.xml | 29 ++++++++++++++++---
 app/src/main/res/values/dimens.xml            |  1 +
 app/src/main/res/values/strings.xml           |  3 ++
 4 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable/history_favicon_background.xml

diff --git a/app/src/main/res/drawable/history_favicon_background.xml b/app/src/main/res/drawable/history_favicon_background.xml
new file mode 100644
index 000000000..af32d3980
--- /dev/null
+++ b/app/src/main/res/drawable/history_favicon_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/photonGrey40" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/history_list_item.xml b/app/src/main/res/layout/history_list_item.xml
index b220c2042..9dabd5c29 100644
--- a/app/src/main/res/layout/history_list_item.xml
+++ b/app/src/main/res/layout/history_list_item.xml
@@ -1,22 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="56dp"
     android:clickable="true"
     android:focusable="true"
     android:padding="4dp"
     android:paddingStart="20dp"
     android:background="?android:attr/selectableItemBackground"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    
+    <ImageView
+        android:id="@+id/history_favicon"
+        android:layout_width="@dimen/history_favicon_width_height"
+        android:layout_height="@dimen/history_favicon_width_height"
+        android:background="@drawable/history_favicon_background"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <TextView
         android:id="@+id/history_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        android:layout_marginStart="16dp"
         android:textColor="@color/history_title"
         android:textSize="18sp"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toEndOf="@id/history_favicon"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
@@ -27,12 +36,24 @@
         android:textSize="12sp"
         android:layout_marginTop="4dp"
         android:layout_marginBottom="8dp"
+        android:layout_marginStart="16dp"
         android:singleLine="true"
         android:layout_marginEnd="20dp"
         android:textAlignment="viewStart"
         android:ellipsize="end"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toEndOf="@id/history_favicon"
         app:layout_constraintTop_toBottomOf="@id/history_title"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/overflow_button"
         app:layout_constraintBottom_toBottomOf="parent" />
+
+    <ImageButton
+        android:id="@+id/overflow_button"
+        android:layout_width="@dimen/glyph_button_height"
+        android:layout_height="@dimen/glyph_button_height"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:src="@drawable/ic_menu"
+        android:tint="?attr/menuButtonTint"
+        android:contentDescription="@string/content_description_history_menu"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 9103c534b..cb044cc13 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -10,4 +10,5 @@
     <dimen name="library_item_height">56dp</dimen>
     <dimen name="library_item_icon_height">40dp</dimen>
     <dimen name="library_item_icon_margin">16dp</dimen>
+    <dimen name="history_favicon_width_height">40dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b66c7f5e1..0ef5b0c19 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -128,4 +128,7 @@
     <string name="tabs_header_title">Current Session</string>
     <string name="close_tab">Close tab</string>
     <string name="favicon_content_description">Favorite icon</string>
+
+    <!-- Content description (not visible, for screen readers etc.): "Menu icon for items on a history item" -->
+    <string name="content_description_history_menu">History item menu</string>
 </resources>