Feature/david/contrast colors change

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

@@ -16,7 +16,6 @@
 
 package com.duckduckgo.app.bookmarks.ui
 
-import android.app.AlertDialog
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -26,7 +25,7 @@ import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.PopupMenu
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.RecyclerView.Adapter
@@ -46,6 +45,15 @@ import com.duckduckgo.app.global.view.show
 import kotlinx.android.synthetic.main.content_bookmarks.*
 import kotlinx.android.synthetic.main.include_toolbar.*
 import kotlinx.android.synthetic.main.view_bookmark_entry.view.*
+import kotlinx.android.synthetic.main.content_bookmarks.emptyBookmarks
+import kotlinx.android.synthetic.main.content_bookmarks.recycler
+import kotlinx.android.synthetic.main.include_toolbar.toolbar
+import kotlinx.android.synthetic.main.popup_window_bookmarks_menu.view.deleteBookmark
+import kotlinx.android.synthetic.main.popup_window_bookmarks_menu.view.editBookmark
+import kotlinx.android.synthetic.main.view_bookmark_entry.view.favicon
+import kotlinx.android.synthetic.main.view_bookmark_entry.view.overflowMenu
+import kotlinx.android.synthetic.main.view_bookmark_entry.view.title
+import kotlinx.android.synthetic.main.view_bookmark_entry.view.url
 import timber.log.Timber
 
 class BookmarksActivity : DuckDuckGoActivity() {
@@ -64,7 +72,7 @@ class BookmarksActivity : DuckDuckGoActivity() {
     }
 
     private fun setupBookmarksRecycler() {
-        adapter = BookmarksAdapter(applicationContext, viewModel)
+        adapter = BookmarksAdapter(layoutInflater, viewModel)
         recycler.adapter = adapter
     }
 
@@ -126,10 +134,13 @@ class BookmarksActivity : DuckDuckGoActivity() {
         deleteDialog = AlertDialog.Builder(this)
             .setTitle(title)
             .setMessage(message)
-            .setPositiveButton(android.R.string.yes) { _, _ -> delete(bookmark) }
-            .setNegativeButton(android.R.string.no) { _, _ -> }
-            .create()
-        deleteDialog?.show()
+            .setPositiveButton(android.R.string.yes) { _, _ ->
+                delete(bookmark)
+            }
+            .setNegativeButton(android.R.string.no) { dialog, _ ->
+                dialog.dismiss()
+            }
+            .show()
     }
 
     private fun delete(bookmark: BookmarkEntity) {
@@ -151,7 +162,7 @@ class BookmarksActivity : DuckDuckGoActivity() {
     }
 
     class BookmarksAdapter(
-        private val context: Context,
+        private val layoutInflater: LayoutInflater,
         private val viewModel: BookmarksViewModel
     ) : Adapter<BookmarksViewHolder>() {
 
@@ -164,7 +175,7 @@ class BookmarksActivity : DuckDuckGoActivity() {
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BookmarksViewHolder {
             val inflater = LayoutInflater.from(parent.context)
             val view = inflater.inflate(R.layout.view_bookmark_entry, parent, false)
-            return BookmarksViewHolder(view, viewModel)
+            return BookmarksViewHolder(layoutInflater, view, viewModel)
         }
 
         override fun onBindViewHolder(holder: BookmarksViewHolder, position: Int) {
@@ -176,8 +187,7 @@ class BookmarksActivity : DuckDuckGoActivity() {
         }
     }
 
-    class BookmarksViewHolder(itemView: View, private val viewModel: BookmarksViewModel) :
-        ViewHolder(itemView) {
+    class BookmarksViewHolder(val layoutInflater: LayoutInflater, itemView: View, private val viewModel: BookmarksViewModel) : ViewHolder(itemView) {
 
         lateinit var bookmark: BookmarkEntity
 
@@ -217,23 +227,14 @@ class BookmarksActivity : DuckDuckGoActivity() {
             return uri.baseHost ?: return urlString
         }
 
-        private fun showOverFlowMenu(overflowMenu: ImageView, bookmark: BookmarkEntity) {
-            val popup = PopupMenu(overflowMenu.context, overflowMenu)
-            popup.inflate(R.menu.bookmarks_individual_overflow_menu)
-            popup.setOnMenuItemClickListener {
-                when (it.itemId) {
-
-                    R.id.edit -> {
-                        editBookmark(bookmark); true
-                    }
-                    R.id.delete -> {
-                        deleteBookmark(bookmark); true
-                    }
-                    else -> false
-
-                }
+        private fun showOverFlowMenu(anchor: ImageView, bookmark: BookmarkEntity) {
+            val popupMenu = BookmarksPopupMenu(layoutInflater)
+            val view = popupMenu.contentView
+            popupMenu.apply {
+                onMenuItemClicked(view.editBookmark) { editBookmark(bookmark) }
+                onMenuItemClicked(view.deleteBookmark) { deleteBookmark(bookmark) }
             }
-            popup.show()
+            popupMenu.show(itemView, anchor)
         }
 
         private fun editBookmark(bookmark: BookmarkEntity) {

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

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2020 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.bookmarks.ui
+
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Build.VERSION.SDK_INT
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import android.widget.PopupWindow
+import com.duckduckgo.app.browser.R
+
+class BookmarksPopupMenu(layoutInflater: LayoutInflater, view: View = inflate(layoutInflater, R.layout.popup_window_bookmarks_menu)) :
+    PopupWindow(view, WRAP_CONTENT, WRAP_CONTENT, true) {
+
+    init {
+        if (SDK_INT <= 22) {
+            // popupwindow gets stuck on the screen on API 22 (tested on 23) without a background
+            // color.  Adding it however garbles the elevation so we cannot have elevation here.
+            setBackgroundDrawable(ColorDrawable(Color.WHITE))
+        } else {
+            elevation = ELEVATION
+        }
+        animationStyle = android.R.style.Animation_Dialog
+    }
+
+    fun onMenuItemClicked(menuView: View, onClick: () -> Unit) {
+        menuView.setOnClickListener {
+            onClick()
+            dismiss()
+        }
+    }
+
+    fun show(rootView: View, anchorView: View) {
+        val anchorLocation = IntArray(2)
+        anchorView.getLocationOnScreen(anchorLocation)
+        val x = MARGIN
+        val y = anchorLocation[1] + MARGIN
+        showAtLocation(rootView, Gravity.TOP or Gravity.END, x, y)
+    }
+
+    companion object {
+
+        private const val MARGIN = 30
+        private const val ELEVATION = 6f
+
+        fun inflate(layoutInflater: LayoutInflater, resourceId: Int): View {
+            return layoutInflater.inflate(resourceId, null)
+        }
+    }
+}

app/src/main/java/com/duckduckgo/app/icon/ui/ChangeIconActivity.kt

@@ -24,6 +24,8 @@ import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.GridLayoutManager
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.DuckDuckGoActivity
+import kotlinx.android.synthetic.main.content_app_icons.appIconsList
+import kotlinx.android.synthetic.main.include_toolbar.toolbar
 import kotlinx.android.synthetic.main.content_app_icons.*
 import kotlinx.android.synthetic.main.include_toolbar.*
 

app/src/main/res/color/browser_icon_color_selector_dark.xml

@@ -17,5 +17,5 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@color/midGray" />
-    <item android:color="@color/grayish"/>
+    <item android:color="@color/white"/>
 </selector>

app/src/main/res/color/browser_icon_color_selector_light.xml

@@ -17,5 +17,5 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@color/pinkish_grey_two" />
-    <item android:color="@color/grayishBrown"/>
+    <item android:color="@color/almostBlackDark"/>
 </selector>

app/src/main/res/drawable/bottom_navigation_bar_bg.xml

@@ -43,13 +43,13 @@
     <item>
         <shape android:shape="rectangle">
             <padding android:top="1dp"/>
-            <solid android:color="#50CCCCCC" />
+            <solid android:color="?attr/toolbarBgBorderColor" />
         </shape>
     </item>
     <item>
         <shape
             android:shape="rectangle">
-            <solid android:color="?attr/colorPrimary"/>
+            <solid android:color="?attr/toolbarBgColor"/>
         </shape>
     </item>
 </layer-list>

app/src/main/res/drawable/ic_cancel_brownish_24dp.xml

@@ -20,6 +20,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/brownishGray"
+        android:fillColor="?normalTextColor"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
 </vector>

app/src/main/res/drawable/loading_progress.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2020 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.
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <solid
+                android:color="?toolbarBgColor" />
+        </shape>
+    </item>
+
+    <item
+        android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <solid
+                    android:color="?colorAccent" />
+            </shape>
+        </clip>
+    </item>
+
+</layer-list>

app/src/main/res/drawable/popup_menu_bg.xml

@@ -15,6 +15,6 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?attr/colorPrimary"/>
+    <solid android:color="?attr/dialogBgColor"/>
     <corners android:radius="8dp" />
 </shape>

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

@@ -142,7 +142,7 @@
                 android:paddingEnd="16dp"
                 android:paddingBottom="2dp"
                 android:text="@string/systemSearchDeviceAppLabel"
-                android:textColor="@color/grayish"
+                android:textColor="?normalTextColor"
                 android:textSize="13sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"

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

@@ -46,7 +46,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/bottomBarHeight"
         android:layout_gravity="bottom"
-        android:background="@drawable/bottom_navigation_bar_bg"
+        android:background="?toolbarBgColor"
         android:gravity="center"
         android:orientation="horizontal"
         android:elevation="8dp"

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

@@ -28,10 +28,10 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/bottomBarHeight"
         android:layout_gravity="bottom"
-        android:background="@drawable/bottom_navigation_bar_bg"
         android:elevation="8dp"
         android:gravity="center"
         android:orientation="horizontal"
+        android:background="?toolbarBgColor"
         app:layoutResource="@layout/layout_browser_bottom_navigation_bar"
         app:layout_behavior="com.duckduckgo.app.browser.ui.BottomNavigationBehavior" />
 
@@ -61,8 +61,8 @@
         android:id="@+id/autoCompleteSuggestionsList"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/colorPrimary"
-        android:backgroundTint="?attr/colorPrimary"
+        android:background="?toolbarBgColor"
+        android:backgroundTint="?toolbarBgColor"
         android:clipToPadding="false"
         android:elevation="4dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"

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

@@ -21,7 +21,7 @@
     android:id="@+id/cta"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/colorPrimary"
+    android:background="?toolbarBgColor"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent">

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

@@ -33,13 +33,13 @@
             android:id="@+id/toolbarContainer"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:theme="@style/OmnibarToolbarTheme">
+            android:background="?toolbarBgColor">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="0dp"
                 android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorPrimary"
+                android:background="?attr/toolbarBgColor"
                 app:contentInsetEnd="0dp"
                 app:contentInsetStart="0dp"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -48,14 +48,14 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:popupTheme="@style/AppTheme.Dark.PopupOverlay">
 
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/omniBarContainer"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_margin="8dp"
-                        android:background="@drawable/omnibar_field_background"
-                        android:paddingStart="6dp"
-                        android:paddingEnd="6dp">
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/omniBarContainer"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_margin="8dp"
+                    android:background="@drawable/omnibar_field_background"
+                    android:paddingStart="6dp"
+                    android:paddingEnd="6dp">
 
                         <androidx.constraintlayout.widget.ConstraintLayout
                             android:id="@+id/animationContainer"
@@ -206,6 +206,7 @@
                 style="@style/Widget.AppCompat.ProgressBar.Horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="4dp"
+                android:progressDrawable="@drawable/loading_progress"
                 android:visibility="invisible"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"

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

@@ -30,6 +30,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
+        android:background="?attr/toolbarBgColor"
         android:theme="@style/ToolbarTheme"
         app:popupTheme="@style/AppTheme.Dark.PopupOverlay" />