Feature/bookmark favicons (#216)

* Add glide to project

* Load favicon image from bookmarks adapter

* Restore tools:text value

* Code formatting

* Reduce adapter row margin

app/build.gradle

@@ -79,6 +79,7 @@ ext {
     dagger = "2.14.1"
     retrofit = "2.3.0"
     ankoVersion = "0.10.4"
+    glide = "4.6.1"
 }
 
 
@@ -127,6 +128,10 @@ dependencies {
     kaptAndroidTest "com.google.dagger:dagger-android-processor:$dagger"
     kaptAndroidTest "com.google.dagger:dagger-compiler:$dagger"
 
+    // Glide
+    implementation "com.github.bumptech.glide:glide:$glide"
+    kapt "com.github.bumptech.glide:compiler:$glide"
+
     testImplementation "org.mockito:mockito-core:2.15.0"
     testImplementation "com.nhaarman:mockito-kotlin-kt1.1:1.5.0"
     testImplementation "junit:junit:4.12"

app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt

@@ -37,6 +37,8 @@ import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.DuckDuckGoActivity
 import com.duckduckgo.app.global.ViewModelFactory
 import com.duckduckgo.app.global.baseHost
+import com.duckduckgo.app.global.faviconLocation
+import com.duckduckgo.app.global.image.GlideApp
 import com.duckduckgo.app.global.view.gone
 import com.duckduckgo.app.global.view.show
 import kotlinx.android.synthetic.main.content_bookmarks.*
@@ -146,15 +148,15 @@ class BookmarksActivity : DuckDuckGoActivity() {
         private const val EDIT_BOOKMARK_FRAGMENT_TAG = "EDIT_BOOKMARK"
     }
 
-    class BookmarksAdapter(val context: Context, val viewModel: BookmarksViewModel) : Adapter<BookmarksViewHolder>() {
+    class BookmarksAdapter(private val context: Context,
+                           private val viewModel: BookmarksViewModel) : Adapter<BookmarksViewHolder>() {
 
         var bookmarks: List<BookmarkEntity> = emptyList()
             set(value) {
                 field = value
                 notifyDataSetChanged()
             }
 
-
         override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): BookmarksViewHolder {
             val inflater = LayoutInflater.from(context)
             val view = inflater.inflate(R.layout.view_bookmark_entry, parent, false)
@@ -168,10 +170,9 @@ class BookmarksActivity : DuckDuckGoActivity() {
         override fun getItemCount(): Int {
             return bookmarks.size
         }
-
     }
 
-    class BookmarksViewHolder(itemView: View?, val viewModel: BookmarksViewModel) :
+    class BookmarksViewHolder(itemView: View?, private val viewModel: BookmarksViewModel) :
         ViewHolder(itemView) {
 
         lateinit var bookmark: BookmarkEntity
@@ -186,6 +187,7 @@ class BookmarksActivity : DuckDuckGoActivity() {
 
             itemView.title.text = bookmark.title
             itemView.url.text = parseDisplayUrl(bookmark.url)
+            loadFavicon(bookmark.url)
 
             itemView.overflowMenu.setOnClickListener {
                 showOverFlowMenu(itemView.overflowMenu, bookmark)
@@ -196,6 +198,16 @@ class BookmarksActivity : DuckDuckGoActivity() {
             }
         }
 
+        private fun loadFavicon(url: String) {
+            val faviconUrl = Uri.parse(url).faviconLocation()
+
+            GlideApp.with(itemView)
+                    .load(faviconUrl)
+                    .placeholder(R.drawable.ic_globe_white_24dp)
+                    .error(R.drawable.ic_globe_white_24dp)
+                    .into(itemView.favicon)
+        }
+
         private fun parseDisplayUrl(urlString: String): String {
             val uri = Uri.parse(urlString)
             return uri.baseHost ?: return urlString

app/src/main/java/com/duckduckgo/app/global/UriExtension.kt

@@ -56,3 +56,11 @@ fun Uri.toDesktopUri(): Uri {
         this
     }
 }
+
+private const val faviconBaseUrlFormat = "https://icons.duckduckgo.com/ip3/%s.ico"
+
+fun Uri?.faviconLocation(): Uri? {
+    val host = this?.host
+    if (host.isNullOrBlank()) return null
+    return Uri.parse(String.format(faviconBaseUrlFormat, host))
+}

app/src/main/java/com/duckduckgo/app/global/image/AppGlideModule.kt

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2018 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.app.global.image
+
+import com.bumptech.glide.annotation.GlideModule
+import com.bumptech.glide.module.AppGlideModule
+
+
+@GlideModule
+class GlobalGlideModule : AppGlideModule()

app/src/main/res/layout/view_bookmark_entry.xml

@@ -22,10 +22,22 @@
     android:background="?android:attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
-    android:layout_marginTop="6dp"
+    android:layout_marginTop="4dp"
     android:layout_marginBottom="4dp"
 >
 
+    <ImageView
+        android:id="@+id/favicon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="22dp"
+        android:importantForAccessibility="no"
+        android:src="@drawable/ic_globe_white_24dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        />
+
     <TextView
         android:id="@+id/title"
         android:layout_width="0dp"
@@ -39,7 +51,7 @@
         app:layout_constraintBottom_toTopOf="@+id/url"
         app:layout_constraintEnd_toStartOf="@+id/overflowMenu"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toEndOf="@id/favicon"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Bookmark" />
 
@@ -50,13 +62,13 @@
         android:fontFamily="sans-serif"
         android:layout_marginStart="22dp"
         android:paddingTop="2dp"
+        app:layout_constraintStart_toEndOf="@id/favicon"
         android:paddingBottom="4dp"
         android:textColor="@color/warmGray"
         android:textSize="12sp"
         android:textStyle="normal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/overflowMenu"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/title"
         tools:text="Bookmark" />