apply white menu (#136)

Author: brindy

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

@@ -47,7 +47,7 @@ import com.duckduckgo.app.privacymonitor.renderer.icon
 import com.duckduckgo.app.privacymonitor.ui.PrivacyDashboardActivity
 import com.duckduckgo.app.settings.SettingsActivity
 import kotlinx.android.synthetic.main.activity_browser.*
-import kotlinx.android.synthetic.main.popup_window_brower_menu.view.*
+import kotlinx.android.synthetic.main.popup_window_browser_menu.view.*
 import org.jetbrains.anko.doAsync
 import org.jetbrains.anko.toast
 import org.jetbrains.anko.uiThread

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

@@ -30,9 +30,9 @@ class BrowserPopupMenu : PopupWindow {
     constructor(layoutInflater: LayoutInflater, view: View = BrowserPopupMenu.inflate(layoutInflater))
             : super(view, WRAP_CONTENT, WRAP_CONTENT, true) {
 
-        if (SDK_INT <= 21) {
-            // popupwindow gets stuck on the screen on API 21 without a background color.
-            // Adding it however garbles the elevation so we cannot have elevation here
+        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 = 6.toFloat()
@@ -54,7 +54,7 @@ class BrowserPopupMenu : PopupWindow {
         val margin = 30
 
         fun inflate(layoutInflater: LayoutInflater): View {
-            return layoutInflater.inflate(R.layout.popup_window_brower_menu, null)
+            return layoutInflater.inflate(R.layout.popup_window_browser_menu, null)
         }
 
     }

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

@@ -35,7 +35,7 @@ import com.duckduckgo.app.global.view.FireDialog
 import com.duckduckgo.app.settings.SettingsActivity
 import kotlinx.android.synthetic.main.activity_home.*
 import kotlinx.android.synthetic.main.content_home.*
-import kotlinx.android.synthetic.main.popup_window_brower_menu.view.*
+import kotlinx.android.synthetic.main.popup_window_browser_menu.view.*
 import org.jetbrains.anko.toast
 import javax.inject.Inject
 import javax.inject.Provider

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

@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_enabled="false" android:color="@color/paleOrange" />
-  <item android:color="@color/white"/>
+  <item android:color="@color/subtleGrey" android:state_enabled="false"/>
+  <item android:color="@color/brownishGray"/>
 </selector>

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

@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:state_enabled="false" android:color="@color/paleBrownishGray" />
   <item android:color="@color/brownishGray"/>

app/src/main/res/layout/popup_window_brower_menu.xml renamed to app/src/main/res/layout/popup_window_browser_menu.xml

@@ -24,7 +24,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:background="@color/colorAccent"
+        android:background="@color/white"
         android:gravity="center"
         android:orientation="horizontal">
 
@@ -59,13 +59,19 @@
             android:src="@drawable/ic_bookmark_24px" />
 
     </LinearLayout>
+    
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/white_two"
+        app:layout_constraintBottom_toBottomOf="@+id/header" />
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:paddingBottom="20dp"
-        android:paddingTop="20dp"
+        android:paddingTop="13dp"
         app:layout_constraintTop_toBottomOf="@id/header">
 
         <TextView

app/src/main/res/values/colors.xml

@@ -21,7 +21,6 @@
     <color name="subtleGrey">#f0f0f0</color>
     <color name="subtleGreyTwo">#D8D8D8</color>
 
-    <color name="paleOrange">#DA8E76</color>
     <color name="orange">#de5833</color>
     <color name="brickOrange">#d03a10</color>
 
@@ -32,5 +31,6 @@
     <color name="muddyGreen">#58732e</color>
     <color name="midGreen">#3fa140</color>
 
+    <color name="white_two">#e4e4e4</color>
 
 </resources>