Bookmarks ui tweaks and dialog leak clean up

Author: subsymbolic

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

@@ -17,13 +17,15 @@
 package com.duckduckgo.app.bookmarks.ui
 
 import android.app.Activity
+import android.app.AlertDialog
 import android.arch.lifecycle.Observer
 import android.arch.lifecycle.ViewModelProviders
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.support.v7.widget.RecyclerView.Adapter
 import android.support.v7.widget.RecyclerView.ViewHolder
+import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -38,11 +40,12 @@ import org.jetbrains.anko.alert
 import org.jetbrains.anko.doAsync
 import javax.inject.Inject
 
-class BookmarksActivity: DuckDuckGoActivity() {
+class BookmarksActivity : DuckDuckGoActivity() {
 
     @Inject
     lateinit var viewModelFactory: ViewModelFactory
     lateinit var adapter: BookmarksAdapter
+    private var deleteDialog: AlertDialog? = null
 
     private val viewModel: BookmarksViewModel by lazy {
         ViewModelProviders.of(this, viewModelFactory).get(BookmarksViewModel::class.java)
@@ -74,11 +77,11 @@ class BookmarksActivity: DuckDuckGoActivity() {
         })
 
         viewModel.command.observe(this, Observer {
-            when(it) {
+            when (it) {
                 is BookmarksViewModel.Command.ConfirmDeleteBookmark -> confirmDeleteBookmark(it.bookmark)
                 is BookmarksViewModel.Command.OpenBookmark -> openBookmark(it.bookmark)
             }
-         })
+        })
     }
 
     private fun openBookmark(bookmark: BookmarkEntity) {
@@ -87,13 +90,15 @@ class BookmarksActivity: DuckDuckGoActivity() {
         finish()
     }
 
+    @Suppress("deprecation")
     private fun confirmDeleteBookmark(bookmark: BookmarkEntity) {
-        val message = getString(R.string.bookmarkDeleteConfirmMessage, bookmark.title)
+        val message = Html.fromHtml(getString(R.string.bookmarkDeleteConfirmMessage, bookmark.title))
         val title = getString(R.string.bookmarkDeleteConfirmTitle)
-        alert(message, title) {
+        deleteDialog = alert(message, title) {
             positiveButton(android.R.string.yes) { delete(bookmark) }
             negativeButton(android.R.string.no) { }
-        }.show()
+        }.build()
+        deleteDialog?.show()
     }
 
     private fun delete(bookmark: BookmarkEntity) {
@@ -102,6 +107,11 @@ class BookmarksActivity: DuckDuckGoActivity() {
         }
     }
 
+    override fun onDestroy() {
+        deleteDialog?.dismiss()
+        super.onDestroy()
+    }
+
     companion object {
         fun intent(context: Context): Intent {
             return Intent(context, BookmarksActivity::class.java)
@@ -110,7 +120,7 @@ class BookmarksActivity: DuckDuckGoActivity() {
         val OPEN_URL_RESULT_CODE = Activity.RESULT_FIRST_USER
     }
 
-    class BookmarksAdapter(val context: Context, val viewModel: BookmarksViewModel): Adapter<BookmarksViewHolder>() {
+    class BookmarksAdapter(val context: Context, val viewModel: BookmarksViewModel) : Adapter<BookmarksViewHolder>() {
 
         var bookmarks: List<BookmarkEntity> = emptyList()
             set(value) {

app/src/main/java/com/duckduckgo/app/browser/BrowserActivity.kt

@@ -428,6 +428,11 @@ class BrowserActivity : DuckDuckGoActivity() {
         webView.hide()
     }
 
+    override fun onDestroy() {
+        popupMenu.dismiss()
+        super.onDestroy()
+    }
+
     companion object {
 
         fun intent(context: Context, sharedText: String? = null): Intent {

app/src/main/java/com/duckduckgo/app/home/HomeActivity.kt

@@ -152,6 +152,11 @@ class HomeActivity : AppCompatActivity() {
         startActivity(BrowserActivity.intent(this, url))
     }
 
+    override fun onDestroy() {
+        popupMenu.dismiss()
+        super.onDestroy()
+    }
+
     companion object {
 
         private const val SETTINGS_REQUEST_CODE = 100

app/src/main/res/drawable-hdpi/ic_remove.png

@@ -17,6 +17,8 @@
 
 <android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/recycler"
+    android:paddingTop="18dp"
+    android:paddingBottom="18dp"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"

app/src/main/res/drawable-mdpi/ic_remove.png

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) 2018 DuckDuckGo
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,40 +14,45 @@
   ~ limitations under the License.
   -->
 
-<android.support.constraint.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<android.support.constraint.ConstraintLayout 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_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="20dp"
     android:background="?android:attr/selectableItemBackground"
-    android:clickable="true">
+    android:clickable="true"
+    android:focusable="true"
+    android:padding="16dp">
 
-    <!-- content description set to network name in code -->
-    <ImageView
-        android:id="@+id/delete"
-        android:contentDescription="@string/appName"
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:fontFamily="sans-serif"
+        android:lineSpacingExtra="4sp"
+        android:paddingEnd="4dp"
+        android:paddingStart="8dp"
+        android:textColor="@color/white"
+        android:textSize="16sp"
+        android:textStyle="normal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/delete"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_remove" />
+        tools:text="Bookmark" />
 
-    <TextView
-        android:id="@+id/title"
+    <!-- content description set to network name in code -->
+    <ImageView
+        android:id="@+id/delete"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="19dp"
-        android:textColor="@color/white"
+        android:contentDescription="@string/appName"
+        android:padding="4dp"
+        android:src="@drawable/ic_clear_black_24px"
+        android:tint="@color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/delete"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        android:fontFamily="sans-serif-medium"
-        tools:text="Title" />
+        app:layout_constraintTop_toTopOf="parent" />
+
 
 </android.support.constraint.ConstraintLayout>