From 63e958a793b434642709e816f308d23ed558a15d Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Mon, 8 Oct 2018 13:46:50 +0100
Subject: [PATCH 01/11] Separate application theme init from activity theme
 selection

---
 .../app/global/DuckDuckGoApplication.kt       | 11 +++++++-
 .../java/com/duckduckgo/app/global/Theming.kt | 28 ++++++++-----------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/global/DuckDuckGoApplication.kt b/app/src/main/java/com/duckduckgo/app/global/DuckDuckGoApplication.kt
index c1d4a3b8ea4c..f67f5277e359 100644
--- a/app/src/main/java/com/duckduckgo/app/global/DuckDuckGoApplication.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/DuckDuckGoApplication.kt
@@ -28,14 +28,16 @@ import android.support.v4.app.Fragment
 import com.duckduckgo.app.browser.BuildConfig
 import com.duckduckgo.app.di.AppComponent
 import com.duckduckgo.app.di.DaggerAppComponent
-import com.duckduckgo.app.fire.UnsentForgetAllPixelStore
 import com.duckduckgo.app.fire.FireActivity
+import com.duckduckgo.app.fire.UnsentForgetAllPixelStore
 import com.duckduckgo.app.global.install.AppInstallStore
 import com.duckduckgo.app.global.notification.NotificationRegistrar
 import com.duckduckgo.app.global.shortcut.AppShortcutCreator
 import com.duckduckgo.app.httpsupgrade.HttpsUpgrader
 import com.duckduckgo.app.job.AppConfigurationSyncer
 import com.duckduckgo.app.migration.LegacyMigration
+import com.duckduckgo.app.settings.db.SettingsDataStore
+import com.duckduckgo.app.statistics.VariantManager
 import com.duckduckgo.app.statistics.api.StatisticsUpdater
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.APP_LAUNCH
@@ -82,9 +84,15 @@ open class DuckDuckGoApplication : HasActivityInjector, HasServiceInjector, HasS
     @Inject
     lateinit var appInstallStore: AppInstallStore
 
+    @Inject
+    lateinit var settingsDataStore: SettingsDataStore
+
     @Inject
     lateinit var notificationRegistrar: NotificationRegistrar
 
+    @Inject
+    lateinit var variantManager: VariantManager
+
     @Inject
     lateinit var pixel: Pixel
 
@@ -118,6 +126,7 @@ open class DuckDuckGoApplication : HasActivityInjector, HasServiceInjector, HasS
         }
 
         initializeStatistics()
+        initializeTheme(settingsDataStore, variantManager.getVariant())
         loadTrackerData()
         configureDataDownloader()
         recordInstallationTimestamp()
diff --git a/app/src/main/java/com/duckduckgo/app/global/Theming.kt b/app/src/main/java/com/duckduckgo/app/global/Theming.kt
index df91506f1202..1e095622edb9 100644
--- a/app/src/main/java/com/duckduckgo/app/global/Theming.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/Theming.kt
@@ -22,6 +22,8 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.support.v4.content.LocalBroadcastManager
 import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.global.DuckDuckGoTheme.DARK
+import com.duckduckgo.app.global.DuckDuckGoTheme.LIGHT
 import com.duckduckgo.app.global.ThemingConstants.BROADCAST_THEME_CHANGED
 import com.duckduckgo.app.settings.db.SettingsDataStore
 import com.duckduckgo.app.statistics.Variant
@@ -33,16 +35,22 @@ enum class DuckDuckGoTheme {
     LIGHT;
 }
 
-fun DuckDuckGoActivity.applyTheme(settingsDataStore: SettingsDataStore, variant: Variant): BroadcastReceiver? {
-
+fun DuckDuckGoApplication.initializeTheme(settingsDataStore: SettingsDataStore, variant: Variant) {
     if (settingsDataStore.theme == null) {
-        settingsDataStore.theme = defaultApplicationTheme(variant)
+        settingsDataStore.theme = if (variant.hasFeature(LightThemeAsDefault)) LIGHT else DARK
     }
+}
 
+fun DuckDuckGoActivity.applyTheme(settingsDataStore: SettingsDataStore, variant: Variant): BroadcastReceiver? {
     if (!isThemeConfigurable()) {
         return null
     }
-    setTheme(themeId(settingsDataStore, variant))
+    val themeId = when (settingsDataStore.theme) {
+        LIGHT -> R.style.AppTheme_Light
+        DARK -> R.style.AppTheme_Dark
+        null -> if (variant.hasFeature(LightThemeAsDefault)) R.style.AppTheme_Light else R.style.AppTheme_Dark
+    }
+    setTheme(themeId)
     return registerForThemeChangeBroadcast()
 }
 
@@ -62,14 +70,6 @@ fun DuckDuckGoActivity.sendThemeChangedBroadcast() {
     manager.sendBroadcast(Intent(BROADCAST_THEME_CHANGED))
 }
 
-private fun themeId(settingsDataStore: SettingsDataStore, variant: Variant): Int {
-    val theme = settingsDataStore.theme ?: defaultApplicationTheme(variant)
-    return when (theme) {
-        DuckDuckGoTheme.LIGHT -> R.style.AppTheme_Light
-        DuckDuckGoTheme.DARK -> R.style.AppTheme_Dark
-    }
-}
-
 private fun DuckDuckGoActivity.isThemeConfigurable(): Boolean {
     return manifestThemeId() == R.style.AppTheme_Dark || manifestThemeId() == R.style.AppTheme_Light
 }
@@ -78,10 +78,6 @@ private fun DuckDuckGoActivity.manifestThemeId(): Int {
     return packageManager.getActivityInfo(componentName, 0).themeResource
 }
 
-private fun defaultApplicationTheme(variant: Variant): DuckDuckGoTheme {
-    return if (variant.hasFeature(LightThemeAsDefault)) DuckDuckGoTheme.LIGHT else DuckDuckGoTheme.DARK
-}
-
 object ThemingConstants {
     const val BROADCAST_THEME_CHANGED = "BROADCAST_THEME_CHANGED"
 }

From 29ee3338a1e8d80090912f3c83d523b3486ff75d Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Mon, 8 Oct 2018 15:04:38 +0100
Subject: [PATCH 02/11] Add themed switch background color

---
 app/src/main/res/values/attrs.xml  | 1 +
 app/src/main/res/values/styles.xml | 2 +-
 app/src/main/res/values/themes.xml | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index ad3573b3ec6e..2aab51e03906 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -33,5 +33,6 @@
     <attr name="settingsSectionTextColor" format="color" />
     <attr name="settingsItemTextColor" format="color" />
     <attr name="settingsMinorTextColor" format="color" />
+    <attr name="settingsSwitchBackgroundColor" format="color" />
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 965771998e15..d214dba77574 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -127,7 +127,7 @@
 
     <style name="SettingsItem.SettingsSwitch">
         <item name="colorSwitchThumbNormal">@color/white</item>
-        <item name="android:colorForeground">@color/subtleGrayTwo</item>
+        <item name="android:colorForeground">?attr/settingsSwitchBackgroundColor</item>
         <item name="android:layout_marginEnd">0dp</item>
         <item name="android:layout_marginStart">0dp</item>
         <item name="android:layout_marginTop">0dp</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index bcb1e6d5523b..7d06410c948a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -45,6 +45,7 @@
         <item name="settingsSectionTextColor">@color/grayishTwo</item>
         <item name="settingsItemTextColor">@color/white</item>
         <item name="settingsMinorTextColor">@color/grayishTwo</item>
+        <item name="settingsSwitchBackgroundColor">@color/subtleGrayTwo</item>
     </style>
 
     <style name="AppTheme.Dark" parent="AppTheme.BaseDark" />
@@ -86,6 +87,7 @@
         <item name="settingsSectionTextColor">@color/warmerGray</item>
         <item name="settingsItemTextColor">@color/grayishBrown</item>
         <item name="settingsMinorTextColor">@color/warmerGray</item>
+        <item name="settingsSwitchBackgroundColor">@color/brownishGrayTwo</item>
     </style>
 
     <style name="AppTheme.Light" parent="AppTheme.BaseLight">

From ca4313089781bf1294a4132e8f6703b102c7f04c Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Mon, 8 Oct 2018 17:31:28 +0100
Subject: [PATCH 03/11] Update tabs screen to meet latest design

---
 .../java/com/duckduckgo/app/browser/BrowserTabFragment.kt | 2 +-
 .../java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt | 5 -----
 app/src/main/res/drawable/tab_background_selected.xml     | 2 +-
 app/src/main/res/drawable/tab_unread.xml                  | 2 +-
 app/src/main/res/layout/activity_tab_switcher.xml         | 1 -
 app/src/main/res/layout/content_tab_switcher.xml          | 8 +++++---
 app/src/main/res/layout/item_tab.xml                      | 6 ++++--
 app/src/main/res/values/attrs.xml                         | 3 ++-
 app/src/main/res/values/themes.xml                        | 6 ++++--
 app/src/main/res/xml/search_widget_info_light.xml         | 1 +
 10 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
index 06183718550c..1333e1c8af42 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -112,7 +112,7 @@ class BrowserTabFragment : Fragment(), FindListener {
     lateinit var shortcutBuilder: ShortcutBuilder
 
     @Inject
-    lateinit var  clipboardManager: ClipboardManager
+    lateinit var clipboardManager: ClipboardManager
 
     val tabId get() = arguments!![TAB_ID_ARG] as String
 
diff --git a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt
index aab2497d0f9e..3bf1e74b0ffc 100644
--- a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt
+++ b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt
@@ -53,7 +53,6 @@ class TabSwitcherAdapter(private val context: Context, private val itemClickList
         holder.url.text = tab.displayUrl()
         holder.tabUnread.visibility = if (tab.viewed) View.INVISIBLE else View.VISIBLE
         holder.root.setBackgroundResource(if (tab.tabId == selectedTab?.tabId) SELECTED_BACKGROUND else DEFAULT_BACKGROUND)
-        holder.root.alpha = if (tab.tabId == selectedTab?.tabId) SELECTED_ALPHA else DEFAULT_ALPHA
 
         GlideApp.with(holder.root)
             .load(tab.favicon())
@@ -103,10 +102,6 @@ class TabSwitcherAdapter(private val context: Context, private val itemClickList
         private const val SELECTED_BACKGROUND = R.drawable.tab_background_selected
         @DrawableRes
         private const val DEFAULT_BACKGROUND = R.drawable.tab_background
-
-        private const val SELECTED_ALPHA = 1.0f
-        private const val DEFAULT_ALPHA = 0.77f
-
     }
 
 }
diff --git a/app/src/main/res/drawable/tab_background_selected.xml b/app/src/main/res/drawable/tab_background_selected.xml
index 760b0cca715b..a1f342e86319 100644
--- a/app/src/main/res/drawable/tab_background_selected.xml
+++ b/app/src/main/res/drawable/tab_background_selected.xml
@@ -18,6 +18,6 @@
     <solid android:color="@color/white" />
     <stroke
         android:width="2dp"
-        android:color="@color/skyBlue" />
+        android:color="?attr/tabSelectedBorderColor" />
     <corners android:radius="2dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tab_unread.xml b/app/src/main/res/drawable/tab_unread.xml
index 00ee84d331ce..d571ed4fc9d4 100644
--- a/app/src/main/res/drawable/tab_unread.xml
+++ b/app/src/main/res/drawable/tab_unread.xml
@@ -18,5 +18,5 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="#678FFF" />
+    <solid android:color="@color/cornflowerBlue" />
 </shape>
diff --git a/app/src/main/res/layout/activity_tab_switcher.xml b/app/src/main/res/layout/activity_tab_switcher.xml
index 5352f1493f69..b73cf32f9b86 100644
--- a/app/src/main/res/layout/activity_tab_switcher.xml
+++ b/app/src/main/res/layout/activity_tab_switcher.xml
@@ -18,7 +18,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/tabsBackgroundColor"
     tools:context="com.duckduckgo.app.tabs.ui.TabSwitcherActivity">
 
     <include layout="@layout/include_toolbar" />
diff --git a/app/src/main/res/layout/content_tab_switcher.xml b/app/src/main/res/layout/content_tab_switcher.xml
index f8069a1e25fe..22a5128642e6 100644
--- a/app/src/main/res/layout/content_tab_switcher.xml
+++ b/app/src/main/res/layout/content_tab_switcher.xml
@@ -32,6 +32,8 @@
             android:id="@+id/tabsRecycler"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
             tools:itemCount="3"
             tools:listitem="@layout/item_tab" />
 
@@ -47,7 +49,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif"
                 android:text="@string/tapFireDirective"
-                android:textColor="@color/white"
+                android:textColor="?attr/tabsFireTextColor"
                 android:textSize="14sp"
                 android:textStyle="normal" />
 
@@ -58,14 +60,14 @@
                 android:layout_marginEnd="6dp"
                 android:contentDescription="@string/tapFireIconDescription"
                 android:src="@drawable/ic_fire_24dp"
-                android:tint="@color/white" />
+                android:tint="?attr/tabsFireTextColor" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif"
                 android:text="@string/tapFireExplanation"
-                android:textColor="@color/white"
+                android:textColor="?attr/tabsFireTextColor"
                 android:textSize="14sp"
                 android:textStyle="normal" />
 
diff --git a/app/src/main/res/layout/item_tab.xml b/app/src/main/res/layout/item_tab.xml
index 84986447fc55..99696dbbff74 100644
--- a/app/src/main/res/layout/item_tab.xml
+++ b/app/src/main/res/layout/item_tab.xml
@@ -20,9 +20,11 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="10dp"
-    android:layout_marginTop="10dp"
+    android:layout_marginTop="5dp"
     android:layout_marginEnd="10dp"
-    android:background="@drawable/tab_background">
+    android:layout_marginBottom="5dp"
+    android:background="@drawable/tab_background"
+    android:elevation="2dp">
 
     <ImageView
         android:id="@+id/tabUnread"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 2aab51e03906..601a1ba5a030 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -24,9 +24,10 @@
     <attr name="omnibarTextColor" format="color" />
     <attr name="omnibarHintColor" format="color" />
     <attr name="autoCompleteTextColor" format="color" />
-    <attr name="tabsBackgroundColor" format="color" />
     <attr name="tabTitleTextColor" format="color" />
     <attr name="tabSubtitleTextColor" format="color" />
+    <attr name="tabSelectedBorderColor" format="color" />
+    <attr name="tabsFireTextColor" format="color" />
     <attr name="bookmarkIconColor" format="color" />
     <attr name="bookmarkTitleTextColor" format="color" />
     <attr name="bookmarkSubtitleTextColor" format="color" />
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 7d06410c948a..da9055a637f4 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -36,9 +36,10 @@
         <item name="omnibarTextColor">@color/white</item>
         <item name="omnibarHintColor">@color/grayishTwo</item>
         <item name="autoCompleteTextColor">@color/white</item>
-        <item name="tabsBackgroundColor">?attr/colorPrimary</item>
         <item name="tabTitleTextColor">@color/midnight</item>
         <item name="tabSubtitleTextColor">@color/coolGray</item>
+        <item name="tabSelectedBorderColor">@color/skyBlue</item>
+        <item name="tabsFireTextColor">@color/white</item>
         <item name="bookmarkIconColor">@color/white</item>
         <item name="bookmarkTitleTextColor">@color/white</item>
         <item name="bookmarkSubtitleTextColor">@color/grayishTwo</item>
@@ -78,9 +79,10 @@
         <item name="omnibarTextColor">@color/brownishGrayTwo</item>
         <item name="omnibarHintColor">@color/warmGray</item>
         <item name="autoCompleteTextColor">@color/grayishBrown</item>
-        <item name="tabsBackgroundColor">@color/greyishBrownTwo</item>
         <item name="tabTitleTextColor">@color/almostBlack</item>
         <item name="tabSubtitleTextColor">@color/warmerGray</item>
+        <item name="tabSelectedBorderColor">@color/cornflowerBlue</item>
+        <item name="tabsFireTextColor">@color/warmerGray</item>
         <item name="bookmarkIconColor">@color/grayishBrown</item>
         <item name="bookmarkTitleTextColor">@color/almostBlack</item>
         <item name="bookmarkSubtitleTextColor">@color/warmerGray</item>
diff --git a/app/src/main/res/xml/search_widget_info_light.xml b/app/src/main/res/xml/search_widget_info_light.xml
index 66bbee48b6e9..73e203a601b9 100644
--- a/app/src/main/res/xml/search_widget_info_light.xml
+++ b/app/src/main/res/xml/search_widget_info_light.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
   ~ Copyright (c) 2018 DuckDuckGo
   ~

From d16cb8c645abedd6922dcd0aab6c9246df0e3b0d Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Mon, 8 Oct 2018 21:33:04 +0100
Subject: [PATCH 04/11] Use neutral colors on startup and delete redundant
 themes

---
 app/src/main/AndroidManifest.xml              |  6 +--
 .../app/global/DuckDuckGoApplication.kt       |  1 +
 .../java/com/duckduckgo/app/global/Theming.kt | 39 +++++++++----------
 app/src/main/res/values/themes.xml            |  9 +++--
 4 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8ceee34a5740..d77c75510fd8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
         android:label="@string/appName"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.Dark"
+        android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
         <meta-data
             android:name="android.webkit.WebView.MetricsOptOut"
@@ -34,7 +34,6 @@
             android:label="@string/appName">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -116,8 +115,7 @@
             android:theme="@style/ModalCardTheme" />
         <activity
             android:name="com.duckduckgo.app.fire.FireActivity"
-            android:process="@string/fireProcessName"
-            android:theme="@style/SplashTheme" />
+            android:process="@string/fireProcessName" />
 
         <service
             android:name="com.duckduckgo.app.job.AppConfigurationJobService"
diff --git a/app/src/main/java/com/duckduckgo/app/global/DuckDuckGoApplication.kt b/app/src/main/java/com/duckduckgo/app/global/DuckDuckGoApplication.kt
index f67f5277e359..a6ccfe434fd2 100644
--- a/app/src/main/java/com/duckduckgo/app/global/DuckDuckGoApplication.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/DuckDuckGoApplication.kt
@@ -30,6 +30,7 @@ import com.duckduckgo.app.di.AppComponent
 import com.duckduckgo.app.di.DaggerAppComponent
 import com.duckduckgo.app.fire.FireActivity
 import com.duckduckgo.app.fire.UnsentForgetAllPixelStore
+import com.duckduckgo.app.global.Theming.initializeTheme
 import com.duckduckgo.app.global.install.AppInstallStore
 import com.duckduckgo.app.global.notification.NotificationRegistrar
 import com.duckduckgo.app.global.shortcut.AppShortcutCreator
diff --git a/app/src/main/java/com/duckduckgo/app/global/Theming.kt b/app/src/main/java/com/duckduckgo/app/global/Theming.kt
index 1e095622edb9..809fe7e6b499 100644
--- a/app/src/main/java/com/duckduckgo/app/global/Theming.kt
+++ b/app/src/main/java/com/duckduckgo/app/global/Theming.kt
@@ -24,7 +24,8 @@ import android.support.v4.content.LocalBroadcastManager
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.global.DuckDuckGoTheme.DARK
 import com.duckduckgo.app.global.DuckDuckGoTheme.LIGHT
-import com.duckduckgo.app.global.ThemingConstants.BROADCAST_THEME_CHANGED
+import com.duckduckgo.app.global.Theming.Constants.BROADCAST_THEME_CHANGED
+import com.duckduckgo.app.global.Theming.Constants.THEME_MAP
 import com.duckduckgo.app.settings.db.SettingsDataStore
 import com.duckduckgo.app.statistics.Variant
 import com.duckduckgo.app.statistics.VariantManager.VariantFeature.ThemeFeature.LightThemeAsDefault
@@ -35,21 +36,27 @@ enum class DuckDuckGoTheme {
     LIGHT;
 }
 
-fun DuckDuckGoApplication.initializeTheme(settingsDataStore: SettingsDataStore, variant: Variant) {
-    if (settingsDataStore.theme == null) {
-        settingsDataStore.theme = if (variant.hasFeature(LightThemeAsDefault)) LIGHT else DARK
+object Theming {
+
+    fun initializeTheme(settingsDataStore: SettingsDataStore, variant: Variant) {
+        if (settingsDataStore.theme == null) {
+            settingsDataStore.theme = if (variant.hasFeature(LightThemeAsDefault)) LIGHT else DARK
+        }
+    }
+
+    object Constants {
+
+        const val BROADCAST_THEME_CHANGED = "BROADCAST_THEME_CHANGED"
+
+        val THEME_MAP = mapOf(
+            Pair(R.style.AppTheme, DuckDuckGoTheme.LIGHT) to R.style.AppTheme_Light,
+            Pair(R.style.AppTheme, DuckDuckGoTheme.DARK) to R.style.AppTheme_Dark
+        )
     }
 }
 
 fun DuckDuckGoActivity.applyTheme(settingsDataStore: SettingsDataStore, variant: Variant): BroadcastReceiver? {
-    if (!isThemeConfigurable()) {
-        return null
-    }
-    val themeId = when (settingsDataStore.theme) {
-        LIGHT -> R.style.AppTheme_Light
-        DARK -> R.style.AppTheme_Dark
-        null -> if (variant.hasFeature(LightThemeAsDefault)) R.style.AppTheme_Light else R.style.AppTheme_Dark
-    }
+    val themeId = THEME_MAP[Pair(manifestThemeId(), settingsDataStore.theme)] ?: return null
     setTheme(themeId)
     return registerForThemeChangeBroadcast()
 }
@@ -70,14 +77,6 @@ fun DuckDuckGoActivity.sendThemeChangedBroadcast() {
     manager.sendBroadcast(Intent(BROADCAST_THEME_CHANGED))
 }
 
-private fun DuckDuckGoActivity.isThemeConfigurable(): Boolean {
-    return manifestThemeId() == R.style.AppTheme_Dark || manifestThemeId() == R.style.AppTheme_Light
-}
-
 private fun DuckDuckGoActivity.manifestThemeId(): Int {
     return packageManager.getActivityInfo(componentName, 0).themeResource
 }
-
-object ThemingConstants {
-    const val BROADCAST_THEME_CHANGED = "BROADCAST_THEME_CHANGED"
-}
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index da9055a637f4..1d5258a3081a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -17,6 +17,11 @@
 <resources>
 
     <style name="AppTheme" parent="Theme.AppCompat.Light">
+
+        <!-- neutral colors to cover cases like startup before dynamic theme can be applied -->
+        <item name="colorPrimary">@color/subtleGrayTwo</item>
+        <item name="colorPrimaryDark">@color/subtleGrayTwo</item>
+
         <item name="android:windowBackground">?attr/colorPrimaryDark</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
@@ -97,10 +102,6 @@
         <item name="android:statusBarColor">@color/almostBlack</item>
     </style>
 
-    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowBackground">?attr/colorPrimaryDark</item>
-    </style>
-
     <style name="ModalCardTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/darkThemePrimary</item>
         <item name="colorPrimaryDark">@color/darkThemePrimaryDark</item>

From 065b493d5ba2541247f1b9abbe1daac003271fa6 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Mon, 8 Oct 2018 22:42:40 +0100
Subject: [PATCH 05/11] Ensure browser toolbar shows on resume

---
 .../main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
index 1333e1c8af42..7867e436bbec 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -209,6 +209,7 @@ class BrowserTabFragment : Fragment(), FindListener {
     override fun onResume() {
         super.onResume()
         addTextChangedListeners()
+        appBarLayout.setExpanded(true)
         viewModel.onViewVisible()
     }
 

From cdf9e0c36b50162296c84539ef545fbfa3014e39 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Mon, 8 Oct 2018 23:24:13 +0100
Subject: [PATCH 06/11] Add theme to browser toolbar to allow ripple color to
 show

---
 app/src/main/res/layout/include_omnibar_toolbar.xml | 2 +-
 app/src/main/res/layout/include_toolbar.xml         | 1 -
 app/src/main/res/values/themes.xml                  | 2 ++
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/include_omnibar_toolbar.xml b/app/src/main/res/layout/include_omnibar_toolbar.xml
index 534c270e574f..8e17c4ee766e 100644
--- a/app/src/main/res/layout/include_omnibar_toolbar.xml
+++ b/app/src/main/res/layout/include_omnibar_toolbar.xml
@@ -38,7 +38,6 @@
                 android:id="@+id/toolbar"
                 android:layout_width="0dp"
                 android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorPrimary"
                 app:contentInsetEnd="0dp"
                 app:contentInsetStart="0dp"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -46,6 +45,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_scrollFlags="scroll|enterAlways"
+                android:theme="@style/ToolbarTheme"
                 app:popupTheme="@style/AppTheme.Dark.PopupOverlay">
 
                 <android.support.constraint.ConstraintLayout
diff --git a/app/src/main/res/layout/include_toolbar.xml b/app/src/main/res/layout/include_toolbar.xml
index f65459db4c57..153ffcbe1118 100644
--- a/app/src/main/res/layout/include_toolbar.xml
+++ b/app/src/main/res/layout/include_toolbar.xml
@@ -29,7 +29,6 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
         android:theme="@style/ToolbarTheme"
         app:popupTheme="@style/AppTheme.Dark.PopupOverlay" />
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 1d5258a3081a..629a972ae815 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -114,8 +114,10 @@
     </style>
 
     <style name="ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+        <item name="android:background">?attr/colorPrimary</item>
         <item name="colorControlNormal">?attr/toolbarIconColor</item>
         <item name="android:textColorPrimary">?attr/toolbarTextColor</item>
+        <item name="colorControlHighlight">@color/subtleGrayTwo</item>
     </style>
 
     <style name="SwitchTheme" parent="Widget.AppCompat.CompoundButton.Switch">

From d798f708d0be2d7244c0b5d1552221cf61a2bdb4 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Tue, 9 Oct 2018 01:52:01 +0100
Subject: [PATCH 07/11] Remove superfluous string template on string

---
 .../java/com/duckduckgo/app/browser/BrowserWebViewClient.kt     | 2 +-
 .../app/httpsupgrade/api/HttpsUpgradeDataDownloader.kt          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserWebViewClient.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserWebViewClient.kt
index 49c618d1bf50..5b1b81962af3 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserWebViewClient.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserWebViewClient.kt
@@ -181,7 +181,7 @@ class BrowserWebViewClient @Inject constructor(
 
     private fun reportHttpsUpgradeSiteError(url: Uri, error: String?) {
         val params = mapOf(
-            APP_VERSION to "${BuildConfig.VERSION_NAME}",
+            APP_VERSION to BuildConfig.VERSION_NAME,
             URL to url.simpleUrl,
             ERROR_CODE to error
         )
diff --git a/app/src/main/java/com/duckduckgo/app/httpsupgrade/api/HttpsUpgradeDataDownloader.kt b/app/src/main/java/com/duckduckgo/app/httpsupgrade/api/HttpsUpgradeDataDownloader.kt
index 1026828a5b37..587d9270910c 100644
--- a/app/src/main/java/com/duckduckgo/app/httpsupgrade/api/HttpsUpgradeDataDownloader.kt
+++ b/app/src/main/java/com/duckduckgo/app/httpsupgrade/api/HttpsUpgradeDataDownloader.kt
@@ -122,7 +122,7 @@ class HttpsUpgradeDataDownloader @Inject constructor(
                 return@defer complete()
             }
             val params = mapOf(
-                APP_VERSION to "${BuildConfig.VERSION_NAME}",
+                APP_VERSION to BuildConfig.VERSION_NAME,
                 TOTAL_COUNT to statisticsDataStore.httpsUpgradesTotal.toString(),
                 FAILURE_COUNT to statisticsDataStore.httpsUpgradesFailures.toString()
             )

From 0100c2431014bad01a533869eec8c033fd2c7b99 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Tue, 9 Oct 2018 10:58:20 +0100
Subject: [PATCH 08/11] Remove old home row related experiment restrictions

---
 .../java/com/duckduckgo/app/statistics/VariantManager.kt    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt b/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
index 8426670dec53..9d457329f9bd 100644
--- a/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
+++ b/app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
@@ -96,14 +96,8 @@ class ExperimentationVariantManager(
     }
 
     private fun generateVariant(activeVariants: List<Variant>): Variant {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
-            Timber.i("No variants available for pre-Nougat devices")
-            return DEFAULT_VARIANT
-        }
-
         val randomizedIndex = indexRandomizer.random(activeVariants)
         return activeVariants[randomizedIndex]
-
     }
 }
 

From 64b24d696213c31d29951002d8cd74de3e494906 Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Tue, 9 Oct 2018 11:16:27 +0100
Subject: [PATCH 09/11] Give omnibar own theme to set color control to avoid
 messing up tabs icon

---
 app/src/main/res/layout/include_omnibar_toolbar.xml | 3 ++-
 app/src/main/res/values/themes.xml                  | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/include_omnibar_toolbar.xml b/app/src/main/res/layout/include_omnibar_toolbar.xml
index 8e17c4ee766e..dcc57e3ad9ba 100644
--- a/app/src/main/res/layout/include_omnibar_toolbar.xml
+++ b/app/src/main/res/layout/include_omnibar_toolbar.xml
@@ -38,6 +38,8 @@
                 android:id="@+id/toolbar"
                 android:layout_width="0dp"
                 android:layout_height="?attr/actionBarSize"
+                android:background="?attr/colorPrimary"
+                android:theme="@style/OmnibarToolbarTheme"
                 app:contentInsetEnd="0dp"
                 app:contentInsetStart="0dp"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -45,7 +47,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_scrollFlags="scroll|enterAlways"
-                android:theme="@style/ToolbarTheme"
                 app:popupTheme="@style/AppTheme.Dark.PopupOverlay">
 
                 <android.support.constraint.ConstraintLayout
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 629a972ae815..86e651a73773 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -120,6 +120,10 @@
         <item name="colorControlHighlight">@color/subtleGrayTwo</item>
     </style>
 
+    <style name="OmnibarToolbarTheme">
+        <item name="colorControlHighlight">@color/subtleGrayTwo</item>
+    </style>
+
     <style name="SwitchTheme" parent="Widget.AppCompat.CompoundButton.Switch">
         <item name="colorControlActivated">@android:color/white</item>
     </style>

From 82a838eb39cada81a397dc219d1c808d28a089fe Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Tue, 9 Oct 2018 11:40:31 +0100
Subject: [PATCH 10/11] Remove unwanted background color from toolbar

---
 app/src/main/res/values/themes.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 86e651a73773..108df658468f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -114,7 +114,6 @@
     </style>
 
     <style name="ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
-        <item name="android:background">?attr/colorPrimary</item>
         <item name="colorControlNormal">?attr/toolbarIconColor</item>
         <item name="android:textColorPrimary">?attr/toolbarTextColor</item>
         <item name="colorControlHighlight">@color/subtleGrayTwo</item>

From 1df394c2c6df77c564fe187cbc955dff6013018c Mon Sep 17 00:00:00 2001
From: Mia Alexiou <mia@duckduckgo.com>
Date: Tue, 9 Oct 2018 12:09:33 +0100
Subject: [PATCH 11/11] Update variant versions tests

---
 .../ExperimentationVariantManagerTest.kt      | 26 ++-----------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/app/src/androidTest/java/com/duckduckgo/app/statistics/ExperimentationVariantManagerTest.kt b/app/src/androidTest/java/com/duckduckgo/app/statistics/ExperimentationVariantManagerTest.kt
index f4329fa6bb85..3672474a33c8 100644
--- a/app/src/androidTest/java/com/duckduckgo/app/statistics/ExperimentationVariantManagerTest.kt
+++ b/app/src/androidTest/java/com/duckduckgo/app/statistics/ExperimentationVariantManagerTest.kt
@@ -16,8 +16,6 @@
 
 package com.duckduckgo.app.statistics
 
-import android.os.Build
-import android.support.test.filters.SdkSuppress
 import com.duckduckgo.app.statistics.store.StatisticsDataStore
 import com.nhaarman.mockito_kotlin.*
 import org.junit.Assert.assertEquals
@@ -95,8 +93,7 @@ class ExperimentationVariantManagerTest {
 
 
     @Test
-    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
-    fun whenNougatOrLaterAndNoVariantPersistedThenNewVariantAllocated() {
+    fun whenNoVariantPersistedThenNewVariantAllocated() {
         activeVariants.add(Variant("foo", 100.0))
 
         testee.getVariant(activeVariants)
@@ -105,30 +102,11 @@ class ExperimentationVariantManagerTest {
     }
 
     @Test
-    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
-    fun whenNougatOrLaterAndNoVariantPersistedThenNewVariantKeyIsAllocatedAndPersisted() {
+    fun whenNoVariantPersistedThenNewVariantKeyIsAllocatedAndPersisted() {
         activeVariants.add(Variant("foo", 100.0))
 
         testee.getVariant(activeVariants)
 
         verify(mockStore).variant = "foo"
     }
-
-    @Test
-    @SdkSuppress(maxSdkVersion = Build.VERSION_CODES.M)
-    fun whenMarshmallowOrEarlierAndNoVariantPersistedThenDefaultVariantAllocated() {
-        activeVariants.add(Variant("foo", 100.0))
-
-        assertEquals(VariantManager.DEFAULT_VARIANT, testee.getVariant(activeVariants))
-    }
-
-    @Test
-    @SdkSuppress(maxSdkVersion = Build.VERSION_CODES.M)
-    fun whenMarshmallowOrEarlierAndNoVariantPersistedThenDefaultVariantKeyIsAllocatedAndPersisted() {
-        activeVariants.add(Variant("foo", 100.0))
-
-        testee.getVariant(activeVariants)
-
-        verify(mockStore).variant = VariantManager.DEFAULT_VARIANT.key
-    }
 }
\ No newline at end of file